From 7f76bf32b81ea1ec14f248e603ae9d0a498a0620 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Tue, 9 Apr 2024 16:55:49 +0800 Subject: [PATCH 001/299] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9douyin?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit handler_user_profile -> fetch_user_profile --- README.en.md | 2 +- README.md | 2 +- docs/guide/apps/douyin/index.md | 4 ++-- docs/snippets/douyin/user-profile.py | 2 +- f2/apps/douyin/handler.py | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.en.md b/README.en.md index ef247502..bb10b935 100644 --- a/README.en.md +++ b/README.en.md @@ -100,7 +100,7 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores | Feature | Account Status | Interface | Feature Status | | --- | --- | --- | --- | - | User Information | 🟣⚫ | `handler_user_profile` | 🟢 | + | User Information | 🟣⚫ | `fetch_user_profile` | 🟢 | | Single Work (Video, Album, Daily) | 🟣⚫ | `fetch_one_video` | 🟢 | | Home Page Works | 🟣⚫ | `fetch_user_post_videos` | 🟢 | | Liked Works | 🟣⚫ | `fetch_user_like_videos` | 🟢 | diff --git a/README.md b/README.md index 9eaed4aa..50dc495a 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ |功能|账号状态|接口|功能状态| |---|---|---|---| - |用户信息|🟣⚫|`handler_user_profile`|🟢| + |用户信息|🟣⚫|`fetch_user_profile`|🟢| |单个作品（视频、图集、日常）|🟣⚫|`fetch_one_video`|🟢| |主页作品|🟣⚫|`fetch_user_post_videos`|🟢| |点赞作品|🟣⚫|`fetch_user_like_videos`|🟢| diff --git a/docs/guide/apps/douyin/index.md b/docs/guide/apps/douyin/index.md index c95294e9..f4f0f314 100644 --- a/docs/guide/apps/douyin/index.md +++ b/docs/guide/apps/douyin/index.md @@ -31,7 +31,7 @@ outline: deep | 用户直播流数据2 | fetch_user_live_videos_by_room_id | 🟢 | | 用户首页推荐作品数据 | fetch_user_feed_videos | 🟢 | | ...... | ...... | 🔵 | -| 用户信息 | handler_user_profile | 🟢 | +| 用户信息 | fetch_user_profile | 🟢 | | 获取指定用户名 | get_user_nickname | 🔴 | | 创建用户记录与目录 | get_or_add_user_data | 🟡 | | 创建作品下载记录 | get_or_add_video_data | 🟢 | @@ -412,7 +412,7 @@ outline: deep <<< @/snippets/douyin/xbogus.py#model-2-endpoint-2-filter-snippet{22-27} -更加抽象的高级方法可以直接调用handler接口的`handler_user_profile`。 +更加抽象的高级方法可以直接调用handler接口的`fetch_user_profile`。 ::: tip 提示 本项目中的UA参数为固定值，`Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, diff --git a/docs/snippets/douyin/user-profile.py b/docs/snippets/douyin/user-profile.py index 5bfe045a..cb049261 100644 --- a/docs/snippets/douyin/user-profile.py +++ b/docs/snippets/douyin/user-profile.py @@ -13,7 +13,7 @@ async def main(): sec_user_id = "MS4wLjABAAAANXSltcLCzDGmdNFI2Q_QixVTr67NiYzjKOIP5s03CAE" - user = await DouyinHandler(kwargs).handler_user_profile(sec_user_id=sec_user_id) + user = await DouyinHandler(kwargs).fetch_user_profile(sec_user_id=sec_user_id) print("=================_to_raw================") print(user._to_raw()) # print("=================_to_dict===============") diff --git a/f2/apps/douyin/handler.py b/f2/apps/douyin/handler.py index 90231e11..0addc8ce 100644 --- a/f2/apps/douyin/handler.py +++ b/f2/apps/douyin/handler.py @@ -68,7 +68,7 @@ def __init__(self, kwargs: dict = ...) -> None: self.kwargs = kwargs self.downloader = DouyinDownloader(kwargs) - async def handler_user_profile( + async def fetch_user_profile( self, sec_user_id: str, ) -> UserProfileFilter: @@ -110,7 +110,7 @@ async def get_user_nickname( user_dict = await db.get_user_info(sec_user_id) if not user_dict: - user_dict = await self.handler_user_profile(sec_user_id) + user_dict = await self.fetch_user_profile(sec_user_id) await db.add_user_info(**user_dict._to_dict()) return user_dict.get("nickname") @@ -137,7 +137,7 @@ async def get_or_add_user_data( local_user_data = await db.get_user_info(sec_user_id) # 从服务器获取当前用户最新数据 - current_user_data = await self.handler_user_profile(sec_user_id) + current_user_data = await self.fetch_user_profile(sec_user_id) # 获取当前用户最新昵称 current_nickname = current_user_data._to_dict().get("nickname") From 79eeb1ab4a8b7ba718423999ae98740cdbf608b9 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Tue, 9 Apr 2024 16:57:39 +0800 Subject: [PATCH 002/299] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9tiktok?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit handler_user_profile -> fetch_user_profile --- README.en.md | 2 +- README.md | 2 +- docs/guide/apps/tiktok/index.md | 4 ++-- docs/snippets/tiktok/user-profile.py | 4 ++-- f2/apps/tiktok/handler.py | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.en.md b/README.en.md index bb10b935..ba1ac06e 100644 --- a/README.en.md +++ b/README.en.md @@ -139,7 +139,7 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores | Feature | Account Status | Interface | Feature Status | | --- | --- | --- | --- | - | User Information | 🟣⚫ | `handler_user_profile` | 🟢 | + | User Information | 🟣⚫ | `fetch_user_profile` | 🟢 | | Single Work | 🟣⚫ | `fetch_one_video` | 🟢 | | Home Page Works | 🟣⚫ | `fetch_user_post_videos` | 🟢 | | Liked Works | 🟣⚫ | `fetch_user_like_videos` | 🟢 | diff --git a/README.md b/README.md index 50dc495a..1930a420 100644 --- a/README.md +++ b/README.md @@ -140,7 +140,7 @@ |功能|账号状态|接口|功能状态| |---|---|---|---| - |用户信息|🟣⚫|`handler_user_profile`|🟢| + |用户信息|🟣⚫|`fetch_user_profile`|🟢| |单个作品|🟣⚫|`fetch_one_video`|🟢| |主页作品|🟣⚫|`fetch_user_post_videos`|🟢| |点赞作品|🟣⚫|`fetch_user_like_videos`|🟢| diff --git a/docs/guide/apps/tiktok/index.md b/docs/guide/apps/tiktok/index.md index 968a60c5..0cf925c5 100644 --- a/docs/guide/apps/tiktok/index.md +++ b/docs/guide/apps/tiktok/index.md @@ -29,7 +29,7 @@ outline: deep | 用户播放列表作品数据 | fetch_play_list | 🟢 | | 用户合辑(播放列表)作品 | fetch_user_mix_videos | 🟢 | | ...... | ...... | 🔵 | -| 用户信息 | handler_user_profile | 🟢 | +| 用户信息 | fetch_user_profile | 🟢 | | 获取指定用户名 | get_user_nickname | 🔴 | | 创建用户记录与目录 | get_or_add_user_data | 🟡 | | 创建作品下载记录 | get_or_add_video_data | 🟢 | @@ -366,7 +366,7 @@ TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 <<< @/snippets/tiktok/xbogus.py#model-2-endpoint-2-filter-snippet{21-26} -更加抽象的高级方法可以直接调用handler接口的`handler_user_profile`。 +更加抽象的高级方法可以直接调用handler接口的`fetch_user_profile`。 ::: tip 提示 本项目中的UA参数为固定值，`Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, diff --git a/docs/snippets/tiktok/user-profile.py b/docs/snippets/tiktok/user-profile.py index 5819a3e6..07a0a479 100644 --- a/docs/snippets/tiktok/user-profile.py +++ b/docs/snippets/tiktok/user-profile.py @@ -16,13 +16,13 @@ async def main(): "MS4wLjABAAAAQhcYf_TjRKUku-aF8oqngAfzrYksgGLRz8CKMciBFdfR54HQu3qGs-WoJ-KO7hO8" ) uniqueId = "vantoan___" - user = await TiktokHandler(kwargs).handler_user_profile(secUid=secUid) + user = await TiktokHandler(kwargs).fetch_user_profile(secUid=secUid) print("=================_to_raw================") print(user._to_raw()) # print("=================_to_dict===============") # print(user._to_dict()) - user = await TiktokHandler(kwargs).handler_user_profile(uniqueId=uniqueId) + user = await TiktokHandler(kwargs).fetch_user_profile(uniqueId=uniqueId) print("=================_to_raw================") print(user._to_raw()) # print("=================_to_dict===============") diff --git a/f2/apps/tiktok/handler.py b/f2/apps/tiktok/handler.py index d6d8a149..e4b8f2dc 100644 --- a/f2/apps/tiktok/handler.py +++ b/f2/apps/tiktok/handler.py @@ -48,7 +48,7 @@ def __init__(self, kwargs: dict = ...) -> None: self.kwargs = kwargs self.downloader = TiktokDownloader(kwargs) - async def handler_user_profile( + async def fetch_user_profile( self, secUid: str = "", uniqueId: str = "", @@ -95,7 +95,7 @@ async def get_user_nickname( user_dict = await db.get_user_info(secUid) if not user_dict: - user_dict = await self.handler_user_profile(secUid) + user_dict = await self.fetch_user_profile(secUid) await db.add_user_info(**user_dict._to_dict()) return user_dict.get("nickname", "") @@ -121,7 +121,7 @@ async def get_or_add_user_data( local_user_data = await db.get_user_info(secUid) # 从服务器获取当前用户最新数据 - current_user_data = await self.handler_user_profile(secUid) + current_user_data = await self.fetch_user_profile(secUid) # 获取当前用户最新昵称 current_nickname = current_user_data._to_dict().get("nickname") From 1bb834592c80d42ec116411a6b756893a8330576 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Tue, 9 Apr 2024 16:59:43 +0800 Subject: [PATCH 003/299] =?UTF-8?q?perf:=20=E7=A7=BB=E5=8A=A8tiktok?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=8E=E9=80=89=E6=8B=A9=E6=92=AD=E6=94=BE?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E6=96=B9=E6=B3=95=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/handler.py | 166 +++++++++++++++++++------------------- 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/f2/apps/tiktok/handler.py b/f2/apps/tiktok/handler.py index e4b8f2dc..1483272e 100644 --- a/f2/apps/tiktok/handler.py +++ b/f2/apps/tiktok/handler.py @@ -163,89 +163,6 @@ async def get_or_add_video_data( # current_video_data = await fetch_one_video(aweme_data.get("aweme_id")) await db.add_video_info(ignore_fields=ignore_fields, **aweme_data) - async def fetch_play_list( - self, - secUid: str, - cursor: int, - page_counts: int, - ) -> UserPlayListFilter: - """ - 用于获取指定用户的作品合集列表 - (Used to get video mix list of specified user) - - Args: - secUid: str: 用户ID (User ID) - cursor: int: 分页游标 (Page cursor) - page_counts: int: 分页数量 (Page counts) - - Return: - playlist: UserPlayListFilter: 作品合集列表 (Video mix list) - """ - - logger.debug(_("开始爬取用户：{0} 的作品合集列表").format(secUid)) - - async with TiktokCrawler(self.kwargs) as crawler: - params = UserPlayList(secUid=secUid, cursor=cursor, count=page_counts) - response = await crawler.fetch_user_play_list(params) - playlist = UserPlayListFilter(response) - - if not playlist.hasPlayList: - logger.info(_("用户：{0} 没有作品合集").format(secUid)) - return {} - - logger.debug(_("当前请求的cursor：{0}").format(cursor)) - logger.debug( - _("作品合集ID：{0} 作品合集标题：{1}").format( - playlist.mixId, playlist.mixName - ) - ) - logger.debug("===================================") - return playlist - - async def select_playlist( - self, playlists: Union[dict, UserPlayListFilter] - ) -> Union[str, List[str]]: - """ - 用于选择要下载的作品合辑 - (Used to select the video mix to download) - - Args: - playlists: Union[dict, UserPlayListFilter]: 作品合辑列表 (Video mix list) - - Return: - selected_index: Union[str, List[str]]: 选择的作品合辑序号 (Selected video mix index) - """ - - if playlists == {}: - sys.exit(_("用户没有作品合辑")) - - rich_console.print("[bold]请选择要下载的合辑：[/bold]") - rich_console.print("0: [bold]全部下载[/bold]") - - for i in range(len(playlists.mixId)): - rich_console.print( - _("{0}: {1} (包含 {2} 个作品，收藏夹ID {3})").format( - i + 1, - playlists.mixName[i], - playlists.videoCount[i], - playlists.mixId[i], - ) - ) - - # rich_prompt 会有字符刷新问题，暂时使用rich_print - rich_console.print(_("[bold yellow]请输入希望下载的合辑序号：[/bold yellow]")) - selected_index = int( - rich_prompt.ask( - # _("[bold yellow]请输入希望下载的合辑序号:[/bold yellow]"), - choices=[str(i) for i in range(len(playlists.mixId) + 1)], - ) - ) - - if selected_index == 0: - return playlists.mixId - else: - return playlists.mixId[selected_index - 1] - @mode_handler("one") async def handler_one_video(self): """ @@ -616,6 +533,89 @@ async def handler_user_mix(self): self.kwargs, aweme_data_list._to_list(), user_path ) + async def fetch_play_list( + self, + secUid: str, + cursor: int, + page_counts: int, + ) -> UserPlayListFilter: + """ + 用于获取指定用户的作品合集列表 + (Used to get video mix list of specified user) + + Args: + secUid: str: 用户ID (User ID) + cursor: int: 分页游标 (Page cursor) + page_counts: int: 分页数量 (Page counts) + + Return: + playlist: UserPlayListFilter: 作品合集列表 (Video mix list) + """ + + logger.debug(_("开始爬取用户：{0} 的作品合集列表").format(secUid)) + + async with TiktokCrawler(self.kwargs) as crawler: + params = UserPlayList(secUid=secUid, cursor=cursor, count=page_counts) + response = await crawler.fetch_user_play_list(params) + playlist = UserPlayListFilter(response) + + if not playlist.hasPlayList: + logger.info(_("用户：{0} 没有作品合集").format(secUid)) + return {} + + logger.debug(_("当前请求的cursor：{0}").format(cursor)) + logger.debug( + _("作品合集ID：{0} 作品合集标题：{1}").format( + playlist.mixId, playlist.mixName + ) + ) + logger.debug("===================================") + return playlist + + async def select_playlist( + self, playlists: Union[dict, UserPlayListFilter] + ) -> Union[str, List[str]]: + """ + 用于选择要下载的作品合辑 + (Used to select the video mix to download) + + Args: + playlists: Union[dict, UserPlayListFilter]: 作品合辑列表 (Video mix list) + + Return: + selected_index: Union[str, List[str]]: 选择的作品合辑序号 (Selected video mix index) + """ + + if playlists == {}: + sys.exit(_("用户没有作品合辑")) + + rich_console.print("[bold]请选择要下载的合辑：[/bold]") + rich_console.print("0: [bold]全部下载[/bold]") + + for i in range(len(playlists.mixId)): + rich_console.print( + _("{0}: {1} (包含 {2} 个作品，收藏夹ID {3})").format( + i + 1, + playlists.mixName[i], + playlists.videoCount[i], + playlists.mixId[i], + ) + ) + + # rich_prompt 会有字符刷新问题，暂时使用rich_print + rich_console.print(_("[bold yellow]请输入希望下载的合辑序号：[/bold yellow]")) + selected_index = int( + rich_prompt.ask( + # _("[bold yellow]请输入希望下载的合辑序号:[/bold yellow]"), + choices=[str(i) for i in range(len(playlists.mixId) + 1)], + ) + ) + + if selected_index == 0: + return playlists.mixId + else: + return playlists.mixId[selected_index - 1] + async def fetch_user_mix_videos( self, mixId: str, cursor: int, page_counts: int, max_counts: float ) -> AsyncGenerator[UserMixFilter, Any]: From 53e00c7fd58c65cab298dd223ec7c1a7390b1fef Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Tue, 9 Apr 2024 18:15:46 +0800 Subject: [PATCH 004/299] =?UTF-8?q?style:=20=E4=BD=BF=E7=94=A8black?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96tiktok\handler.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/handler.py | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/f2/apps/tiktok/handler.py b/f2/apps/tiktok/handler.py index 1483272e..1a1c3c36 100644 --- a/f2/apps/tiktok/handler.py +++ b/f2/apps/tiktok/handler.py @@ -192,7 +192,10 @@ async def handler_one_video(self): self.kwargs, aweme_data._to_dict(), user_path ) - async def fetch_one_video(self, itemId: str) -> PostDetailFilter: + async def fetch_one_video( + self, + itemId: str, + ) -> PostDetailFilter: """ 用于获取指定作品的详细信息 (Used to get detailed information of specified video) @@ -336,7 +339,11 @@ async def handler_user_like(self): ) async def fetch_user_like_videos( - self, secUid: str, cursor: int, page_counts: int, max_counts: float + self, + secUid: str, + cursor: int, + page_counts: int, + max_counts: float, ) -> AsyncGenerator[UserPostFilter, Any]: """ 用于获取指定用户点赞的作品列表 @@ -432,7 +439,11 @@ async def handler_user_collect(self): ) async def fetch_user_collect_videos( - self, secUid: str, cursor: int, page_counts: int, max_counts: float + self, + secUid: str, + cursor: int, + page_counts: int, + max_counts: float, ) -> AsyncGenerator[UserPostFilter, Any]: """ 用于获取指定用户收藏的作品列表 @@ -573,7 +584,8 @@ async def fetch_play_list( return playlist async def select_playlist( - self, playlists: Union[dict, UserPlayListFilter] + self, + playlists: Union[dict, UserPlayListFilter], ) -> Union[str, List[str]]: """ 用于选择要下载的作品合辑 @@ -617,7 +629,11 @@ async def select_playlist( return playlists.mixId[selected_index - 1] async def fetch_user_mix_videos( - self, mixId: str, cursor: int, page_counts: int, max_counts: float + self, + mixId: str, + cursor: int, + page_counts: int, + max_counts: float, ) -> AsyncGenerator[UserMixFilter, Any]: """ 用于获取指定用户合集的作品列表 @@ -692,4 +708,3 @@ async def main(kwargs): await mode_function_map[mode](TiktokHandler(kwargs)) else: logger.error(_("不存在该模式: {0}").format(mode)) - rich_console.print(_("不存在该模式: {0}").format(mode)) From ed766bdaac7062e18237544f91a7619b14540a7b Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 11 Apr 2024 17:29:50 +0800 Subject: [PATCH 005/299] =?UTF-8?q?refactor:=20=E7=B1=BB=E2=80=9CBaseModel?= =?UTF-8?q?=E2=80=9D=E4=B8=AD=E7=9A=84=E2=80=9Cdict=E2=80=9D=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=B7=B2=E5=BC=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit dict() -> model_dump() --- docs/snippets/douyin/xbogus.py | 2 +- docs/snippets/tiktok/xbogus.py | 2 +- f2/apps/douyin/crawler.py | 48 +++++++++++++------------- f2/apps/douyin/test/test_apps_model.py | 2 +- f2/apps/tiktok/crawler.py | 18 +++++----- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/docs/snippets/douyin/xbogus.py b/docs/snippets/douyin/xbogus.py index d57f16f3..2e3b6b7d 100644 --- a/docs/snippets/douyin/xbogus.py +++ b/docs/snippets/douyin/xbogus.py @@ -22,7 +22,7 @@ async def main(): async def gen_user_profile(params: UserProfile): return XBogusManager.model_2_endpoint( - dyendpoint.USER_DETAIL, params.dict() + dyendpoint.USER_DETAIL, params.model_dump() ) async def main(): diff --git a/docs/snippets/tiktok/xbogus.py b/docs/snippets/tiktok/xbogus.py index b8a6e144..1b75baeb 100644 --- a/docs/snippets/tiktok/xbogus.py +++ b/docs/snippets/tiktok/xbogus.py @@ -22,7 +22,7 @@ async def main(): async def gen_user_profile(params: UserProfile): return XBogusManager.model_2_endpoint( - tkendpoint.USER_DETAIL, params.dict() + tkendpoint.USER_DETAIL, params.model_dump() ) async def main(): diff --git a/f2/apps/douyin/crawler.py b/f2/apps/douyin/crawler.py index da37917e..00d9c7c6 100644 --- a/f2/apps/douyin/crawler.py +++ b/f2/apps/douyin/crawler.py @@ -53,7 +53,7 @@ async def fetch_user_profile(self, params: UserProfile): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.USER_DETAIL, - params.dict(), + params.model_dump(), ) logger.debug(_("用户信息接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -62,7 +62,7 @@ async def fetch_user_post(self, params: UserPost): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.USER_POST, - params.dict(), + params.model_dump(), ) logger.debug(_("主页作品接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -71,7 +71,7 @@ async def fetch_user_like(self, params: UserLike): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.USER_FAVORITE_A, - params.dict(), + params.model_dump(), ) logger.debug(_("主页喜欢作品接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -80,16 +80,16 @@ async def fetch_user_collection(self, params: UserCollection): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.USER_COLLECTION, - params.dict(), + params.model_dump(), ) logger.debug(_("主页收藏作品接口地址：{0}").format(endpoint)) - return await self._fetch_post_json(endpoint, params.dict()) + return await self._fetch_post_json(endpoint, params.model_dump()) async def fetch_user_collects(self, params: UserCollects): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.USER_COLLECTS, - params.dict(), + params.model_dump(), ) logger.debug(_("收藏夹接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -98,7 +98,7 @@ async def fetch_user_collects_video(self, params: UserCollectsVideo): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.USER_COLLECTS_VIDEO, - params.dict(), + params.model_dump(), ) logger.debug(_("收藏夹作品接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -107,7 +107,7 @@ async def fetch_user_music_collection(self, params: UserMusicCollection): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.USER_MUSIC_COLLECTION, - params.dict(), + params.model_dump(), ) logger.debug(_("音乐收藏接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -116,7 +116,7 @@ async def fetch_user_mix(self, params: UserMix): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.MIX_AWEME, - params.dict(), + params.model_dump(), ) logger.debug(_("合集作品接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -125,7 +125,7 @@ async def fetch_post_detail(self, params: PostDetail): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.POST_DETAIL, - params.dict(), + params.model_dump(), ) logger.debug(_("作品详情接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -134,7 +134,7 @@ async def fetch_post_comment(self, params: PostDetail): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.POST_COMMENT, - params.dict(), + params.model_dump(), ) logger.debug(_("作品评论接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -143,7 +143,7 @@ async def fetch_post_feed(self, params: PostDetail): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.TAB_FEED, - params.dict(), + params.model_dump(), ) logger.debug(_("首页推荐作品接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -152,7 +152,7 @@ async def fetch_follow_feed(self, params: PostDetail): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.FOLLOW_FEED, - params.dict(), + params.model_dump(), ) logger.debug(_("关注作品接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -161,7 +161,7 @@ async def fetch_friend_feed(self, params: PostDetail): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.FRIEND_FEED, - params.dict(), + params.model_dump(), ) logger.debug(_("朋友作品接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -170,7 +170,7 @@ async def fetch_post_related(self, params: PostDetail): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.POST_RELATED, - params.dict(), + params.model_dump(), ) logger.debug(_("相关推荐作品接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -179,7 +179,7 @@ async def fetch_live(self, params: UserLive): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.LIVE_INFO, - params.dict(), + params.model_dump(), ) logger.debug(_("直播接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -192,7 +192,7 @@ async def fetch_live_room_id(self, params: UserLive2): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.LIVE_INFO_ROOM_ID, - params.dict(), + params.model_dump(), ) logger.debug(_("直播接口地址（room_id）：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -203,7 +203,7 @@ async def fetch_follow_live(self, params: FollowUserLive): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.FOLLOW_USER_LIVE, - params.dict(), + params.model_dump(), ) logger.debug(_("关注用户直播接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -212,7 +212,7 @@ async def fetch_locate_post(self, params: UserPost): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.LOCATE_POST, - params.dict(), + params.model_dump(), ) logger.debug(_("定位上一次作品接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -221,7 +221,7 @@ async def fetch_login_qrcode(self, parms: LoginGetQr): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.SSO_LOGIN_GET_QR, - parms.dict(), + parms.model_dump(), ) logger.debug(_("SSO获取二维码接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -230,7 +230,7 @@ async def fetch_check_qrcode(self, parms: LoginCheckQr): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.SSO_LOGIN_CHECK_QR, - parms.dict(), + parms.model_dump(), ) logger.debug(_("SSO检查扫码状态接口地址：{0}").format(endpoint)) return await self._fetch_response(endpoint) @@ -239,7 +239,7 @@ async def fetch_check_login(self, parms: LoginCheckQr): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.SSO_LOGIN_CHECK_LOGIN, - parms.dict(), + parms.model_dump(), ) logger.debug(_("SSO检查登录状态接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -248,7 +248,7 @@ async def fetch_user_following(self, params: UserFollowing): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.USER_FOLLOWING, - params.dict(), + params.model_dump(), ) logger.debug(_("用户关注列表接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -257,7 +257,7 @@ async def fetch_user_follower(self, params: UserFollower): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.USER_FOLLOWER, - params.dict(), + params.model_dump(), ) logger.debug(_("用户粉丝列表接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) diff --git a/f2/apps/douyin/test/test_apps_model.py b/f2/apps/douyin/test/test_apps_model.py index ff759476..6c91913a 100644 --- a/f2/apps/douyin/test/test_apps_model.py +++ b/f2/apps/douyin/test/test_apps_model.py @@ -14,7 +14,7 @@ def test_xbogus_manager(): final_endpoint = XBogusManager.model_2_endpoint( user_agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 Edg/122.0.0.0", base_endpoint=dyendpoint.USER_DETAIL, - params=params.dict(), + params=params.model_dump(), ) assert final_endpoint, "Failed to get a final endpoint." diff --git a/f2/apps/tiktok/crawler.py b/f2/apps/tiktok/crawler.py index cb65c292..6090e1d1 100644 --- a/f2/apps/tiktok/crawler.py +++ b/f2/apps/tiktok/crawler.py @@ -45,7 +45,7 @@ async def fetch_user_profile(self, params: UserProfile): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), tkendpoint.USER_DETAIL, - params.dict(), + params.model_dump(), ) logger.debug(_("用户信息接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -54,7 +54,7 @@ async def fetch_user_post(self, params: UserPost): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), tkendpoint.USER_POST, - params.dict(), + params.model_dump(), ) logger.debug(_("主页作品接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -63,7 +63,7 @@ async def fetch_user_like(self, params: UserLike): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), tkendpoint.USER_LIKE, - params.dict(), + params.model_dump(), ) logger.debug(_("喜欢作品接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -72,7 +72,7 @@ async def fetch_user_collect(self, params: UserCollect): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), tkendpoint.USER_COLLECT, - params.dict(), + params.model_dump(), ) logger.debug(_("收藏作品接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -81,7 +81,7 @@ async def fetch_user_play_list(self, params: UserPlayList): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), tkendpoint.USER_PLAY_LIST, - params.dict(), + params.model_dump(), ) logger.debug(_("合辑列表接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -90,7 +90,7 @@ async def fetch_user_mix(self, params: UserMix): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), tkendpoint.USER_MIX, - params.dict(), + params.model_dump(), ) logger.debug(_("合辑作品接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -99,7 +99,7 @@ async def fetch_post_detail(self, params: PostDetail): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), tkendpoint.AWEME_DETAIL, - params.dict(), + params.model_dump(), ) logger.debug(_("作品详情接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -108,7 +108,7 @@ async def fetch_post_comment(self, params: PostComment): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), tkendpoint.POST_COMMENT, - params.dict(), + params.model_dump(), ) logger.debug(_("作品评论接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) @@ -117,7 +117,7 @@ async def fetch_post_recommend(self, params: PostDetail): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), tkendpoint.HOME_RECOMMEND, - params.dict(), + params.model_dump(), ) logger.debug(_("首页推荐接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) From af9023570f355dd1477d695f2effc7fd5bd2faac Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 11 Apr 2024 17:38:20 +0800 Subject: [PATCH 006/299] =?UTF-8?q?build:=20=E6=9B=B4=E6=96=B0`pydantic`?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=88=B0`2.6.4`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b5c7ed3c..6e7004e9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,7 +38,7 @@ dependencies = [ "pytest==7.4.2", "pytest-asyncio==0.21.1", "browser_cookie3==0.19.1", - "pydantic==1.10.12", + "pydantic==2.6.4", "qrcode==7.4.2", ] From eb3e5d4c2598af968b2bd2634d5140a2e04e0d72 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 11 Apr 2024 18:25:45 +0800 Subject: [PATCH 007/299] =?UTF-8?q?refactor:=20=E5=AE=8C=E5=96=84=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=88=B3=E8=BD=AC=E6=8D=A2=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/utils/utils.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/f2/utils/utils.py b/f2/utils/utils.py index 09c5a340..63c21574 100644 --- a/f2/utils/utils.py +++ b/f2/utils/utils.py @@ -76,13 +76,18 @@ def timestamp_2_str( str: 格式化的日期时间字符串 (The formatted date-time string) """ if timestamp is None or timestamp == "None": - return "" + return "Invalid timestamp" if isinstance(timestamp, str): if len(timestamp) == 30: - return datetime.datetime.strptime(timestamp, "%a %b %d %H:%M:%S %z %Y") + date_obj = datetime.datetime.strptime(timestamp, "%a %b %d %H:%M:%S %z %Y") + else: + date_obj = datetime.datetime.fromtimestamp(float(timestamp)) + + if isinstance(timestamp, Union[int, float]): + date_obj = datetime.datetime.fromtimestamp(float(timestamp)) - return datetime.datetime.fromtimestamp(float(timestamp)).strftime(format) + return date_obj.strftime(format) def num_to_base36(num: int) -> str: From 81efa50672a18e2b03c1e58a36f223d4b24d8df2 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 11 Apr 2024 18:26:06 +0800 Subject: [PATCH 008/299] =?UTF-8?q?test:=20=E6=B7=BB=E5=8A=A0=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=88=B3=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_timestamp_2_str.py | 53 +++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 tests/test_timestamp_2_str.py diff --git a/tests/test_timestamp_2_str.py b/tests/test_timestamp_2_str.py new file mode 100644 index 00000000..dd3ec38d --- /dev/null +++ b/tests/test_timestamp_2_str.py @@ -0,0 +1,53 @@ +import pytest +from f2.utils.utils import timestamp_2_str + + +class TestTimestamp2Str: + def test_timestamp_2_str(self): + assert timestamp_2_str(1697889407) == "2023-10-21 19-56-47" + + def test_timestamp_2_str_with_format(self): + assert timestamp_2_str(1697889407, "%Y-%m-%d %H-%M-%S") == "2023-10-21 19-56-47" + + def test_timestamp_2_str_with_invalid_format(self): + assert timestamp_2_str(1697889407, "%Y-%m-%d") == "2023-10-21" + + def test_timestamp_2_str_with_invalid_timestamp(self): + assert timestamp_2_str("1620000000") == "2021-05-03 08-00-00" + + def test_long_timestamp_2_str(self): + assert ( + timestamp_2_str("Sun Apr 07 18:43:48 +0800 2024") == "2024-04-07 18-43-48" + ) + + def test_long_timestamp_2_str_with_format(self): + assert ( + timestamp_2_str("Sun Apr 07 18:43:48 +0800 2024", "%Y-%m-%d %H-%M-%S") + == "2024-04-07 18-43-48" + ) + + def test_long_timestamp_2_str_with_format_ymd(self): + assert ( + timestamp_2_str("Sun Apr 07 18:43:48 +0800 2024", "%Y-%m-%d") + == "2024-04-07" + ) + + def test_long_timestamp_2_str_with_format_abd_hms_zy(self): + assert ( + timestamp_2_str("Sun Apr 07 18:43:48 +0800 2024", "%a %b %d %H:%M:%S %z %Y") + == "Sun Apr 07 18:43:48 +0800 2024" + ) + + def test_long_timestamp_2_str_with_format_abd_hms(self): + assert ( + timestamp_2_str("Sun Apr 07 18:43:48 +0800 2024", "%a %b %d %H:%M:%S") + == "Sun Apr 07 18:43:48" + ) + + def test_invalid_timestamp_2_str(self): + with pytest.raises(ValueError): + timestamp_2_str("invalid_timestamp") + + def test_invalid_timestamp_2_str_with_format(self): + with pytest.raises(ValueError): + timestamp_2_str("invalid_timestamp", "%Y-%m-%d %H-%M-%S") From 2f3d5f85798d9458ce84c54c98ddc6eb24a06610 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 11 Apr 2024 18:48:30 +0800 Subject: [PATCH 009/299] =?UTF-8?q?refactor:=20=E6=B7=BB=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=88=B3=E8=BD=AC=E6=8D=A2=E7=9A=84=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=97=B6=E5=8C=BA=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 使用东八区北京时间 --- f2/utils/utils.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/f2/utils/utils.py b/f2/utils/utils.py index 63c21574..99b519be 100644 --- a/f2/utils/utils.py +++ b/f2/utils/utils.py @@ -60,10 +60,12 @@ def get_timestamp(unit: str = "milli"): def timestamp_2_str( - timestamp: Union[str, int, float], format: str = "%Y-%m-%d %H-%M-%S" + timestamp: Union[str, int, float], + format: str = "%Y-%m-%d %H-%M-%S", + tz: datetime.timezone = datetime.timezone(datetime.timedelta(hours=8)), ) -> str: """ - 将 UNIX 时间戳转换为格式化字符串 (Convert a UNIX timestamp to a formatted string) + 将 UNIX 时间戳转换为东八区北京时间格式化字符串使用 Args: timestamp (int): 要转换的 UNIX 时间戳 (The UNIX timestamp to be converted) @@ -71,6 +73,7 @@ def timestamp_2_str( 默认为 '%Y-%m-%d %H-%M-%S'。 (The format for the returned date-time string Defaults to '%Y-%m-%d %H-%M-%S') + tz (datetime.timezone, optional): 时区，默认为东八区北京时间。 Returns: str: 格式化的日期时间字符串 (The formatted date-time string) @@ -82,10 +85,10 @@ def timestamp_2_str( if len(timestamp) == 30: date_obj = datetime.datetime.strptime(timestamp, "%a %b %d %H:%M:%S %z %Y") else: - date_obj = datetime.datetime.fromtimestamp(float(timestamp)) + date_obj = datetime.datetime.fromtimestamp(float(timestamp), tz=tz) - if isinstance(timestamp, Union[int, float]): - date_obj = datetime.datetime.fromtimestamp(float(timestamp)) + elif isinstance(timestamp, (int, float)): + date_obj = datetime.datetime.fromtimestamp(float(timestamp), tz=tz) return date_obj.strftime(format) From 961a8ed271a9fa65b3240b227b167b128322fc2a Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 11 Apr 2024 18:57:57 +0800 Subject: [PATCH 010/299] =?UTF-8?q?refactor:=20=E7=B1=BB=E2=80=9Cdatetime?= =?UTF-8?q?=E2=80=9D=E4=B8=AD=E7=9A=84=E2=80=9Cutcnow=E2=80=9D=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=B7=B2=E5=BC=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/utils/utils.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/f2/utils/utils.py b/f2/utils/utils.py index 99b519be..eec8f6a2 100644 --- a/f2/utils/utils.py +++ b/f2/utils/utils.py @@ -38,7 +38,7 @@ def gen_random_str(randomlength: int) -> str: def get_timestamp(unit: str = "milli"): """ - 根据给定的单位获取当前时间 (Get the current time based on the given unit) + 根据给定的单位获取当前时区的时间戳 (Get the current time based on the given unit) Args: unit (str): 时间单位，可以是 "milli"、"sec"、"min" 等 @@ -48,7 +48,9 @@ def get_timestamp(unit: str = "milli"): int: 根据给定单位的当前时间 (The current time based on the given unit) """ - now = datetime.datetime.utcnow() - datetime.datetime(1970, 1, 1) + now = datetime.datetime.now(datetime.timezone.utc) - datetime.datetime( + 1970, 1, 1, tzinfo=datetime.timezone.utc + ) if unit == "milli": return int(now.total_seconds() * 1000) elif unit == "sec": From cce3eaeed10744098bc875f21b25abef2be6fb79 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 11 Apr 2024 18:58:24 +0800 Subject: [PATCH 011/299] =?UTF-8?q?test:=20=E4=BF=AE=E6=94=B9=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=88=B3=E6=B5=8B=E8=AF=95=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...{test_timestamp_2_str.py => test_timestamp.py} | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) rename tests/{test_timestamp_2_str.py => test_timestamp.py} (80%) diff --git a/tests/test_timestamp_2_str.py b/tests/test_timestamp.py similarity index 80% rename from tests/test_timestamp_2_str.py rename to tests/test_timestamp.py index dd3ec38d..b04145f2 100644 --- a/tests/test_timestamp_2_str.py +++ b/tests/test_timestamp.py @@ -1,5 +1,18 @@ import pytest -from f2.utils.utils import timestamp_2_str +from f2.utils.utils import get_timestamp, timestamp_2_str + + +class TestGetTimestamp: + def test_get_timestamp(self): + print(get_timestamp()) + assert len(str(get_timestamp())) == 13 + + def test_get_timestamp_with_unit(self): + assert len(str(get_timestamp("sec"))) == 10 + + def test_get_timestamp_with_invalid_unit(self): + with pytest.raises(ValueError): + get_timestamp("invalid_unit") class TestTimestamp2Str: From 0bd9ea1950fb400a054581161134236b0fd58deb Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 13 Apr 2024 00:25:30 +0800 Subject: [PATCH 012/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0ClientConfMan?= =?UTF-8?q?ager=E4=B8=BAdouyin=E6=8F=90=E4=BE=9B=E6=9B=B4=E5=8A=A0?= =?UTF-8?q?=E6=96=B9=E4=BE=BF=E7=9A=84app=E9=85=8D=E7=BD=AE=E8=AF=BB?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/utils.py | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/f2/apps/douyin/utils.py b/f2/apps/douyin/utils.py index 2924a0fa..4dd69a3d 100644 --- a/f2/apps/douyin/utils.py +++ b/f2/apps/douyin/utils.py @@ -32,6 +32,44 @@ ) +class ClientConfManager: + """ + 用于管理客户端配置 (Used to manage client configuration) + """ + + client_conf = ( + ConfigManager(f2.F2_CONFIG_FILE_PATH).get_config("f2").get("douyin", {}) + ) + + @classmethod + def client(cls) -> dict: + return cls.client_conf + + @classmethod + def proxies(cls) -> dict: + return cls.client_conf.get("proxies", {}) + + @classmethod + def headers(cls) -> dict: + return cls.client_conf.get("headers", {}) + + @classmethod + def user_agent(cls) -> str: + return cls.headers().get("User-Agent", "") + + @classmethod + def referer(cls) -> str: + return cls.headers().get("Referer", "") + + @classmethod + def msToken(cls) -> str: + return cls.client_conf.get("msToken", {}) + + @classmethod + def ttwid(cls) -> str: + return cls.client_conf.get("ttwid", {}) + + class TokenManager: f2_manager = ConfigManager(f2.F2_CONFIG_FILE_PATH).get_config("f2").get("douyin") token_conf = f2_manager.get("msToken", None) From aba85682ddd5115a67ea97b21761895bb701c860 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 13 Apr 2024 00:27:44 +0800 Subject: [PATCH 013/299] =?UTF-8?q?refactor:=20=E4=B8=BAdouyin=E4=BD=BF?= =?UTF-8?q?=E7=94=A8ClientConfManager=E6=9D=A5=E7=BB=9F=E4=B8=80=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E4=BB=A3=E7=90=86=E4=B8=8E=E5=85=B6=E4=BB=96=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/cli.py | 16 ++++------------ f2/apps/douyin/crawler.py | 19 +++++++------------ f2/apps/douyin/utils.py | 14 +++++--------- f2/dl/base_downloader.py | 6 +----- 4 files changed, 17 insertions(+), 38 deletions(-) diff --git a/f2/apps/douyin/cli.py b/f2/apps/douyin/cli.py index 688b71a1..cf425493 100644 --- a/f2/apps/douyin/cli.py +++ b/f2/apps/douyin/cli.py @@ -20,6 +20,7 @@ from f2.utils.conf_manager import ConfigManager from f2.i18n.translator import TranslationManager, _ from f2.apps.douyin.handler import handle_sso_login +from f2.apps.douyin.utils import ClientConfManager def handler_help( @@ -375,22 +376,13 @@ def douyin( main_conf_path = get_resource_path(f2.APP_CONFIG_FILE_PATH) main_conf = main_manager.get_config("douyin") - # 读取f2低频配置文件 - f2_manager = ConfigManager(f2.F2_CONFIG_FILE_PATH) - - f2_conf = f2_manager.get_config("f2").get("douyin") - f2_proxies = f2_conf.get("proxies") - # 更新主配置文件中的代理参数 - main_conf["proxies"] = { - "http": f2_proxies.get("http"), - "https": f2_proxies.get("https"), - } + main_conf["proxies"] = ClientConfManager.proxies() # 更新主配置文件中的headers参数 kwargs.setdefault("headers", {}) - kwargs["headers"]["User-Agent"] = f2_conf["headers"].get("User-Agent", "") - kwargs["headers"]["Referer"] = f2_conf["headers"].get("Referer", "") + kwargs["headers"]["User-Agent"] = ClientConfManager.user_agent() + kwargs["headers"]["Referer"] = ClientConfManager.referer() # 如果初始化配置文件，则与更新配置文件互斥 if init_config and not update_config: diff --git a/f2/apps/douyin/crawler.py b/f2/apps/douyin/crawler.py index 00d9c7c6..0bb6848c 100644 --- a/f2/apps/douyin/crawler.py +++ b/f2/apps/douyin/crawler.py @@ -1,7 +1,5 @@ # path: f2/apps/douyin/crawler.py -import f2 - from f2.log.logger import logger from f2.i18n.translator import _ from f2.utils.conf_manager import ConfigManager @@ -25,7 +23,7 @@ UserFollowing, UserFollower, ) -from f2.apps.douyin.utils import XBogusManager +from f2.apps.douyin.utils import XBogusManager, ClientConfManager class DouyinCrawler(BaseCrawler): @@ -33,17 +31,14 @@ def __init__( self, kwargs: dict = ..., ): - f2_manager = ConfigManager(f2.F2_CONFIG_FILE_PATH) - f2_conf = f2_manager.get_config("f2").get("douyin") - proxies_conf = kwargs.get("proxies", {"http": None, "https": None}) - proxies = { - "http://": proxies_conf.get("http", None), - "https://": proxies_conf.get("https", None), - } + # 需要与cli同步 + proxies = kwargs.get("proxies", {"http://": None, "http://": None}) + self.user_agent = ClientConfManager.user_agent() + self.referrer = ClientConfManager.referer() self.headers = { - "User-Agent": f2_conf["headers"]["User-Agent"], - "Referer": f2_conf["headers"]["Referer"], + "User-Agent": self.user_agent, + "Referer": self.referrer, "Cookie": kwargs["cookie"], } diff --git a/f2/apps/douyin/utils.py b/f2/apps/douyin/utils.py index 4dd69a3d..2f1deb9c 100644 --- a/f2/apps/douyin/utils.py +++ b/f2/apps/douyin/utils.py @@ -71,14 +71,10 @@ def ttwid(cls) -> str: class TokenManager: - f2_manager = ConfigManager(f2.F2_CONFIG_FILE_PATH).get_config("f2").get("douyin") - token_conf = f2_manager.get("msToken", None) - ttwid_conf = f2_manager.get("ttwid", None) - proxies_conf = f2_manager.get("proxies", None) - proxies = { - "http://": proxies_conf.get("http", None), - "https://": proxies_conf.get("https", None), - } + token_conf = ClientConfManager.msToken() + ttwid_conf = ClientConfManager.ttwid() + proxies = ClientConfManager.proxies() + user_agent = ClientConfManager.user_agent() @classmethod def gen_real_msToken(cls) -> str: @@ -97,7 +93,7 @@ def gen_real_msToken(cls) -> str: } ) headers = { - "User-Agent": cls.token_conf["User-Agent"], + "User-Agent": cls.user_agent, "Content-Type": "application/json", } diff --git a/f2/dl/base_downloader.py b/f2/dl/base_downloader.py index ec12d483..7bbd41f6 100644 --- a/f2/dl/base_downloader.py +++ b/f2/dl/base_downloader.py @@ -27,11 +27,7 @@ class BaseDownloader(BaseCrawler): """基础下载器 (Base Downloader Class)""" def __init__(self, kwargs: dict = ...): - proxies_conf = kwargs.get("proxies", {"http": None, "https": None}) - proxies = { - "http://": proxies_conf.get("http", None), - "https://": proxies_conf.get("https", None), - } + proxies = kwargs.get("proxies", {"http": None, "https": None}) self.headers = { "User-Agent": kwargs["headers"]["User-Agent"], From b576dcc28fb081f4908e40df2144bb464e82628c Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 13 Apr 2024 00:29:26 +0800 Subject: [PATCH 014/299] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9douyin?= =?UTF-8?q?=E4=BB=A3=E7=90=86=E9=85=8D=E7=BD=AE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit http: https: -> http://: https://: --- f2/apps/douyin/cli.py | 6 +++--- f2/conf/conf.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/f2/apps/douyin/cli.py b/f2/apps/douyin/cli.py index cf425493..f76f0bd7 100644 --- a/f2/apps/douyin/cli.py +++ b/f2/apps/douyin/cli.py @@ -317,7 +317,7 @@ def handler_sso_login( type=str, nargs=2, help=_( - "代理服务器，最多 2 个参数，http与https。空格区分 2 个参数 http://x.x.x.x https://x.x.x.x" + "代理服务器，最多 2 个参数，http://与https://。空格区分 2 个参数 http://x.x.x.x https://x.x.x.x" ), ) @click.option("--lyric", "-L", type=bool, help=_("是否保存原声歌词")) @@ -412,8 +412,8 @@ def douyin( # 将kwargs["proxies"]中的tuple转换为dict if kwargs.get("proxies"): kwargs["proxies"] = { - "http": kwargs["proxies"][0], - "https": kwargs["proxies"][1], + "http://": kwargs["proxies"][0], + "https://": kwargs["proxies"][1], } # 从低频配置开始到高频配置再到cli参数，逐级覆盖，如果键值不存在使用父级的键值 diff --git a/f2/conf/conf.yaml b/f2/conf/conf.yaml index 550e357c..bf01a7c5 100644 --- a/f2/conf/conf.yaml +++ b/f2/conf/conf.yaml @@ -6,8 +6,8 @@ f2: Referer: https://www.douyin.com/ proxies: - http: - https: + http://: + https://: msToken: url: https://mssdk.bytedance.com/web/report From 8e4b8a6f46c5edbbf45a4f38081b41ea16455843 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 13 Apr 2024 00:39:27 +0800 Subject: [PATCH 015/299] =?UTF-8?q?perf:=20=E4=BD=BF=E7=94=A8douyin?= =?UTF-8?q?=E7=9A=84=E8=BF=87=E6=BB=A4=E5=99=A8=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/f2/apps/douyin/handler.py b/f2/apps/douyin/handler.py index 0addc8ce..02ca3f3f 100644 --- a/f2/apps/douyin/handler.py +++ b/f2/apps/douyin/handler.py @@ -140,7 +140,7 @@ async def get_or_add_user_data( current_user_data = await self.fetch_user_profile(sec_user_id) # 获取当前用户最新昵称 - current_nickname = current_user_data._to_dict().get("nickname") + current_nickname = current_user_data.nickname # 设置用户目录 user_path = create_or_rename_user_folder( From 12f9b1ae81d1e91fc468258806f30ad44a8b04b5 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 13 Apr 2024 00:40:04 +0800 Subject: [PATCH 016/299] =?UTF-8?q?perf:=20=E5=BC=83=E7=94=A8douyin?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E5=90=8D=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/snippets/douyin/user-nickname.py | 26 -------------------------- f2/apps/douyin/handler.py | 23 ----------------------- 2 files changed, 49 deletions(-) delete mode 100644 docs/snippets/douyin/user-nickname.py diff --git a/docs/snippets/douyin/user-nickname.py b/docs/snippets/douyin/user-nickname.py deleted file mode 100644 index 518f1c3f..00000000 --- a/docs/snippets/douyin/user-nickname.py +++ /dev/null @@ -1,26 +0,0 @@ -import asyncio -from f2.apps.douyin.handler import DouyinHandler -from f2.apps.douyin.db import AsyncUserDB - -kwargs = { - "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", - "Referer": "https://www.douyin.com/", - }, - "proxies": {"http": None, "https": None}, - "cookie": "YOUR_COOKIE_HERE", -} - - -async def main(): - async with AsyncUserDB("douyin_users.db") as audb: - sec_user_id = "MS4wLjABAAAANXSltcLCzDGmdNFI2Q_QixVTr67NiYzjKOIP5s03CAE" - print( - await DouyinHandler(kwargs).get_user_nickname( - sec_user_id=sec_user_id, db=audb - ) - ) - - -if __name__ == "__main__": - asyncio.run(main()) diff --git a/f2/apps/douyin/handler.py b/f2/apps/douyin/handler.py index 02ca3f3f..918f3431 100644 --- a/f2/apps/douyin/handler.py +++ b/f2/apps/douyin/handler.py @@ -91,29 +91,6 @@ async def fetch_user_profile( raise APIResponseError(_("API内容请求失败，请更换新cookie后再试")) return UserProfileFilter(response) - async def get_user_nickname( - self, - sec_user_id: str, - db: AsyncUserDB, - ) -> str: - """ - 获取指定用户的昵称，如果不存在，则从服务器获取并存储到数据库中 - (Used to get personal info of specified users) - - Args: - sec_user_id (str): 用户ID (User ID) - db (AsyncUserDB): 用户数据库 (User database) - - Returns: - user_nickname: (str): 用户昵称 (User nickname) - """ - - user_dict = await db.get_user_info(sec_user_id) - if not user_dict: - user_dict = await self.fetch_user_profile(sec_user_id) - await db.add_user_info(**user_dict._to_dict()) - return user_dict.get("nickname") - async def get_or_add_user_data( self, kwargs: dict, From 1a70c66cbdaadbfd0989247febdc599bfbaa9107 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 13 Apr 2024 00:51:38 +0800 Subject: [PATCH 017/299] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9douyin?= =?UTF-8?q?=E4=BB=A3=E7=90=86=E9=85=8D=E7=BD=AE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit http: https: -> http://: https://: --- docs/snippets/douyin/format-file-name.py | 2 +- docs/snippets/douyin/one-video.py | 2 +- docs/snippets/douyin/user-collection.py | 2 +- docs/snippets/douyin/user-collects.py | 2 +- docs/snippets/douyin/user-folder.py | 2 +- docs/snippets/douyin/user-follower.py | 5 +---- docs/snippets/douyin/user-following.py | 5 +---- docs/snippets/douyin/user-get-add.py | 2 +- docs/snippets/douyin/user-like.py | 2 +- docs/snippets/douyin/user-live-room-id.py | 2 +- docs/snippets/douyin/user-live.py | 2 +- docs/snippets/douyin/user-mix.py | 2 +- docs/snippets/douyin/user-post.py | 2 +- docs/snippets/douyin/user-profile.py | 2 +- docs/snippets/douyin/video-get-add.py | 2 +- docs/snippets/douyin/xbogus.py | 2 +- docs/snippets/set-debug.py | 4 ++-- f2/apps/douyin/handler.py | 2 +- f2/apps/douyin/help.py | 2 +- 19 files changed, 20 insertions(+), 26 deletions(-) diff --git a/docs/snippets/douyin/format-file-name.py b/docs/snippets/douyin/format-file-name.py index 510cf80e..ca68df0f 100644 --- a/docs/snippets/douyin/format-file-name.py +++ b/docs/snippets/douyin/format-file-name.py @@ -24,7 +24,7 @@ async def main(): "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.douyin.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "naming": "{create}_{desc}_{aweme_id}_{location}", "cookie": "", } diff --git a/docs/snippets/douyin/one-video.py b/docs/snippets/douyin/one-video.py index a608f413..ca85a103 100644 --- a/docs/snippets/douyin/one-video.py +++ b/docs/snippets/douyin/one-video.py @@ -6,8 +6,8 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.douyin.com/", }, - "proxies": {"http": None, "https": None}, "cookie": "YOUR_COOKIE_HERE", + "proxies": {"http://": None, "https://": None}, } diff --git a/docs/snippets/douyin/user-collection.py b/docs/snippets/douyin/user-collection.py index a296c22b..839747dc 100644 --- a/docs/snippets/douyin/user-collection.py +++ b/docs/snippets/douyin/user-collection.py @@ -6,8 +6,8 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.douyin.com/", }, - "proxies": {"http": None, "https": None}, "cookie": "YOUR_COOKIE_HERE", + "proxies": {"http://": None, "https://": None}, "timeout": 10, } diff --git a/docs/snippets/douyin/user-collects.py b/docs/snippets/douyin/user-collects.py index fb609d1a..181c7e8c 100644 --- a/docs/snippets/douyin/user-collects.py +++ b/docs/snippets/douyin/user-collects.py @@ -6,7 +6,7 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.douyin.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "timeout": 10, "cookie": "YOUR_COOKIE_HERE", } diff --git a/docs/snippets/douyin/user-folder.py b/docs/snippets/douyin/user-folder.py index 7770db61..8244ef4d 100644 --- a/docs/snippets/douyin/user-folder.py +++ b/docs/snippets/douyin/user-folder.py @@ -34,7 +34,7 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.douyin.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "cookie": "YOUR_COOKIE_HERE", "path": "Download", "mode": "post", diff --git a/docs/snippets/douyin/user-follower.py b/docs/snippets/douyin/user-follower.py index f0e6a665..721793f9 100644 --- a/docs/snippets/douyin/user-follower.py +++ b/docs/snippets/douyin/user-follower.py @@ -7,10 +7,7 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.douyin.com/", }, - "proxies": { - "http": None, - "https": None, - }, + "proxies": {"http://": None, "https://": None}, "timeout": 10, "cookie": "YOUR_COOKIE_HERE", } diff --git a/docs/snippets/douyin/user-following.py b/docs/snippets/douyin/user-following.py index 9fa39f1b..84487276 100644 --- a/docs/snippets/douyin/user-following.py +++ b/docs/snippets/douyin/user-following.py @@ -7,10 +7,7 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.douyin.com/", }, - "proxies": { - "http": None, - "https": None, - }, + "proxies": {"http://": None, "https://": None}, "timeout": 10, "cookie": "YOUR_COOKIE_HERE", } diff --git a/docs/snippets/douyin/user-get-add.py b/docs/snippets/douyin/user-get-add.py index 13b4cb24..b466547b 100644 --- a/docs/snippets/douyin/user-get-add.py +++ b/docs/snippets/douyin/user-get-add.py @@ -7,7 +7,7 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.douyin.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "cookie": "YOUR_COOKIE_HERE", "path": "Download", } diff --git a/docs/snippets/douyin/user-like.py b/docs/snippets/douyin/user-like.py index e48775db..75bdb441 100644 --- a/docs/snippets/douyin/user-like.py +++ b/docs/snippets/douyin/user-like.py @@ -6,9 +6,9 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.douyin.com/", }, - "proxies": {"http": None, "https": None}, "cookie": "YOUR_COOKIE_HERE", "timeout": 10, + "proxies": {"http://": None, "https://": None}, } diff --git a/docs/snippets/douyin/user-live-room-id.py b/docs/snippets/douyin/user-live-room-id.py index 5c427dcf..7c9caf4b 100644 --- a/docs/snippets/douyin/user-live-room-id.py +++ b/docs/snippets/douyin/user-live-room-id.py @@ -6,7 +6,7 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.douyin.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "cookie": "YOUR_COOKIE_HERE", } diff --git a/docs/snippets/douyin/user-live.py b/docs/snippets/douyin/user-live.py index dba3acfd..0fc21353 100644 --- a/docs/snippets/douyin/user-live.py +++ b/docs/snippets/douyin/user-live.py @@ -6,7 +6,7 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.douyin.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "cookie": "YOUR_COOKIE_HERE", } diff --git a/docs/snippets/douyin/user-mix.py b/docs/snippets/douyin/user-mix.py index 8e255205..b7a80e30 100644 --- a/docs/snippets/douyin/user-mix.py +++ b/docs/snippets/douyin/user-mix.py @@ -6,7 +6,7 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.douyin.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "timeout": 10, "cookie": "YOUR_COOKIE_HERE", } diff --git a/docs/snippets/douyin/user-post.py b/docs/snippets/douyin/user-post.py index f4130e51..3069744b 100644 --- a/docs/snippets/douyin/user-post.py +++ b/docs/snippets/douyin/user-post.py @@ -6,7 +6,7 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.douyin.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "timeout": 10, "cookie": "YOUR_COOKIE_HERE", } diff --git a/docs/snippets/douyin/user-profile.py b/docs/snippets/douyin/user-profile.py index cb049261..be468da0 100644 --- a/docs/snippets/douyin/user-profile.py +++ b/docs/snippets/douyin/user-profile.py @@ -6,7 +6,7 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.douyin.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "cookie": "YOUR_COOKIE_HERE", } diff --git a/docs/snippets/douyin/video-get-add.py b/docs/snippets/douyin/video-get-add.py index 1829cbe8..e51175af 100644 --- a/docs/snippets/douyin/video-get-add.py +++ b/docs/snippets/douyin/video-get-add.py @@ -10,7 +10,7 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.douyin.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "cookie": "YOUR_COOKIE_HERE", } diff --git a/docs/snippets/douyin/xbogus.py b/docs/snippets/douyin/xbogus.py index 2e3b6b7d..f449df97 100644 --- a/docs/snippets/douyin/xbogus.py +++ b/docs/snippets/douyin/xbogus.py @@ -51,7 +51,7 @@ async def main(): "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.douyin.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "cookie": "YOUR_COOKIE_HERE", } diff --git a/docs/snippets/set-debug.py b/docs/snippets/set-debug.py index b73e8e7e..a4b92132 100644 --- a/docs/snippets/set-debug.py +++ b/docs/snippets/set-debug.py @@ -18,7 +18,7 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.douyin.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "cookie": "YOUR_COOKIE_HERE", } @@ -48,7 +48,7 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.douyin.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "cookie": "YOUR_COOKIE_HERE", } diff --git a/f2/apps/douyin/handler.py b/f2/apps/douyin/handler.py index 918f3431..6d78ea94 100644 --- a/f2/apps/douyin/handler.py +++ b/f2/apps/douyin/handler.py @@ -1349,7 +1349,7 @@ async def handle_sso_login(): """ kwargs = { - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "cookie": "", "headers": { "Referer": "https://www.douyin.com/", diff --git a/f2/apps/douyin/help.py b/f2/apps/douyin/help.py index 89298328..bb3106e4 100644 --- a/f2/apps/douyin/help.py +++ b/f2/apps/douyin/help.py @@ -78,7 +78,7 @@ def help() -> None: "-P --proxies", "[dark_cyan]str", _( - "代理服务器，最多 2 个参数，http与https。空格区分 2 个参数 http://x.x.x.x https://x.x.x.x" + "代理服务器，最多 2 个参数，http://与https://。空格区分 2 个参数 http://x.x.x.x https://x.x.x.x" ), ), ("-L --lyric", "[dark_cyan]Bool", _("是否保存视频歌词")), From 67d55dbdaca20996f00c9ffa81d2ff1d2b2b739d Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 13 Apr 2024 00:54:42 +0800 Subject: [PATCH 018/299] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9douyin?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=90=86=E9=85=8D=E7=BD=AE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/conf/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/f2/conf/test.yaml b/f2/conf/test.yaml index 699dcf3d..18952717 100644 --- a/f2/conf/test.yaml +++ b/f2/conf/test.yaml @@ -4,8 +4,8 @@ douyin: Referer: https://www.douyin.com/ cookie: __ac_nonce=066126d7400831d6b5c4e; __ac_signature=_02B4Z6wo00f01Y.vKPwAAIDC-cD1sEsc6ZmPzyxAAAXq04; ttwid=1%7Crk-8HHHCVERrpnGqN5PSPeaEwNAo02w-MzX5peKwBnI%7C1712483701%7C16399ab279d221e1f50ef17c96b5215641887b7a739cec048347e0c45221a491; douyin.com; device_web_cpu_core=12; device_web_memory_size=8; architecture=amd64; IsDouyinActive=true; home_can_add_dy_2_desktop=%220%22; dy_swidth=1920; dy_sheight=1080; stream_recommend_feed_params=%22%7B%5C%22cookie_enabled%5C%22%3Atrue%2C%5C%22screen_width%5C%22%3A1920%2C%5C%22screen_height%5C%22%3A1080%2C%5C%22browser_online%5C%22%3Atrue%2C%5C%22cpu_core_num%5C%22%3A12%2C%5C%22device_memory%5C%22%3A8%2C%5C%22downlink%5C%22%3A10%2C%5C%22effective_type%5C%22%3A%5C%224g%5C%22%2C%5C%22round_trip_time%5C%22%3A150%7D%22; csrf_session_id=3d3dbde628fcd833106552c68320f88b; FORCE_LOGIN=%7B%22videoConsumedRemainSeconds%22%3A180%7D; strategyABtestKey=%221712483704.155%22; volume_info=%7B%22isUserMute%22%3Afalse%2C%22isMute%22%3Afalse%2C%22volume%22%3A0.7%7D; stream_player_status_params=%22%7B%5C%22is_auto_play%5C%22%3A0%2C%5C%22is_full_screen%5C%22%3A0%2C%5C%22is_full_webscreen%5C%22%3A0%2C%5C%22is_mute%5C%22%3A0%2C%5C%22is_speed%5C%22%3A1%2C%5C%22is_visible%5C%22%3A1%7D%22; passport_csrf_token=b2ef0d72ded3b759412fe41b62111cc9; passport_csrf_token_default=b2ef0d72ded3b759412fe41b62111cc9; bd_ticket_guard_client_data=eyJiZC10aWNrZXQtZ3VhcmQtdmVyc2lvbiI6MiwiYmQtdGlja2V0LWd1YXJkLWl0ZXJhdGlvbi12ZXJzaW9uIjoxLCJiZC10aWNrZXQtZ3VhcmQtcmVlLXB1YmxpYy1rZXkiOiJCRWFLenNuYW8vUHhnajB2L1NRYUU4U29QVGZhS1YxVnpnYnZEMnFlektXdVhqcDNXOTNjZXB6b1hoU0MxQ05YNVNRTUg1QWRlakd5UzBNNld1RjRBZVE9IiwiYmQtdGlja2V0LWd1YXJkLXdlYi12ZXJzaW9uIjoxfQ%3D%3D; bd_ticket_guard_client_web_domain=2; msToken=mnRmihU-xb0ZsLkb-itjzad_A7ZQyDmKNrcczdt6Jj_7IXz0gdwCT8uN8XYukG1Zj5-JFxDv4yeRKsiC_WxSeXrcbYJYC0Uwyuz0C-Oe; odin_tt=509a427e7fae6b0f4498c2bbed2ead86ae99d77284740ea0f1ab337321cb107858575a289f02b0d4e81f660aeec9405be135e8361c3726ca00857825c875944955ed204c58993e6c6e879dcd024a0733 proxies: - http: - https: + http://: + https://: tiktok: headers: From a17a116c6a1bb6c7cfd123b492d400c5b8824416 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 13 Apr 2024 00:57:05 +0800 Subject: [PATCH 019/299] =?UTF-8?q?test:=20=E4=BF=AE=E6=94=B9=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B=E7=9A=84=E4=BB=A3=E7=90=86=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_dl.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/test_dl.py b/tests/test_dl.py index f3065b54..9b71e15b 100644 --- a/tests/test_dl.py +++ b/tests/test_dl.py @@ -3,7 +3,11 @@ import pytest from f2.dl.base_downloader import BaseDownloader -kwargs = {"headers": {"User-Agent": "", "Referer": ""}, "cookie": ""} +kwargs = { + "headers": {"User-Agent": "", "Referer": ""}, + "proxies": {"http://": None, "https://": None}, + "cookie": "", +} # 使用 Pytest 的 asyncio 装饰器标记异步测试函数 From 08393af0d46b78e8e2589680607f39c71d26fe0c Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 13 Apr 2024 14:44:36 +0800 Subject: [PATCH 020/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0xb=E7=AE=97?= =?UTF-8?q?=E6=B3=95=E7=A4=BA=E4=BE=8B=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更正示例，只需要params和ua，不需要uri部分 --- f2/utils/xbogus.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/f2/utils/xbogus.py b/f2/utils/xbogus.py index d23aac7c..6ad4fc23 100644 --- a/f2/utils/xbogus.py +++ b/f2/utils/xbogus.py @@ -4,7 +4,7 @@ @Description:xbogus.py @Date :2023/02/09 00:29:30 @Author :JohnserfSeed -@version :0.0.2 +@version :0.0.3 @License :Apache License 2.0 @Github :https://github.com/johnserf-seed @Mail :johnserf-seed@foxmail.com @@ -13,6 +13,7 @@ 2023/02/09 00:29:30 - Create XBogus class 2023/06/07 17:26:02 - Refactor the XB algorithm using Python. 2024/04/01 00:32:30 - Black Code Style & Support custom ua +2024/04/13 14:42:10 - Correction examples ------------------------------------------------- """ @@ -59,15 +60,15 @@ def md5_str_to_array(self, md5_str): idx += 2 return array - def md5_encrypt(self, url_path): + def md5_encrypt(self, url_params): """ 使用多轮md5哈希算法对URL路径进行加密。 Encrypt the URL path using multiple rounds of md5 hashing. """ - hashed_url_path = self.md5_str_to_array( - self.md5(self.md5_str_to_array(self.md5(url_path))) + hashed_url_params = self.md5_str_to_array( + self.md5(self.md5_str_to_array(self.md5(url_params))) ) - return hashed_url_path + return hashed_url_params def md5(self, input_data): """ @@ -147,7 +148,7 @@ def calculation(self, a1, a2, a3): + self.character[x3 & 63] ) - def getXBogus(self, url_path): + def getXBogus(self, url_params): """ 获取 X-Bogus 值。 Get the X-Bogus value. @@ -164,7 +165,7 @@ def getXBogus(self, url_path): array2 = self.md5_str_to_array( self.md5(self.md5_str_to_array("d41d8cd98f00b204e9800998ecf8427e")) ) - url_path_array = self.md5_encrypt(url_path) + url_params_array = self.md5_encrypt(url_params) timer = int(time.time()) ct = 536919696 @@ -174,7 +175,7 @@ def getXBogus(self, url_path): # fmt: off new_array = [ 64, 0.00390625, 1, 12, - url_path_array[14], url_path_array[15], array2[14], array2[15], array1[14], array1[15], + url_params_array[14], url_params_array[15], array2[14], array2[15], array1[14], array1[15], timer >> 24 & 255, timer >> 16 & 255, timer >> 8 & 255, timer & 255, ct >> 24 & 255, ct >> 16 & 255, ct >> 8 & 255, ct & 255 ] @@ -216,16 +217,16 @@ def getXBogus(self, url_path): ord(garbled_code[idx + 2]), ) idx += 3 - self.params = "%s&X-Bogus=%s" % (url_path, xb_) + self.params = "%s&X-Bogus=%s" % (url_params, xb_) self.xb = xb_ return (self.params, self.xb, self.user_agent) if __name__ == "__main__": - url_path = "https://www.douyin.com/aweme/v1/web/aweme/post/?device_platform=webapp&aid=6383&channel=channel_pc_web&sec_user_id=MS4wLjABAAAAW9FWcqS7RdQAWPd2AA5fL_ilmqsIFUCQ_Iym6Yh9_cUa6ZRqVLjVQSUjlHrfXY1Y&max_cursor=0&locate_query=false&show_live_replay_strategy=1&need_time_list=1&time_list_query=0&whale_cut_token=&cut_version=1&count=18&publish_video_strategy_type=2&pc_client_type=1&version_code=170400&version_name=17.4.0&cookie_enabled=true&screen_width=1920&screen_height=1080&browser_language=zh-CN&browser_platform=Win32&browser_name=Edge&browser_version=122.0.0.0&browser_online=true&engine_name=Blink&engine_version=122.0.0.0&os_name=Windows&os_version=10&cpu_core_num=12&device_memory=8&platform=PC&downlink=10&effective_type=4g&round_trip_time=50&webid=7335414539335222835&msToken=p9Y7fUBuq9DKvAuN27Peml6JbaMqG2ZcXfFiyDv1jcHrCN00uidYqUgSuLsKl1onC-E_n82m-aKKYE0QGEmxIWZx9iueQ6WLbvzPfqnMk4GBAlQIHcDzxb38FLXXQxAm" + url_params = "device_platform=webapp&aid=6383&channel=channel_pc_web&sec_user_id=MS4wLjABAAAAW9FWcqS7RdQAWPd2AA5fL_ilmqsIFUCQ_Iym6Yh9_cUa6ZRqVLjVQSUjlHrfXY1Y&max_cursor=0&locate_query=false&show_live_replay_strategy=1&need_time_list=1&time_list_query=0&whale_cut_token=&cut_version=1&count=18&publish_video_strategy_type=2&pc_client_type=1&version_code=170400&version_name=17.4.0&cookie_enabled=true&screen_width=1920&screen_height=1080&browser_language=zh-CN&browser_platform=Win32&browser_name=Edge&browser_version=122.0.0.0&browser_online=true&engine_name=Blink&engine_version=122.0.0.0&os_name=Windows&os_version=10&cpu_core_num=12&device_memory=8&platform=PC&downlink=10&effective_type=4g&round_trip_time=50&webid=7335414539335222835&msToken=p9Y7fUBuq9DKvAuN27Peml6JbaMqG2ZcXfFiyDv1jcHrCN00uidYqUgSuLsKl1onC-E_n82m-aKKYE0QGEmxIWZx9iueQ6WLbvzPfqnMk4GBAlQIHcDzxb38FLXXQxAm" # ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 Edg/122.0.0.0" ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36" XB = XBogus(user_agent=ua) - xbogus = XB.getXBogus(url_path) + xbogus = XB.getXBogus(url_params) print(f"url: {xbogus[0]}, xbogus:{xbogus[1]}, ua: {xbogus[2]}") From 130b968f030cb6b4b1033e48c1c17a5825d628a2 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 13 Apr 2024 14:45:56 +0800 Subject: [PATCH 021/299] =?UTF-8?q?style:=20=E6=9B=B4=E6=96=B0base=5Fcrawl?= =?UTF-8?q?er=E5=BC=82=E5=B8=B8=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/crawlers/base_crawler.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/f2/crawlers/base_crawler.py b/f2/crawlers/base_crawler.py index bd8cb1be..7fce40f9 100644 --- a/f2/crawlers/base_crawler.py +++ b/f2/crawlers/base_crawler.py @@ -121,14 +121,16 @@ def parse_json(self, response: Response) -> dict: try: return response.json() except json.JSONDecodeError as e: - logger.error(_("解析 {0} 接口 JSON 失败： {1}").format(response.url, e)) + logger.error(_("解析 {0} 接口 JSON 失败：{1}").format(response.url, e)) + except UnicodeDecodeError as e: + logger.error(_("解析 {0} 接口 JSON 失败：{1}").format(response.url, e)) else: if isinstance(response, Response): logger.error( _("获取数据失败。状态码: {0}").format(response.status_code) ) else: - logger.error(_("无效响应类型。响应类型: {0}").format(type(response))) + logger.error(_("无效响应类型")) return {} From da5bca78fbd1ef7cdf80fcd01a59e7a48e453302 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 13 Apr 2024 14:47:33 +0800 Subject: [PATCH 022/299] =?UTF-8?q?perf:=20=E5=BC=83=E7=94=A8tiktok?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E5=90=8D=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/snippets/tiktok/user-nickname.py | 24 ------------------------ f2/apps/tiktok/handler.py | 23 ----------------------- 2 files changed, 47 deletions(-) delete mode 100644 docs/snippets/tiktok/user-nickname.py diff --git a/docs/snippets/tiktok/user-nickname.py b/docs/snippets/tiktok/user-nickname.py deleted file mode 100644 index 31246a99..00000000 --- a/docs/snippets/tiktok/user-nickname.py +++ /dev/null @@ -1,24 +0,0 @@ -import asyncio -from f2.apps.tiktok.handler import TiktokHandler -from f2.apps.tiktok.db import AsyncUserDB - -kwargs = { - "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", - "Referer": "https://www.tiktok.com/", - }, - "proxies": {"http": None, "https": None}, - "cookie": "YOUR_COOKIE_HERE", -} - - -async def main(): - async with AsyncUserDB("tiktok_users.db") as audb: - secUid = "MS4wLjABAAAAQhcYf_TjRKUku-aF8oqngAfzrYksgGLRz8CKMciBFdfR54HQu3qGs-WoJ-KO7hO8" - print(await TiktokHandler(kwargs).get_user_nickname(secUid=secUid, db=audb)) - secUid = "MS4wLjABAAAAQeB9NnG9Sz6yDPlmm3zM891Qk4E66_CvHfSRGkDIX5Y" - print(await TiktokHandler(kwargs).get_user_nickname(secUid=secUid, db=audb)) - - -if __name__ == "__main__": - asyncio.run(main()) diff --git a/f2/apps/tiktok/handler.py b/f2/apps/tiktok/handler.py index 1a1c3c36..f3846260 100644 --- a/f2/apps/tiktok/handler.py +++ b/f2/apps/tiktok/handler.py @@ -76,29 +76,6 @@ async def fetch_user_profile( raise APIResponseError(_("API内容请求失败，请更换新cookie后再试")) return UserProfileFilter(response) - async def get_user_nickname( - self, - secUid: str, - db: AsyncUserDB, - ) -> str: - """ - 用于获取指定用户的昵称 - (Used to get nickname of specified users) - - Args: - secUid: str: 用户ID (User ID) - db: AsyncUserDB: 用户数据库 (User database) - - Return: - nick_name: str: 用户昵称 (User nickname) - """ - - user_dict = await db.get_user_info(secUid) - if not user_dict: - user_dict = await self.fetch_user_profile(secUid) - await db.add_user_info(**user_dict._to_dict()) - return user_dict.get("nickname", "") - async def get_or_add_user_data( self, secUid: str, From a81d50f769fe8b5c9eeefa39b83e54d4eb8be6f7 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 13 Apr 2024 15:22:20 +0800 Subject: [PATCH 023/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0ClientConfMan?= =?UTF-8?q?ager=E4=B8=BAtiktok=E6=8F=90=E4=BE=9B=E6=9B=B4=E5=8A=A0?= =?UTF-8?q?=E6=96=B9=E4=BE=BF=E7=9A=84app=E9=85=8D=E7=BD=AE=E8=AF=BB?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/utils.py | 42 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/f2/apps/tiktok/utils.py b/f2/apps/tiktok/utils.py index 2688313f..b0e5d7e2 100644 --- a/f2/apps/tiktok/utils.py +++ b/f2/apps/tiktok/utils.py @@ -28,6 +28,48 @@ ) +class ClientConfManager: + """ + 用于管理客户端配置 (Used to manage client configuration) + """ + + client_conf = ( + ConfigManager(f2.F2_CONFIG_FILE_PATH).get_config("f2").get("tiktok", {}) + ) + + @classmethod + def client(cls) -> dict: + return cls.client_conf + + @classmethod + def proxies(cls) -> dict: + return cls.client_conf.get("proxies", {}) + + @classmethod + def headers(cls) -> dict: + return cls.client_conf.get("headers", {}) + + @classmethod + def user_agent(cls) -> str: + return cls.headers().get("User-Agent", "") + + @classmethod + def referer(cls) -> str: + return cls.headers().get("Referer", "") + + @classmethod + def msToken(cls) -> str: + return cls.client_conf.get("msToken", {}) + + @classmethod + def ttwid(cls) -> str: + return cls.client_conf.get("ttwid", {}) + + @classmethod + def odin_tt(cls) -> str: + return cls.client_conf.get("odin_tt", {}) + + class TokenManager: f2_manager = ConfigManager(f2.F2_CONFIG_FILE_PATH).get_config("f2").get("tiktok") token_conf = f2_manager.get("msToken", None) From 9a5f1e040539b077a8a5d630fa9a5e9c776ac18d Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 13 Apr 2024 15:23:21 +0800 Subject: [PATCH 024/299] =?UTF-8?q?refactor:=20=E4=B8=BAtiktok=E4=BD=BF?= =?UTF-8?q?=E7=94=A8ClientConfManager=E6=9D=A5=E7=BB=9F=E4=B8=80=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E4=BB=A3=E7=90=86=E4=B8=8E=E5=85=B6=E4=BB=96=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/cli.py | 16 ++++------------ f2/apps/tiktok/crawler.py | 20 +++++++------------- f2/apps/tiktok/utils.py | 14 +++++--------- 3 files changed, 16 insertions(+), 34 deletions(-) diff --git a/f2/apps/tiktok/cli.py b/f2/apps/tiktok/cli.py index 35b1ee39..ab4902cf 100644 --- a/f2/apps/tiktok/cli.py +++ b/f2/apps/tiktok/cli.py @@ -18,6 +18,7 @@ ) from f2.utils.conf_manager import ConfigManager from f2.i18n.translator import TranslationManager, _ +from f2.apps.tiktok.utils import ClientConfManager def handler_help( @@ -334,22 +335,13 @@ def tiktok( main_conf_path = get_resource_path(f2.APP_CONFIG_FILE_PATH) main_conf = main_manager.get_config("tiktok") - # 读取f2低频配置文件 - f2_manager = ConfigManager(f2.F2_CONFIG_FILE_PATH) - - f2_conf = f2_manager.get_config("f2").get("tiktok") - f2_proxies = f2_conf.get("proxies") - # 更新主配置文件中的代理参数 - main_conf["proxies"] = { - "http": f2_proxies.get("http"), - "https": f2_proxies.get("https"), - } + main_conf["proxies"] = ClientConfManager.proxies() # 更新主配置文件中的headers参数 kwargs.setdefault("headers", {}) - kwargs["headers"]["User-Agent"] = f2_conf["headers"].get("User-Agent", "") - kwargs["headers"]["Referer"] = f2_conf["headers"].get("Referer", "") + kwargs["headers"]["User-Agent"] = ClientConfManager.user_agent() + kwargs["headers"]["Referer"] = ClientConfManager.referer() # 如果初始化配置文件，则与更新配置文件互斥 if init_config and not update_config: diff --git a/f2/apps/tiktok/crawler.py b/f2/apps/tiktok/crawler.py index 6090e1d1..9f7430da 100644 --- a/f2/apps/tiktok/crawler.py +++ b/f2/apps/tiktok/crawler.py @@ -1,10 +1,7 @@ # path: f2/apps/tiktok/crawler.py -import f2 - from f2.log.logger import logger from f2.i18n.translator import _ -from f2.utils.conf_manager import ConfigManager from f2.crawlers.base_crawler import BaseCrawler from f2.apps.tiktok.api import TiktokAPIEndpoints as tkendpoint from f2.apps.tiktok.model import ( @@ -17,7 +14,7 @@ UserPlayList, PostComment, ) -from f2.apps.tiktok.utils import XBogusManager +from f2.apps.tiktok.utils import XBogusManager, ClientConfManager class TiktokCrawler(BaseCrawler): @@ -25,17 +22,14 @@ def __init__( self, kwargs: dict = ..., ): - f2_manager = ConfigManager(f2.F2_CONFIG_FILE_PATH) - f2_conf = f2_manager.get_config("f2").get("tiktok") - proxies_conf = kwargs.get("proxies", {"http": None, "https": None}) - proxies = { - "http://": proxies_conf.get("http", None), - "https://": proxies_conf.get("https", None), - } + # 需要与cli同步 + proxies = kwargs.get("proxies", {"http://": None, "http://": None}) + self.user_agent = ClientConfManager.user_agent() + self.referrer = ClientConfManager.referer() self.headers = { - "User-Agent": f2_conf["headers"]["User-Agent"], - "Referer": f2_conf["headers"]["Referer"], + "User-Agent": self.user_agent, + "Referer": self.referrer, "Cookie": kwargs["cookie"], } diff --git a/f2/apps/tiktok/utils.py b/f2/apps/tiktok/utils.py index b0e5d7e2..273f070a 100644 --- a/f2/apps/tiktok/utils.py +++ b/f2/apps/tiktok/utils.py @@ -71,15 +71,11 @@ def odin_tt(cls) -> str: class TokenManager: - f2_manager = ConfigManager(f2.F2_CONFIG_FILE_PATH).get_config("f2").get("tiktok") - token_conf = f2_manager.get("msToken", None) - ttwid_conf = f2_manager.get("ttwid", None) - odin_tt_conf = f2_manager.get("odin_tt", None) - proxies_conf = f2_manager.get("proxies", None) - proxies = { - "http://": proxies_conf.get("http", None), - "https://": proxies_conf.get("https", None), - } + + token_conf = ClientConfManager.msToken() + ttwid_conf = ClientConfManager.ttwid() + odin_tt_conf = ClientConfManager.odin_tt() + proxies = ClientConfManager.proxies() @classmethod def gen_real_msToken(cls) -> str: From e6139991c1b9586f3cbb657c1032d7e78df65f2b Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 13 Apr 2024 15:24:13 +0800 Subject: [PATCH 025/299] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9tiktok?= =?UTF-8?q?=E4=BB=A3=E7=90=86=E9=85=8D=E7=BD=AE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit http: https: -> http://: https://: --- f2/apps/tiktok/cli.py | 6 +++--- f2/conf/conf.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/f2/apps/tiktok/cli.py b/f2/apps/tiktok/cli.py index ab4902cf..db228b6c 100644 --- a/f2/apps/tiktok/cli.py +++ b/f2/apps/tiktok/cli.py @@ -282,7 +282,7 @@ def handler_naming( type=str, nargs=2, help=_( - "代理服务器，最多 2 个参数，http与https。空格区分 2 个参数 http://x.x.x.x https://x.x.x.x" + "代理服务器，最多 2 个参数，http://与https://。空格区分 2 个参数 http://x.x.x.x https://x.x.x.x" ), ) @click.option( @@ -371,8 +371,8 @@ def tiktok( # 将kwargs["proxies"]中的tuple转换为dict if kwargs.get("proxies"): kwargs["proxies"] = { - "http": kwargs["proxies"][0], - "https": kwargs["proxies"][1], + "http://": kwargs["proxies"][0], + "https://": kwargs["proxies"][1], } # 从低频配置开始到高频配置再到cli参数，逐级覆盖，如果键值不存在使用父级的键值 diff --git a/f2/conf/conf.yaml b/f2/conf/conf.yaml index bf01a7c5..121c8366 100644 --- a/f2/conf/conf.yaml +++ b/f2/conf/conf.yaml @@ -28,8 +28,8 @@ f2: Referer: https://www.tiktok.com/ proxies: - http: - https: + http://: + https://: msToken: url: https://mssdk-sg.tiktok.com/web/common?msToken=1Ab-7YxR9lUHSem0PraI_XzdKmpHb6j50L8AaXLAd2aWTdoJCYLfX_67rVQFE4UwwHVHmyG_NfIipqrlLT3kCXps-5PYlNAqtdwEg7TrDyTAfCKyBrOLmhMUjB55oW8SPZ4_EkNxNFUdV7MquA== From baa5d2dd74f46e679f47b55eab38716260edcde6 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 13 Apr 2024 15:25:56 +0800 Subject: [PATCH 026/299] =?UTF-8?q?test:=20=E4=BF=AE=E6=94=B9tiktok?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=90=86=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/snippets/tiktok/format-file-name.py | 2 +- docs/snippets/tiktok/one-video.py | 2 +- docs/snippets/tiktok/user-collect.py | 2 +- docs/snippets/tiktok/user-folder.py | 4 ++-- docs/snippets/tiktok/user-get-add.py | 2 +- docs/snippets/tiktok/user-like.py | 2 +- docs/snippets/tiktok/user-mix.py | 4 ++-- docs/snippets/tiktok/user-playlist.py | 2 +- docs/snippets/tiktok/user-post.py | 2 +- docs/snippets/tiktok/user-profile.py | 2 +- docs/snippets/tiktok/video-get-add.py | 2 +- docs/snippets/tiktok/xbogus.py | 2 +- f2/conf/test.yaml | 4 ++-- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/snippets/tiktok/format-file-name.py b/docs/snippets/tiktok/format-file-name.py index 7ad5620c..80dc69d1 100644 --- a/docs/snippets/tiktok/format-file-name.py +++ b/docs/snippets/tiktok/format-file-name.py @@ -7,7 +7,7 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.tiktok.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "cookie": "YOUR_COOKIE_HERE", "naming": "{create}_{desc}_{aweme_id}", } diff --git a/docs/snippets/tiktok/one-video.py b/docs/snippets/tiktok/one-video.py index fb264d2c..438e1429 100644 --- a/docs/snippets/tiktok/one-video.py +++ b/docs/snippets/tiktok/one-video.py @@ -6,7 +6,7 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.tiktok.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "cookie": "YOUR_COOKIE_HERE", } diff --git a/docs/snippets/tiktok/user-collect.py b/docs/snippets/tiktok/user-collect.py index effeac21..15e2ad54 100644 --- a/docs/snippets/tiktok/user-collect.py +++ b/docs/snippets/tiktok/user-collect.py @@ -7,7 +7,7 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.tiktok.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "timeout": 10, "cookie": "YOUR_COOKIE_HERE", } diff --git a/docs/snippets/tiktok/user-folder.py b/docs/snippets/tiktok/user-folder.py index 94cc72cb..f276781a 100644 --- a/docs/snippets/tiktok/user-folder.py +++ b/docs/snippets/tiktok/user-folder.py @@ -7,7 +7,7 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.tiktok.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "cookie": "YOUR_COOKIE_HERE", "path": "Download", "mode": "post", @@ -34,7 +34,7 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.tiktok.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "cookie": "YOUR_COOKIE_HERE", "path": "Download", "mode": "post", diff --git a/docs/snippets/tiktok/user-get-add.py b/docs/snippets/tiktok/user-get-add.py index 3b3ab49a..0e423c02 100644 --- a/docs/snippets/tiktok/user-get-add.py +++ b/docs/snippets/tiktok/user-get-add.py @@ -7,7 +7,7 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.tiktok.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "cookie": "YOUR_COOKIE_HERE", "path": "Download", } diff --git a/docs/snippets/tiktok/user-like.py b/docs/snippets/tiktok/user-like.py index 4517fb67..af11fd41 100644 --- a/docs/snippets/tiktok/user-like.py +++ b/docs/snippets/tiktok/user-like.py @@ -7,7 +7,7 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.tiktok.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "timeout": 10, "cookie": "YOUR_COOKIE_HERE", } diff --git a/docs/snippets/tiktok/user-mix.py b/docs/snippets/tiktok/user-mix.py index bf486de9..7155cdd9 100644 --- a/docs/snippets/tiktok/user-mix.py +++ b/docs/snippets/tiktok/user-mix.py @@ -9,7 +9,7 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.tiktok.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "timeout": 10, "cookie": "YOUR_COOKIE_HERE", } @@ -43,7 +43,7 @@ async def main(): "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.tiktok.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "timeout": 10, "cookie": "YOUR_COOKIE_HERE", } diff --git a/docs/snippets/tiktok/user-playlist.py b/docs/snippets/tiktok/user-playlist.py index 8418e7ce..e42af244 100644 --- a/docs/snippets/tiktok/user-playlist.py +++ b/docs/snippets/tiktok/user-playlist.py @@ -7,7 +7,7 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.tiktok.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "cookie": "YOUR_COOKIE_HERE", } diff --git a/docs/snippets/tiktok/user-post.py b/docs/snippets/tiktok/user-post.py index 38cb3dcf..7a1a094a 100644 --- a/docs/snippets/tiktok/user-post.py +++ b/docs/snippets/tiktok/user-post.py @@ -7,7 +7,7 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.tiktok.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "timeout": 10, "cookie": "YOUR_COOKIE_HERE", } diff --git a/docs/snippets/tiktok/user-profile.py b/docs/snippets/tiktok/user-profile.py index 07a0a479..90cfcfd9 100644 --- a/docs/snippets/tiktok/user-profile.py +++ b/docs/snippets/tiktok/user-profile.py @@ -6,8 +6,8 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.tiktok.com/", }, - "proxies": {"http": None, "https": None}, "cookie": "YOUR_COOKIE_HERE", + "proxies": {"http://": None, "https://": None}, } diff --git a/docs/snippets/tiktok/video-get-add.py b/docs/snippets/tiktok/video-get-add.py index 34c6d33e..a1141e3f 100644 --- a/docs/snippets/tiktok/video-get-add.py +++ b/docs/snippets/tiktok/video-get-add.py @@ -10,7 +10,7 @@ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.tiktok.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "cookie": "YOUR_COOKIE_HERE", } diff --git a/docs/snippets/tiktok/xbogus.py b/docs/snippets/tiktok/xbogus.py index 1b75baeb..6af23622 100644 --- a/docs/snippets/tiktok/xbogus.py +++ b/docs/snippets/tiktok/xbogus.py @@ -50,7 +50,7 @@ async def main(): "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", "Referer": "https://www.tiktok.com/", }, - "proxies": {"http": None, "https": None}, + "proxies": {"http://": None, "https://": None}, "cookie": "YOUR_COOKIE_HERE", } diff --git a/f2/conf/test.yaml b/f2/conf/test.yaml index 18952717..ea5b0f09 100644 --- a/f2/conf/test.yaml +++ b/f2/conf/test.yaml @@ -13,5 +13,5 @@ tiktok: Referer: https://www.tiktok.com/ cookie: tt_csrf_token=OFxPH3PE-pSbFptiHW4iy-z4yo3u6gMDt3H0; tt_chain_token=mCH+/C/4flkJarNC1WciiQ==; ak_bmsc=91F3094B27728C66727FD8F413E3CFDA~000000000000000000000000000000~YAAQDfN0aMJLgrOOAQAAfOkFuBeR4cRsy06d9RdcxcQPWGV8lJwTK79/VYCCwvjeEtlU2mCQalUnDU1R2p6Put0FonN6gVhoG2cCdwocRl87ItHMeEQpQxAH0640eFwLYG7OBS5ydU9DUbYX3pCINlGp3AbB7wbAxQb75svv1eEALa0ba8YvA85s1ingqnpt4WmKuSeyR9LkCIg9oABnKJHbPaR2FAWA982tsSdQYIeKlsUc5nyotjtrmgDubgD+v624hs2ilwVQ61HKiCQ7P15mH0M9FL8ciGsDpTKotxZ8sG2phoylvmn0ajD8QV2YdDOegI9ss6RC79POVI5xaFnpoV8TQWLyPzdEl/E6S1TVqaqRHMJsF1De/tdQcLC9//aCKt3NZTqDGg==; tiktok_webapp_theme=light; ttwid=1%7C92fxGgEo0Z8ZDy0YLeqOnKTMHMCPieG0L8UVR1j1oI8%7C1712484381%7Ccb6cbac4d746f5a6acaf73301b34642d1358092dce19a9cb97a4adc978e9d383; odin_tt=d739e385ecc07c0682ee2c2824e464e42d6760e26ec3df8c5b4a0ed1b0bcf02fb36a3eed2a0012a70b3f8ac84a79d5278e23b2ead40ed7aaf85c8ca8b611a8f5819324df5b2ecc7e1d45725a1f5f3ed9; msToken=iA6SqoX-3ggC9aEGWcxqgX0GoRG_1z-3JA9jecj8NwngM3ivhpnl6113Xc72cEc1RhP5YXXeblbo5OOrjfH6tyqtVhD68pnoxVHFTwONHFKwxGkryp3AP2ipQ8Y4; msToken=-RWw93z8QG4ppPftuXXV0NXTs3KN74Jc-eZ7G8Yw0GOWvLoCXB4upq-lPpbKVhIOxp_wJ-hDkWHj364_BTIJUmFLhFLIOaTzgjD4tazEVOEQUBdyG3IbsEZnHxcR proxies: - http: - https: \ No newline at end of file + http://: + https://: \ No newline at end of file From e6de4d424813323f766e7e2f4d5a95c55bf1728c Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 13 Apr 2024 15:29:38 +0800 Subject: [PATCH 027/299] =?UTF-8?q?style:=20=E6=B3=A8=E9=87=8A=E4=B8=8E?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/crawler.py | 1 - f2/apps/douyin/utils.py | 2 +- f2/apps/tiktok/help.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/f2/apps/douyin/crawler.py b/f2/apps/douyin/crawler.py index 0bb6848c..cc23b515 100644 --- a/f2/apps/douyin/crawler.py +++ b/f2/apps/douyin/crawler.py @@ -2,7 +2,6 @@ from f2.log.logger import logger from f2.i18n.translator import _ -from f2.utils.conf_manager import ConfigManager from f2.crawlers.base_crawler import BaseCrawler from f2.apps.douyin.api import DouyinAPIEndpoints as dyendpoint from f2.apps.douyin.model import ( diff --git a/f2/apps/douyin/utils.py b/f2/apps/douyin/utils.py index 2f1deb9c..25011e03 100644 --- a/f2/apps/douyin/utils.py +++ b/f2/apps/douyin/utils.py @@ -438,7 +438,7 @@ async def get_aweme_id(cls, url: str) -> str: except httpx.HTTPStatusError as e: raise APIResponseError( - _("链接：{0}，状态码 {1}：{2} ").format( + _("链接：{0}，状态码 {1}：{2}").format( e.response.url, e.response.status_code, e.response.text ) ) diff --git a/f2/apps/tiktok/help.py b/f2/apps/tiktok/help.py index c8628941..4f60d0ba 100644 --- a/f2/apps/tiktok/help.py +++ b/f2/apps/tiktok/help.py @@ -82,7 +82,7 @@ def help() -> None: "-P --proxies", "[dark_cyan]str", _( - "代理服务器，最多 2 个参数，http与https。空格区分 2 个参数 http://x.x.x.x https://x.x.x.x" + "代理服务器，最多 2 个参数，http://与https://。空格区分 2 个参数 http://x.x.x.x https://x.x.x.x" ), ), ( From 0128886ef44189c7d50c01511f69954cedd2e936 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 13 Apr 2024 17:42:31 +0800 Subject: [PATCH 028/299] =?UTF-8?q?perf:=20=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=90=8E=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=20(#70)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/cli.py | 2 +- f2/apps/tiktok/cli.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/f2/apps/douyin/cli.py b/f2/apps/douyin/cli.py index f76f0bd7..88aa17b8 100644 --- a/f2/apps/douyin/cli.py +++ b/f2/apps/douyin/cli.py @@ -387,7 +387,7 @@ def douyin( # 如果初始化配置文件，则与更新配置文件互斥 if init_config and not update_config: main_manager.generate_config("douyin", init_config) - # return + return elif init_config: raise click.UsageError(_("不能同时初始化和更新配置文件")) # 如果没有初始化配置文件，但是更新配置文件，则需要提供配置文件路径 diff --git a/f2/apps/tiktok/cli.py b/f2/apps/tiktok/cli.py index db228b6c..1ad188c5 100644 --- a/f2/apps/tiktok/cli.py +++ b/f2/apps/tiktok/cli.py @@ -346,7 +346,7 @@ def tiktok( # 如果初始化配置文件，则与更新配置文件互斥 if init_config and not update_config: main_manager.generate_config("tiktok", init_config) - # return + return elif init_config: raise click.UsageError(_("不能同时初始化和更新配置文件")) # 如果没有初始化配置文件，但是更新配置文件，则需要提供配置文件路径 From d21e80edb02fcf0a60d95240d6b0337a01a1907e Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 13 Apr 2024 19:01:28 +0800 Subject: [PATCH 029/299] =?UTF-8?q?perf:=20douyin=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E8=BF=87=E6=BB=A4=E5=99=A8video=5Fplay=5Fadd?= =?UTF-8?q?r=E8=BF=94=E5=9B=9E=E8=A7=86=E9=A2=91=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/filter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/f2/apps/douyin/filter.py b/f2/apps/douyin/filter.py index 1465ee3c..3d211c8a 100644 --- a/f2/apps/douyin/filter.py +++ b/f2/apps/douyin/filter.py @@ -234,7 +234,7 @@ def cover(self): @property def video_play_addr(self): - return self._get_list_attr_value("$.aweme_list[*].video.play_addr.url_list[0]") + return self._get_list_attr_value("$.aweme_list[*].video.play_addr.url_list") @property def video_bit_rate(self): From 6cd17bae19aad9969a0e3d3acf9d6f3d6ee59d29 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 22 Apr 2024 23:27:33 +0800 Subject: [PATCH 030/299] =?UTF-8?q?perf:=20=E8=87=AA=E5=8A=A8=E8=8E=B7?= =?UTF-8?q?=E5=8F=96cookie=E5=90=8E=E9=80=80=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/cli.py | 3 ++- f2/apps/tiktok/cli.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/f2/apps/douyin/cli.py b/f2/apps/douyin/cli.py index 88aa17b8..9468ad81 100644 --- a/f2/apps/douyin/cli.py +++ b/f2/apps/douyin/cli.py @@ -81,7 +81,8 @@ def handler_auto_cookie( except Exception as e: logger.error(_("自动获取Cookie失败：{0}").format(str(e))) ctx.abort() - + finally: + ctx.exit(0) def handler_language( ctx: click.Context, diff --git a/f2/apps/tiktok/cli.py b/f2/apps/tiktok/cli.py index 1ad188c5..edeb2741 100644 --- a/f2/apps/tiktok/cli.py +++ b/f2/apps/tiktok/cli.py @@ -78,6 +78,8 @@ def handler_auto_cookie( except Exception as e: logger.error(_("自动获取Cookie失败：{0}").format(str(e))) ctx.abort() + finally: + ctx.exit(0) def handler_language( From a425260042ffe6869c4718d66deb0ced9ed69c26 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Tue, 23 Apr 2024 15:29:53 +0800 Subject: [PATCH 031/299] =?UTF-8?q?perf:=20=E6=B7=BB=E5=8A=A0tiktok=20db?= =?UTF-8?q?=E7=94=A8uniqueId=E8=AF=BB=E5=8F=96=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/db.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/f2/apps/tiktok/db.py b/f2/apps/tiktok/db.py index 89690b3d..108e979d 100644 --- a/f2/apps/tiktok/db.py +++ b/f2/apps/tiktok/db.py @@ -89,19 +89,25 @@ async def update_user_info(self, secUid, **kwargs) -> None: ) await self.commit() - async def get_user_info(self, secUid: str) -> dict: + async def get_user_info(self, secUid: str = "", uniqueId: str = "") -> dict: """ 获取用户信息 Args: secUid (str): 用户唯一标识 + uniqueId (str): 用户名 Returns: dict: 对应的用户信息，如果不存在则返回 None """ - cursor = await self.execute( - f"SELECT * FROM {self.TABLE_NAME} WHERE secUid=?", (secUid,) - ) + if secUid: + cursor = await self.execute( + f"SELECT * FROM {self.TABLE_NAME} WHERE secUid=?", (secUid,) + ) + elif uniqueId: + cursor = await self.execute( + f"SELECT * FROM {self.TABLE_NAME} WHERE uniqueId=?", (uniqueId,) + ) result = await cursor.fetchone() if not result: return {} From a8216709aa5b5e77182712221923c7ccd3653ff4 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Tue, 23 Apr 2024 15:32:26 +0800 Subject: [PATCH 032/299] =?UTF-8?q?perf:=20tiktok=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BD=BF=E7=94=A8=E5=AE=A2=E6=88=B7=E7=AB=AF?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/utils.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/f2/apps/tiktok/utils.py b/f2/apps/tiktok/utils.py index 273f070a..39413868 100644 --- a/f2/apps/tiktok/utils.py +++ b/f2/apps/tiktok/utils.py @@ -321,7 +321,7 @@ async def get_secuid(cls, url: str) -> str: transport = httpx.AsyncHTTPTransport(retries=5) async with httpx.AsyncClient( - transport=transport, proxies=TokenManager.proxies, timeout=10 + transport=transport, proxies=ClientConfManager.proxies(), timeout=10 ) as client: try: response = await client.get(url, follow_redirects=True) @@ -363,7 +363,7 @@ async def get_secuid(cls, url: str) -> str: raise APIConnectionError( _( "请求端点失败，请检查当前网络环境。 链接：{0}，代理：{1}，异常类名：{2}，异常详细信息：{3}" - ).format(url, TokenManager.proxies, cls.__name__, exc) + ).format(url, ClientConfManager.proxies(), cls.__name__, exc) ) @classmethod @@ -418,7 +418,7 @@ async def get_uniqueid(cls, url: str) -> str: transport = httpx.AsyncHTTPTransport(retries=5) async with httpx.AsyncClient( - transport=transport, proxies=TokenManager.proxies, timeout=10 + transport=transport, proxies=ClientConfManager.proxies(), timeout=10 ) as client: try: response = await client.get(url, follow_redirects=True) @@ -454,7 +454,7 @@ async def get_uniqueid(cls, url: str) -> str: raise APIConnectionError( _( "连接端点失败，检查网络环境或代理：{0} 代理：{1} 类名：{2}" - ).format(url, TokenManager.proxies, cls.__name__), + ).format(url, ClientConfManager.proxies(), cls.__name__), ) @classmethod @@ -518,7 +518,7 @@ async def get_aweme_id(cls, url: str) -> str: transport = httpx.AsyncHTTPTransport(retries=5) async with httpx.AsyncClient( - transport=transport, proxies=TokenManager.proxies, timeout=10 + transport=transport, proxies=ClientConfManager.proxies(), timeout=10 ) as client: try: response = await client.get(url, follow_redirects=True) @@ -555,7 +555,7 @@ async def get_aweme_id(cls, url: str) -> str: raise APIConnectionError( _( "请求端点失败，请检查当前网络环境。 链接：{0}，代理：{1}，异常类名：{2}，异常详细信息：{3}" - ).format(url, TokenManager.proxies, cls.__name__, exc) + ).format(url, ClientConfManager.proxies(), cls.__name__, exc) ) @classmethod From 6be50177c6b570980acfbc5288ee4c8096748adb Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Tue, 23 Apr 2024 15:47:50 +0800 Subject: [PATCH 033/299] =?UTF-8?q?perf:=20=E4=B8=BAtiktok=E7=9A=84handler?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0uniqueId=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/handler.py | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/f2/apps/tiktok/handler.py b/f2/apps/tiktok/handler.py index f3846260..aad77755 100644 --- a/f2/apps/tiktok/handler.py +++ b/f2/apps/tiktok/handler.py @@ -79,6 +79,7 @@ async def fetch_user_profile( async def get_or_add_user_data( self, secUid: str, + uniqueId: str, db: AsyncUserDB, ) -> Path: """ @@ -88,6 +89,7 @@ async def get_or_add_user_data( Args: kwargs (dict): 配置参数 (Conf parameters) secUid (str): 用户ID (User ID) + uniqueId (str): 用户名 (Username) db (AsyncUserDB): 用户数据库 (User database) Returns: @@ -95,10 +97,12 @@ async def get_or_add_user_data( """ # 尝试从数据库中获取用户数据 - local_user_data = await db.get_user_info(secUid) + local_user_data = await db.get_user_info(secUid=secUid, uniqueId=uniqueId) # 从服务器获取当前用户最新数据 - current_user_data = await self.fetch_user_profile(secUid) + current_user_data = await self.fetch_user_profile( + secUid=secUid, uniqueId=uniqueId + ) # 获取当前用户最新昵称 current_nickname = current_user_data._to_dict().get("nickname") @@ -155,7 +159,9 @@ async def handler_one_video(self): aweme_data = await self.fetch_one_video(aweme_id) async with AsyncUserDB("tiktok_users.db") as udb: - user_path = await self.get_or_add_user_data(aweme_data.secUid, udb) + user_path = await self.get_or_add_user_data( + secUid="", uniqueId=aweme_data.uniqueId, db=udb + ) async with AsyncVideoDB("tiktok_videos.db") as vdb: await self.get_or_add_video_data( @@ -215,7 +221,9 @@ async def handler_user_post(self): secUid = await SecUserIdFetcher.get_secuid(self.kwargs.get("url")) async with AsyncUserDB("tiktok_users.db") as udb: - user_path = await self.get_or_add_user_data(secUid, udb) + user_path = await self.get_or_add_user_data( + secUid=secUid, uniqueId="", db=udb + ) async for aweme_data_list in self.fetch_user_post_videos( secUid, cursor, page_counts, max_counts @@ -305,7 +313,9 @@ async def handler_user_like(self): secUid = await SecUserIdFetcher.get_secuid(self.kwargs.get("url")) async with AsyncUserDB("tiktok_users.db") as udb: - user_path = await self.get_or_add_user_data(secUid, udb) + user_path = await self.get_or_add_user_data( + secUid=secUid, uniqueId="", db=udb + ) async for aweme_data_list in self.fetch_user_like_videos( secUid, cursor, page_counts, max_counts @@ -405,7 +415,9 @@ async def handler_user_collect(self): secUid = await SecUserIdFetcher.get_secuid(self.kwargs.get("url")) async with AsyncUserDB("tiktok_users.db") as udb: - user_path = await self.get_or_add_user_data(secUid, udb) + user_path = await self.get_or_add_user_data( + secUid=secUid, uniqueId="", db=udb + ) async for aweme_data_list in self.fetch_user_collect_videos( secUid, cursor, page_counts, max_counts @@ -507,7 +519,9 @@ async def handler_user_mix(self): mixId = await self.select_playlist(playlist) async with AsyncUserDB("tiktok_users.db") as audb: - user_path = await self.get_or_add_user_data(secUid, audb) + user_path = await self.get_or_add_user_data( + secUid=secUid, uniqueId="", db=audb + ) if isinstance(mixId, str): mixId = [mixId] From f2b951d958ee972970b9eaf38ba71aa24060c551 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Tue, 23 Apr 2024 15:50:47 +0800 Subject: [PATCH 034/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0tiktok?= =?UTF-8?q?=E7=9A=84BaseRequestModel=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/model.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/f2/apps/tiktok/model.py b/f2/apps/tiktok/model.py index 2f3002c5..1a72508f 100644 --- a/f2/apps/tiktok/model.py +++ b/f2/apps/tiktok/model.py @@ -19,12 +19,12 @@ class BaseRequestModel(BaseModel): browser_online: str = "true" browser_platform: str = "Win32" browser_version: str = quote( - "5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36", + "5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36", safe="", ) channel: str = "tiktok_web" cookie_enabled: str = "true" - device_id: str = "7306060721837852167" + device_id: str = "7360698239018452498" device_platform: str = "web_pc" focus_state: str = "true" from_page: str = "user" @@ -36,7 +36,7 @@ class BaseRequestModel(BaseModel): priority_region: str = "" referer: str = "" region: str = "SG" # SG JP KR... - root_referer: str = quote("https://www.tiktok.com/", safe="") + # root_referer: str = quote("https://www.tiktok.com/", safe="") screen_height: int = 1080 screen_width: int = 1920 webcast_language: str = "zh-Hans" From 717329a48f7473c060e2c220c9a708336022da8d Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Tue, 23 Apr 2024 15:52:15 +0800 Subject: [PATCH 035/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0xb=E7=9A=84?= =?UTF-8?q?=5F=5Fmain=5F=5F=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/utils/xbogus.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/f2/utils/xbogus.py b/f2/utils/xbogus.py index 6ad4fc23..1350308e 100644 --- a/f2/utils/xbogus.py +++ b/f2/utils/xbogus.py @@ -223,10 +223,15 @@ def getXBogus(self, url_params): if __name__ == "__main__": - url_params = "device_platform=webapp&aid=6383&channel=channel_pc_web&sec_user_id=MS4wLjABAAAAW9FWcqS7RdQAWPd2AA5fL_ilmqsIFUCQ_Iym6Yh9_cUa6ZRqVLjVQSUjlHrfXY1Y&max_cursor=0&locate_query=false&show_live_replay_strategy=1&need_time_list=1&time_list_query=0&whale_cut_token=&cut_version=1&count=18&publish_video_strategy_type=2&pc_client_type=1&version_code=170400&version_name=17.4.0&cookie_enabled=true&screen_width=1920&screen_height=1080&browser_language=zh-CN&browser_platform=Win32&browser_name=Edge&browser_version=122.0.0.0&browser_online=true&engine_name=Blink&engine_version=122.0.0.0&os_name=Windows&os_version=10&cpu_core_num=12&device_memory=8&platform=PC&downlink=10&effective_type=4g&round_trip_time=50&webid=7335414539335222835&msToken=p9Y7fUBuq9DKvAuN27Peml6JbaMqG2ZcXfFiyDv1jcHrCN00uidYqUgSuLsKl1onC-E_n82m-aKKYE0QGEmxIWZx9iueQ6WLbvzPfqnMk4GBAlQIHcDzxb38FLXXQxAm" # ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 Edg/122.0.0.0" - ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36" - + ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36" XB = XBogus(user_agent=ua) - xbogus = XB.getXBogus(url_params) - print(f"url: {xbogus[0]}, xbogus:{xbogus[1]}, ua: {xbogus[2]}") + + dy_url_params = "device_platform=webapp&aid=6383&channel=channel_pc_web&sec_user_id=MS4wLjABAAAAW9FWcqS7RdQAWPd2AA5fL_ilmqsIFUCQ_Iym6Yh9_cUa6ZRqVLjVQSUjlHrfXY1Y&max_cursor=0&locate_query=false&show_live_replay_strategy=1&need_time_list=1&time_list_query=0&whale_cut_token=&cut_version=1&count=18&publish_video_strategy_type=2&pc_client_type=1&version_code=170400&version_name=17.4.0&cookie_enabled=true&screen_width=1920&screen_height=1080&browser_language=zh-CN&browser_platform=Win32&browser_name=Edge&browser_version=122.0.0.0&browser_online=true&engine_name=Blink&engine_version=122.0.0.0&os_name=Windows&os_version=10&cpu_core_num=12&device_memory=8&platform=PC&downlink=10&effective_type=4g&round_trip_time=50&webid=7335414539335222835&msToken=p9Y7fUBuq9DKvAuN27Peml6JbaMqG2ZcXfFiyDv1jcHrCN00uidYqUgSuLsKl1onC-E_n82m-aKKYE0QGEmxIWZx9iueQ6WLbvzPfqnMk4GBAlQIHcDzxb38FLXXQxAm" + tk_url_params = "WebIdLastTime=1713796127&abTestVersion=%5Bobject%20Object%5D&aid=1988&appType=t&app_language=zh-Hans&app_name=tiktok_web&browser_name=Mozilla&browser_online=true&browser_platform=Win32&browser_version=5.0%20%28Windows%20NT%2010.0%3B%20Win64%3B%20x64%29%20AppleWebKit%2F537.36%20%28KHTML%2C%20like%20Gecko%29%20Chrome%2F123.0.0.0%20Safari%2F537.36&channel=tiktok_web&device_id=7360698239018452498&odinId=7360698115047851026®ion=TW&tz_name=Asia%2FHong_Kong&uniqueId=rei_toy625" + + dy_xbogus = XB.getXBogus(dy_url_params) + print(f"url: {dy_xbogus[0]}, xbogus:{dy_xbogus[1]}, ua: {dy_xbogus[2]}") + + tk_xbogus = XB.getXBogus(tk_url_params) + print(f"url: {tk_xbogus[0]}, xbogus:{tk_xbogus[1]}, ua: {tk_xbogus[2]}") From fcbb305a8a9f0d8d4dea1e5988d5d095b1c88102 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Tue, 23 Apr 2024 15:52:49 +0800 Subject: [PATCH 036/299] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0f2-logo-with-?= =?UTF-8?q?no-shadow.png?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/public/f2-logo-with-no-shadow.png | Bin 152985 -> 122509 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/public/f2-logo-with-no-shadow.png b/docs/public/f2-logo-with-no-shadow.png index e962da994f624385011c757bcaf3ae7cf332a479..b18c64cb702c7112b46fb5373c66047ccf2e59ab 100644 GIT binary patch literal 122509 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

>S6giM7J~L`#I-tCdw}m z9eguW^8%%V7aF?r#rx^SFTR$){6{aP-~8i-UOgC@<5z40B}7r25eJ+ZcO?B&;MQq{zhT&BY)xscHSzcxZ=ix zc|=@9fQd+4TM(Gs#JMi07EsGjz|g#nd9^Ay^VKl@rhsn zXX9ZzKsMA!{A8R2Hv)_cZA^nBeU;Tck4)lqK?UuB{h6(y!Qi20w1es}om!N>g4Xwn{0 z+FRgXN>>X~-qcm=ttR#G-Z-C#uF^Z`5&E8cDK}p}pnHGNb;I9S zJQL@`-}UUj^2*gmf0~+ffrkQF5Fn3#wi$}%KnIM41~0j|GWzR;FVP$1Z1Um3Ub9d$ zmjWBVR(013(Z=w=+bE>f5+V>ANFXbVapw~se=+^$H}Hl52h_fc;qK@KxH)m{EoJYZp)}M}W-X2n?~CgtAn=Sx z0O0Y;QNrJxF!}vk@BP6WFJF1|e_Fs_Aqz8G$N5`pfkqD(%7tRuXtOKEX)spGEF4$V^;^Sg?hn3p6E6Cx$ zPk#29g-N&5-Nru+)a1|%Y~B%$R?rs?EEGy)=LGJ+JVpFqY>FY8J22;TemC!aU^iX; zz+S#emkwT^AJ0GVnTB5dmDhIu@JOYS4C^byybus(-(F{p~-RC_Tt;?(EE63S8N|1~RD@3!$tXEE=td zFqlG+%jX%7njdwCt~SvRTxI*hF9=O?n;~LSV`HvdgY5 zIK`kt0N7x@-yl+k>tskl;EC(%;8PYETH}UDdAW8Uw+h?sv5x zguOnn8+e+k=WBTkg-uBpa*8AXaI-Q5hu!z{aGbvQLvhCP8vOgYH+|QG2j}*F5aG(e zpIhKzzrxWR%EdZ6Q%9@U&e=<(T85NRO9zTRaZ08?J-4XJj{iYnJjS)&&__^h&eRbzUUxRATfxf9> zcol14hxrY`+;Kr*z~Tv%0KnB`2)Ndn_Z0XWN;@0=4*&k)Qy=(F%5;HWI~g=en`0%6RzV%i0!;s-?YZ3QX>`E*e3(DV)X)0leg#Gs}0$4r|*PlC_}nZV*?UJ4AcmzSlhT z?T#UF+Fwa?fA8Y^B@|cfWd<_%bZ^{THdr+&g@eg5!74!n znFQLLLsO=IowVAz?BX$aHsWR`11Rx;DDh-PZ3|(%a@N#WfD?hYg+Cr-Py=xYfw>S? zldYyw<}%5?x$Q)FtzLo|@dX0;U7BD~iZQ{Hly6_Rd=_R4 z0*O%dq=d-*x0sg+d(mYEGqaNj;$#-5+0wgQU$Twij~qby0=-#@6=xb|_R+|$c$@~4 zyN~k}P!wD;s##rJpLA6;T+zfABJ)BGU77vLs~70=U%aUg$>RP7O)x;+4g)3Ef>(EA zAIeuDYYcUcAHHMI6;8SJ-Rk)EK9hSI9uuwy-t`QYjkty)c5}0r=-l^SXrB1qx840u zzI;F3`QKjL`Q-ol{N6wMLkDCY-s}zDAC{=%_<95a{c-Iax%0I&ePLb#0#BjT9P5T0 zt<->S4D$MpYv&@;fz>^a)|4_`bP13rH1-Sjepvb_>K4sfd(I4P}oJ+E* zvcO}hOIv&ko2~!BM$G37YODp#xXKs7v}jUtQnI_C;_b*eEc9tmWa>?dQT_wXyFtCzTO$MRCaL`gLzJpqO$^; z^yKnsNe`~G0!PHheY)I&%KeFCTSG8%$+un}j|@IFZG zl!i?9U6Pt|&1Df8-{0_>%H^|*?;ET{F`dh+hWMK*FEsUyG?Slq{K#?d0BL!8e7Cvu z>?8NT_1C`T_D}rxZ@l{#-|ybB_>ZXjciFJ9cmLGiwKRQU%fy+QSI8Df0N`e1=m8je zIEEhXp*ZV;KX`$qJ@eTN3q3ONBbI5Y_TrG6O!90kVzS2&A=|#%v&x*ugYI?_s-g zLpVa(fgB(OP1fT3kYTb>n9K?fByFR%Z5&R;4>i`8*PjtVN`{3uc3x^Obs#Wx zDrhKBWSBE5R}Jfxvg@M)&gGuXeEr-44%;SDxJg=n##C`Dg!p4tws%)6>w^nplVuebyMn(j@}sv$vs=}fyNmw zuBDkmqIqz=GCWVxcl<17p6ctaeF<4CooY0k+DRF^DeZm#m4i3@+`Df7?Vowuogewf=E^;<#OOVuCN7q=Gf&(+S)37e8`m3Se?C;@=W%Q|lGIiNV_g)#SUHBIJ) z9AZW+!Y}Wnle*DInSdT@6VUOofFEkG;5WL2;NJ~ubac>DQ!mU5T%>MP%g2MSKqKz> z(a7K-{>NBbK?kMnO@Y1xSSZ5UzOL4Q77rE!L6+6GWoU%@0u&xJ;4X$WAgt8{EkuKT z2BRXBjlU7VIP7(oUa}e~(+C9}Rf!}BM+Yi;%jxcT#ng@S3uW~u*GW>9n-6ybv2{hq z--^fb*#SUm-IB;(=de<=afvm=0Co7SA$3e}Z3R2gW(wV|GcWl*%b1IhBT_DNENEZ# zp@ZwG^)S8Y^-WlYepR^I>(%p%Qsf*%o}|RS)sVyK4xj$)8$@%Li#89tg-D;@j2|#? zUO|sP%v|5faSMugN0@sbl$GWlh4&1UMwm#7CA~M;fwg`x!ZXkB#eD8N&Nq+!58rb8 zM}FyTcb@&eoxJb2WgPqP?)d;8eb*0#`>=q(kd6cZ9<7W$5Pj$8K5%0%3IDRGo;!4t zz?!opV;*Sz%2zXLR&XU?LQ^bjs05y%@CF7uG~=*Fkkp)%n*)iT8y)Q1df0)3wKt0x zIGCnJOvcIw^c&PRb21wJ4sLOj0^n(M0L)GUBBn8bv&DQw zsNwD}JEs9n^qv^-?E)7YlMkz`-+oRmrxsT zQBU6$aCb3}^E)QXYz&yc3C}rYa5Kelc$i@K?dR`5`aiz&_J8^dZ@c~MpM%Rd26(mi z_SCSxxc=Of^Fv|F#0lAQ2>@KbtmErw3J8w93~1yf(|1n)fzw@*t00iZ)ntL-ndg(hU z6F!c_Jg#v?>xSHhLT17#1DQ5x1O!z=Jh;&m~*t~7xl`o&x zf&004?H@e)58nOKfA+J_-2Th&H{IL+KHhQXYjJ$ol<>avedmY5HWer2m?QvjIa%hW z9!oO@eN$cxL%)5xF(6EAw&71=G2e*hj|U+&_wtLI=je$hjd0~I&figOp1f?^Nj+vE zL;Dvrd^}*3T{zGj%=7aIwPvacY~8O2NHJWMe*&^#o<*%3Z}+w^+m?7GU1C!;m&b!u zlc|BZdATeC5iMuah?#k@Pz1G%+-^3F!C;qRV9E%-q8;Sp44Ofr*Ij(c420bqPGQ6N za0KWu)7k8L4wEyE(PY3HumZryf(OKh`zV)ib-r!uBex9ta3puW1Hd}qBarIHh_hPa zhYc(as`e+IFp+Zi2?dj*$%DF2bILXiK_4b_E!eR%OrtO$H0U27xr| zHIM~5dhw)ho2+@kb=8RgyWe*C{?kAAu9tq|zrK0r`>*#vVBdRtigs}7@ld?EVarHB z;Fd}N;PJ>Z+P|TALk~OkyijN$41W6=Gg;;aX4dE>Sb1ygCsxCUP{Z>C<-N%!6*T=8 zNJFzRr!8;tcF<|uV9}@+VaL=-wG_B&7d4hVh>1%QV$(Ow1v92?k{vjBo)Av@PoFnYNC2~JPBm-3(t*r7kE`J<&YMxov>LA5Ak2nA%jB!^v##9 z&=o zabaB$xXgGJvLzA#xL#TICSOMT*B56@v)7kj_XX25$@;-#?H&wlxx8q35E9D`3{K#} zrKk$z9ZjTj*JOJ%^L1|r=#+Wxo{sdgXd;tn;AGV=SGDY|o0|qe5>V zb3Y5nlz*AwNc;|R7D;}qhPh2-e8zQ45*=f5Z6WkmY@908=QvSkhX#oTMy9GnzT;x z;g}mRQtKB9&Iu-*j|%yld576O5AsexBn3?$J}acIt)wUMW^;Mq{Ac~(vT)e`O_%rR z@{hmy<-hWaZ+_`N^sZyb-o2f0S~AQZkDZ$nHkKyj1V{kj(a6|CS35WL1u*n`=m8)5 z0u}G8szI_^4R+TeFJ5q^kjm~HJP%GZal!}1ObNdIbOopmMl!mg+lB-$0xIMJkHVgg_5AL9UlIV*% z$mao=xRYLX0TVK9<37N9A(=Z@@6RL}z^)1n0Z2jt>@vp7+-7}@w5{AOo-vnvQL5E4 z{mA`Zc7sV!9#$riJy%vL=p0gQZ-y|bOD>KNvzup_tS#I4d*<>}r`y_Vlt`fR@c*Cs z+#A6S5i0mq6KGai^R-L5I7&5moQGT7Wi*TU{!ti|JIa`rby^5RoIE||qfIRqiLV*I z_ZqDqe~@Iku9@_*W^F&0!XJxrPxH;S^DS4JTR;DvZ~o-pedO-9UzzkC-VO*HlPPHe z6t_$Q0O!lPZ{oT6jXl_XUy!vIi$5mw(h)NhsBw63BAh^NAwuG@A}4Dc)<}t8Ez!h) zMuM7RzAdg$^wnKH?r{iE%WuTS0b6X zIjMg|;mB-bDuC<#rBImYpxL2MKlil6=J-2OpDeezeKHV;piis{U5^?Y&W@zDOEWw( z+NX`t7-uu*HkWA@thE)W6CarRjZV3bKRi&`FZ{+V3h0=cM3>XZ zA`LOmb~J#n7=?6SU@_fhSk%Ej1;J&DLSQ@SGyquy&27hMZ+9&9XRT$1e#(0FWUvM^ z;o-l>4qd?TfaRe=X1;l6AW0{@6>yN%wHY!uu3w7#7=|ZGIspzr+uXHD|CL1S=E4B)y~=W&8jl2fE@A&g~D3|491HLRAU#$0Wb4ZJch8$Av6&fm%ahz>8V8c9-g`VZ_6yHHPIq42Q#UK+{%st3qJ|CM4SM@p zO`u69z@>mMbNHx{ekZx4<#}R9Jvfh0K0Z`C-hjrAyIx^WpRGjj;aU2&De3v6KsCtf zcwWF1{Dq=EQbR@t$w|)846z2R_H)U95nB+xl%qw8( zlzdnK;8KAz855e~Gf&LX2_T36;`}7e3Y?HN4S)u&P6fx-Wuka%!fv$VRmE7GUN^F^ zM0XW&{iajj<@%%qfG)qG9~UOzm%7k_0D)ka^|xx-AdK+XLx?*DXmq;(03ZNKL_t&y z`DZ+7RHPoP$SsoTWZF4)t$?d(n`3C%?8OT?`1U)%%mCp@cI&`?rFvd~Q|d~|fd_mz zRpH1%Xv>$be1s?|6t5>fw;Ar+Z0qm#Q$9TYz0bTsyCUl|n)sustZesl|1w8!ShMc7 zS}QB*WxJ_nifIZJRx(whYzJT--2mK$n_y7F46nOQR<5Bi#Y^u4g@%>k?RwSWttOpej9A>+;^CZuL1)NDhOuVtrSaHo+}sSn<}zOb&;dK^PP z`PtV?m_Q(0E_-Fl{mGkkXIqg*qH$+{B>-U%;T;#2G1O5u&qI>u2GawG@w+C&b4Kv~ z^6`T6EF_48&l7^e3b{lzks;8k z9s6@bQhS(bAiS?!4|+Z~xZY>go%_ zRml>b_5(lAosCg^8zsJLAL-t|FTQe#zWC+Gbj~Gg%|>8a_b?=i`h?GUBRlxuq8WUK zBoDaXW!52>c`fiYt}oPtEL!@Kal=zV&cu(o{WXdJX%*lupIabYq9#?VPMQq7oFD# zu$eRuIafaJ8URebzWtkj?H}HJ`OiN# z@=mA9le7v1j)kvV0uql|0syyLh8}k6c_Db|dqH$Ge*Rp_`89-f_m*gPIbTo|}y9v?VMZs*m&HfgERFME9H%Dk&av<8iQ)$70`?l&4+ zHcC!97_fH9_$+jDkNBTmFa_dNVYX}dH*h5*}q#R;Dbh% zkWjL5g3EDW9f0iw@m0dV6-GO(;=!##VwniqREs+>W@PK)q|HZ7xGC#`2c4FXZR0Wk zrUWx2FyUtFKBc&5u^?y(N&33fCnr}<2M!fXvspw_A=o}pE_phOX8k&HKj0g{<;&4N z`I)ESnS{BxsJD|x7Q<^0tLOErhQNQI-QQb_)z$fYO?UxD1C|8IYw?ULSf&DZvICKW zaMjeo`!4fh5m-UoxaT{oY1%*_>EbzcpQXM|`JT{kjolAEe&>Tf_slo{y|=on(Dx3f z%6Xs8hj|%`vk5I=K;SV-0O00iin@KS_HQg+?IqDyeqWfL%gx=)1Cy9#NZ|qev8n&O zGRVpzhw|3ei9YJ1jZ`}&W2bTI+DK&-Ivb-+(i-Qj?snSWfDT4WZnFS;-#a)ni`bE|*z*Wc#Y2!3( zmPXCJyu-Bo_I}gV_?f^(6+mml-?ZMGOL{D?n}q$MG@N-KVK4y`*1dsuY+J?~9=!YJ zpMA&IfB1v;=9&b3Qz38&>W&HmLyk!T09Thy-QYE?+)$jU$9-Rr-ST(@Z`3^m5kdzJ z=EZu%YTPsT8}pNy#yB((A=H2@c|x zVAOo4XqD`Bcl*VvCXeiO&st|$B`yGonnxY%C4PqbB2-I%XE~+!KY}IXp8zl*D%US_ z8w_-2Z78TN&8lUFY0S{%-B#}N&p%GD+`eG?+3D_K+5i9^_kL+FUP9>ugh8&4cnQ$+ znV+4*k3m>4qE4XsF#+&mf1t#mrO!}?ITH&IWVkkF=LWz{`^Tr}v+|+Q=sJCze`??n zArSAC_NqN}@&5IH`0lU$=)a{wdM7|@Pcj4sBp#Cl03N*z-R!Gq|Hjfy)dI@7!#RNM zPaKTwKqjV7abX4;JO(d5P8h}ofrblJVh!(@!C(3$<|ckW3pC*VwUL#&(thYuo_~}KrNSh6Q$HM}8+VK* zur~a$D=))JL~uNe%;f50Ap`&hz(+v{01j`eoZXfaXfEYJGk5Z6J55w(@S9l8Z1ycq z=C-ylE8ym#itCR>QvwYd-t$;5d=3E4%0Ycj9~4x1^3===A})`T7H50|lKJcBo*IxN zcuoX08H97m7n+PwkDl^eH?X1?A=K=qf?tgV%orD9-cXIR@MH|gs|>E-QT~~;OBGK#M=Zmn>I`#ic2Mg8U+L^x zg#phmFfk@Ag6-bqA2@o3fvS474A{a7LypFIHZcE4#yGd9sAv#)ek2ci1sDN#u;7fM3tO2pU+sno0f2l7W_C0*hEq zEq$e}^0PyH_KKtPZh@5S(t@V4Q-AJuci)*lCf5)CHBiDzxgBkICXH|IjkaDq|4(#h zIh&QZl3mjD8MN5A@?OhyA8sCE%lQWKXKR3b7YJ~IrVb&Lkt=bB4@=Y44#b4GZf4SS?+W(9~#{DKlr&rlF?Ty14rIIfn+yYTeEt;cuFX2&mz;@#T}fX5FIT zN2-SdCEvTZM_+jUvGVLGfXS8QXT!|} z0kVch&F{#={~wsG>j1dn9lerLivzV>%cSS`PyuvH;1An}ML0B|*#d&92#>uU`3d>RjZeRU}O$$x6Vq|-%(K%M zG5WvLe4Fw$j_JjHjNbzo<_+NbX;XL9_%a_Vtb@c3422a7~@WdM_L)^T8O@W z#<6%$k<`6j zwRqj!8T96~b*M}a4`VrX!B!y0Yj$BV%pZK=Cfz^Sfe#K^Jh!^rw1qJ&1fQ)0=2DA# zO$YXjugh$wL8MNf+o>Ns2N{^PRfEDQ zTENb~Tp%!a64-fo#9{EIT{g-DXR7?Nq_UE?2*aKv&5~DZrUTI6xpg>Tk&Yxd7f`iw z>U&V2QC_pGGjF5}Ee_YR>ghR~XZ8O$A7Pt}<%Z1ilgykM;wEm>pI(de< zjqG$9`~xoH>(*{MZ>Gd)9ZkbrLT8o0=YxThKeQX@I5c~wy!RL1^X0$sU#tj${`VB^ z-=?*E0f|Q_0f6h5bwFR=`96)`5a9KNO{-_(MTPnjF z@rM##Yl6JVfnWpAED4N}uvu2;@eG0~oA+5Z8bQ)FNMGW1k!?J#A!-vdyO?s*L=x7G ziv`Po#4J-a8mLDi@GB_qllC35oA>|9d%pBH{^rQIFz0VAt`D!ts!EHHW0C;CqmwD> zb05Bn_HQf<W0|PQ?|>LL(?6fxaXe-WZ@{5WqM@X418e z>i~lALMBsp*U6$N%2IzK)hHO37BHysc5yl}UN^xPIwY;5q))Jr1a?4RP{mzVQZZd8 zh$pUODuXbR!Qua2XUxC0KU;7}05eJd5mr4b&{g3K$i@IAfQ>*^mg`_H0+%UwXx0lO zzkS&VVSa_JgIw$%@qLHwbXrKPBLg27=7-HrA8=dH-U+L21@;hP!4*vh3?VOqws=6r zvKO3(@u2_sxy5$y#~Q8<&xvlodY=C1OOG1YD#&ICnVtE!csFL%jPa^@o!hGmHkvYZ z!92IPI@Y{b;GZ+^>Qw{-bAiGP6-QSxEkuG@n1Qg#prKRWfgHzZ>l2p>bN|3+VFGQR zwmXaQps}55G>qu(W|#J#eczXU{8_k5{2kHvmj=SeAaKf9HU}8zo)1}*1OQHxb>5J3 zAB>>~l-$EUC2Z;!Vp>erYjj=;6_bjc2u%Qg3U_iIUSg6*1|VWr9y}OjGGE$SHi@ef z2FrB7PFtM@%?#phZW6;4;W&z4=#7Ct0blM17`v1Bgd@>n9@b|^e7_-7f=EB4(ieDH zbcYTZEZKMk&YJZaXqyF?(E?neEVh92b~q0jII5F_4R0evki6>by`7y!^G`PzI<0K!xG;o;-fHi`^kqP=t>{Dn+Cy9Ruds0 z`~HM}m-=gP%Bj*GaPO1LZ*;Fy$msV!cas{wY?{rXFuzsItQi?!E1{bF^0)wKwSkSy z6O`t#BWP;3T%?2S@>M`nOG1X7J~G?}neu_UabXb5nV+&U4=^?Of`E@iZa3@c${bwq zGl<}*zqQYCCmsWoCN4rQ|H|_2QIqxI)^V5q=6k;UBR}Zw&f0sPD(8Hfp)jAvDiV;l z1rh+bysYahX4x;NInXzhSML|1d)@1Svos}%fIDlzfMR?D!a@>R=+Vdvk>LyX=H+~e zwQ~iGWWdev;zu_#1OvLPOja|KXww$L>u6IM*8vK-!7@;y2F`CT&pQ@0Ji4{{@_xZE zDP0zBG_YTD2uVF~*NyVIw~{=q(VKn{+y6-Zqh zjP?(XjW!TKIq7|&RZ6x_y)db9KmECzT}?RLj@TtFud238HQGf_j*FUbB`qKo1E1CW zlgtY??o$9NTVnwD1>^-7V0xzV>@f)HR1}`Chx1`s^M=o(!fYe$gFHCQn)q&^R@0vH_@3Hx8vyGJrHDoCqy+rQQH+YHls*ixcP8b%^ac>no6C zp@vke0VoqVgTWnV)T8!H$_BR^xneRan%M?5t2rA;I$QxPyLe#T&A6YMmwPQG8LyVAG=l+Y3}7aP#i zxWMbKE;V2rI;Q$oZbYyXiEGCqc5<*vo$J9Fe(JfKMtk07z=bt3f3Mv}v8T)3rH>kng%}Lu&%lVo9^zxS?RvksO8ILB|X=_(FBV&$o9acZ+KA^e^~0{ zu7HUjF{}mEDJ(cox%eW*4@}r@Qawik7^f_E1p~8u)Fy$@{R{VB_dmbwtAFVol^doH z0{u9HG~;ntbR8RHGT3qbk(fM(HfZg_Vm=jz*UV*eLMT=#!peIobIb% z{km9KucyntUW#0`hC!S*-8Wvi^8d5U0qcz-+AdOZ8~CY zmbb9X&K3}tquaxQRx!H++A|M1qiJJzFV?kJm3bLxqJ1!~)u@%Uku&RXd)sytEbvZ* zZOVT6(Jy->XZg;X;=s5>JjnjeCczGbV^}BSyk6d9^sMbqFJFG+ga7mUZhz|LF*0YD z5}>|woa{P{BIC4a0f>({?f+Q!?%kK}cfubB_I7FiM*l=oe=#Qti6S7tn>Q^Omsic8 z1Hoj7l7J3nZg{&*pg~K3vw5~!$%X4zS*9>WTB$|MDa$Lpg&&Mu@J{7Pt2qRrvK+^)^izHVtk485-r7_ZZl zH~(pw5?cVpFoE#d9xG<+^R70WRHcZ}XdpJ!l1a)~E9A2}%ME@r_Qb6##^9aWF6qti zxcXhd5*q0=^uJvjjQbvy<9pj^GosUI%n-aD12|3O>(75e-uu*FX~nc_=u9`-gYYL` zYw`X5=Jjlxrr1zT?KpJ0H*KEZo9@cJyLaW@y?b)!-W{3l-Az!bJ`ZM7j8*IZ44hVN zZRmW*u4=2l-RRTuZQ7*}i&9r@{9=*&TQIk0jqSYW)wy18hmRltv(-u)2=;rkefV@^ z0-{Z~vhg@>Wlx*_DDWe%ztz_^1g385=k!Ft7?%Rh^l=q_-ZJy#W3T@F|M=p?fAM!; z-~ZlS8PAx}-!f6@`L1X6^GUwTj=W2H3)2DsA5A(bkUPn)YS-tH=I#_Kl-703TM+=UOgT2_e;nZf}LbA4()=lIecmjf*Jw#pxUmR#=i;3dP5DOh}=AL3yLnl zqXLQ1cd2%NAasC;LulERox;wg+XgiFY$KqRvPd!PHjE>^b8H$MD_6icKzJt9l)-NX zTc#`{=Wq2IF7iBXKLa3dyI?@5q~X-jF-@-jFxme7)JhHXzt|L{_J1Zqf)c$!fkj za%Ns_1!%5o)!4w{ejq@cNPxA?xVkAv1H4GSwFYjr0f#f#b4{YQKKq7F8$i=ZXS>KX zcr*>~U*#_LkI$wiXT?K=kr{Uf&e(Z(c`$wOC`oH`yc(mzr z1#F{PcwBlbfZYNRA7NUKfZv`p0&X>(1O)o`ZO`zxU4MspJCHI8?a~C_CNQ!ew@jJG zwOAr(^OL|(=0a9YaIZvP9*mM9Pa5PM`wOO0Rvr&5Ws|v5YZOV68x1c)Hwxg)&9d< zQldUh`Y8QcZ1=*^DC_M`IW;#M{4(}ISmTC+sjmG^Ej1m5TUDM}kRpJNAc*&VBuXPp zPhhFYH3eEm=g^#D%O;_2e1g6>mfR1*<20s8e8-+YdhLRI^Z94Gyy3V|$sYN@UNCsY zwl=67?jOqevlr#)(sg<4>QnN*o6pFT*FPZFFFz(1&t6(XyYS}^+M+XxIGCN<{lpTW zOu+UIy_5y-AC5ky(};*`1dT&E#ika6-{-TqK}3^3OeL(;{1CME)yqC+kHKfpYCOg! z-Mf3!;XnB4=lcu3&!b_f-z#gXY1{K{WuNr7B|XBl0Kof8#{ss{^M^Ufx7B~r zHf(ECVGdP*O9v9v0o~eBgRQ#f=S5KReZFq*mYP37XA)rUSD$`tbNst4*$(RFZaJAI z0YL{>(0qZgc#<-Q-^Gw_1366pYCPmYXuFDE=re?7lYXE&A&hlhJN&+^bfVzT7W76< z9HP0r16c7f)>UXk4jks15Cnz}=~^2=U1^dX$#6CW?MWFBGd`DPj}}5y8lJI6ATQb| zpjvBR!RmXS1Qw(i#R0WKw{BoD1WTggt~~6GHZ2u`_n4Rk;D*}0&^ji4vFWAb z#hFfD`r0RCn%V(n-5`y+Rn~}<`H8lyu&<$aJ;%ZRpkvw~mA{Ed{G?c6^$AW}4<$ok1hl-rArO0QSt#$%H|pfIY7G<_7~n`!ROd|GEYc zjDW-DIm5k>4I-?EfRPgb$^e*i5ohjP`EP&X#sBCT9ES3_0>WK?N5Ad*Tz`9zv;f3M zlokMZe0o%qZx{F)tNR{2g=5&TW@Bkp() z&Y#=-+u4IEkZPWR22W6%GZ0*)5!CYgK=4~3ByG$A8wI~EK&sa7M^|Cy(}B+sa^!BW z(~UDPgW>|-p&MQ##$m>S=~d$IMSFm#A!e@Zb=p64Q?CZ=pRtrFW8 z1L(`}Bo?|#2p#VoEp0|wQ*^+F_-YRKBSE;D=Y`ThD(e=djgzOQV<0QPsD_$~)Bt z7R$ya;t<2Lb@qe31G#ekNS-|UfINBQ19JJok?d*O279394E@B{&?Qe2I2LYmhD-u1 z12?xo^aeZ*Pw5k+M~xBM#iNW$09D@~O))(2zOt6F##1!l7YGpXxfiMTR-gRHi@*Dy z4>tKH;Qw2HA3fie|Fpk9?Dv+mBP{^%;iuCsfYVOwZ9BLJSy(zOBg|f=?UkAk1CM)V z(DJ8qZ0kh`Huin`{9N!U;Oi*nd`)>c_m^d*QN%>WLrI~G67;u6O=`O zY>?N=U?1)s%C!qO<>{Lr+8h_3**^<~S^U99+U6*D0vbZt7Db@d0L(x$zvfs2adFqL zKk3X>a3h@M;uV^jP;Y)R-2*zg%_eBe>!uCzWqmjh$y05%2mJj{KKq~ijblLIadK(M z5_ja^Rn~*%Thc>H3jlny>A2mJl;2OftJ;;XmNoi227L85zzSNlf3Z7;(qUs#TN|7pB9xU_=yjp=~L z#+5!=^@{|v*Xav?{xcmWMLMbsfZ(7Utz{JYbQ>O+78CT{38xcO?2!jrk1n3MBu^Z@ zPo6k>ube+~u~i8`FsNcV4gvDoZzV=yti#QbEATFxgRi?oj6qus?kx@=2f?TX0P&2& z+X+bP+mtWP$I*ho7|RrqGWR9~n{&0Rb8p`K@1DHW-p$6g{oR&MEALL57J&GW z(*gh=PI{OVbK4@?2G&ke#z_EXSN_UOM|vUDHf-XyO+s<-Hpgxb^dx@^um}t_eh-0C zBK=Q;SZOCnbo4uL(#TX$DrhsJ;|fBc3Or=QRRAjI>jirjFAe9SRx*Jj9Ql+o3oPRL zTe^AnRu)?5;PQ_iXa?i9F1LWdL3_Mj@C)W93}k}77el}h=-sOr0KWlk@fcDHZAS?= z8(0rI5vXJ53TRF;FRlB~{Z>x7d-Fb+R|W$HB#Q6dF@D!n1`XZNx6j|b{g}M?y{EW~ zog)+XNo#izaFy<>mG_OuK}&nWG-ANXuucb6XZO#^doDjIPhb0>Ts*wg;4ZFHivaT- zDC`(O0z}m0x%O`k#R3{Tr*G?{fd_Hg+`=)h=PUM-2;!WW6WlqRZIw8lmY4^;9z^u1 zr*8k7|J4@oSBG)*+qUn=$)H_zo#eeGJ;JmAz_%wo%*C(^2p(7N5crMM6`?7yWQf5- z1;I$M6*7Y|EOxQE%SZ4>m8P8`0jrT9&1Xul8?>34so{0spj^ksarta;-W+kcDaq*z4J=Nf{n1e{l@p zFWF?3mc#?6JN-2#J^*#Y_nKB2ZBu(7Sr8+D{W#KV0ILGF5hzvJvgwF-3)-oR4(G1A z7is$m`ZOw9YTfnJ5OxjSylegW!dHK$w72hP05u0On(Y=C5}X*7*_a=-#?{3T5M6SO z5D+ZwiaCjex8K*cf;TTeAx~ZZfLu7d6t{+WvnC2U4_Y}%Tf0fBGspzPms&d707D}Z zFy?J0yur!*_*rXz)qvhiXWyXsTs5G#&)L;<@E?BiTbuiWD+k;K=5_(O(R&Nfdl#hz z0G>WQ$i%(hT@mKrwd1M_a`boC4zE13?jwURvgVFo6-p;9MHoICFi9oNMu3y40Ld}* z>rxz(6q`DMXHo#0+v*H~%7|Eu1);y-VOT&Zl1a;7|6yogU+ka=Xet+8om)lbn-s1! z8^8odjuz2YQzJtji}kF1^OKgr#c(h*AF`dONe%&6)H! zt8u(tlSD(@2=~P`00i_Aw1surgGXE#WzyC>B4k@gzC-1mDf(P^!o)|aWjW9q+Sh}P zM)2{g@0YU&=Q8$a8>bBroM1PLpXmq}HK_T%=TY28Of)mO>?d0L@>k|0KY#5(I@n%H=I! zQu}u>Bb7_Xt{`lWvk4RipvSSXF6>N^tMqvXSUo!Uf$Xm`ypDR|p~-8a9f4q{rjr~a zO%Q;R+5r!02a}%d_5!2>7?0*{R?u?XIXEB-!ng)R;l>J&>8I`bE{iZjYGoI&ab#)E zN(ht?bQ17R&)#T{wSiZqzN$Ei0nj4+G1irr4P9~CC2|x1uEn<2W_l2)g7!uE1jsCk z@jjD{oQXX5;(O)xE7xgh(%)8&PoHkCw`nrbJSq4!H2;Op-~d5W5Eu`!i|l#C;hQX9 zGS~#J|D8KHD^FZ~-$pCA28E?Z-JQhQ*D1AZ05~&ev)WSzfeNK#!zbK)%xcCA@v^ZY z#G_%Xr;N4tS!#aR;P^OfruOQ?AAa%g{(*4XC0|DJXB%)F{k|(LVD4>B3jln$=`=vC z{(hPT^dJjI%fD^qlET6tX#fSkI>}#~8aRSGY~d)UVMN%yw-U>7hQP6@?_h_W9XyP@ z<#aRTs)69Bp;ZP73s62$9R%bm0ILlK%!KWtx{6cECjZpOSF_Q#YKLX~`TF6l`B+UY zgna}tmR==__IeorI)OU%wUw#faPPZWmgT}Sh(7}|6yjB2nIocN45v7NtwIM}vEfhy z%}HLXm6c`1ab;oapV7Ul85G&y(IU__8V|Z4<3VuED%ourTx+Lr;NCzm-HH=+L(u3L z2!lHM1+k$6V8;aPt~t}zX9Xa)j{W!XZqjYDp=Hl~Xc}nX#lcwxbNHIa;SVU3o@n zmy9{hd-qeul8#9W0DN?5+ax{d#6HO+KW@>=mIZ!XIm!=>&{OR0m7iPnu7&rtX?@JO zbQK&JLPnBt*YGV-QTMF;-NJb)ARGcR(!VfB+kBp~lL-O_FG7I5h|Wfvjb`ub|Xuldec8Vk=4N2fW$7^k~Hit;M8( zL*b-@N<}(z0BpZw)&fLJwz&jGUVr}bHvj+%7u#)00w3qbkQ{3a=p3|2b-80Nt(wGv z=AFjNU_zGm@jRaI)QylX0`JO7Zd`beJbC5)a=1Fv+4H$pe42R7F&qqnzs-gfk9i9~ zgBel4T)yM{1VJFamnIPP78e+*w)rx@b)>8>Gd*|h)sOxoBpH%=@ccLsH_G=gfZmcG zaasW2yC)q7-~{qitaB>hmuU*+gaUI-EuUv>3`T(&N^*bK2$}$h!ksMzRt4mT!NHD8 z%8Va@Q%z{A)C&w}pxNi+Y7YY9cH7?t)RP{(HeZzAe(%Z$;2Sin$9(>mxA;`|`t$WO zw;*VXfCqO#^CC(d#1t(8#S9!Y7@q^EsBjM(&e~vBI5VEd_GcZv6GWxac5h~oAW1 zw0T=Bfr#jMMmXZP)jrLh9-r*Cu|m?F=tH;vFd1yCNw zmIuG{@o)X!UoWG!3yh8A&vAh7qyTbBZ&O+T;O_J&C+bPcJ`V6bNZlt~>~QP_TAr#s zsLWW49Mw1r^1FVEZBPiCDaz~O)0H&*MN9n^JPpwC5P$)7{78$y%-FOFG&oRK0nq+h z1qQxjkA75u3c_=E?5s>r*#v>U-D#~PfG0yEr5yY;rPdZ&5{;FK08ON38)mnD9+|{j za3I@H+`&X}+HIRb3D`zG8h{IbkAJ2HRC!;UhmH>Z3p?%@y@OGEDv%A*3`Q*Sl=X$> z)Mx(Am%sk80GaVS0Vl4h>sz6L&(+urVNanmTR|lJ4N!-m5Wpz4c{Cns-4%4fYgFah z#rMb)m)|S-->5n)i&G47Qw=!c_uE3?_pq@n9gDeC25bWRznLXMzaTERHzW6z zK!>)$?r4zo)AMh>=O6D)XGY3`9ZG?%psxOYnsh&9EgOn25UEB@Og(TNyeQWi$)i~5yh9=HHr+& z&WA84Y6f-22|d?YO@LuRXkdWxB7d*N)_(*n8$Ia)h{5q@R8j!>`tyymw^&q-WAtB{fJ$OQcCU8}#ezFTVW|Sj(l2BVbq7 zyw@1Vsddp2{UxqR!(-#om}lELnWWE*!TWBOVC_ZQ(ih@LwssOZFHc?lpqxLv5CN6V zHGyHef>wA2&Mw7a12lBlm&wNmfg;&d_gtDcZqR0B+WVLo_T5X+IwpIc_{2AV@3*1G zZL(z-=sQjxZF_eCaPNS$0Km65J;*L<*8<(Po2&2d2Bn}0^FXH={$WZ3_jEGl0{oaa z1atv+?V2{JG4dQypm1rw)ieZiz#FT)<^boTfbRK+o_v(LkaPQI{ zkLIaC-J=9|3s8K7X#s%moU|K^9WU#TTa>%XszA}jvW8ZPUP{TQjmx?)N*OiV@Tn!E z7O=aaWFEEygbN6^F?efjBI9_>3m~(+kFr?BqwDjt>{}t$$mYpX5C!qbX3v>A5;z69 zfiNZ#L;vGf?FXxS2ehX*&fE$+L^HJA1kj`2q6&_H_*GI<5mp+^Akq9z-i-E39*hC_ z%Rq$yk8zog+8AIP(f)5I$~-dfi=t$yO; z-}sOJUQW!B9N5lsc6=Z1Yj?bRKR|B*hYy$*0Qm6IuAS1h?{9Vcj#DBr)*)uAz;s+* zP5BZER}93fpfy8|yJ1*UWAwh;bsUfky4vsU>YUe0njz4XZ0oq^9}W(b!;hdm<-90h zQg}0FiH`#t#STnh8;h{B+6>5l<=|C0)H|SMXkkCR5WH^0tnY~B*gM7I9@>V?Obf7r zBUBs{D6GAnXLbSjL+hyV-W&}^v#%|NUy#Q8(}W`rbqd?r6rhGrK~+%#0SrHspOlF2 z0h2{gqakeOys31mx9nF2p?S<@nciY>KHsYUI^J!lV+l>LScRVYtsgJJ<1M85Xy zM`8|<-mXmkSiaCr@>T_{GL}V0%RIel-erDYAV`BOH_b#4JV|=|B4CBASet_^qqxrr zoX#I!l&7w|Pga6TGV6|Rr@VK!J)MY9d4!vKzUuH|0Q@%3?it-Gf+rJ5(h9nfhDiGa zoG{;1769omUN$K0f47VC!OSvYB7vJ+{1dO0zr-25fmIgq;Q=k z^fa_2jqy&oi?`6??+|JrR(!hw*J+(|6Z4kz}5G=GvW?efW>Rw*a7Qzj$c2M{~ z?F(3`s1OpQc$?QTQez}C@S>$w8V79-Lir>S1SqLV2>|PPCA~e7LfLl-C#gCrQM`Iv zwfo(*iebw~H{SI`#>!-5q3_IEzePu}|3%V{BvY#PxU_7wCWK^M}q z8xPQwJIS?_(=`hpSf4j|jsOVqDFn3g{SDT6xOYaLzWjbU+&c@Kk139ZoyG~^1m;u= z4h>pZ3t2nZZIS`LoUiDv|OmDY#VhkxSP-~COXl%C)-rfuJ=OgZk| zld!xcJ;byCz_%xz6p-!8cU&3AVTf%D59G}hz)XTark0I0JMcQXHj$K1S^`0S#b58&yk_W2H2Q>J1#I zJ@guJhy~h^ za)9nA%M$G2-X_5sQ%RuT>rZ>DeR=ZI({ldc0%;@T))9BGn6ltW!q|_1U6_2hy{AIo zE4Zbl0q>%1U~J~3XkAl#8Yc}r`Qz)s-OInf1^D$-Vtbyq1E?+F@Bz{S0N?&}k{wV@ zyLMKm0e-bk`W#nfH6}$s1>$UZnt{m_jva=A3K*qMiH6jHQ(S2UXe;ht#Y(z!BX1A^ zprK<%Vg6fF(IogOBa3MOV=@MIspZ7NfR2;Z63hFwkDv)qCKY9GoxQPk0O^!HhFJ&} zFbo5sT7nhldjmjEq_ZT<=(um|IHXM&!xn%O2Kfre6Qn=2Mrn-1>f~?lmhrEtZaDDB z(gI8~?8d^#J9<3Kf*v8w*}2PzI*HOu>T9NRE}(8qXBgjAa!kf z0U6>B5+-zXy3sxrTJ&=erfvNZK5tW8n&eu+a^eOe7>~_<7w0PWWwY*9^4O)PH@Aqa zf0$xJ;V(?w?`Q~sK-V6|xMeVGe`|8>D$Z&=E~bvm-J6&tG$3Bq5NfT_6k@}t_CERX zum9fP*diZ>d)h(1(f3`lYV_`Lz;j6tF)aY_tx2QF`!FW@2>hMq-L2qn{)2bB7NP2f z@QT0$jLNqOx2b2kVvL?v%~OstmX?Qp2ZWQik+cjbDbc=XOUFg{ShYK4#5_>hk_m`_LIeS(gBAYR;v+= zEwo1(`y7CGyZH}^7xy$Q3n(lvz5F-;sR~}(XS$(6f|eP)ok2+M=LYDklr@(o z8qiHpz~H$iaO(>I?sV<~fa&c5z)1T>nAcN#aQ=;({{Sd+0{PJ8sri=l4o?dJd}pNN zc2*C%sE#XR`wol*Hvon9f$Zx*V?YAX@b?fQ)UdE^3RGkyxVk2}6dkLc=yMOK0Biwe zbo5^QW?i0+sHHwFgeTcL*q!6C3<9Dq4M1WAaSj0SrjZ!7O-L3A&4szZfre(gP(oH( zTL7gv22{zbrvOYvw;M=OXspFCRs%&K&1b-bM~g;+I;RV0lc6tp5bMA}DTIj@2LrFu zzmrb~)aT6!&6k7Z@Fo_z))2=)d}9^f<4VV|DC6^(RB6)@K#5*TS~%#5u~a_}Z0&Md zx1VmmazuqE#x{CBvb_yj7BE6R2EZtS?E|n0$F!n@=~mYtfLI5I24jsI9qb12D|B}m zf$8g(s`X7fKEP#uI+SDIm zVxI0d5Ij~MY02jQwt>Y_zgCjAfP{x@CB}WCB5l40*xz?SA41pBntCXbq;A2_gD$u{b^wpL!iiOU1DCPO1ZVPofJ%E(-;~z-&jC9r@>lP zpc(?J393vQ@^Q8Q(DR1*$D8LK4^3bawnavmFq{>fjr$sG^;m?%fxZ>KSa${p8vRx! zUq#g?$BHRV-;+k$*=bKN{pf>#zmRVm_^bQeO7?BvPb7OzkY`B`AuRy#-IGo;`FDZ5 zZTb2IsB)Kg&92$e6bxXO24bx=0C&RZP26OZ!I#*HXI?yt!4@LpLnMYrYQ4P`+9hT) z1p3Dk3(DF-K*e@IOu#(8NnwfppVW3NchF@dr%3StZUtiai|dECfVQAzbDJT?@9Geg6L=FTAY*EPZ02?nL0J2))>@X@6QSqR4gxC+{K z?Z!@8X8(dsnuV7mMvmP904py{pML{QNZ4oPQIG}@*wh!_quznwj~B453W96EstEj{ z0;+&TP(&13v=37X9Rj%iuBL#Gy82Cg%9sg`9RVYl8QD@=?N$MZSnm4Yg@f1R-2Ur* z<(&aq5kl=Z0~bweATN&XhC2rU9sqi@i%lnOE*bnS!!`uI4!d%bpcRa@R%KgTeh9X# z0M8H!nrlL%oys(Cp^nC>QNT6aF&A>IW^Ja1&v3LBwWDOSi1`q_8qKo+nsAg)N236K zl9U>N+J||X_J*{_O`d?l7HMOK8?}DZ6<`$ynUG6eCvarxf1Bgjl!QpL2}_N2y*4r0 zpiq|6G5W@azNB?U>^I;q>-yev{&6|nKL_2IQoE;MgJ|BjW*=Dlf(-z>#R;BU*G`ez zNWkgLZ)`w!keAxJ};+ScCWUQL*c&p^?J@~8%Kxbr8KbC=ZVdJ!dQ2w0SKM;bh z#j`9m092I>ZZ8Mpk+K^>RKA14o<}h$t6g0JrDm?0myUYjjo6$h0ugR&(xBQy=5enY zw>LtwzMBX$iVWseAT#K@I(-`mP0hHr4Ux(Uj_o6!=QNM=g^Rc3(xvaoxeK@D{P|mQ z{=)a={DoU`=FAV}_1CV*3*Y`p`TAG>y4bz_3|tP|$c}O1m|&mi9S5Zuv`5>%QJZOmlHli-qcI&)Vk=wG=iRG&VEc)HfqGt8Cnq!-9715qME>`|1RHRmVcPZEgQjg|Kgv3PY|{b&-#O`if#GrQ zjdo`ze&1ilBP#SJ?a(No6h0+y z#`u$zPnpTmWX_-r%s1;3ot;*gz|}>f0pRoNnO6Flr0YxHK&0AD+@FwiYIUrhF8j*GMvMfn@=g zGPW^gGW990_8aU5>+xwBL3jsgYjWY-t69B+Aj9Qsc@3QdGU?Z%0eE)o<@3(h^c?aj z*N>JquhZe-YjXA4^K$L_vvPFx1-X3X#m&DfSH2^A`*(&k_V=Ip$$uuF___a0{^=k7 zr}E0Jr?S1B7P5gaJUx&MJ+<-$J&6a!+6psPx{@a@J}uAv;2UyJ{Dvc^8H`ktHV3=` zJ##H{W4Kx;a$_!2gM13$4mqlp@6_ee?rz&PsjPJGmp}NzZ$0+4$N%t!GAtwTcM?$8 zvzGC*CB4OI0e}xDZRO|3qz=anvfnQ-e2~<5HG(-^fR{Hpx)32<;5}$7);U3YD%kXE#v(j}YxEEypvP-P51Pl# zbUal1R>5$4z6OBIZJU5m_q|9YKg*|d=rGlyJ778|U>XP%8_(Dw$bnlI91H~ZXzjpP zY5@da0Z|b6YXfiCXe>i>9t^=NoC<3JFO>!gfN4Z4f5Ks!vwfW;#IPz@Ce{sqs~w;g zI1qqRSn6gC#kH{4d!31;ot>YiM?_JZ8F@ol+w z{o8Wm#Cfiv*bkj_*&SRKmE^H0hPKm1nHtmWE5jqt|n8;eE-In`7lwTnpF%T zr4C1Q6(x;DuC0SWQ$Jnkxavq*&;`hKp$pUp5RSwRxtU6f4zwWg3@W19{jT4Fs2qg) zb9Dh3ri5^OE!QtGiH@Ys3^-h>w5LJvFi#bC>6p$c0PalaK!N|0$pQ z=l||#xd^Z!q8@HYC^H16=XIX$!jN5IhfA=j)?pdsEzhTJHQz(m~FuELDK>ZA5vNX z;G<8+fw%_&c@I+F@$KroVj(0*6GAe195{)bHGpn1a!_f3U`WJMt<}dzWfcf@&n=lF zp;;@t-N7-|=s1dkNel4OEr#v2ZDB!@t2#(#wR7Q?X;0lns#-#?b@=!14pvJXvVXv5jqXF!| z?#~inksVzV!0sV!05-%yG3*YkffEP47X9|wObEW%mq~(H7xJpP0lLCQS{rtiB%N{$S98;=GW!K2CG4 z_#8{f9Lq;zofI9eA_#_=GwuD{Gtd6Lr@s2s|MF~BJe**a{Z?SM3kYrli}#xrV0g;3 z0Ko0(VFRc8x{$`GC(0-+AjU_ z#%I;xVHYtHbPR|Rjke&N8V4J1uf~l;TNefvTNHvr161Nz<_SHxzqH9PuOkf) z(;RnA@SyM+=wL8^g4AtZ{L;_j7v0wOdsg1oR+ay|(c z;ZPHta~!QF=*3OmObf^xn~b^FN3VS3w?*W?$7RbiVQbn3>`n^MMj&xXk031o@ZFIJ zPm~rTXgeuL9F^C@dNL;^Ff>}=b2><=2`BOvt8|ijo0BL`Rj1BP}oEoXZ;Z2K=FAjTZ zqHv77oR2;8ujJd$eNaC0g_hnScfNCem(xYulZFx@%iF)fp_^0k0+w1KdAMn;Lo zW9@TneUQ7i(v3af^FRD%=BGKrN5Rv;UeX!OrbOCE!RCoJFNtd1#+Tck{Um4)(`yCa z_olOds{z0f@axg=81%{D*-7#&=`BbL0DR}AT|jOZ5Iku*c^T?=DzNhfdS8n3LFDEI zWFc1|k4-d`MpS4Cy!snQ+H=LaB^V@~w>n6gdM{zrFi7bef<14u7J$cK81r-ekvFOW zVP!>lk-!ly2LTGw89c3Bh@M-$As6?5L~X|FsKS`NoZXYP8iCEKX@b6DY?^8t3C$HK zj^+{>H9_A2Em@_J2fv>{{l@oz_5!wnsrB=*Ag|qZmX)>eQyNhUR^*K18U0otp7qJQ=03Y7(z-HW4Bhs1 z+WYzU-1@5*Up)HEtK2~v?gvfx3;Y(q_z=<(2>RsdegW5`Y)kz+%6Hm!N0||%mVU@1 zM0!b+*?8_vjw#=(LYzfYs|zxiC0HZyBbi5CUH(4>xu#T?%* z-}}vo&oLg^=f3fYIe%=His=S`aijTY!^s(sY>G;!wOa+1mw@c(>~%S_I?L1^de7%P z&+(XTtRvb$3ApVYA%KkhZ{p20^A*dc#u~}V*tE}wPrdX@zXT*7EswgS>*wuDYIoXJ z?rGjz(lKcPfJ?$uP+gC@6q$`#Z`(z{izU7$#{pr`vvLMiu&EZ{^hFTT?*J}P0(NB# zG!Y~4h8~n!I2%z&x4b{7x0VGG7_Qap+ph!mM#6p*0_IjHV5(qtA?R1V5!eIm3LbG* z5D+Dz7qFmaOu|^*1s}G-g&aEBL^~WzcNl;Hp?4;ZVZEr%P!a?kfd66vP%yi@B4op? zqpUZ92OOq)C%g%OaJRfWMDr2wRxq6qcS6DSM#uF7ROlZ)AJ9T9HNLoJ>FU{uUGl_ilPk*%srGs{exMPoj4w*B>ak}S+7D6$! zV71*D9Nxu(;1O4XHM-|!j9URWpLicEd8q+_&GBh}!>rZ<1XEK>GyL)T-@%>Bzji`U zbsS*Z1q8Q&#U(xBv;e@jCcRT8_Hny4PF8l*L)iz6P#vr}qef$AwvLJr7U95PMMISL z&?2)$ty};S7gjpx6fn4v_GWauNW6=hwgP5RNNy#f$1bexMUH2jw*!$1eYa}6#(nem zt{uKiS}@%DI~WNtsmf)lUtg6{!N;<02Rtq#0h>-N_B6vyKssimc8Gm6t7chZZUi_J zr<-QrWP`9b>`IhmZ3U}1P_?LEybKJr;u8u4X7(qMPi}6kn>T*s=zuNUTL?URyWDBR z0*;DG0F==9H3K=nzRxw{v2^i{=2#~TyhTBauNi75qLnmf3~>hp7!&tmjqBEYq8R{_ zpaY`~3nDgJtK?W(P@d!deoul^)Uuh=IHM-A*2!1#b^0f0ZAsV-1C!6M!I%xzTaidRX1BQB__eH;jT0)9|7 z=qUJ*sJI~$2tcEM-*9)Djh+MP7UEDcekU{rWdBo{KfcogW^@8sLEOWz_cs0;{em*O z{*>SR@6C+{5Qw5KFsylq7C8)RR>HX2JZv??yO7L~^uP_lhFY2cZ#gfN;@1JNBy+-? z6M_FxUDxW}yldKnFSK{``3C~g!6T2c!WDTS-5vO7>Y>n?C~6Ksr{U2XfDuS-t$%)G z8{o*%7EXEco>1Y2fmRH!01Kcto-pWa$mr zjCb9f#dzZ;0X7E`?;30*GiOu6=r#y#6yO;9WVn6D3Xx)DowI|slA zw2aBtpDWj8SGXl#KYMr|cR6uBGi^O+nwvXOtiP6r4n32|hbZhm2_dov| zkHPHNC09l)ca%;F+!lcMh|>Z9-`aE<5Vq_2gQioKYsjfnxQlQsxC&Nq$Ld14XPONHhyr%&g62KaTeGxUT z4~`xsj`?O_8wbFEkPVMH70UDtnB%G#CRk%0sT<3bj45Z(2KV8&m^4m8Xs_Wrd`z3; z!Qf=3SN2nBgPCI*09kW?A}R!S(b2}gyB6%l=RYjpdG;eh8LIs!C?yf*c58=c4FNoj z`IunTHv&0t=N?`^b2HmPvyqQ|@hCXgA#4;{n&7+QaO1iY5|SE_nK@x69<{ z2S4#|Yyp0!l~2ck$5Ebb?=I;fqy+%pe|i`@oL%p{T@!v#ud-&UJvD(N+!3MzCz3e& zBIcXFBuMH(pWU6}D;{+g95Fxh-!=2pUF|fLXI;CS0Pv$S?01W#?{!sd47fJyz<6s` z=~p~qo$+ofy91z{K{qh~Z$&*R=VuL9DwSM-W0W=r!0apP$Dav$U~J;BmW611w~X26 z1DHouv_r^trC5skP;-`wGK)BR0S*iXL9=Wtba(BR!G^$q8UkQ~-Iv-kW%C4&X@`}h zCo2S=j&?984G^P#ES%uH!Vz?sN-XRKbrzNT1})|!fUj(7s$S7t1II&&0svH7TTAp_fV#`-;9A{ zOj($_*p!327yer5;c;N_G{Ejrqy;RVFf9P^?Mshhl0Hb8Ti(TB6!0{dehrETj0_l^ ziyS`^ROEV9n>Voe5*a%{1Q3axEx#WOeFT{5E}P;OT9#Yv^5`nC%KAota?19PL0oyi zX!~Rf#}yN9fBSyp?90%UawHp&&dY&g%=W*P@$(-m39UFbXpA!U&xBq}L|TAF(as>? zDfWnp8nqH1Pz1mp+CB~jhP#Ol7ko^HHhr-gKwyXP1rU|AN|=K68iA;)=@Dvy3Rjqr zv}k~6ycF71I$Xwz*91`}zLpgZWz_kTZxXnGxraed0xnj%b#Pp`uLv%M(+^*{F5mdd z&r+W@vv=a$y^c*KK`-xlI-hfXetgbMPhrVkbUm9!idKR3m72NdK${RgDYc?l!#rTHcP) zQk#naRBWCRkR$K9%24NuIy0fVJyx%yhO@!`K)>n_d#k&0`QTNiz2~UL>jb!XqU2v2 zwy|%}Kz2a>`WuS9QN5_)7?rC75?Glw-1l*NDuy3|a_S$Bas4p?lPBHr-Vh*1dnN$3 zBjAP4M)Q|9Rthwr*m?p032BR9$GD79eOxz#<9>g{c4^{Z#D5F>(Q!S7TD*!`MdZ&u z`|C1Id)YUn0hSTl5O)%Z)(3E#3bpAN)lV@zS}K`k6dTG${6jq>7Y{D?v)Y|UkWU3I zlQszA$d1)qi)vh~W**uU(U|*@{MtK6d%l4`xK|O!p&OM)K)?-(AuJrUd}L zJJQ441&wxSqxanf5tzs1Y%oG0(5rNGU|2-FH~-{2Z%yVH?>HY)Xhb&B|CuloGyy&h z;HuigYpv3sP0|ClqOl85f+kcTQ8YgiRgo{dJ(HUC+LR^P)ZWP@coSg$jjrS zDQrli8-fH35gayHKwbXL!1+fbM?IcL0q#}f^K?QGss{zE2`W7pL?Ng_!siAACWdA| ziRJ=yhkjIYj}x?~d9F%$`1YiCTgo_oZxfWK9qOnUk@i3`KbycDB*y^&%`VtM`-*4d z2-c_%3Sd|T=jy5oyjM$j-C<>k;)2qgW+J*JhS1UHC zo_9LVCWSlVKm769;ce(c0mo)(@6|LHXz!OcZ$kID8mLdhDL~*J*U*F{xSxfzQr+Q6 z3>Vz{e2Q^^=P2y7tJBCfF@CO~H~LL!t5Uh@V6YT)2NMpHd%M4P{` zK?~|z%)UzRuDI1iu|#sko>Zw7MhDz(ig zF43)GCcM6{_Q|Pfuq4{E138e(hgZ09PWNK0>h%zq4VvU!_R844vt4@}H!GD5R+KFf zOE7-Xq}TeW{OlV?Ke+|?jnYYF+yeC8=ClC7hnpV7gg$ARk8ois3E-5Q&ODqUqx98a zpm{I(0R1>mL2pX|5KwmR)w@=#=Suj!J4J%)ov^843Djarkly=5WA}@U(SskjC@U0Ei1f*Hmc$J_W%ZLQ^fqH$kflX&+P6 zayEge4i1fgK+-9NeF&=p?BXVu<^f@rM_3sK2JN0w+Z=Gk`)EK<+K@P{0Kizry7SG& zT({;kXqUfj)ENhm2yb23YK(hm(I93I+0~KuR1*~8{0xwmpgGzcQwior8}GTj2@4Y_ zXigc)SbVcaxP+3i>`ws3m^V3L2^5;Zy!0?K7T8JKERNBpD8dJa?6#n%5t;RB-bQA5kYrjW&W7%p3@7*6p=PbOrR+a1@7Lw5G-& z2Wb?b6vxlPtJmj$v^VReRc+(msc#Ua7;rv7tFcJiHcF$$EU28~ecCgM#jcX5K@Ylce^YZEsZon87 zBUj`pjP%GcD#wud70zGeU=dCzHXn+`K>bczkv-j$i~E}|_8dcJ_Y`%DV}eDL&kOuk1|Czm_0 zMUxN*^W^D5xxfqRnhD@8$Qow>m>0-;?6(y50Cu)xC;$)x1|7E^qyW`YUf`Khj>Y>0 zOhT2UwKSp6^gb|XY^M#lrvGBKLjN~qCsEd|zg$0a8;-8QV3BT4(4tLB35l`yk`Ngt zgMM-00n#MHhUD?DQ5^|TTxhz`^A3V|Bf`*?b>NW1n&UhwH0Aar;^p8ss*KT1p--U2 z4CNmjFOuMl1{W}fQVqN~Q-7BQkPs#e>hyBDGx$a41+s<3H4(?UIc6sKw;VW_%Ab7t??{)*oQ;WuLlrR> z300;R*HWt-<2KEA0At&<-Nur~_R~&0bM^3Am>z73nV9EcpNTkL{=jZEd3G610K*3F zFgApDEX@)&uTT2SDL`D!vn&4s-rmNv0Ki9^-rbX11q26z87u!+mpq9Bkzky55-tF! z$)CGcLKEa*4n^<@~vJ}Y3xg*5&gUd0H$3oFgK zsj-`M{qSYNBIU%b7YqPED^RQ5s@y+-H3F27Q$}Oj0o`&urycp4m_lGieKD8a+?R6f zg#xc51+J@#a(?du)orMGow%*BaVqrn&l7Z#*K9c!@jQ)@ zbT-aW9?->BkDq_-@dFvBT|>GpEx_*`kQM;=?n$RniOYR1N=}wc4TV5f(6oQBq4typ z_1gXB4-gCl!;A;4-5GVt+cVkNHZa~n`?3KqmI7Rc?e#pyg0eVEcAx35!8==o6N}3o z?*X{OIyM?Wq#T_N001BWNkl8^1#ZeQsF1Cw6+5r3>pmAeBgm2wmA|AnvMfmmWgdw5|+uR33$P?@;cFv zno=E6JWYAzchqhH>C4h0%mkU`7VRCW z|AA(+J&H6ATS)_9idqvLUZ5`meinWtoi_X&=C}e{IFnY)(i}q=gjx0(om6l{DJ)7B z=#DdSyxna)+zu_vOIto~Dj&IHN<8DE2!@9aY&0MUzw3PiReT;nR_6pi?o4=_>l;8O zItQTz362MtcD(f5GxEZ>K1ywp0;J-RmBE6$fGYq^?VAR_$b)h~ka;RY;?ViH>tEouZt+>eGeqes*u*#EygV&4T8J?N^bruif|n0KAg`GTKiK z#KW%lmh={+1pvOY(*5q99!BcxwMmmfW9uxRNpSY|PQE^8Wi*z+rrG-qjvS?GD=HZ9 z&!tW}?i^@2^7o$cfwLvIzkIG5pA9dbdZX>GJg`MVJ22``0gD}|?)uN|x^nP}?5*yF zDkB6g9XGOUQv4!9K#QG0()%(2W&TZQ(#F~H_>5tcpU)`)xPU|jAqU`51u&6j0Rmp4 zK1oAUq%N?tEqQG1f;$Q6z=tIkfLfSfF}$uh(fnPb9!nF3D6w2g*3DJ8vM)3`cwM3+ z6(gI~+5d*a`dAD$t`P)z4neoAUCD4VF*ht7licwJJa#p1AaOPU2oAo_^oOuMJ~{v- zqYrUyUxuFv`#drE+`mlQzu`uWW@>(mA#L$ZLx1NQGzYXuPj?oI>+=8)8QukrHD=f! z;+yTg%Li9BzfE-<%KE6uHxzNVH1WZLXhADTn*gUjyi0S^GftZ;;hx??+C04lTO3T& zG`hPii@UpfAXsoG!QC~uyL(vN-GaNjyE`NVcZcAvfgoS*=e^GP3DZ~4OjmbR_1TZt z;v|%n>tAWE|4r#U4ET;&PAH1z??Mc}Oi}b50jqvGfBys@g7&F86cyk2T>D~LlH?** z)MRc#(qq}QiuSvnnfJ(#xNKdSuS0ELD!D<<>H<=~b2M_ag^xbf+Q#}jd^$_pY~!Gh zpO)c`kNEDJ=;VYA#20_Jgjwkq?OScn#$8g_fp*Fve>CE&XoMdfFvB(?MTM;yAK2pp z=dYYNI-|p#E@GQ8AU{d50(Bx~@J-G*EWcylE@J>Zet|kSpN7>% zgq0(6oAD!?-%!s*fpKNxsdJ+T?7eR&0FYSujBjfXvh+E^b;QgNOrB(cSkIAXJD55% z8Hr?G_P!MPp8k5TP@*I?yH%!hpQXcl=(GkfTLl*$+>&^cdhNYVBXhJVe4Vhf***CA(pJe1$vpp#*^MsDL-FB@?sW(9+ z3L?g-wLvoZ8zPf77GLeRRCN<2GYEErf&*vMnt~AfH?w=pc{9AEbg(Io?FI(mU;1aX z!R{JklB0hSV46Y_m03+k$;au()tCf+tXN>A4$bnG=0`(Q4d+gD*uG-rX@mKE1imaG zLc*g`EurIQC9Q~|#Gh&n1*|kUZ9_+A38rXb%}6}M2k;NV(cx$A-X!GxK)yd6g#u|2 zbpU)u1&enoxk2MC%8uv7pgP1D+8|@tl^W3Sis&TJb(<=4vE%| zSbc}Dm{$&&!>=qEEH#<{X$88j#@KV~$LX}6XCh-+iZhanlLrR=^cNqrp?4XQS3Mdq z;1No8=JW8gdq3O<24s*evoJ%Z%l;h&!@$#;F%Ph7j&{CQ6X1Ec|` z?zQ7*i*cn0oJAw2VKa1Dk$;?SQH8>YUc#9yy|JWy23&H`jfRWpU*VO@W2g1Al&_TElnR_hzXhyemHH}C6E!AgOS}5 zPyk{#0}My5NA}l=Zn4^FO7GW~!YF{LK8cYmt+o2-zOL(BNRl=?li<9}{0+jbd;B2q zQ3!3hmqH}!2p(?Z;NOdLJ3We+N1%tNXZNj^;LKpb*keme4Z@qkcT?Fnqht^#)qH%U&ZEb^VYn?GM*;% zUdgIhF){Ay^wjqbD@i9D{b$i5_o{5#L9$PAWReXwhDEmLsmEt&kHOI7gkH> z)6}@FbU8WtR6!zbm@i}4e+k`@f=65y7&2UkR14epYTw4mUhUd%4~$w#kEv>k8mjblG-V z=X9XRp<%n@u1^H4(ns$F5F=`5uWeqC1Xk-Sm|44tD8b|FDIT2Z!4y`aoo&7>NNq@9 zFr%MKevWIRTk-V|OWa|`3P2x^4r7`Cytj>75vI`YRebAA?vdjug6iGSHXL?>7;ftcgFr;zM!Qp(ie#?X$g7%IKcY7I`X z+ix9%ErC9_z@zB>M|F(sO^E55Hc2{}RyBXVEb{s&*Wk++b zxiY0cWjw50;~s=e!Ql9wED#bd8&n^ zkATOOSML3nHyehlYU$qr5qiHV2LdFjTFV5ba2Yd1`;x|0kAv=_laVM z+ZlC-gMtf-;dYo7~Lr#(UWSeED?C7CNx%@ouk)cGAA4ckb zzJkr_W>A{W?y2fP9FXwAwr}rBXxyaz^+xz?){Sk5>);!dcvf9nLfizx32)5?uDGX! z#*E|Nt68F}4Q``^sdozh+%5k7Pent@hsjIi3^u@5dV1Th(}JcwwJ~vV37G>H??lZ| zNKo`+Quzpnd;t0m73b}|{PV#|@Q=pFngt+7NpGq<57kttFF`-!8~*P;d*a4oNM%pb zR;`@?G-fPJOs(HhaK9NzOrT)E8CYd(0(x)y7%EasO{^0@8sKy! zx5ahb+J-Ow&e2Z`>yEnEWL^Q5@{8`isE8=PO+VY8u9#?epWzg4`8l`rVeT0Hc7-C5 zmIRDslfl?0D8&IAL!}s>b(?J+dO!i`v~SY*0oRBB6?HYUSOSIC=Wb#NfDivy=TXw* zl62xw__pclk@&Lkx!}>ikQYV{&5QIO8R%!p4O5{j@fE*x#bw-tE?{5$UoYxq zGJ(``rfkioA5$?WBbw)XD;bW%x7@+Dt7@_`T);TofUFXMiWwwLY)hH6{b8UN3+9}f zggVt=UJYcyMIQvVWuH>WXV@ z{s;^IEFlw0o)}ziIM^W?vGh8OPF!{m__5d{FA}FLOT(GG`fv4fD)524ZqXgT&5A-` z;E#tuYnWJ?=y&W7Va`1*`W|@cW;;Az@+HioqD3SaYO3});kG|z-=f(x)pULId(+%+ zCetVNKzQ3M#OJIPqQI@^5O z*X=#PODa*Epijt>Z4qSo(lHq#7e~>@p zyTL64Czxu;mnz^lX`l?hMbmp=w+Du6c{#d~P?QeJ8{nP_9d?b8z>!kmd16D@v}{z9 zO0;lqOAa4wZz9S;1{Z@niB-^;`xk7^X!!6<3-21h2`*5HTJ#~KqnJJi`lFP8637_v z(9_eh=}fWps!qo-l)D7LW4LaUuSzYy&^$GmAznU^+Z5HB>L~*YG#q)SBipj3p49d2 zWY(r7u`EU0TTC#|-I!#`R(zO+^uE9-x*!~d2Pwx_E2%|gDHmV0)1FGu?zTl1a#bq?U zxrrRjA1pL;Y|YQuDLBHY#RZ=hHSW`FR7Ibn!>RuYqxn1kG8a?{8{IwlPg45sT$+uf zQtBh@DpFG6Se0U^#AhD2MWVK!gpI5EF)*n1U`j7I&WYdrW4v2(zn!+XobtTx3k#{> zvx6m*nnAJb5^OCNj5Lbf%82M*JH?m30ytG)bw>fzB^w}j{tc9Tl31l$7D^EeXjeaA zIP-%*99Lcn#;IRqE3moLz98m_6<#kd zOU05A_+@1!WF(@AmNsnWSgD$n9AoIRyr&fusJ{+OUpq#LaZ};n^>3!I>fK z<|u~V1Lp1Dl0)p=_~|{6mEfnoQ)NIQ;Y(8y^ffx?RW=Syt%5_d>cD+Zd;-ur?k}~g zKZtg?K;sTcmTc8hNfth0z;I!=7iG4e`IV-Kv7m<=pcvCT8#!*T&k-`RI?*&`_#uBD zJ$&f%E&|2mPWt5K&3{B_)BcFSe?C20qrp(%6ir0jmlMC9D zUVjlj?#I3V-eQ?&X22gtk~)`) zt=QSc$=yu@vAh-Pm~)E7nh4Dd{l}xS}~ogEHD+7y30RED3k}0rh`B&D4+~ z?6Td}VlW-Tvw*x6m_$stpCYAHCR!lfAE*Pf7+^$+jy>X#x?{|^9YqRVI;JPxYT4Tc zM8)?8idk2BNJp8MaWb8pr`O4uCo2}O0KDHxCIi^IzqDaKQp4tlK8A$4kHe#vbCZYi z55~Yx$aXC)0X>s=b||7(F>=WaZFB3-Fwuk8QNqxL5>b+1L@q1H$s1i5j)b>zU=tg^wAs$k(%pK_c46aNiY`PEnrc&WL7}A(kvFq=PUQEeN`#gT%U5BUmYg%gcH5OkO5YRd zQ4`c-0c`Ruw}OA+?S<`KQKsr?hIV==ufEqGkCVUllfCrw*T`R%6a~)C2DW=qmdsqk z;~kB;;q--mX>Z#@rLFL@Oa&Mr^6P@-zAXMVfYXiisyxVJTgMp#w-hq`s2|0l?Bp?} ztJdNDSvFd-3ybWD)U6=j5VIWplbO7%8(eEuS~^GhT$3Deyd3YpO$>8VJ~zL0iLgC| zE);@Y0)?t12o%ojVUD_gRwIXgG9Jb#L~V-whG&E0PF++SzzAnYkXwTlufO&@9(JiC z7#Y&xQ9>QTMo~xsV%5kRfrP-+6%RV5`~WF$`8p`DC05>%!K@3inc3& z!UoxFY$gMH>JIF%>Rb+#)p)-6f!(s+f$ZqHcq+Z@j|;R?0n z+7N%qW35Fk6=oaF6i2FBNz1L9^vroleGFnF1^ z)pmN|9+9_$#e-_?i3U(rum6)~WfB=Xnp+l9z<&d@1P8O9o#e zO5D{ccDjf#@V}m4oseUhjY}jVKz7JqCe+>%P1SEC;urH_PQAEV3&fpecrm0d5O zkgnq+-XNJ+PQ2_`lH0W8pB|t;-+f-uzAT|f9b(|D`7hsnzB1%dv-{Tgh2wvs56N|&;TLkk zeT6ZV&@jcb-$G1m^-;5e!~+urln%gqG-%4`ac-FnEPm4f)#oU z18r*VaJW)IT>&GUS?(uOc~8foh=SblZn1|meh1mLlXL5N_)X1ZRX@Z01d|2z-E7Lm zyNcV1v2%aYgAdXu&_CLVyvg`FPhI(WUAguG?11k7NeUdL>14l1?G{TQGphLBPyg$J zm@6%3SWj~YP_f|=4-Y{+CT29^*PA5K9NJZCY00kwQ9enI^fjh3%`WM7TJ(j(64;HG z>JV)tjr;d38UqTXP+}s3l-7?&*KkK8TrzzHW~Zh?a2#GyMzBV3&bTBc-~Uv-$S6Xd z;Q+GD_CcHK_#8@j%11as-bijzdn$5QQ4qerRi+#gBE=8H)O9vQ?Zp}shlk&^D(us^ z31-;DPt?ZZ{LDpY1N(}sMy0aDUHeuHl`8E5E-(S~y*pKE-Y0u^XWYV!AB7%`mXUYC zMuz$f-}90fV^)oEwLyYsoqZ*r^;E+pNq{C#S1BE2$gqDX?3GLmlQ%cg24l|k1^Yi1 z8C#V1-#uaj;WPHsEzqpG#;OCPmTkt0=Fs-{%bi(y`yc;L0w}wh9{7_9DH7Ou?mk~7 zF1E&UShGliqZ%e=ZKwA4|*Co7K};&=TJ(ins!B){h_T5G_wH%w%tM}z}d|HPbeFACKMR;&A) zPB{HWc8H~yRCW5D+D7qhMG5R}2C$&W<~&vtFce3>St=r!rXt6c@hlVKWECND)(tz| zCp?L~Nd{HpmCc-;&u_;XPTxJ4nPXwN63EHCe2AnansCItc(~`y+t3RU@+LDDsPYJB zJryxpev4r>Ly*PU3sa6Ku?(wN3aEzj;i~Jub<&xUP;hb@)@tC=F>I8=8b;qXA-5I= zNuB3G9~}MNw!tR4(xqNIl543_O*l8OR;(9fiIuJtxr(iDg^s-ly28dgNIbqs|H{m? zCjRy%!@~e13jB;|Ry=3%X%*ho_%E&QCp-`v{&wJ%yQmQ~ufqBoa7hnhwORW;gMsmn zhZ>Vb*loJVCHh|3TJkgBRBRK~eUCzmZ+kGy8w*Bhd%#bc4hYn@btn2200tMCP_*&= zY!iA6HOm7GLDc0#_3F`E3foMVW8oF&HpL5l=e%F>`o7bT0ZDj{EB5Q%fb{vW!Tt4? zy53$5c}+*&Q%E+sF4dkN+Ez5pi6WP(a+_p9Qz}yGUfohdob8PMU5i(XEj{8IxVP{gNE3(qG5uk^p)EKgoc56#oV8S50^LN z{#eFEDE>hqc`v8^b(d^5PHX&}Y!3qZ^4LLhM%Mh14| zbU>s`PekTwP6j{T)fvt|w*mfHfATLqAgDFX&dCED3!QC?UtChR#QOOgjqQdoQ>oSQ z*E2HkwBy7Eu2nY^xECCM-4T_Ye+b(juRmRY@LN%0M`)H-W{(%zg8veLM@eX-;~h(T zNB;;CS4D;!;$QCz4=e3wi*b)R2x^N@i;j_`(ms>PU;hELi*M=|`=xQ#L4cfB3`m0n zQetDAnIrdi?w^vxKX~+MaCCV@ysdn5_1sR6e-$^YdfXy}mrhQQOh;_vTO}|_g}Ww! zxB4Y?`~Ide+f(E8M~(=m9*{7DgeKnn)EHR!yh#9wq_8DYu+?~JH>n4*ezs%SRjdN^ z3)<59l2il9nLqx(ht4Fn@VvdE-*&)|Zz^vVLAQM^5<5Sh13bmMI*L5p{}FByTWBrv z%LQS`p%y0a;p9J|N^rJPCSf_{jwFr{5oD?8NrQAHcu5#DH4fWxlC=0dOwQYK{!2@k zULMa%@TdCC0`asbf$$u zUEBqRU zg&D({x59VsvG)j3;PV8NH_s1A_t)rwdtmmvd!Azk6!Pv&*dAl1Nl;NB}HJ-dm|Ow>sIB z8fT5R5tn~l0GniF_x!S6mi290UgvOvgzLh7{Dd)(zzao1%;XOr&fqa?!Bh+PxEn$wnHX`{?zz2dg18#FbMd3Or zc>0w(&&wi1(`P)3xt_(kJ#XOc?fh}f!1w9USYJKSs+y{#c{Z@2#e`b^R>UlK@2GDk zyX0k<@XyLAtju3fC~v9Z#H@pu(-8CbIE%HpSK_4s-2&uE>sO?&3PB_v&cZAmlv)&< z8$NUS`@6pJZzZ0UXgstj2~pDc29N{+t?=l+oO3 zf0SYz6?rPWqlv4PXZr!-ux5tUe${(xa0w#IcWQ&hQ_PN$KiBM!y+1;8IXf0?_x&R? zjdy9zis}AB@W~=V7x`PjAGb0Kwhs<9FoQIW(B$|bpo{TyvO8oNq=d+oEafsET@J(K zj|bM!^T!(uG)XQdkEipM>zM!v4?MX+M?p~ix)B2RndsD(ViaS3onUl+#WW0yi{73wpOAtW$;?+FFQnM$EKq0J|MJnDnxKQe?dYh2GNTfQm28+cP;;fv=z(hbzb{ z2onQLr(Ye$x;%JVmU0bVl>&(k)=AsJ4P~gp5fE#Z1rnekQQ@z`=}Ngfib#S^v{=g~ z2d7kkmJOQW?)=070$LV&crepgShqye^{Nlpxv~hSU|_MsNg|K zZ-ki|%VnQ^B~j1LUi&*7Sqe&ULxoF}Ln&nvs}Us|W+g+Y>p z#mxBXx%cC|^Tu%&G`30cf742ASanBSFjdWlRLNohft8qVnJ8h_7FLnJZx_`EZkakaa-vBYH?4)V8J!jMAWBg1 zON5oC{`e34_ZK-19vL_0q=Qe+?D4-Bsu%qq3)T6|>Fg4HXwYd?@H;dbf_d49V$>Cc zhQisTA`Di{87;H9!Z#f3?7y@dj+Uy7)L8qWoR%fg6A_w@0?o~IKqi$sHCb_5aQq~} zG7YetQ-=^7BRR>2^Jt@>*r#UKvKS_4%m|mZ6c;IbwH=!9U&&qyuHQKK8xKkw4=nCE zz^SrdQoD}Sl@-ik2Gz)XViMc2@BDUH9bc{-@{w5;ku;-uGvJOk2siYomKymXRujSs zU0C@$gD5aHY0%zzS1u;KFb%zp*T^iPn4x~Bt+YGbf82T&D+?7KLf6H4D-H?LnsaVD zG;DlE9jw{ws=I*i+}`n>j|ar2x9p0W0IH_FTJA8Y1`E;@A0pW~k6J&NibisDcp3;M zUoY4S*<{P{n5I(_@N8bGsQ5qH{vf?cIJ9&0p?MrZuiPJvu(f zM|$whkadE#QVu2w0X7j_|11X2u`?gOvn>@9z-~$5@{NUY*21yX6OJSe<0{sx^qZy5brr z92~^^B);f%~t`Ot4$fKKwu;z>Y7Qv+#-m z_jg`h1fhIBj+d(y^a1cKy2v6kj6w7?Q$Ysr<=-hz=oiq>i>BQ;XJo$uxQw<4L~1GZ z@^F6c=olcLgGIL&^baN5F>BE{25;3ncz@l71dxE>TMy;vNP~J*(PDBwr zsU@nv>|UqJ`C-^giXf8Du0=5DGZAzT(~9pe%6uG)!255kWarf;%m0%H(2!(iQ5f>z zeJWg5?u;XAvZf2Mup#7>cK3vQtHW~&uh&R=Lf^{7y_h}8=}~~(F`?~tnP#^1l2!H z#5yQMeWyYYbx~kQKJ-9AYFe=T#>afv;KR&mlgHFHdFYg_n=pjKZc&j}mm1eVuei?JP(vieViX0)l4EAdzi@hIZ>QdF`JaQ^U#Xrl4& z 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 Date: Tue, 23 Apr 2024 15:53:48 +0800 Subject: [PATCH 037/299] =?UTF-8?q?build:=20=E6=9B=B4=E6=96=B0httpx?= =?UTF-8?q?=E4=B8=8Eaiosqlite=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit httpx==0.27.0 aiosqlite==0.20.0 --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 6e7004e9..c1d4097c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,9 +28,9 @@ classifiers = [ dependencies = [ "click==8.1.7", "rich==13.7.1", - "httpx==0.25.0", + "httpx==0.27.0", "aiofiles==22.1.0", - "aiosqlite==0.19.0", + "aiosqlite==0.20.0", "pyyaml==6.0.1", "jsonpath-ng==1.6.0", "importlib_resources==6.1.0", From a338cdf93c2b25dcc62be75c52f4acd431c51a21 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Tue, 30 Apr 2024 22:28:23 +0800 Subject: [PATCH 038/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=90=9C=E7=B4=A2=E6=8E=A5=E5=8F=A3=E7=AB=AF?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/api.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/f2/apps/tiktok/api.py b/f2/apps/tiktok/api.py index f390b45e..234bec8c 100644 --- a/f2/apps/tiktok/api.py +++ b/f2/apps/tiktok/api.py @@ -50,3 +50,6 @@ class TiktokAPIEndpoints: # 作品评论 (Post Comment) POST_COMMENT = f"{TIKTOK_DOMAIN}/api/comment/list/" + + # 作品搜索 (Post Search) + POST_SEARCH = f"{TIKTOK_DOMAIN}/api/search/item/full/" From 7867ef9e81ea11f3868869e2793246a253d45d04 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Tue, 30 Apr 2024 22:29:03 +0800 Subject: [PATCH 039/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=90=9C=E7=B4=A2=E5=85=B3=E9=94=AE=E8=AF=8D?= =?UTF-8?q?cli=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/cli.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/f2/apps/tiktok/cli.py b/f2/apps/tiktok/cli.py index edeb2741..ab4256b4 100644 --- a/f2/apps/tiktok/cli.py +++ b/f2/apps/tiktok/cli.py @@ -228,6 +228,13 @@ def handler_naming( # default="all", help=_("下载日期区间发布的作品，格式：2022-01-01|2023-01-01，'all' 为下载所有作品"), ) +@click.option( + "--keyword", + "-w", + type=str, + # default="", + help=_("搜索关键字，用于搜索作品"), +) @click.option( "--timeout", "-e", From c5389479cd0ce109df7f43a410eb95b41a941c06 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Tue, 30 Apr 2024 22:29:28 +0800 Subject: [PATCH 040/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=90=9C=E7=B4=A2=E7=88=AC=E8=99=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/crawler.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/f2/apps/tiktok/crawler.py b/f2/apps/tiktok/crawler.py index 9f7430da..7edc1da9 100644 --- a/f2/apps/tiktok/crawler.py +++ b/f2/apps/tiktok/crawler.py @@ -13,6 +13,7 @@ PostDetail, UserPlayList, PostComment, + PostSearch, ) from f2.apps.tiktok.utils import XBogusManager, ClientConfManager @@ -116,6 +117,15 @@ async def fetch_post_recommend(self, params: PostDetail): logger.debug(_("首页推荐接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) + async def fetch_post_search(self, params: PostSearch): + endpoint = XBogusManager.model_2_endpoint( + self.headers.get("User-Agent"), + tkendpoint.POST_SEARCH, + params.model_dump(), + ) + logger.debug(_("搜索作品接口地址：{0}").format(endpoint)) + return await self._fetch_get_json(endpoint) + async def __aenter__(self): return self From 4cb06db19772e904f4c80878a4c36258d22ea820 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Tue, 30 Apr 2024 22:30:23 +0800 Subject: [PATCH 041/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=90=9C=E7=B4=A2=E6=8E=A5=E5=8F=A3=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/filter.py | 227 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 227 insertions(+) diff --git a/f2/apps/tiktok/filter.py b/f2/apps/tiktok/filter.py index 1f68492b..cd108349 100644 --- a/f2/apps/tiktok/filter.py +++ b/f2/apps/tiktok/filter.py @@ -686,3 +686,230 @@ def _to_list(self): d[key] = attr_values[index] if index < len(attr_values) else None list_dicts.append(d) return list_dicts + + +class PostSearchFilter(JSONModel): + @property + def api_status_code(self): + return self._get_attr_value("$.status_code") + + @property + def has_aweme(self) -> bool: + return bool(self._get_attr_value("$.item_list")) + + @property + def has_more(self) -> bool: + return bool(self._get_attr_value("$.has_more")) + + @property + def cursor(self): + return self._get_attr_value("$.cursor") + + @property + def backtrace(self): + return self._get_attr_value("$.backtrace") + + @property + def search_id(self): + return self._get_attr_value("$.extra.logid") + + @property + def aweme_id(self): + ids = self._get_list_attr_value("$.item_list[*].id") + return ids if isinstance(ids, list) else [ids] + + @property + def createTime(self): + create_times = self._get_list_attr_value("$.item_list[*].createTime") + return ( + [timestamp_2_str(ct) for ct in create_times] + if isinstance(create_times, list) + else timestamp_2_str(create_times) + ) + + @property + def desc(self): + return replaceT(self._get_list_attr_value("$.item_list[*].desc")) + + @property + def desc_raw(self): + return self._get_list_attr_value("$.item_list[*].desc") + + @property + def textExtra(self): + return self._get_list_attr_value("$.item_list[*].textExtra") + + # music + @property + def music_album(self): + return self._get_list_attr_value("$.item_list[*].music.album") + + @property + def music_authorName(self): + return replaceT(self._get_list_attr_value("$.item_list[*].music.authorName")) + + @property + def music_authorName_raw(self): + return self._get_list_attr_value("$.item_list[*].music.authorName") + + @property + def music_coverLarge(self): + return self._get_list_attr_value("$.item_list[*].music.coverLarge") + + @property + def music_duration(self): + return self._get_list_attr_value("$.item_list[*].music.duration") + + @property + def music_id(self): + return self._get_list_attr_value("$.item_list[*].music.id") + + @property + def music_original(self): + return self._get_list_attr_value("$.item_list[*].music.original") + + @property + def music_playUrl(self): + return self._get_list_attr_value("$.item_list[*].music.playUrl") + + @property + def music_title(self): + return replaceT(self._get_list_attr_value("$.item_list[*].music.title")) + + @property + def music_title_raw(self): + return self._get_list_attr_value("$.item_list[*].music.title") + + # video + @property + def video_bitrate(self): + return self._get_list_attr_value("$.item_list[*].video.bitrate") + + @property + def video_codecType(self): + return self._get_list_attr_value("$.item_list[*].video.codecType") + + @property + def video_cover(self): + return self._get_list_attr_value("$.item_list[*].video.cover") + + @property + def video_dynamicCover(self): + return self._get_list_attr_value("$.item_list[*].video.dynamicCover") + + @property + def video_playAddr(self): + return self._get_list_attr_value("$.item_list[*].video.playAddr") + + @property + def video_duration(self): + return self._get_list_attr_value("$.item_list[*].video.duration") + + @property + def video_height(self): + return self._get_list_attr_value("$.item_list[*].video.height") + + @property + def video_width(self): + return self._get_list_attr_value("$.item_list[*].video.width") + + # author + @property + def nickname(self): + return replaceT(self._get_list_attr_value("$.item_list[*].author.nickname")) + + @property + def nickname_raw(self): + return self._get_list_attr_value("$.item_list[*].author.nickname") + + @property + def uid(self): + return self._get_list_attr_value("$.item_list[*].author.id") + + @property + def secUid(self): + return self._get_list_attr_value("$.item_list[*].author.secUid") + + # your stats + @property + def collected(self): + return self._get_list_attr_value("$.item_list[*].collected") + + @property + def digged(self): + return self._get_list_attr_value("$.item_list[*].digged") + + @property + def duetEnabled(self): + return self._get_list_attr_value("$.item_list[*].duetEnabled") + + @property + def forFriend(self): + return self._get_list_attr_value("$.item_list[*].forFriend") + + @property + def itemCommentStatus(self): + return self._get_list_attr_value("$.item_list[*].itemCommentStatus") + + @property + def privateItem(self): + return self._get_list_attr_value("$.item_list[*].privateItem") + + @property + def secret(self): + return self._get_list_attr_value("$.item_list[*].secret") + + @property + def shareEnabled(self): + return self._get_list_attr_value("$.item_list[*].shareEnabled") + + # aweme stats + @property + def collectCount(self): + return self._get_list_attr_value("$.item_list[*].stats.collectCount") + + @property + def commentCount(self): + return self._get_list_attr_value("$.item_list[*].stats.commentCount") + + @property + def diggCount(self): + return self._get_list_attr_value("$.item_list[*].stats.diggCount") + + @property + def playCount(self): + return self._get_list_attr_value("$.item_list[*].stats.playCount") + + @property + def shareCount(self): + return self._get_list_attr_value("$.item_list[*].stats.shareCount") + + def _to_raw(self) -> dict: + return self._data + + def _to_dict(self) -> dict: + return { + prop_name: getattr(self, prop_name) + for prop_name in dir(self) + if not prop_name.startswith("__") and not prop_name.startswith("_") + } + + def _to_list(self): + exclude_list = ["has_more", "cursor", "has_aweme", "api_status_code"] + keys = [ + prop_name + for prop_name in dir(self) + if not prop_name.startswith("__") + and not prop_name.startswith("_") + and prop_name not in exclude_list + ] + aweme_entries = self._get_attr_value("$.item_list") or [] + list_dicts = [] + for entry in aweme_entries: + d = {"has_more": self.has_more, "cursor": self.cursor} + for key in keys: + attr_values = getattr(self, key) + index = aweme_entries.index(entry) + d[key] = attr_values[index] if index < len(attr_values) else None + list_dicts.append(d) + return list_dicts From f26f0641242924b27e729acb33eaa80f549209f7 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Tue, 30 Apr 2024 22:30:53 +0800 Subject: [PATCH 042/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=90=9C=E7=B4=A2=E6=8E=A5=E5=8F=A3=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/model.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/f2/apps/tiktok/model.py b/f2/apps/tiktok/model.py index 1a72508f..83c799df 100644 --- a/f2/apps/tiktok/model.py +++ b/f2/apps/tiktok/model.py @@ -92,3 +92,27 @@ class PostComment(BaseRequestModel): count: int = 20 cursor: int = 0 current_region: str = "" + + +class PostSearch(BaseRequestModel): + count: int = 20 + keyword: str + offset: int = 0 + from_page: str = "search" + search_id: str = "" + web_search_code: str = quote( + str( + { + "tiktok": { + "client_params_x": { + "search_engine": { + "ies_mt_user_live_video_card_use_libra": 1, + "mt_search_general_user_live_card": 1, + } + }, + "search_server": {}, + } + } + ), + safe="", + ) From 7a7e815f07f911193a59b4f1f5286b44e31058b9 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Tue, 30 Apr 2024 22:31:18 +0800 Subject: [PATCH 043/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=90=9C=E7=B4=A2handler=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/handler.py | 118 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/f2/apps/tiktok/handler.py b/f2/apps/tiktok/handler.py index aad77755..2be4f45e 100644 --- a/f2/apps/tiktok/handler.py +++ b/f2/apps/tiktok/handler.py @@ -3,6 +3,7 @@ import sys from pathlib import Path +from urllib.parse import quote, unquote from typing import AsyncGenerator, Union, List, Any from f2.i18n.translator import _ @@ -19,6 +20,7 @@ UserMix, UserPlayList, PostDetail, + PostSearch, ) from f2.apps.tiktok.filter import ( UserProfileFilter, @@ -26,6 +28,7 @@ PostDetailFilter, UserMixFilter, UserPlayListFilter, + PostSearchFilter, ) from f2.apps.tiktok.utils import ( SecUserIdFetcher, @@ -692,6 +695,121 @@ async def fetch_user_mix_videos( logger.debug(_("爬取结束，共爬取 {0} 个作品").format(videos_collected)) + @mode_handler("search") + async def handler_search(self): + """ + 用于搜索指定关键词的作品信息 + (Used to search video info of specified keyword) + + Args: + kwargs: dict: 参数字典 (Parameter dictionary) + """ + + cursor = self.kwargs.get("cursor", 0) + page_counts = self.kwargs.get("page_counts", 30) + max_counts = self.kwargs.get("max_counts") + keyword = self.kwargs.get("keyword") + + secUid = await SecUserIdFetcher.get_secuid(self.kwargs.get("url")) + + async with AsyncUserDB("tiktok_users.db") as udb: + user_path = await self.get_or_add_user_data( + secUid=secUid, uniqueId="", db=udb + ) + + async for aweme_data_list in self.fetch_search_videos( + keyword, cursor, page_counts, max_counts + ): + # 创建下载任务 + await self.downloader.create_download_tasks( + self.kwargs, aweme_data_list._to_list(), user_path + ) + + async def fetch_search_videos( + self, + keyword: str, + offset: int, + page_counts: int, + max_counts: float, + ) -> AsyncGenerator[PostSearchFilter, Any]: + """ + 用于搜索指定关键词的作品列表 + (Used to search video list of specified keyword) + + Args: + keyword: str: 搜索关键词 (Search keyword) + offset: int: 分页游标 (Page offset) + page_counts: int: 分页数量 (Page counts) + max_counts: float: 最大数量 (Max counts) + + Return: + search: AsyncGenerator[PostSearchFilter, Any]: 搜索作品信息过滤器 (Search video info filter) + """ + + max_counts = max_counts or float("inf") + videos_collected = 0 + search_id = "" + + logger.info( + _("开始搜索关键词：{0} 的作品，最大作品数量 {1} ").format( + keyword, max_counts + ) + ) + + while videos_collected < max_counts: + current_request_size = min(page_counts, max_counts - videos_collected) + + logger.debug("===================================") + logger.info( + _("开始搜索第 {0} 个作品，每次请求数量：{1}").format( + offset + 1, current_request_size + ) + ) + + async with TiktokCrawler(self.kwargs) as crawler: + params = PostSearch( + keyword=quote(keyword, safe=""), + offset=offset, + count=page_counts, + search_id=search_id, + ) + response = await crawler.fetch_post_search(params) + search = PostSearchFilter(response) + + if not search.has_aweme: + logger.info(_("第 {0} 个offset没有找到作品").format(offset)) + if not search.has_more and str(search.api_status_code) == "0": + logger.info(_("关键词：{0} 所有作品采集完毕").format(keyword)) + break + else: + offset = search.cursor + continue + + logger.debug(_("当前请求的offset：{0}").format(offset)) + logger.debug( + _("作品ID：{0} 作品文案：{1} 作者：{2}").format( + search.aweme_id, search.desc, search.nickname + ) + ) + logger.debug("===================================") + + if videos_collected >= max_counts: + logger.info( + _("关键词：{0} 已达到最大下载数量 {} 个").format( + keyword, max_counts + ) + ) + break + + yield search + + # 更新已经处理的作品数量 (Update the number of videos processed) + videos_collected += len(search.aweme_id) + offset = search.cursor + search_id = search.search_id + + logger.info(_("搜索结束，共搜索到 {0} 个作品").format(videos_collected)) + async def main(kwargs): mode = kwargs.get("mode") From 7967e6f913e14e90456c56efd3c956e586e27183 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Tue, 30 Apr 2024 22:31:41 +0800 Subject: [PATCH 044/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=90=9C=E7=B4=A2=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/f2/__init__.py b/f2/__init__.py index e774a0ea..4a6c75b4 100644 --- a/f2/__init__.py +++ b/f2/__init__.py @@ -34,4 +34,4 @@ "live", ] -TIKTOK_MODE_LIST = ["one", "post", "like", "collect", "mix"] +TIKTOK_MODE_LIST = ["one", "post", "like", "collect", "mix", "search"] From 2625ff21ff6d65870b9899661505855f088f657a Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Tue, 30 Apr 2024 22:32:45 +0800 Subject: [PATCH 045/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=90=9C=E7=B4=A2=E5=85=B3=E9=94=AE=E8=AF=8D?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/conf/defaults.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/f2/conf/defaults.yaml b/f2/conf/defaults.yaml index 2f7c0c1d..88605ed1 100644 --- a/f2/conf/defaults.yaml +++ b/f2/conf/defaults.yaml @@ -28,6 +28,7 @@ tiktok: mode: naming: cookie: + keyword: interval: timeout: max_connections: From e61988942381dcd46c95c9ccd7b30e866c41afbe Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Tue, 30 Apr 2024 22:46:27 +0800 Subject: [PATCH 046/299] =?UTF-8?q?docs:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 4 ++++ README.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/README.en.md b/README.en.md index ba1ac06e..495703c7 100644 --- a/README.en.md +++ b/README.en.md @@ -145,6 +145,7 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores | Liked Works | 🟣⚫ | `fetch_user_like_videos` | 🟢 | | Favorite Works | 🟣⚫ | `fetch_user_collect_videos` | 🟢 | | Playlist Works | 🟣⚫ | `fetch_user_mix_videos` | 🟢 | + |Post Search|🟣⚫|`fetch_search_videos`|🟢| | ... | ... | ... | ... | @@ -227,6 +228,9 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores + ### TikTok Post Search + + diff --git a/README.md b/README.md index 1930a420..f2cb26cb 100644 --- a/README.md +++ b/README.md @@ -146,6 +146,7 @@ |点赞作品|🟣⚫|`fetch_user_like_videos`|🟢| |收藏作品|🟣⚫|`fetch_user_collect_videos`|🟢| |播放列表作品|🟣⚫|`fetch_user_mix_videos`|🟢| + |作品搜索|🟣⚫|`fetch_search_videos`|🟢| |...|...|...|...| @@ -222,6 +223,9 @@ **ps. 0.0.1.5 relase版本需要拉取这个提交补丁来修复 [05ee1c4](https://github.com/Johnserf-Seed/f2/commit/05ee1c4293d1fb9f01c25739372a2fbac18454cd)** **ps. 从main分支安装的不需要更新** + ### TikTok作品搜索 + + From 763e3949f99100faa7bee825b2fe97412dbcd269 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Wed, 1 May 2024 18:24:42 +0800 Subject: [PATCH 047/299] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9tiktok?= =?UTF-8?q?=E7=88=AC=E8=99=AB=E9=BB=98=E8=AE=A4=E4=BB=A3=E7=90=86https://?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/crawler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/f2/apps/tiktok/crawler.py b/f2/apps/tiktok/crawler.py index 7edc1da9..d1cdffdd 100644 --- a/f2/apps/tiktok/crawler.py +++ b/f2/apps/tiktok/crawler.py @@ -24,7 +24,7 @@ def __init__( kwargs: dict = ..., ): # 需要与cli同步 - proxies = kwargs.get("proxies", {"http://": None, "http://": None}) + proxies = kwargs.get("proxies", {"http://": None, "https://": None}) self.user_agent = ClientConfManager.user_agent() self.referrer = ClientConfManager.referer() From be28368918da7aa0fa26513e46dbd65bbdbc561e Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Wed, 1 May 2024 18:25:09 +0800 Subject: [PATCH 048/299] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9douyin?= =?UTF-8?q?=E7=88=AC=E8=99=AB=E9=BB=98=E8=AE=A4=E4=BB=A3=E7=90=86https://?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/crawler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/f2/apps/douyin/crawler.py b/f2/apps/douyin/crawler.py index cc23b515..e71e8355 100644 --- a/f2/apps/douyin/crawler.py +++ b/f2/apps/douyin/crawler.py @@ -31,7 +31,7 @@ def __init__( kwargs: dict = ..., ): # 需要与cli同步 - proxies = kwargs.get("proxies", {"http://": None, "http://": None}) + proxies = kwargs.get("proxies", {"http://": None, "https://": None}) self.user_agent = ClientConfManager.user_agent() self.referrer = ClientConfManager.referer() From f681fd90adff4a2cc78581d42fa4d7f2ec4a8968 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Wed, 1 May 2024 22:57:02 +0800 Subject: [PATCH 049/299] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=86m3u8?= =?UTF-8?q?=E6=B5=81=E4=B8=8B=E8=BD=BD=E6=97=B6=E4=BC=9A=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=9F=90=E4=BA=9Bts=E7=89=87=E6=AE=B5?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 针对直播流下载问题进行修复 --- f2/dl/base_downloader.py | 107 ++++++++++++++++++++++++--------------- 1 file changed, 67 insertions(+), 40 deletions(-) diff --git a/f2/dl/base_downloader.py b/f2/dl/base_downloader.py index 7bbd41f6..595186b1 100644 --- a/f2/dl/base_downloader.py +++ b/f2/dl/base_downloader.py @@ -22,6 +22,10 @@ get_segments_from_m3u8, ) +# 最大片段缓存数量，超过这个数量就会进行清理 +# (Maximum segment cache count, clear when it exceeds this count) +MAX_SEGMENT_COUNT = 1000 + class BaseDownloader(BaseCrawler): """基础下载器 (Base Downloader Class)""" @@ -255,8 +259,13 @@ async def download_m3u8_stream( """ async with self.semaphore: full_path = self._ensure_path(full_path) - total_downloaded = 1024000 + # 设置默认下载总量 (Set default total download) + total_downloaded = 10240000 + # 默认块大小 (Default chunk size) default_chunks = 409600 + # 记录已经下载的片段序号 + # (Record the segment number that has been downloaded) + downloaded_segments = set() while not SignalManager.is_shutdown_signaled(): try: @@ -279,50 +288,68 @@ async def download_m3u8_stream( if SignalManager.is_shutdown_signaled(): break - ts_url = segment.absolute_uri - ts_content_length = await get_content_length( - ts_url, self.headers - ) - if ts_content_length == 0: - ts_content_length = default_chunks - logger.warning( - _( - "无法读取该TS文件字节长度，将使用默认400kb块大小处理数据" + # 检查是否已经下载过该片段 (Check if the segment has been downloaded) + if segment.absolute_uri not in downloaded_segments: + ts_url = segment.absolute_uri + ts_content_length = await get_content_length( + ts_url, self.headers + ) + if ts_content_length == 0: + ts_content_length = default_chunks + logger.warning( + _( + "无法读取该TS文件字节长度，将使用默认400kb块大小处理数据" + ) ) + ts_request = self.aclient.build_request( + "GET", ts_url, headers=self.headers + ) + ts_response = await self.aclient.send( + ts_request, stream=True ) - ts_request = self.aclient.build_request( - "GET", ts_url, headers=self.headers - ) - ts_response = await self.aclient.send( - ts_request, stream=True - ) - - try: - async for chunk in ts_response.aiter_bytes( - get_chunk_size(ts_content_length) - ): - if SignalManager.is_shutdown_signaled(): - break - - # 直播流分块下载，每次下载后更新进度条 - # (Live stream block download, update progress bar after each download) - await file.write(chunk) - total_downloaded += len(chunk) - await self.progress.update( - task_id, - advance=len(chunk), - total=total_downloaded, + + try: + async for chunk in ts_response.aiter_bytes( + get_chunk_size(ts_content_length) + ): + if SignalManager.is_shutdown_signaled(): + break + + # 直播流分块下载，每次下载后更新进度条 + # (Live stream block download, update progress bar after each download) + await file.write(chunk) + total_downloaded += len(chunk) + await self.progress.update( + task_id, + advance=len(chunk), + total=total_downloaded, + ) + + # 记录已经下载的片段序号 + # (Record the segment number that has been downloaded) + downloaded_segments.add(segment.absolute_uri) + + except httpx.ReadTimeout as e: + logger.warning(_("TS文件下载超时: {0}").format(e)) + except Exception as e: + logger.error(_("TS文件下载失败: {0}").format(e)) + logger.error(traceback.format_exc()) + finally: + await ts_response.aclose() + else: + logger.debug( + _("为你跳过已下载的片段，URI: {0}").format( + segment.absolute_uri ) + ) + + # 每下载一定数量的片段后，清理一次集合 + # (After downloading a certain number of segments, clean up the collection) + if len(downloaded_segments) > MAX_SEGMENT_COUNT: + downloaded_segments = set() - except httpx.ReadTimeout as e: - logger.warning(_("TS文件下载超时: {0}").format(e)) - except Exception as e: - logger.error(_("TS文件下载失败: {0}").format(e)) - logger.error(traceback.format_exc()) - finally: - await ts_response.aclose() # 等待一段时间后再次请求更新 (Request update again after waiting for a while) - await asyncio.sleep(5) + await asyncio.sleep(segment.duration) except httpx.HTTPStatusError as e: if e.response.status_code == 404: From 10cfdf8c7fc0e83a9def1b2ce705bc6ba7fc4e94 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Wed, 1 May 2024 23:01:21 +0800 Subject: [PATCH 050/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=94=B9douyin?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E4=B8=8B=E8=BD=BD=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit .mp4 -> .flv --- f2/apps/douyin/dl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/f2/apps/douyin/dl.py b/f2/apps/douyin/dl.py index e2224dd4..22812629 100644 --- a/f2/apps/douyin/dl.py +++ b/f2/apps/douyin/dl.py @@ -404,5 +404,5 @@ async def handler_stream( webcast_url = webcast_data_dict.get("m3u8_pull_url").get("FULL_HD1") await self.initiate_m3u8_download( - _("直播"), webcast_url, base_path, webcast_name, ".mp4" + _("直播"), webcast_url, base_path, webcast_name, ".flv" ) From 44fd00d80a7e2472503e83c54189a7e801674246 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Wed, 1 May 2024 23:02:46 +0800 Subject: [PATCH 051/299] =?UTF-8?q?feat:=20=E4=B8=BA=5Fdl=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=8E=B7=E5=8F=96segments=E7=9A=84duration=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/utils/_dl.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/f2/utils/_dl.py b/f2/utils/_dl.py index d38d9c35..262bbcde 100644 --- a/f2/utils/_dl.py +++ b/f2/utils/_dl.py @@ -170,3 +170,17 @@ async def get_segments_from_m3u8(url: str): ) ) return segments + + +async def get_segments_duration(url: str) -> Union[list, int, float, None]: + """ + 从给定的m3u8文件中获取segments的duration + + Args: + url (str): m3u8文件的URL + + Returns: + segments的duration列表 + """ + segments = await get_segments_from_m3u8(url) + return [segment.duration for segment in segments] From 25fec8187fe51bdbf8fd96e5fe3e5d50c954a8f0 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Wed, 1 May 2024 23:03:40 +0800 Subject: [PATCH 052/299] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E4=B8=8B=E8=BD=BD=E5=99=A8=E9=BB=98=E8=AE=A4=E4=BB=A3?= =?UTF-8?q?=E7=90=86=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/dl/base_downloader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/f2/dl/base_downloader.py b/f2/dl/base_downloader.py index 595186b1..39814991 100644 --- a/f2/dl/base_downloader.py +++ b/f2/dl/base_downloader.py @@ -31,7 +31,7 @@ class BaseDownloader(BaseCrawler): """基础下载器 (Base Downloader Class)""" def __init__(self, kwargs: dict = ...): - proxies = kwargs.get("proxies", {"http": None, "https": None}) + proxies = kwargs.get("proxies", {"http://": None, "https://": None}) self.headers = { "User-Agent": kwargs["headers"]["User-Agent"], From 1c08a5187e600a5e01cbeeccfe33227ad7e27809 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Wed, 1 May 2024 23:04:42 +0800 Subject: [PATCH 053/299] =?UTF-8?q?feat:=20=E4=B8=BA=5Fdl=E8=8E=B7?= =?UTF-8?q?=E5=8F=96segments=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=9B=9E=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/utils/_dl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/f2/utils/_dl.py b/f2/utils/_dl.py index 262bbcde..3e19d465 100644 --- a/f2/utils/_dl.py +++ b/f2/utils/_dl.py @@ -141,7 +141,7 @@ def get_chunk_size(file_size: int) -> int: return 1 * 1024 * 1024 # 使用1MB的块大小 (Use a chunk size of 1MB) -async def get_segments_from_m3u8(url: str): +async def get_segments_from_m3u8(url: str) -> Union[list, str, None]: """ 从给定的m3u8文件中获取segments From 1fddf307e327d61692add5e72ea5676bb6ebce44 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 2 May 2024 00:01:58 +0800 Subject: [PATCH 054/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0app=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E6=A8=A1=E5=BC=8F=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/cli.py | 1 + f2/apps/tiktok/cli.py | 1 + 2 files changed, 2 insertions(+) diff --git a/f2/apps/douyin/cli.py b/f2/apps/douyin/cli.py index 9468ad81..6cf89e4e 100644 --- a/f2/apps/douyin/cli.py +++ b/f2/apps/douyin/cli.py @@ -420,6 +420,7 @@ def douyin( # 从低频配置开始到高频配置再到cli参数，逐级覆盖，如果键值不存在使用父级的键值 kwargs = merge_config(main_conf, custom_conf, **kwargs) + logger.info(_("模式：{0}").format(kwargs.get("mode"))) logger.info(_("主配置路径：{0}").format(main_conf_path)) logger.info(_("自定义配置路径：{0}").format(Path.cwd() / config)) logger.debug(_("主配置参数：{0}").format(main_conf)) diff --git a/f2/apps/tiktok/cli.py b/f2/apps/tiktok/cli.py index ab4256b4..c72c8789 100644 --- a/f2/apps/tiktok/cli.py +++ b/f2/apps/tiktok/cli.py @@ -387,6 +387,7 @@ def tiktok( # 从低频配置开始到高频配置再到cli参数，逐级覆盖，如果键值不存在使用父级的键值 kwargs = merge_config(main_conf, custom_conf, **kwargs) + logger.info(_("模式：{0}").format(kwargs.get("mode"))) logger.info(_("主配置路径：{0}").format(main_conf_path)) logger.info(_("自定义配置路径：{0}").format(Path.cwd() / config)) logger.debug(_("主配置参数：{0}").format(main_conf)) From 9d04c22f2704c02991e59f227cf1fd2f1e9c4cdc Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 2 May 2024 01:32:44 +0800 Subject: [PATCH 055/299] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dm3u8=E6=B5=81?= =?UTF-8?q?=E8=8E=B7=E5=8F=96content=5Flength=E6=97=B6=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=8F=90=E4=BE=9B=E4=BB=A3=E7=90=86=E5=8F=82=E6=95=B0=E9=80=A0?= =?UTF-8?q?=E6=88=90=E7=9A=84=E8=AE=BF=E9=97=AE=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/dl/base_downloader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/f2/dl/base_downloader.py b/f2/dl/base_downloader.py index 39814991..80ca73b3 100644 --- a/f2/dl/base_downloader.py +++ b/f2/dl/base_downloader.py @@ -292,7 +292,7 @@ async def download_m3u8_stream( if segment.absolute_uri not in downloaded_segments: ts_url = segment.absolute_uri ts_content_length = await get_content_length( - ts_url, self.headers + ts_url, self.headers,self.proxies ) if ts_content_length == 0: ts_content_length = default_chunks From f544fe9d6955f2e9edbdf2ebb33e90a2091d018e Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 2 May 2024 01:33:40 +0800 Subject: [PATCH 056/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9B=B4=E6=92=AD=E6=8E=A5=E5=8F=A3=E7=AB=AF?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/api.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/f2/apps/tiktok/api.py b/f2/apps/tiktok/api.py index 234bec8c..85c37e09 100644 --- a/f2/apps/tiktok/api.py +++ b/f2/apps/tiktok/api.py @@ -53,3 +53,6 @@ class TiktokAPIEndpoints: # 作品搜索 (Post Search) POST_SEARCH = f"{TIKTOK_DOMAIN}/api/search/item/full/" + + # 用户直播 (User Live) + USER_LIVE = f"{TIKTOK_DOMAIN}/api-live/user/room/" From f7033cb5234d5c6ead43bafcfc4b6887501743c7 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 2 May 2024 01:37:05 +0800 Subject: [PATCH 057/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9B=B4=E6=92=AD=E6=8E=A5=E5=8F=A3=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/model.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/f2/apps/tiktok/model.py b/f2/apps/tiktok/model.py index 83c799df..47808b72 100644 --- a/f2/apps/tiktok/model.py +++ b/f2/apps/tiktok/model.py @@ -116,3 +116,8 @@ class PostSearch(BaseRequestModel): ), safe="", ) + + +class UserLive(BaseRequestModel): + uniqueId: str + sourceType: int = 54 From 379e4d7ee248c5fe2512bdeedb580cb19dbe5b09 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 2 May 2024 01:37:24 +0800 Subject: [PATCH 058/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9B=B4=E6=92=AD=E7=88=AC=E8=99=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/crawler.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/f2/apps/tiktok/crawler.py b/f2/apps/tiktok/crawler.py index d1cdffdd..812a4fbe 100644 --- a/f2/apps/tiktok/crawler.py +++ b/f2/apps/tiktok/crawler.py @@ -14,6 +14,7 @@ UserPlayList, PostComment, PostSearch, + UserLive, ) from f2.apps.tiktok.utils import XBogusManager, ClientConfManager @@ -126,6 +127,15 @@ async def fetch_post_search(self, params: PostSearch): logger.debug(_("搜索作品接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) + async def fetch_user_live(self, params: UserLive): + endpoint = XBogusManager.model_2_endpoint( + self.headers.get("User-Agent"), + tkendpoint.USER_LIVE, + params.model_dump(), + ) + logger.debug(_("用户直播接口地址：{0}").format(endpoint)) + return await self._fetch_get_json(endpoint) + async def __aenter__(self): return self From 18987914870b32990145310db7be4817868ee6ea Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 2 May 2024 01:37:39 +0800 Subject: [PATCH 059/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9B=B4=E6=92=ADhandler=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/handler.py | 75 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/f2/apps/tiktok/handler.py b/f2/apps/tiktok/handler.py index 2be4f45e..1e02b03f 100644 --- a/f2/apps/tiktok/handler.py +++ b/f2/apps/tiktok/handler.py @@ -21,6 +21,7 @@ UserPlayList, PostDetail, PostSearch, + UserLive, ) from f2.apps.tiktok.filter import ( UserProfileFilter, @@ -29,6 +30,7 @@ UserMixFilter, UserPlayListFilter, PostSearchFilter, + UserLiveFilter, ) from f2.apps.tiktok.utils import ( SecUserIdFetcher, @@ -810,6 +812,79 @@ async def fetch_search_videos( logger.info(_("搜索结束，共搜索到 {0} 个作品").format(videos_collected)) + @mode_handler("live") + async def handler_user_live(self): + """ + 用于获取指定用户的直播信息 + (Used to get live info of specified user) + + Args: + kwargs: dict: 参数字典 (Parameter dictionary) + """ + + uniqueId = await SecUserIdFetcher.get_uniqueid(self.kwargs.get("url")) + + webcast_data = await self.fetch_user_live_videos(uniqueId) + + # 判断是否有直播间 + if not webcast_data.has_live: + logger.info(_("用户：{0} 没有直播间").format(uniqueId)) + return + + # 是否正在直播 + if webcast_data.live_status != 2: + logger.info(_("当前 {0} 直播已结束").format(webcast_data.live_title_raw)) + return + + async with AsyncUserDB("tiktok_users.db") as udb: + user_path = await self.get_or_add_user_data( + secUid="", uniqueId=uniqueId, db=udb + ) + + # 创建下载任务 + await self.downloader.create_stream_tasks( + self.kwargs, webcast_data._to_dict(), user_path + ) + + async def fetch_user_live_videos( + self, + uniqueId: str, + ) -> UserLiveFilter: + """ + 用于获取指定用户直播的作品列表 + (Used to get live video list of specified user) + + Args: + secUid: str: 用户ID (User ID) + cursor: int: 分页游标 (Page cursor) + page_counts: int: 分页数量 (Page counts) + max_counts: float: 最大数量 (Max counts) + + Return: + live: [UserLiveFilter: 直播作品信息过滤器 (Live video info filter) + """ + + logger.info(_("开始爬取用户：{0} 的直播").format(uniqueId)) + logger.debug("===================================") + + async with TiktokCrawler(self.kwargs) as crawler: + params = UserLive(uniqueId=uniqueId) + response = await crawler.fetch_user_live(params) + live = UserLiveFilter(response) + + logger.debug( + _("直播间ID：{0} 直播间标题：{1} 直播状态: {2} 观看人数: {3}").format( + live.live_room_id, + live.live_title_raw, + live.live_status, + live.live_user_count, + ) + ) + logger.debug("===================================") + logger.info(_("直播信息爬取结束")) + + return live + async def main(kwargs): mode = kwargs.get("mode") From ba82bb0cb026bb857b52e2e5fa9fe0539eb610db Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 2 May 2024 01:38:21 +0800 Subject: [PATCH 060/299] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9tiktok?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9B=B4=E6=92=AD=E4=B8=8B=E8=BD=BD=E6=B5=81?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/dl.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/f2/apps/tiktok/dl.py b/f2/apps/tiktok/dl.py index 85559671..ce1d7e67 100644 --- a/f2/apps/tiktok/dl.py +++ b/f2/apps/tiktok/dl.py @@ -288,7 +288,7 @@ async def handler_stream( custom_fields = { "create": timestamp_2_str(timestamp=get_timestamp(unit="sec")), "nickname": webcast_data_dict.get("nickname", ""), - "aweme_id": webcast_data_dict.get("room_id", ""), + "aweme_id": webcast_data_dict.get("live_room_id", ""), "desc": webcast_data_dict.get("live_title", ""), "uid": webcast_data_dict.get("user_id", ""), } @@ -303,7 +303,7 @@ async def handler_stream( ) webcast_name = f"{format_file_name(kwargs.get('naming', '{create}_{desc}'), custom_fields=custom_fields)}_live" - webcast_url = webcast_data_dict.get("m3u8_pull_url", None).get("FULL_HD1") + webcast_url = webcast_data_dict.get("live_hls_url", None) await self.initiate_m3u8_download( _("直播"), webcast_url, base_path, webcast_name, ".mp4" From ebf8dcd02b4469de8cb9efb566b1e07d566dcb51 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 2 May 2024 01:38:45 +0800 Subject: [PATCH 061/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9B=B4=E6=92=AD=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/f2/__init__.py b/f2/__init__.py index 4a6c75b4..b02c2cf3 100644 --- a/f2/__init__.py +++ b/f2/__init__.py @@ -34,4 +34,4 @@ "live", ] -TIKTOK_MODE_LIST = ["one", "post", "like", "collect", "mix", "search"] +TIKTOK_MODE_LIST = ["one", "post", "like", "collect", "mix", "search", "live"] From 34775d682117824e85529fb1d7b95b88e0c0b700 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 2 May 2024 23:03:05 +0800 Subject: [PATCH 062/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9B=B4=E6=92=AD=E6=95=B0=E6=8D=AE=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/filter.py | 130 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 129 insertions(+), 1 deletion(-) diff --git a/f2/apps/tiktok/filter.py b/f2/apps/tiktok/filter.py index cd108349..1ae9d7c1 100644 --- a/f2/apps/tiktok/filter.py +++ b/f2/apps/tiktok/filter.py @@ -1,7 +1,11 @@ # path: f2/apps/tiktok/filter.py from f2.utils.json_filter import JSONModel -from f2.utils.utils import _get_first_item_from_list, timestamp_2_str, replaceT +from f2.utils.utils import ( + _get_first_item_from_list, + timestamp_2_str, + replaceT, +) class UserProfileFilter(JSONModel): @@ -913,3 +917,127 @@ def _to_list(self): d[key] = attr_values[index] if index < len(attr_values) else None list_dicts.append(d) return list_dicts + + +class UserLiveFilter(JSONModel): + @property + def api_status_code(self): + return self._get_attr_value("$.statusCode") + + @property + def has_live(self) -> bool: + if len(self._get_attr_value("$.data")) == 4: + return False + return True + + # user + @property + def user_avatar_larger(self): + return self._get_attr_value("$.data.user.avatarLarger") + + @property + def user_id(self): + return self._get_attr_value("$.data.user.id") + + @property + def nickname(self): + return replaceT(self._get_attr_value("$.data.user.nickname")) + + @property + def nickname_raw(self): + return self._get_attr_value("$.data.user.nickname") + + @property + def user_secUid(self): + return self._get_attr_value("$.data.user.secUid") + + @property + def user_uniqueId(self): + return self._get_attr_value("$.data.user.uniqueId") + + @property + def user_secret(self): + return self._get_attr_value("$.data.user.secret") + + @property + def user_verified(self): + return self._get_attr_value("$.data.user.verified") + + @property + def user_signature(self): + return replaceT(self._get_attr_value("$.data.user.signature")) + + # stats + @property + def live_following_count(self): + return self._get_attr_value("$.data.stats.followingCount") + + @property + def live_follower_count(self): + return self._get_attr_value("$.data.stats.followerCount") + + @property + def live_user_count(self): + return self._get_attr_value("$.data.liveRoom.liveRoomStats.userCount") + + # live + @property + def live_title(self): + return replaceT(self._get_attr_value("$.data.liveRoom.title")) + + @property + def live_title_raw(self): + return self._get_attr_value("$.data.liveRoom.title") + + @property + def live_startTime(self): + return timestamp_2_str(self._get_attr_value("$.data.liveRoom.startTime")) + + @property + def live_status(self): + return self._get_attr_value("$.data.liveRoom.status") # 2开播 + + @property + def live_coverUrl(self): + return self._get_attr_value("$.data.liveRoom.coverUrl") + + @property + def live_room_mode(self): + return self._get_attr_value("$.data.liveRoom.mode") # 0直播 1聊天室 + + @property + def live_room_id(self): + return self._get_attr_value("$.data.user.roomId") + + @property + def live_stream_id(self): + return self._get_attr_value("$.data.liveRoom.streamId") + + @property + def live_qualities(self): + return self._get_list_attr_value( + "$.data.liveRoom.streamData.pull_data.options.qualities[*].sdk_key" + ) + + + @property + def live_flv_url(self): + return JSONModel(self.live_stream_data)._get_attr_value( + "$.data.origin.main.flv" + ) + + @property + def live_hls_url(self): + return JSONModel(self.live_stream_data)._get_attr_value( + "$.data.origin.main.hls" + ) + + def _to_raw(self) -> dict: + return self._data + + def _to_dict(self) -> dict: + return { + prop_name: getattr(self, prop_name) + for prop_name in dir(self) + if not prop_name.startswith("__") and not prop_name.startswith("_") + } From bf1f623eb0fba4d6cd44f079f9037fdd2b010ed2 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 2 May 2024 23:04:18 +0800 Subject: [PATCH 063/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=8F=8D?= =?UTF-8?q?=E8=BD=AC=E4=B9=89=20JSON=20=E6=96=87=E6=9C=AC=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 适用于嵌套的带转义字符的json --- f2/apps/tiktok/filter.py | 6 ++++++ f2/utils/utils.py | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/f2/apps/tiktok/filter.py b/f2/apps/tiktok/filter.py index 1ae9d7c1..dfcecbd8 100644 --- a/f2/apps/tiktok/filter.py +++ b/f2/apps/tiktok/filter.py @@ -5,6 +5,7 @@ _get_first_item_from_list, timestamp_2_str, replaceT, + unescape_json, ) @@ -1019,6 +1020,11 @@ def live_qualities(self): "$.data.liveRoom.streamData.pull_data.options.qualities[*].sdk_key" ) + @property + def live_stream_data(self): + return unescape_json( + self._get_attr_value("$.data.liveRoom.streamData.pull_data.stream_data") + ) @property def live_flv_url(self): diff --git a/f2/utils/utils.py b/f2/utils/utils.py index eec8f6a2..81fb0d6e 100644 --- a/f2/utils/utils.py +++ b/f2/utils/utils.py @@ -358,3 +358,37 @@ def merge_config( merged_conf[key] = value # CLI 参数会覆盖自定义配置和主配置中的同名参数 return merged_conf + + +def unescape_json(json_text: str) -> dict: + """ + 反转义 JSON 文本 + + Args: + json_text (str): 带有转义字符的 JSON 文本 + + Returns: + json_obj (dict): 反转义后的 JSON 对象 + """ + + # 反转义 JSON 文本 + json_text = re.sub(r"\\{2}", r"\\", json_text) + json_text = re.sub(r"\\\"", r"\"", json_text) + json_text = re.sub(r"\\", r"", json_text) + json_text = re.sub(r"\"{", r"{", json_text) + json_text = re.sub(r"}\"", r"}", json_text) + json_text = re.sub(r"\&", r"&", json_text) + json_text = re.sub(r"\\n", r"", json_text) + json_text = re.sub(r"\\t", r"", json_text) + json_text = re.sub(r"\\r", r"", json_text) + + try: + # 尝试解析 JSON 文本 + import json + + json_obj = json.loads(json_text) + except Exception as e: + print(f"`unescape_json` error: {e}, raw_json: {json_text}") + json_obj = {} + + return json_obj From 93cafef803f302d419a244e312cbf5eb79b18a74 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 2 May 2024 23:06:33 +0800 Subject: [PATCH 064/299] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0tiktok?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB=E7=BD=91=E7=BB=9C=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=8D=95=E8=8E=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/utils.py | 388 +++++++++++++++++++++++++++++++++++----- 1 file changed, 348 insertions(+), 40 deletions(-) diff --git a/f2/apps/tiktok/utils.py b/f2/apps/tiktok/utils.py index 39413868..21fddadc 100644 --- a/f2/apps/tiktok/utils.py +++ b/f2/apps/tiktok/utils.py @@ -20,11 +20,11 @@ split_filename, ) from f2.exceptions.api_exceptions import ( - APIError, APIConnectionError, APIResponseError, APIUnauthorizedError, APINotFoundError, + APITimeoutError, ) @@ -114,16 +114,62 @@ def gen_real_msToken(cls) -> str: return msToken - except httpx.RequestError as exc: - # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + except httpx.TimeoutException as exc: + raise APITimeoutError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求端点超时"), + cls.token_conf["url"], + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.NetworkError as exc: + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("网络连接失败，请检查当前网络环境"), + cls.token_conf["url"], + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.ProtocolError as exc: + raise APIUnauthorizedError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求协议错误"), + cls.token_conf["url"], + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.ProxyError as exc: raise APIConnectionError( _( - "请求端点失败，请检查当前网络环境。 链接：{0}，代理：{1}，异常类名：{2}，异常详细信息：{3}" - ).format(cls.token_conf["url"], cls.proxies, cls.__name__, exc) + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求代理错误"), + cls.token_conf["url"], + ClientConfManager.proxies(), + cls.__name__, + exc, + ) ) - except httpx.HTTPStatusError as e: + except httpx.HTTPStatusError as exc: # 捕获 httpx 的状态代码错误 (captures specific status code errors from httpx) + logger.error(_("msToken API错误：{0}").format(exc)) if response.status_code == 401: raise APIUnauthorizedError( _( @@ -136,16 +182,12 @@ def gen_real_msToken(cls) -> str: else: raise APIResponseError( _("链接：{0}，状态码 {1}：{2} ").format( - e.response.url, e.response.status_code, e.response.text + exc.response.url, + exc.response.status_code, + exc.response.text, ) ) - except APIError as e: - # 返回虚假的msToken (Return a fake msToken) - logger.error(_("msToken API错误：{0}").format(e)) - logger.info(_("生成虚假的msToken")) - return cls.gen_false_msToken() - @classmethod def gen_false_msToken(cls) -> str: """生成随机msToken (Generate random msToken)""" @@ -178,15 +220,60 @@ def gen_ttwid(cls) -> str: return ttwid - except httpx.RequestError as exc: - # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + except httpx.TimeoutException as exc: + raise APITimeoutError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求端点超时"), + cls.ttwid_conf["url"], + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.NetworkError as exc: raise APIConnectionError( _( - "请求端点失败，请检查当前网络环境。 链接：{0}，代理：{1}，异常类名：{2}，异常详细信息：{3}" - ).format(cls.ttwid_conf["url"], cls.proxies, cls.__name__, exc) + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("网络连接失败，请检查当前网络环境"), + cls.ttwid_conf["url"], + ClientConfManager.proxies(), + cls.__name__, + exc, + ) ) - except httpx.HTTPStatusError as e: + except httpx.ProtocolError as exc: + raise APIUnauthorizedError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求协议错误"), + cls.ttwid_conf["url"], + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.ProxyError as exc: + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求代理错误"), + cls.ttwid_conf["url"], + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.HTTPStatusError as exc: # 捕获 httpx 的状态代码错误 (captures specific status code errors from httpx) if response.status_code == 401: raise APIUnauthorizedError( @@ -200,7 +287,9 @@ def gen_ttwid(cls) -> str: else: raise APIResponseError( _("链接：{0}，状态码 {1}：{2} ").format( - e.response.url, e.response.status_code, e.response.text + exc.response.url, + exc.response.status_code, + exc.response.text, ) ) @@ -222,15 +311,60 @@ def gen_odin_tt(cls): return odin_tt - except httpx.RequestError as exc: - # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + except httpx.TimeoutException as exc: + raise APITimeoutError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求端点超时"), + cls.odin_tt_conf["url"], + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.NetworkError as exc: raise APIConnectionError( _( - "请求端点失败，请检查当前网络环境。 链接：{0}，代理：{1}，异常类名：{2}，异常详细信息：{3}" - ).format(cls.odin_tt_conf["url"], cls.proxies, cls.__name__, exc) + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("网络连接失败，请检查当前网络环境"), + cls.odin_tt_conf["url"], + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.ProtocolError as exc: + raise APIUnauthorizedError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求协议错误"), + cls.odin_tt_conf["url"], + ClientConfManager.proxies(), + cls.__name__, + exc, + ) ) - except httpx.HTTPStatusError as e: + except httpx.ProxyError as exc: + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求代理错误"), + cls.odin_tt_conf["url"], + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.HTTPStatusError as exc: # 捕获 httpx 的状态代码错误 (captures specific status code errors from httpx) if response.status_code == 401: raise APIUnauthorizedError( @@ -244,7 +378,9 @@ def gen_odin_tt(cls): else: raise APIResponseError( _("链接：{0}，状态码 {1}：{2} ").format( - e.response.url, e.response.status_code, e.response.text + exc.response.url, + exc.response.status_code, + exc.response.text, ) ) @@ -358,12 +494,70 @@ async def get_secuid(cls, url: str) -> str: else: raise ConnectionError(_("接口状态码异常, 请检查重试")) - except httpx.RequestError as exc: - # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + except httpx.TimeoutException as exc: + raise APITimeoutError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求端点超时"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.NetworkError as exc: raise APIConnectionError( _( - "请求端点失败，请检查当前网络环境。 链接：{0}，代理：{1}，异常类名：{2}，异常详细信息：{3}" - ).format(url, ClientConfManager.proxies(), cls.__name__, exc) + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("网络连接失败，请检查当前网络环境"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.ProtocolError as exc: + raise APIUnauthorizedError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求协议错误"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.ProxyError as exc: + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求代理错误"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.HTTPStatusError as exc: + raise APIResponseError( + _( + "{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("状态码错误"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) ) @classmethod @@ -422,7 +616,6 @@ async def get_uniqueid(cls, url: str) -> str: ) as client: try: response = await client.get(url, follow_redirects=True) - if response.status_code in {200, 444}: if cls._TIKTOK_NOTFOUND_PARREN.search(str(response.url)): raise APINotFoundError( @@ -445,16 +638,73 @@ async def get_uniqueid(cls, url: str) -> str: ) return unique_id - else: - raise ConnectionError( - _("接口状态码异常 {0}, 请检查重试").format(response.status_code) + + response.raise_for_status() + + # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + except httpx.TimeoutException as exc: + raise APITimeoutError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求端点超时"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.NetworkError as exc: + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("网络连接失败，请检查当前网络环境"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.ProtocolError as exc: + raise APIUnauthorizedError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求协议错误"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, ) + ) - except httpx.RequestError: + except httpx.ProxyError as exc: raise APIConnectionError( _( - "连接端点失败，检查网络环境或代理：{0} 代理：{1} 类名：{2}" - ).format(url, ClientConfManager.proxies(), cls.__name__), + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求代理错误"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.HTTPStatusError as exc: + raise APIResponseError( + _( + "{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("状态码错误"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) ) @classmethod @@ -550,12 +800,70 @@ async def get_aweme_id(cls, url: str) -> str: _("接口状态码异常 {0}，请检查重试").format(response.status_code) ) - except httpx.RequestError as exc: - # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + except httpx.TimeoutException as exc: + raise APITimeoutError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求端点超时"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.NetworkError as exc: raise APIConnectionError( _( - "请求端点失败，请检查当前网络环境。 链接：{0}，代理：{1}，异常类名：{2}，异常详细信息：{3}" - ).format(url, ClientConfManager.proxies(), cls.__name__, exc) + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("网络连接失败，请检查当前网络环境"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.ProtocolError as exc: + raise APIUnauthorizedError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求协议错误"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.ProxyError as exc: + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求代理错误"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.HTTPStatusError as exc: + raise APIResponseError( + _( + "{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("状态码错误"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) ) @classmethod From 3f143f2a12549af772275dd4c064ef40e847f00b Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 2 May 2024 23:10:50 +0800 Subject: [PATCH 065/299] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ddouyin?= =?UTF-8?q?=E6=8F=90=E5=89=8D=E5=BC=95=E5=8F=91=E5=BC=82=E5=B8=B8=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=97=A0=E6=B3=95=E7=94=9F=E6=88=90=E8=99=9A=E5=81=87?= =?UTF-8?q?=E7=9A=84msToken?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/model.py | 6 +++++- f2/apps/douyin/utils.py | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/f2/apps/douyin/model.py b/f2/apps/douyin/model.py index 8714a99e..5fa9a281 100644 --- a/f2/apps/douyin/model.py +++ b/f2/apps/douyin/model.py @@ -32,7 +32,11 @@ class BaseRequestModel(BaseModel): downlink: int = 10 effective_type: str = "4g" round_trip_time: int = 100 - msToken: str = TokenManager.gen_real_msToken() + try: + msToken: str = TokenManager.gen_real_msToken() + except: + # 返回虚假的msToken (Return a fake msToken) + msToken: str = TokenManager.gen_false_msToken() class BaseLiveModel(BaseModel): diff --git a/f2/apps/douyin/utils.py b/f2/apps/douyin/utils.py index 25011e03..af2d240e 100644 --- a/f2/apps/douyin/utils.py +++ b/f2/apps/douyin/utils.py @@ -108,7 +108,7 @@ def gen_real_msToken(cls) -> str: msToken = str(httpx.Cookies(response.cookies).get("msToken")) if len(msToken) not in [120, 128]: raise APIResponseError(_("{0} 内容不符合要求").format("msToken")) - + logger.debug(_("生成真实的msToken")) return msToken except httpx.RequestError as exc: @@ -146,6 +146,7 @@ def gen_real_msToken(cls) -> str: @classmethod def gen_false_msToken(cls) -> str: """生成随机msToken (Generate random msToken)""" + logger.debug(_("生成虚假的msToken")) return gen_random_str(126) + "==" @classmethod From 8a941fcbe3b2cab9caa6cd62d5dea66b249dadb8 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 2 May 2024 23:11:07 +0800 Subject: [PATCH 066/299] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dtiktok?= =?UTF-8?q?=E6=8F=90=E5=89=8D=E5=BC=95=E5=8F=91=E5=BC=82=E5=B8=B8=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=97=A0=E6=B3=95=E7=94=9F=E6=88=90=E8=99=9A=E5=81=87?= =?UTF-8?q?=E7=9A=84msToken?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/model.py | 6 +++++- f2/apps/tiktok/utils.py | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/f2/apps/tiktok/model.py b/f2/apps/tiktok/model.py index 47808b72..5c9c5547 100644 --- a/f2/apps/tiktok/model.py +++ b/f2/apps/tiktok/model.py @@ -41,7 +41,11 @@ class BaseRequestModel(BaseModel): screen_width: int = 1920 webcast_language: str = "zh-Hans" tz_name: str = quote("Asia/Hong_Kong", safe="") - msToken: str = TokenManager.gen_real_msToken() + try: + msToken: str = TokenManager.gen_real_msToken() + except: + # 返回虚假的msToken (Return a fake msToken) + msToken: str = TokenManager.gen_false_msToken() # router model diff --git a/f2/apps/tiktok/utils.py b/f2/apps/tiktok/utils.py index 21fddadc..6cbf7325 100644 --- a/f2/apps/tiktok/utils.py +++ b/f2/apps/tiktok/utils.py @@ -111,7 +111,7 @@ def gen_real_msToken(cls) -> str: if len(msToken) not in [148]: raise APIResponseError(_("{0} 内容不符合要求").format("msToken")) - + logger.debug(_("生成真实的msToken")) return msToken # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) @@ -191,6 +191,7 @@ def gen_real_msToken(cls) -> str: @classmethod def gen_false_msToken(cls) -> str: """生成随机msToken (Generate random msToken)""" + logger.debug(_("生成虚假的msToken")) return gen_random_str(146) + "==" @classmethod From 6a82c466f155176365bd811c605dd0b71d08d3c4 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 2 May 2024 23:12:09 +0800 Subject: [PATCH 067/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=94=B9tiktok?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E4=B8=8B=E8=BD=BD=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit .mp4 -> .flv --- f2/apps/tiktok/dl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/f2/apps/tiktok/dl.py b/f2/apps/tiktok/dl.py index ce1d7e67..b133f749 100644 --- a/f2/apps/tiktok/dl.py +++ b/f2/apps/tiktok/dl.py @@ -306,5 +306,5 @@ async def handler_stream( webcast_url = webcast_data_dict.get("live_hls_url", None) await self.initiate_m3u8_download( - _("直播"), webcast_url, base_path, webcast_name, ".mp4" + _("直播"), webcast_url, base_path, webcast_name, ".flv" ) From e3fdada0fdc3035513cc684ba290f3c8e927eb6b Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 2 May 2024 23:13:04 +0800 Subject: [PATCH 068/299] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0base=5Fcrawle?= =?UTF-8?q?r=E7=BD=91=E7=BB=9C=E5=BC=82=E5=B8=B8=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/crawlers/base_crawler.py | 77 +++++++++++++++++++++++++++++++------ 1 file changed, 65 insertions(+), 12 deletions(-) diff --git a/f2/crawlers/base_crawler.py b/f2/crawlers/base_crawler.py index 7fce40f9..36f39f06 100644 --- a/f2/crawlers/base_crawler.py +++ b/f2/crawlers/base_crawler.py @@ -166,15 +166,68 @@ async def get_fetch_data(self, url: str): response.raise_for_status() return response - except httpx.RequestError: + # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + except httpx.TimeoutException as exc: + raise APITimeoutError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求端点超时"), + url, + self.proxies, + self.__class__.__name__, + exc, + ) + ) + + except httpx.NetworkError as exc: raise APIConnectionError( _( - "连接端点失败，检查网络环境或代理：{0} 代理：{1} 类名：{2}" - ).format(url, self.proxies, self.__class__.__name__) + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("网络连接失败，请检查当前网络环境"), + url, + self.proxies, + self.__class__.__name__, + exc, + ) ) - except httpx.HTTPStatusError as http_error: - self.handle_http_status_error(http_error, url, attempt + 1) + except httpx.ProtocolError as exc: + raise APIUnauthorizedError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求协议错误"), + url, + self.proxies, + self.__class__.__name__, + exc, + ) + ) + + except httpx.ProxyError as exc: + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求代理错误"), + url, + self.proxies, + self.__class__.__name__, + exc, + ) + ) + + except httpx.HTTPStatusError as exc: + self.handle_http_status_error(exc, url, attempt + 1) + + except httpx.RequestError as req_err: + raise APIConnectionError( + _( + "连接端点失败，检查网络环境或代理：{0} 代理：{1} 类名：{2} 异常详细信息：{3}" + ).format(url, self.proxies, self.__class__.__name__, req_err) + ) except APIError as e: logger.error(e) @@ -214,11 +267,11 @@ async def post_fetch_data(self, url: str, params: dict = {}): response.raise_for_status() return response - except httpx.RequestError: + except httpx.RequestError as req_err: raise APIConnectionError( _( - "连接端点失败，检查网络环境或代理：{0} 代理：{1} 类名：{2}" - ).format(url, self.proxies, self.__class__.__name__) + "连接端点失败，检查网络环境或代理：{0} 代理：{1} 类名：{2} 异常详细信息：{3}" + ).format(url, self.proxies, self.__class__.__name__, req_err) ) except httpx.HTTPStatusError as http_error: @@ -243,11 +296,11 @@ async def head_fetch_data(self, url: str): response.raise_for_status() return response - except httpx.RequestError: + except httpx.RequestError as req_err: raise APIConnectionError( - _("连接端点失败，检查网络环境或代理：{0} 代理：{1} 类名：{2}").format( - url, self.proxies, self.__class__.__name__ - ) + _( + "连接端点失败，检查网络环境或代理：{0} 代理：{1} 类名：{2} 异常详细信息：{3}" + ).format(url, self.proxies, self.__class__.__name__, req_err) ) except httpx.HTTPStatusError as http_error: From 67211024774ea8f50a12731ed921a83a0d576611 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 2 May 2024 23:23:48 +0800 Subject: [PATCH 069/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0douyin?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB=E7=BD=91=E7=BB=9C=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=8D=95=E8=8E=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/utils.py | 423 +++++++++++++++++++++++++++++++++------- 1 file changed, 354 insertions(+), 69 deletions(-) diff --git a/f2/apps/douyin/utils.py b/f2/apps/douyin/utils.py index af2d240e..7c8cdf02 100644 --- a/f2/apps/douyin/utils.py +++ b/f2/apps/douyin/utils.py @@ -29,6 +29,7 @@ APIUnavailableError, APIUnauthorizedError, APINotFoundError, + APITimeoutError, ) @@ -111,38 +112,79 @@ def gen_real_msToken(cls) -> str: logger.debug(_("生成真实的msToken")) return msToken - except httpx.RequestError as exc: - # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + except httpx.TimeoutException as exc: + raise APITimeoutError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求端点超时"), + cls.token_conf["url"], + cls.proxies, + cls.__name__, + exc, + ) + ) + + except httpx.NetworkError as exc: + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("网络连接失败，请检查当前网络环境"), + cls.token_conf["url"], + cls.proxies, + cls.__name__, + exc, + ) + ) + + except httpx.ProtocolError as exc: + raise APIUnauthorizedError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求协议错误"), + cls.token_conf["url"], + cls.proxies, + cls.__name__, + exc, + ) + ) + + except httpx.ProxyError as exc: raise APIConnectionError( _( - "请求端点失败，请检查当前网络环境。 链接：{0}，代理：{1}，异常类名：{2}，异常详细信息：{3}" - ).format(cls.token_conf["url"], cls.proxies, cls.__name__, exc) + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求代理错误"), + cls.token_conf["url"], + cls.proxies, + cls.__name__, + exc, + ) ) - except httpx.HTTPStatusError as e: + except httpx.HTTPStatusError as exc: # 捕获 httpx 的状态代码错误 (captures specific status code errors from httpx) - if e.response.status_code == 401: + if exc.response.status_code == 401: raise APIUnauthorizedError( _( "参数验证失败，请更新 F2 配置文件中的 {0}，以匹配 {1} 新规则" ).format("msToken", "douyin") ) - elif e.response.status_code == 404: + elif exc.response.status_code == 404: raise APINotFoundError(_("{0} 无法找到API端点").format("msToken")) else: raise APIResponseError( _("链接：{0}，状态码 {1}：{2} ").format( - e.response.url, e.response.status_code, e.response.text + exc.response.url, + exc.response.status_code, + exc.response.text, ) ) - except APIError as e: - # 返回虚假的msToken (Return a fake msToken) - logger.error(_("msToken API错误：{0}").format(e)) - logger.info(_("生成虚假的msToken")) - return cls.gen_false_msToken() - @classmethod def gen_false_msToken(cls) -> str: """生成随机msToken (Generate random msToken)""" @@ -164,32 +206,85 @@ def gen_ttwid(cls) -> str: ) response.raise_for_status() - ttwid = str(httpx.Cookies(response.cookies).get("ttwid")) + ttwid = httpx.Cookies(response.cookies).get("ttwid") + + if ttwid is None: + raise APIResponseError( + _("ttwid: 检查没有通过, 请更新配置文件中的ttwid") + ) + return ttwid - except httpx.RequestError as exc: - # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + except httpx.TimeoutException as exc: + raise APITimeoutError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求端点超时"), + cls.ttwid_conf["url"], + cls.proxies, + cls.__name__, + exc, + ) + ) + + except httpx.NetworkError as exc: raise APIConnectionError( _( - "请求端点失败，请检查当前网络环境。 链接：{0}，代理：{1}，异常类名：{2}，异常详细信息：{3}" - ).format(cls.ttwid_conf["url"], cls.proxies, cls.__name__, exc) + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("网络连接失败，请检查当前网络环境"), + cls.ttwid_conf["url"], + cls.proxies, + cls.__name__, + exc, + ) ) - except httpx.HTTPStatusError as e: + except httpx.ProtocolError as exc: + raise APIUnauthorizedError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求协议错误"), + cls.ttwid_conf["url"], + cls.proxies, + cls.__name__, + exc, + ) + ) + + except httpx.ProxyError as exc: + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求代理错误"), + cls.ttwid_conf["url"], + cls.proxies, + cls.__name__, + exc, + ) + ) + + except httpx.HTTPStatusError as exc: # 捕获 httpx 的状态代码错误 (captures specific status code errors from httpx) - if e.response.status_code == 401: + if exc.response.status_code == 401: raise APIUnauthorizedError( _( "参数验证失败，请更新 F2 配置文件中的 {0}，以匹配 {1} 新规则" ).format("ttwid", "douyin") ) - elif e.response.status_code == 404: + elif exc.response.status_code == 404: raise APINotFoundError(_("ttwid无法找到API端点")) else: raise APIResponseError( _("链接：{0}，状态码 {1}：{2} ").format( - e.response.url, e.response.status_code, e.response.text + exc.response.url, + exc.response.status_code, + exc.response.text, ) ) @@ -306,7 +401,7 @@ async def get_sec_user_id(cls, url: str) -> str: try: transport = httpx.AsyncHTTPTransport(retries=5) async with httpx.AsyncClient( - transport=transport, proxies=TokenManager.proxies, timeout=10 + transport=transport, proxies=ClientConfManager.proxies(), timeout=10 ) as client: response = await client.get(url, follow_redirects=True) # 444一般为Nginx拦截，不返回状态 (444 is generally intercepted by Nginx and does not return status) @@ -320,31 +415,70 @@ async def get_sec_user_id(cls, url: str) -> str: "未在响应的地址中找到sec_user_id，检查链接是否为用户主页类名：{0}" ).format(cls.__name__) ) + response.raise_for_status() - elif response.status_code == 401: - raise APIUnauthorizedError( - _("未授权的请求。类名：{0}").format(cls.__name__) - ) - elif response.status_code == 404: - raise APINotFoundError( - _("未找到API端点。类名：{0}").format(cls.__name__) - ) - elif response.status_code == 503: - raise APIUnavailableError( - _("API服务不可用。类名：{0}").format(cls.__name__) - ) - else: - raise APIResponseError( - _("链接：{0}，状态码 {1}：{2} ").format( - response.url, response.status_code, response.text - ) - ) + # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + except httpx.TimeoutException as exc: + raise APITimeoutError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求端点超时"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) - except httpx.RequestError as exc: + except httpx.NetworkError as exc: raise APIConnectionError( _( - "请求端点失败，请检查当前网络环境。 链接：{0}，代理：{1}，异常类名：{2}，异常详细信息：{3}" - ).format(url, TokenManager.proxies, cls.__name__, exc) + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("网络连接失败，请检查当前网络环境"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.ProtocolError as exc: + raise APIUnauthorizedError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求协议错误"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.ProxyError as exc: + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求代理错误"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.HTTPStatusError as exc: + raise APIResponseError( + _("{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}").format( + _("状态码错误"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) ) @classmethod @@ -407,7 +541,7 @@ async def get_aweme_id(cls, url: str) -> str: # 重定向到完整链接 transport = httpx.AsyncHTTPTransport(retries=5) async with httpx.AsyncClient( - transport=transport, proxies=TokenManager.proxies, timeout=10 + transport=transport, proxies=ClientConfManager.proxies(), timeout=10 ) as client: try: response = await client.get(url, follow_redirects=True) @@ -429,18 +563,69 @@ async def get_aweme_id(cls, url: str) -> str: ) return aweme_id - except httpx.RequestError as exc: - # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + except httpx.TimeoutException as exc: + raise APITimeoutError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求端点超时"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.NetworkError as exc: raise APIConnectionError( _( - "请求端点失败，请检查当前网络环境。 链接：{0}，代理：{1}，异常类名：{2}，异常详细信息：{3}" - ).format(url, TokenManager.proxies, cls.__name__, exc) + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("网络连接失败，请检查当前网络环境"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) ) - except httpx.HTTPStatusError as e: + except httpx.ProtocolError as exc: + raise APIUnauthorizedError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求协议错误"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.ProxyError as exc: + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求代理错误"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.HTTPStatusError as exc: raise APIResponseError( - _("链接：{0}，状态码 {1}：{2}").format( - e.response.url, e.response.status_code, e.response.text + _( + "{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("状态码错误"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, ) ) @@ -503,7 +688,7 @@ async def get_mix_id(cls, url: str) -> str: # 重定向到完整链接 transport = httpx.AsyncHTTPTransport(retries=5) async with httpx.AsyncClient( - transport=transport, proxies=TokenManager.proxies, timeout=10 + transport=transport, proxies=ClientConfManager.proxies(), timeout=10 ) as client: try: response = await client.get(url, follow_redirects=True) @@ -520,18 +705,69 @@ async def get_mix_id(cls, url: str) -> str: ) return mix_id - except httpx.RequestError as exc: - # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + except httpx.TimeoutException as exc: + raise APITimeoutError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求端点超时"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.NetworkError as exc: + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("网络连接失败，请检查当前网络环境"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.ProtocolError as exc: + raise APIUnauthorizedError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求协议错误"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.ProxyError as exc: raise APIConnectionError( _( - "请求端点失败，请检查当前网络环境。 链接：{0}，代理：{1}，异常类名：{2}，异常详细信息：{3}" - ).format(url, TokenManager.proxies, cls.__name__, exc) + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求代理错误"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) ) - except httpx.HTTPStatusError as e: + except httpx.HTTPStatusError as exc: raise APIResponseError( - _("链接：{0}，状态码 {1}：{2} ").format( - e.response.url, e.response.status_code, e.response.text + _( + "{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("状态码错误"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, ) ) @@ -597,7 +833,7 @@ async def get_webcast_id(cls, url: str) -> str: # 重定向到完整链接 transport = httpx.AsyncHTTPTransport(retries=5) async with httpx.AsyncClient( - transport=transport, proxies=TokenManager.proxies, timeout=10 + transport=transport, proxies=ClientConfManager.proxies(), timeout=10 ) as client: response = await client.get(url, follow_redirects=True) response.raise_for_status() @@ -625,18 +861,67 @@ async def get_webcast_id(cls, url: str) -> str: return match.group(1) - except httpx.RequestError as exc: - # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + except httpx.TimeoutException as exc: + raise APITimeoutError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求端点超时"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.NetworkError as exc: raise APIConnectionError( _( - "请求端点失败，请检查当前网络环境。 链接：{0}，代理：{1}，异常类名：{2}，异常详细信息：{3}" - ).format(url, TokenManager.proxies, cls.__name__, exc) + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("网络连接失败，请检查当前网络环境"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.ProtocolError as exc: + raise APIUnauthorizedError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求协议错误"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) + ) + + except httpx.ProxyError as exc: + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求代理错误"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, + ) ) - except httpx.HTTPStatusError as e: + except httpx.HTTPStatusError as exc: raise APIResponseError( - _("链接：{0}，状态码 {1}：{2} ").format( - e.response.url, e.response.status_code, e.response.text + _("{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}").format( + _("状态码错误"), + url, + ClientConfManager.proxies(), + cls.__name__, + exc, ) ) From c8f594788834e9ecfd9ed8596a82ddc304729059 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 2 May 2024 23:29:20 +0800 Subject: [PATCH 070/299] =?UTF-8?q?style:=20=E8=BE=93=E5=87=BA=E4=B8=8E?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/cli.py | 1 + f2/apps/douyin/handler.py | 4 +++- f2/apps/tiktok/handler.py | 4 +++- f2/dl/base_downloader.py | 2 +- tests/test_xbogus.py | 1 - 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/f2/apps/douyin/cli.py b/f2/apps/douyin/cli.py index 6cf89e4e..1aee7b63 100644 --- a/f2/apps/douyin/cli.py +++ b/f2/apps/douyin/cli.py @@ -84,6 +84,7 @@ def handler_auto_cookie( finally: ctx.exit(0) + def handler_language( ctx: click.Context, param: typing.Union[click.Option, click.Parameter], diff --git a/f2/apps/douyin/handler.py b/f2/apps/douyin/handler.py index 6d78ea94..78090bc0 100644 --- a/f2/apps/douyin/handler.py +++ b/f2/apps/douyin/handler.py @@ -88,7 +88,9 @@ async def fetch_user_profile( response = await crawler.fetch_user_profile(params) user = UserProfileFilter(response) if user.nickname is None: - raise APIResponseError(_("API内容请求失败，请更换新cookie后再试")) + raise APIResponseError( + _("`fetch_user_profile`请求失败，请更换cookie或稍后再试") + ) return UserProfileFilter(response) async def get_or_add_user_data( diff --git a/f2/apps/tiktok/handler.py b/f2/apps/tiktok/handler.py index 1e02b03f..5d1c435f 100644 --- a/f2/apps/tiktok/handler.py +++ b/f2/apps/tiktok/handler.py @@ -78,7 +78,9 @@ async def fetch_user_profile( response = await crawler.fetch_user_profile(params) user = UserProfileFilter(response) if user.nickname is None: - raise APIResponseError(_("API内容请求失败，请更换新cookie后再试")) + raise APIResponseError( + _("`fetch_user_profile`请求失败，请更换cookie或稍后再试") + ) return UserProfileFilter(response) async def get_or_add_user_data( diff --git a/f2/dl/base_downloader.py b/f2/dl/base_downloader.py index 80ca73b3..c478c86a 100644 --- a/f2/dl/base_downloader.py +++ b/f2/dl/base_downloader.py @@ -292,7 +292,7 @@ async def download_m3u8_stream( if segment.absolute_uri not in downloaded_segments: ts_url = segment.absolute_uri ts_content_length = await get_content_length( - ts_url, self.headers,self.proxies + ts_url, self.headers, self.proxies ) if ts_content_length == 0: ts_content_length = default_chunks diff --git a/tests/test_xbogus.py b/tests/test_xbogus.py index e1825e09..27484395 100644 --- a/tests/test_xbogus.py +++ b/tests/test_xbogus.py @@ -2,7 +2,6 @@ from f2.utils.xbogus import XBogus - def test_get_xbogus(): xb = XBogus().getXBogus( "aweme_id=7196239141472980280&aid=1128&version_name=23.5.0&device_platform=android&os_version=2333" From dce66f1a1cad16b985264ba84dcf6639ade07761 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 2 May 2024 23:32:07 +0800 Subject: [PATCH 071/299] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E6=A1=A3QA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加了一些ssl错误的解决方案 --- docs/question-answer/qa.md | 8 ++++++++ docs/snippets/QA.md | 24 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/docs/question-answer/qa.md b/docs/question-answer/qa.md index 5cbbddb6..774d183e 100644 --- a/docs/question-answer/qa.md +++ b/docs/question-answer/qa.md @@ -19,3 +19,11 @@ ## WARNING 没有找到符合条件的作品 <<< @/snippets/QA.md#no-matching-videos-found + +## EOF occurred in violation of protocol (_ssl.c:992) + +<<< @/snippets/QA.md#ssl-faild-01 + +## _ssl.c:975 The handshake operation timed out + +<<< @/snippets/QA.md#ssl-faild-02 diff --git a/docs/snippets/QA.md b/docs/snippets/QA.md index 1a0b383c..0f3fda3a 100644 --- a/docs/snippets/QA.md +++ b/docs/snippets/QA.md @@ -49,3 +49,27 @@ https://datatracker.ietf.org/doc/html/rfc6585#section-7.2 https://github.com/Johnserf-Seed/f2/issues/42 https://github.com/Johnserf-Seed/TikTokDownload/issues/660 // #endregion no-matching-videos-found + + +// #region ssl-faild-01 +出现`EOF occurred in violation of protocol (_ssl.c:992)`说明SSL握手失败。 + +解决办法： +1. 请检查你的网络环境是否支持SSL协议。 +2. 确保代理网络连接稳定。 + +这个问题可能涉及到多个方面，需要自己逐步排查和解决。 +// #endregion ssl-faild-01 + + +// #region ssl-faild-02 +出现`_ssl.c:975: The handshake operation timed out`说明SSL握手超时。可能是网络连接不稳定或延迟过高导致。 + +解决办法： +1. 检查网络连接: 确保网络连接稳定，尽量减少网络延迟。 +2. 检查服务器状态: 确保服务器运行正常，并且响应速度良好。 +3. 检查防火墙和代理设置: 确保防火墙和代理服务器的设置正确，并且不会影响 SSL/TLS 握手过程。 +4. 调整超时设置 + +这个问题可能涉及到多个方面，需要自己逐步排查和解决。 +// #endregion ssl-faild-02 \ No newline at end of file From 840bcfced69b98578a8b576e91f536664bceb64a Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Fri, 3 May 2024 23:54:35 +0800 Subject: [PATCH 072/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A8=E8=8D=90=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/f2/__init__.py b/f2/__init__.py index b02c2cf3..22f2d1d4 100644 --- a/f2/__init__.py +++ b/f2/__init__.py @@ -32,6 +32,7 @@ "music", "mix", "live", + "related", ] TIKTOK_MODE_LIST = ["one", "post", "like", "collect", "mix", "search", "live"] From f5c3325ff65b854cb8e7288d1987112733c1050e Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Fri, 3 May 2024 23:55:19 +0800 Subject: [PATCH 073/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A8=E8=8D=90=E6=95=B0=E6=8D=AE=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/filter.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/f2/apps/douyin/filter.py b/f2/apps/douyin/filter.py index 3d211c8a..9cdb3f78 100644 --- a/f2/apps/douyin/filter.py +++ b/f2/apps/douyin/filter.py @@ -1658,6 +1658,11 @@ def _to_dict(self) -> dict: } +class PostRelatedFilter(UserPostFilter): + def __init__(self, data): + super().__init__(data) + + class GetQrcodeFilter(JSONModel): @property def app_name(self): From 3122579d2f8ec96f2785e971c57ed34be9c46652 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Fri, 3 May 2024 23:55:50 +0800 Subject: [PATCH 074/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0douyin?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A8=E8=8D=90=E6=8E=A5=E5=8F=A3=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/model.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/f2/apps/douyin/model.py b/f2/apps/douyin/model.py index 5fa9a281..35d32d68 100644 --- a/f2/apps/douyin/model.py +++ b/f2/apps/douyin/model.py @@ -2,6 +2,7 @@ from typing import Any from pydantic import BaseModel +from urllib.parse import quote, unquote from f2.apps.douyin.utils import TokenManager, VerifyFpManager @@ -165,7 +166,7 @@ class PostRelated(BaseRequestModel): aweme_id: str count: int = 20 filterGids: str # id,id,id - awemePcRecRawData: dict = {} # {"is_client":false} + awemePcRecRawData: str = quote('{"is_client":false}', safe="") sub_channel_id: int = 3 # Seo-Flag: int = 0 From 2f1eda07c0f2ab0a709fe49341fd99227b0f0585 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Fri, 3 May 2024 23:59:20 +0800 Subject: [PATCH 075/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A8=E8=8D=90handler=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/handler.py | 106 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/f2/apps/douyin/handler.py b/f2/apps/douyin/handler.py index 78090bc0..d8196282 100644 --- a/f2/apps/douyin/handler.py +++ b/f2/apps/douyin/handler.py @@ -27,6 +27,7 @@ LoginCheckQr, UserFollowing, UserFollower, + PostRelated, ) from f2.apps.douyin.filter import ( UserPostFilter, @@ -42,6 +43,7 @@ CheckQrcodeFilter, UserFollowingFilter, UserFollowerFilter, + PostRelatedFilter, ) from f2.apps.douyin.utils import ( SecUserIdFetcher, @@ -1178,6 +1180,110 @@ async def fetch_user_feed_videos( logger.info(_("爬取结束，共爬取 {0} 个首页推荐作品").format(videos_collected)) + @mode_handler("related") + async def handle_post_related(self): + """ + 用于处理相关作品 (Used to process related videos) + + Args: + kwargs: dict: 参数字典 (Parameter dictionary) + """ + + page_counts = self.kwargs.get("page_counts", 20) + max_counts = self.kwargs.get("max_counts") + + aweme_id = await AwemeIdFetcher.get_aweme_id(self.kwargs.get("url")) + aweme_data = await self.fetch_one_video(aweme_id) + + async with AsyncUserDB("douyin_users.db") as udb: + user_path = ( + await self.get_or_add_user_data( + self.kwargs, aweme_data.sec_user_id, udb + ) + / aweme_id + ) + + async for aweme_data_list in self.fetch_post_related_videos( + aweme_id, "", page_counts, max_counts + ): + # 创建下载任务 + await self.downloader.create_download_tasks( + self.kwargs, aweme_data_list._to_list(), user_path + ) + + async def fetch_post_related_videos( + self, + aweme_id: str, + filterGids: str = "", + page_counts: int = 20, + max_counts: int = None, + ) -> AsyncGenerator[PostRelatedFilter, Any]: + """ + 用于获取指定作品的相关推荐作品列表。 + + Args: + aweme_id: str: 作品ID + page_counts: int: 每页作品数 + max_counts: int: 最大作品数 + + Return: + related: AsyncGenerator[PostRelatedFilter, Any]: 相关推荐作品数据过滤器 + ，包含相关作品数据的_to_raw、_to_dict、_to_list方法 + """ + from urllib.parse import quote + + max_counts = max_counts or float("inf") + videos_collected = 0 + # aweme_id,awme_id,aweme_id... + filterGids = filterGids or f"{aweme_id}," + + logger.info(_("开始爬取作品: {0} 的相关推荐").format(aweme_id)) + + while videos_collected < max_counts: + current_request_size = min(page_counts, max_counts - videos_collected) + + logger.debug("===================================") + logger.debug( + _("最大数量: {0} 每次请求数量: {1}").format( + max_counts, current_request_size + ) + ) + logger.info(_("开始爬取前 {0} 个相关推荐").format(current_request_size)) + + async with DouyinCrawler(self.kwargs) as crawler: + params = PostRelated( + count=current_request_size, + aweme_id=aweme_id, + filterGids=quote(filterGids), + ) + response = await crawler.fetch_post_related(params) + related = PostRelatedFilter(response) + yield related + + if not related.has_more: + logger.info(_("作品: {0} 的所有相关推荐采集完毕").format(aweme_id)) + break + + logger.debug(_("当前请求的相关推荐数量: {0}").format(len(related.aweme_id))) + logger.debug( + _("作品ID: {0} 作品文案: {1} 作者: {2}").format( + related.aweme_id, related.desc, related.nickname + ) + ) + logger.debug("===================================") + + # 更新已经处理的作品数量 (Update the number of videos processed) + videos_collected += len(related.aweme_id) + + # 更新过滤的作品ID (Update the filtered video ID) + filterGids = ",".join([str(aweme_id) for aweme_id in related.aweme_id]) + + # 避免请求过于频繁 + logger.info(_("等待 {0} 秒后继续").format(self.kwargs.get("timeout", 5))) + await asyncio.sleep(self.kwargs.get("timeout", 5)) + + logger.info(_("爬取结束，共爬取 {0} 个相关推荐").format(videos_collected)) + async def fetch_user_following( self, user_id: str = "", From ab1a504deea29cb82489a7e0adb046d9451380c7 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Fri, 3 May 2024 23:59:56 +0800 Subject: [PATCH 076/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0douyin?= =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E4=BD=9C=E5=93=81=E8=BF=87=E6=BB=A4=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加status_code和exclude_list --- f2/apps/douyin/filter.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/f2/apps/douyin/filter.py b/f2/apps/douyin/filter.py index 9cdb3f78..5cf1b52c 100644 --- a/f2/apps/douyin/filter.py +++ b/f2/apps/douyin/filter.py @@ -131,6 +131,11 @@ def _to_dict(self) -> dict: class UserPostFilter(JSONModel): + + @property + def status_code(self): + return self._get_attr_value("$.status_code") + @property def has_aweme(self) -> bool: return bool( @@ -317,6 +322,7 @@ def _to_dict(self) -> dict: def _to_list(self): exclude_list = [ + "status_code", "has_more", "max_cursor", "min_cursor", @@ -337,6 +343,7 @@ def _to_list(self): list_dicts = [] for entry in aweme_entries: d = { + "status_code": self.status_code, "has_more": self.has_more, "max_cursor": self.max_cursor, "min_cursor": self.min_cursor, From 6cf9d8e1beab06e922dc9335879255000176d639 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 4 May 2024 00:06:21 +0800 Subject: [PATCH 077/299] =?UTF-8?q?docs:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A8=E8=8D=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 6 +++++- README.md | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.en.md b/README.en.md index 495703c7..dcd3e8ec 100644 --- a/README.en.md +++ b/README.en.md @@ -111,7 +111,7 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores | Collected Short Films | 🟣 | `fetch_user_series_collection` | 🟤 | | Collection Works | ⚫ | `fetch_user_mix_videos` | 🟢 | | Home Page Recommended Works | 🟣⚫ | `fetch_user_feed_videos` | 🟡 | - | Similar Recommended Works | ⚫ | `fetch_related_videos` | 🔵 | + | Similar Recommended Works | ⚫ | `fetch_related_videos` | 🟢 | | Live Room Information (Stream Download) | ⚫ | `fetch_user_live_videos`, `fetch_user_live_videos_by_room_id` | 🟢 | | Live Room Danmaku | ⚫ | `fetch_user_live_danmu` | 🔵 | | Following Users' Live Broadcasts | 🟣⚫ | `fetch_user_following_lives` | 🔵 | @@ -199,6 +199,10 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores + ### DouYin Related Videos + + +

diff --git a/README.md b/README.md index f2cb26cb..9c710251 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,7 @@ |收藏短剧|🟣|`fetch_user_series_collection`|🟤| |合集作品|⚫|`fetch_user_mix_videos`|🟢| |首页推荐作品|🟣⚫|`fetch_user_feed_videos`|🟡| - |相似推荐作品|⚫|`fetch_related_videos`|🔵| + |相似推荐作品|⚫|`fetch_related_videos`|🟢| |直播间信息（流下载）|⚫|`fetch_user_live_videos`、`fetch_user_live_videos_by_room_id`|🟢| |直播间弹幕|⚫|`fetch_user_live_danmu`|🔵| |关注用户开播|🟣⚫|`fetch_user_following_lives`|🔵| @@ -195,6 +195,10 @@ + ### 抖音相关推荐 + + +
From 3a4b12bae81b1a30cc1591a6474228eaef09eb51 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 4 May 2024 00:06:44 +0800 Subject: [PATCH 078/299] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9douyin?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A8=E8=8D=90handler=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/handler.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/f2/apps/douyin/handler.py b/f2/apps/douyin/handler.py index d8196282..7a9e4e9b 100644 --- a/f2/apps/douyin/handler.py +++ b/f2/apps/douyin/handler.py @@ -1181,7 +1181,7 @@ async def fetch_user_feed_videos( logger.info(_("爬取结束，共爬取 {0} 个首页推荐作品").format(videos_collected)) @mode_handler("related") - async def handle_post_related(self): + async def handle_related(self): """ 用于处理相关作品 (Used to process related videos) @@ -1203,7 +1203,7 @@ async def handle_post_related(self): / aweme_id ) - async for aweme_data_list in self.fetch_post_related_videos( + async for aweme_data_list in self.fetch_related_videos( aweme_id, "", page_counts, max_counts ): # 创建下载任务 @@ -1211,7 +1211,7 @@ async def handle_post_related(self): self.kwargs, aweme_data_list._to_list(), user_path ) - async def fetch_post_related_videos( + async def fetch_related_videos( self, aweme_id: str, filterGids: str = "", From 650f1fc2374b93e3706bd9c1877a932be83e72e1 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 4 May 2024 00:24:54 +0800 Subject: [PATCH 079/299] Update CHANGELOG.md --- CHANGELOG.md | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c0cd883..3d5f85fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,61 @@ - `0.0.1.6`版本中添加对`weibo`，`x`的支持 + +## [0.0.1.6] - 2024-05-04 + +### Added + +- 添加`douyin`合集`mix_id`获取方法 +- 添加时间戳转换的默认时区设置（`UTC/GMT+08:00`） +- 添加`ClientConfManager`为每个应用提供方便的配置读取 +- 添加`uniqueId`查询`tiktok`的`user_db` +- 添加获取`segments`的`duration`列表方法 +- 添加应用运行模式的输出 +- 新增`tiktok`作品搜索 +- 新增`tiktok`用户直播 +- 添加反转义`JSON`方法 +- 新增`douyin`相关推荐 + +### Changed + +- 修改`douyin`，`tiktok`获取用户信息方法名 +- 完善时间戳转换类型，支持30位 +- 修改应用的代理配置名（`http: https: -> http://: https://:`） +- 更新`xb`算法示例部分 +- 更新`base_crawler`异常捕获与输出 +- 更新应用初始化配置文件后退出 (#70) +- 更新应用使用`--auto-cookie`命令后退出 +- 更新`douyin`过滤器，将`video_play_addr`返回完整视频列表便于下载失败轮替 +- 更改应用直播下载文件名（`mp4 -> flv`） +- 更新应用工具类网络错误捕获 + +### Deprecated + +- 类`BaseModel`中的`dict`方法已弃用(`pydantic>=2.6.4`) +- 类`datetime`中的`utcnow`方法已弃用 +- 弃用`douyin`，`tiktok`获取用户名方法 + +### Removed + +- 删除`tiktok`基础请求模型的无用参数 +- 删除`f2\utils\utils.py`无效导入 + +### Fixed + +- 修复`douyin`下载合集时合集链接无法识别的情况 +- 修复`tiktok`下载播放列表（合辑）的错误 +- 修复`m3u8`流下载时会重复下载`ts`片段的问题 +- 修复`m3u8`流获取`content_length`时没有提供代理参数造成的访问失败 +- 修复`douyin`，`tiktok`因提前引发异常导致无法生成虚假的msToken + +### Security + +- 更新`pydantic`版本到`2.6.4` +- 更新`httpx`版本到`0.27.0` +- 更新`aiosqlite`版本到`0.20.0` + + ## [0.0.1.5] - 2024-04-04 ### Added From 222bd169f697a976fe78be80e65806de1dbf5bcd Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 4 May 2024 00:33:16 +0800 Subject: [PATCH 080/299] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0=E2=9C=A8=20?= =?UTF-8?q?=E6=96=B0=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 28 +++++++++++++++++++--------- README.md | 28 +++++++++++++++++++--------- 2 files changed, 38 insertions(+), 18 deletions(-) diff --git a/README.en.md b/README.en.md index dcd3e8ec..b3f8d6ac 100644 --- a/README.en.md +++ b/README.en.md @@ -53,15 +53,25 @@ ## ✨ New Changes -When upgrading to version `0.0.1.5` of `F2`, please note the following key updates. - -- `XBogus` parameter in `0.0.1.5` version now supports custom User-Agent (UA), please pay attention to UA specification. -- The rebuilt database contains original data of interfaces, so you need to delete the old database file. If you want to retain records, please pay attention to migration. -- The return types of all `fetch` methods have been unified to filter types, so you need to pay attention to this change. -- Filter has added the `_to_raw` method, which can convert the filter to original interface data. -- The file name template has been updated, and if your file name does not meet the specifications, an exception will be thrown. -- `douyin` collection page links cannot be resolved, see [Douyin Collection Works](#抖音合集作品). -- For more changes, see [ChangeLog](https://github.com/Johnserf-Seed/f2/blob/main/CHANGELOG.md#0015---2024-04-04). +When downloading or upgrading to a different version of `F2`, please note the following critical version updates. + +
+ 📡 v0.0.1.6-pw2 + + - For more changes, see [ChangeLog](https://github.com/Johnserf-Seed/f2/blob/main/CHANGELOG.md#0015---2024-04-04). +
+ +
+ 📡 v0.0.1.5-pw2 + + - `XBogus` parameter in `0.0.1.5` version now supports custom User-Agent (UA), please pay attention to UA specification. + - The rebuilt database contains original data of interfaces, so you need to delete the old database file. If you want to retain records, please pay attention to migration. + - The return types of all `fetch` methods have been unified to filter types, so you need to pay attention to this change. + - Filter has added the `_to_raw` method, which can convert the filter to original interface data. + - The file name template has been updated, and if your file name does not meet the specifications, an exception will be thrown. + - `douyin` collection page links cannot be resolved, see [Douyin Collection Works](#抖音合集作品). + - For more changes, see [ChangeLog](https://github.com/Johnserf-Seed/f2/blob/main/CHANGELOG.md#0015---2024-04-04). +
## 📑 Documentation diff --git a/README.md b/README.md index 9c710251..816c44b6 100644 --- a/README.md +++ b/README.md @@ -54,15 +54,25 @@ ## ✨ 新变化 -当升级到`F2`的`0.0.1.5`版本时，请注意以下关键更新。 - -- `0.0.1.5`的`XBogus`参数支持了自定义UA，请注意UA规范。 -- 重建的数据库包含接口的原始数据，所以你需要删除旧的数据库文件。如果你想保留记录请注意迁移。 -- 所有的`fetch`方法返回的类型已统一为过滤器类型，所以你需要注意这个变化。 -- 过滤器添加了`_to_raw`方法，可以将过滤器转换为原始接口数据。 -- 文件名模板已经更新，如果你的文件名不符合规范，将会抛出异常。 -- `douyin`合集页链接无法解析的查看[抖音合集作品](#抖音合集作品)。 -- 更多变化查看[ChangeLog](https://github.com/Johnserf-Seed/f2/blob/main/CHANGELOG.md#0015---2024-04-04)。 +当下载或升级到`F2`的不同版本时，请注意以下关键的版本更新。 + +
+ 📡 v0.0.1.6-pw2 + + - 更多变化查看[ChangeLog](https://github.com/Johnserf-Seed/f2/blob/main/CHANGELOG.md#0015---2024-04-04)。 +
+ +
+ 📡 v0.0.1.5-pw2 + + - `0.0.1.5`的`XBogus`参数支持了自定义UA，请注意UA规范。 + - 重建的数据库包含接口的原始数据，所以你需要删除旧的数据库文件。如果你想保留记录请注意迁移。 + - 所有的`fetch`方法返回的类型已统一为过滤器类型，所以你需要注意这个变化。 + - 过滤器添加了`_to_raw`方法，可以将过滤器转换为原始接口数据。 + - 文件名模板已经更新，如果你的文件名不符合规范，将会抛出异常。 + - `douyin`合集页链接无法解析的查看[抖音合集作品](#抖音合集作品)。 + - 更多变化查看[ChangeLog](https://github.com/Johnserf-Seed/f2/blob/main/CHANGELOG.md#0015---2024-04-04)。 +
## 📑 文档 From c8e0f39fd95488f57549692fcf644ec52ebc9c9f Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 4 May 2024 00:54:54 +0800 Subject: [PATCH 081/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E6=9C=8B=E5=8F=8B=E4=BD=9C=E5=93=81=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/f2/__init__.py b/f2/__init__.py index 22f2d1d4..40920f7b 100644 --- a/f2/__init__.py +++ b/f2/__init__.py @@ -33,6 +33,7 @@ "mix", "live", "related", + "friend", ] TIKTOK_MODE_LIST = ["one", "post", "like", "collect", "mix", "search", "live"] From f5e90733faad7479808a56598bb0d6d4ca23898a Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 4 May 2024 02:17:28 +0800 Subject: [PATCH 082/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E4=BD=9C=E5=93=81=E6=95=B0=E6=8D=AE=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/filter.py | 278 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 278 insertions(+) diff --git a/f2/apps/douyin/filter.py b/f2/apps/douyin/filter.py index 5cf1b52c..965b874a 100644 --- a/f2/apps/douyin/filter.py +++ b/f2/apps/douyin/filter.py @@ -1670,6 +1670,284 @@ def __init__(self, data): super().__init__(data) +class FriendFeedFilter(JSONModel): + # 8 login_expired + @property + def status_code(self): + return self._get_attr_value("$.status_code") + + @property + def status_msg(self): + return self._get_attr_value("$.status_msg") + + @property + def toast(self): + return self._get_attr_value("$.toast") + + @property + def has_more(self): + return bool(self._get_attr_value("$.has_more")) + + @property + def has_aweme(self): + return bool(self._get_attr_value("$.data")) + + @property + def friend_update_count(self): + return self._get_attr_value("$.friend_update_count") + + @property + def cursor(self): + return self._get_attr_value("$.cursor") + + @property + def level(self): + return self._get_attr_value("$.level") + + @property + def friend_feed_type(self): + return self._get_list_attr_value("$.data[*].feed_type") + + @property + def friend_feed_source(self): + return self._get_list_attr_value("$.data[*].source") + + # user + @property + def avatar_larger(self): + return self._get_list_attr_value( + "$.data[*].aweme.author.avatar_larger.url_list[0]" + ) + + @property + def nickname(self): + return replaceT(self._get_list_attr_value("$.data[*].aweme.author.nickname")) + + @property + def nickname_raw(self): + return self._get_list_attr_value("$.data[*].aweme.author.nickname") + + @property + def sec_uid(self): + return self._get_list_attr_value("$.data[*].aweme.author.sec_uid") + + @property + def uid(self): + return self._get_list_attr_value("$.data[*].aweme.author.uid") + + # aweme + @property + def aweme_id(self): + return self._get_list_attr_value("$.data[*].aweme.aweme_id") + + @property + def aweme_type(self): + return self._get_list_attr_value("$.data[*].aweme.aweme_type") + + @property + def desc(self): + return replaceT(self._get_list_attr_value("$.data[*].aweme.desc")) + + @property + def desc_raw(self): + return self._get_list_attr_value("$.data[*].aweme.desc") + + @property + def recommend_reason(self): + return self._get_list_attr_value( + "$.data[*].aweme.fall_card_struct.recommend_reason" + ) + + @property + def create_time(self): + create_times = self._get_list_attr_value("$.data[*].aweme.create_time") + return ( + [timestamp_2_str(str(ct)) for ct in create_times] + if isinstance(create_times, list) + else timestamp_2_str(str(create_times)) + ) + + @property + def is_24_story(self): # 是否是24小时动态 + return self._get_list_attr_value("$.data[*].aweme.is_24_story") + + @property + def media_type(self): + return self._get_list_attr_value("$.data[*].aweme.media_type") + + @property + def collect_count(self): + return self._get_list_attr_value("$.data[*].aweme.statistics.collect_count") + + @property + def comment_count(self): + return self._get_list_attr_value("$.data[*].aweme.statistics.comment_count") + + @property + def digg_count(self): + return self._get_list_attr_value("$.data[*].aweme.statistics.digg_count") + + @property + def exposure_count(self): + return self._get_list_attr_value("$.data[*].aweme.statistics.exposure_count") + + @property + def live_watch_count(self): + return self._get_list_attr_value("$.data[*].aweme.statistics.live_watch_count") + + @property + def play_count(self): + return self._get_list_attr_value("$.data[*].aweme.statistics.play_count") + + @property + def share_count(self): + return self._get_list_attr_value("$.data[*].aweme.statistics.share_count") + + @property + def allow_share(self): + return self._get_list_attr_value("$.data[*].aweme.status.allow_share") + + @property + def private_status(self): + return self._get_list_attr_value("$.data[*].aweme.status.private_status") + + @property + def is_prohibited(self): + return self._get_list_attr_value("$.data[*].aweme.status.is_prohibited") + + @property + def part_see(self): + return self._get_list_attr_value("$.data[*].aweme.status.part_see") + + # video + @property + def animated_cover(self): + # 获取所有视频 + videos = self._get_list_attr_value("$.data[*].aweme.video") + + # 逐个视频判断是否存在animated_cover + animated_covers = [ + ( + video.get("animated_cover", {}).get("url_list", [None])[0] + if video.get("animated_cover") + else None + ) + for video in videos + ] + + return animated_covers + + @property + def cover(self): + return self._get_list_attr_value("$.data[*].aweme.video.cover.url_list[0]") + + @property + def images(self): + images_list = self._get_list_attr_value("$.data[*].aweme.images") + return [ + ( + [ + img["url_list"][0] + for img in images + if isinstance(img, dict) and "url_list" in img and img["url_list"] + ] + if images + else None + ) + for images in images_list + ] + + @property + def video_play_addr(self): + return self._get_list_attr_value("$.data[*].aweme.video.play_addr.url_list") + + # music + @property + def music_id(self): + return self._get_list_attr_value("$.data[*].aweme.music.id") + + @property + def music_mid(self): + return self._get_list_attr_value("$.data[*].aweme.music.mid") + + @property + def music_duration(self): + return self._get_list_attr_value("$.data[*].aweme.music.duration") + + @property + def music_play_url(self): + return self._get_list_attr_value("$.data[*].aweme.music.play_url.url_list[0]") + + @property + def music_owner_nickname(self): + return replaceT( + self._get_list_attr_value("$.data[*].aweme.music.owner_nickname") + ) + + @property + def music_owner_nickname_raw(self): + return self._get_list_attr_value("$.data[*].aweme.music.owner_nickname") + + @property + def music_sec_uid(self): + return self._get_list_attr_value("$.data[*].aweme.music.sec_uid") + + @property + def music_title(self): + return replaceT(self._get_list_attr_value("$.data[*].aweme.music.title")) + + @property + def music_title_raw(self): + return self._get_list_attr_value("$.data[*].aweme.music.title") + + def _to_raw(self) -> dict: + return self._data + + def _to_dict(self) -> dict: + return { + prop_name: getattr(self, prop_name) + for prop_name in dir(self) + if not prop_name.startswith("__") and not prop_name.startswith("_") + } + + def _to_list(self): + exclude_list = [ + "status_code", + "status_msg", + "has_more", + "has_aweme", + "friend_update_count", + "cursor", + "level", + ] + + keys = [ + prop_name + for prop_name in dir(self) + if not prop_name.startswith("__") + and not prop_name.startswith("_") + and prop_name not in exclude_list + ] + + friend_feed_entries = self._get_attr_value("$.data") or [] + + list_dicts = [] + for entry in friend_feed_entries: + d = { + "has_more": self.has_more, + "has_aweme": self.has_aweme, + "friend_update_count": self.friend_update_count, + "cursor": self.cursor, + "level": self.level, + } + for key in keys: + attr_values = getattr(self, key) + index = friend_feed_entries.index(entry) + d[key] = attr_values[index] if index < len(attr_values) else None + list_dicts.append(d) + return list_dicts + + class GetQrcodeFilter(JSONModel): @property def app_name(self): From 4f4d9a906080af66b0c5c749d572262d0601ed79 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 4 May 2024 02:17:58 +0800 Subject: [PATCH 083/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E4=BD=9C=E5=93=81handler=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/handler.py | 89 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/f2/apps/douyin/handler.py b/f2/apps/douyin/handler.py index 7a9e4e9b..198cba23 100644 --- a/f2/apps/douyin/handler.py +++ b/f2/apps/douyin/handler.py @@ -28,6 +28,7 @@ UserFollowing, UserFollower, PostRelated, + FriendFeed, ) from f2.apps.douyin.filter import ( UserPostFilter, @@ -44,6 +45,7 @@ UserFollowingFilter, UserFollowerFilter, PostRelatedFilter, + FriendFeedFilter, ) from f2.apps.douyin.utils import ( SecUserIdFetcher, @@ -1284,6 +1286,93 @@ async def fetch_related_videos( logger.info(_("爬取结束，共爬取 {0} 个相关推荐").format(videos_collected)) + @mode_handler("friend") + async def handle_friend_feed(self): + """ + 用于处理用户好友作品 (Used to process user friend videos) + + Args: + kwargs: dict: 参数字典 (Parameter dictionary) + """ + + max_counts = self.kwargs.get("max_counts") + sec_user_id = await SecUserIdFetcher.get_sec_user_id(self.kwargs.get("url")) + + async with AsyncUserDB("douyin_users.db") as db: + user_path = await self.get_or_add_user_data(self.kwargs, sec_user_id, db) + + async for aweme_data_list in self.fetch_friend_feed_videos( + max_counts=max_counts + ): + # 创建下载任务 + await self.downloader.create_download_tasks( + self.kwargs, aweme_data_list._to_list(), user_path + ) + + async def fetch_friend_feed_videos( + self, + cursor: int = 0, + level: int = 1, + pull_type: int = 0, + max_counts: int = None, + ) -> AsyncGenerator[FriendFeedFilter, Any]: + """ + 用于获取指定用户好友作品列表。 + + Args: + cursor: int: 起始页 + page_counts: int: 每页作品数 + max_counts: int: 最大作品数 + + Return: + friend: AsyncGenerator[UserFriendFilter, Any]: 好友作品数据过滤器，包含好友作品数据的_to_raw、_to_dict、_to_list方法 + """ + + max_counts = max_counts or float("inf") + videos_collected = 0 + + logger.info(_("开始爬取好友作品")) + + while videos_collected < max_counts: + + logger.debug("===================================") + logger.debug(_("最大数量：{0} 个").format(max_counts)) + logger.info(_("开始爬取第：{0} 页").format(cursor)) + + async with DouyinCrawler(self.kwargs) as crawler: + params = FriendFeed( + cursor=cursor, + level=level, + pull_type=pull_type, + ) + response = await crawler.fetch_friend_feed(params) + friend = FriendFeedFilter(response) + + if not friend.has_more: + logger.info(_("所有好友作品采集完毕")) + break + + logger.debug(_("当前请求的cursor: {0}").format(cursor)) + logger.debug( + _("作品ID: {0} 作品文案: {1} 作者: {2}").format( + friend.aweme_id, friend.desc, friend.nickname + ) + ) + logger.debug("===================================") + + yield friend + + # 更新已经处理的作品数量 (Update the number of videos processed) + videos_collected += len(friend.aweme_id) + cursor = friend.cursor + level = friend.level + + # 避免请求过于频繁 + logger.info(_("等待 {0} 秒后继续").format(self.kwargs.get("timeout", 5))) + await asyncio.sleep(self.kwargs.get("timeout", 5)) + + logger.info(_("爬取结束，共爬取 {0} 个好友作品").format(videos_collected)) + async def fetch_user_following( self, user_id: str = "", From cf2e3c6a1e03cdfbf237cfc81d0d60ea86c77efb Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 4 May 2024 02:18:16 +0800 Subject: [PATCH 084/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0douyin?= =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E4=BD=9C=E5=93=81=E7=88=AC=E8=99=AB=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/crawler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/f2/apps/douyin/crawler.py b/f2/apps/douyin/crawler.py index e71e8355..40cfe02c 100644 --- a/f2/apps/douyin/crawler.py +++ b/f2/apps/douyin/crawler.py @@ -158,7 +158,7 @@ async def fetch_friend_feed(self, params: PostDetail): params.model_dump(), ) logger.debug(_("朋友作品接口地址：{0}").format(endpoint)) - return await self._fetch_get_json(endpoint) + return await self._fetch_post_json(endpoint) async def fetch_post_related(self, params: PostDetail): endpoint = XBogusManager.model_2_endpoint( From cadd51d458a7d8df398809ded473778644d4691b Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 4 May 2024 02:18:40 +0800 Subject: [PATCH 085/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0tiktok?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/__init__.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/f2/__init__.py b/f2/__init__.py index 40920f7b..0c639ae2 100644 --- a/f2/__init__.py +++ b/f2/__init__.py @@ -36,4 +36,12 @@ "friend", ] -TIKTOK_MODE_LIST = ["one", "post", "like", "collect", "mix", "search", "live"] +TIKTOK_MODE_LIST = [ + "one", + "post", + "like", + "collect", + "mix", + "search", + "live", +] From 07a0f5c876073d13c4284ef21157d6047a1bb70b Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 4 May 2024 18:21:12 +0800 Subject: [PATCH 086/299] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96douyin?= =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E4=BD=9C=E5=93=81handler=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/handler.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/f2/apps/douyin/handler.py b/f2/apps/douyin/handler.py index 198cba23..a88abc2b 100644 --- a/f2/apps/douyin/handler.py +++ b/f2/apps/douyin/handler.py @@ -1321,7 +1321,8 @@ async def fetch_friend_feed_videos( Args: cursor: int: 起始页 - page_counts: int: 每页作品数 + level: int: 作品等级 + pull_type: int: 拉取类型 max_counts: int: 最大作品数 Return: @@ -1352,6 +1353,19 @@ async def fetch_friend_feed_videos( logger.info(_("所有好友作品采集完毕")) break + if friend.status_code != 0: + logger.warning( + _("请求失败，错误码：{0} 错误信息：{1}").format( + friend.status_code, friend.status_msg + ) + ) + break + else: + # 因为没有好友作品第一页也会返回has_more为False，所以需要访问下一页判断是否有作品 + if not friend.has_aweme: + logger.info(_("第 {0} 页没有找到作品").format(cursor)) + continue + logger.debug(_("当前请求的cursor: {0}").format(cursor)) logger.debug( _("作品ID: {0} 作品文案: {1} 作者: {2}").format( @@ -1364,8 +1378,11 @@ async def fetch_friend_feed_videos( # 更新已经处理的作品数量 (Update the number of videos processed) videos_collected += len(friend.aweme_id) + # 更新下一页的cursor (Update the cursor of the next page) cursor = friend.cursor + # 更新其他参数 (Update other parameters) level = friend.level + pull_type = friend.level # 避免请求过于频繁 logger.info(_("等待 {0} 秒后继续").format(self.kwargs.get("timeout", 5))) From 2fb748e5bf0805d792b5cd59daf7f729ca93a256 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 4 May 2024 18:26:31 +0800 Subject: [PATCH 087/299] =?UTF-8?q?docs:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E4=BD=9C=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 6 +++++- README.md | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.en.md b/README.en.md index b3f8d6ac..94159204 100644 --- a/README.en.md +++ b/README.en.md @@ -129,7 +129,7 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores | Fan User Information | 🟣⚫ | `fetch_user_follower` | 🟢 | | Following User Works | 🟣⚫ | `fetch_user_following_videos` | 🟤 | | Fan User Works | 🟣⚫ | `fetch_user_follower_videos` | 🟤 | - | Friend's Works | 🟣 | `fetch_user_friend_videos` | 🔵 | + | Friend's Works | 🟣 | `fetch_friend_feed_videos` | 🟢 | | Search Videos | ⚫ | `fetch_search_videos` | 🔵 | | Search Users | ⚫ | `fetch_search_users` | 🔵 | | Search Lives | ⚫ | `fetch_search_lives` | 🔵 | @@ -213,6 +213,10 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores + ### DouYin Friend Videos + + +
diff --git a/README.md b/README.md index 816c44b6..6ffde614 100644 --- a/README.md +++ b/README.md @@ -130,7 +130,7 @@ |粉丝用户信息|🟣⚫|`fetch_user_follower`|🟢| |关注用户作品|🟣⚫|`fetch_user_following_videos`|🟤| |粉丝用户作品|🟣⚫|`fetch_user_follower_videos`|🟤| - |朋友作品|🟣|`fetch_user_friend_videos`|🔵| + |朋友作品|🟣|`fetch_friend_feed_videos`|🟢| |搜索视频|⚫|`fetch_search_videos`|🔵| |搜索用户|⚫|`fetch_search_users`|🔵| |搜索直播|⚫|`fetch_search_lives`|🔵| @@ -209,6 +209,10 @@ + ### 抖音好友作品 + + +
From 30f6d1870383fc4dc014a1700c6834b1f33a3fd7 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 4 May 2024 18:30:52 +0800 Subject: [PATCH 088/299] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d5f85fb..ab8da989 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ - 新增`tiktok`用户直播 - 添加反转义`JSON`方法 - 新增`douyin`相关推荐 +- 新增`douyin`好友作品 ### Changed From a8261b2ecf965db2486f0918ccd1dd935ff02cc8 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 6 May 2024 14:17:04 +0800 Subject: [PATCH 089/299] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9Edouyin?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/api.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/f2/apps/douyin/api.py b/f2/apps/douyin/api.py index b8a30f18..2e59b6c4 100644 --- a/f2/apps/douyin/api.py +++ b/f2/apps/douyin/api.py @@ -128,3 +128,6 @@ class DouyinAPIEndpoints: # 点赞评论 (Like Comment) POST_COMMENT_DIGG = f"{DOUYIN_DOMAIN}/aweme/v1/web/comment/digg" + + # 查询用户 (Query User) + QUERY_USER = f"{DOUYIN_DOMAIN}/aweme/v1/web/query/user/" \ No newline at end of file From 78574964c16479986c33ed0d065fbcd7c6b86f2a Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 6 May 2024 14:20:31 +0800 Subject: [PATCH 090/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E6=8E=A5=E5=8F=A3=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/model.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/f2/apps/douyin/model.py b/f2/apps/douyin/model.py index 35d32d68..948a4f79 100644 --- a/f2/apps/douyin/model.py +++ b/f2/apps/douyin/model.py @@ -270,3 +270,8 @@ class UserFollower(BaseRequestModel): gps_access: int = 0 address_book_access: int = 0 is_top: int = 1 +class QueryUser(BaseRequestModel): + publish_video_strategy_type: int = 2 + update_version_code: str = "170400" + version_code: str = "170400" + version_name: str = "17.4.0" From 39dc4410dfe296a4fb45e274b3c0a0c3bc91a4c4 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 6 May 2024 14:22:07 +0800 Subject: [PATCH 091/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E8=BF=87=E6=BB=A4=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/filter.py | 43 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/f2/apps/douyin/filter.py b/f2/apps/douyin/filter.py index 965b874a..41acadea 100644 --- a/f2/apps/douyin/filter.py +++ b/f2/apps/douyin/filter.py @@ -2054,3 +2054,46 @@ def _to_dict(self) -> dict: for prop_name in dir(self) if not prop_name.startswith("__") and not prop_name.startswith("_") } + +class QueryUserFilter(JSONModel): + @property + def browser_name(self): + return self._get_attr_value("$.browser_name") + + @property + def create_time(self): + return timestamp_2_str(str(self._get_attr_value("$.create_time"))) + + @property + def firebase_instance_id(self): + return self._get_attr_value("$.firebase_instance_id") + + @property + def user_unique_id(self): + return self._get_attr_value("$.id") + + @property + def last_time(self): + return timestamp_2_str(str(self._get_attr_value("$.last_time"))) + + @property + def user_agent(self): + return self._get_attr_value("$.user_agent") + + @property + def user_uid(self): + return self._get_attr_value("$.user_uid") + + @property + def user_uid_type(self): + return self._get_attr_value("$.user_uid_type") + + def _to_raw(self) -> dict: + return self._data + + def _to_dict(self) -> dict: + return { + prop_name: getattr(self, prop_name) + for prop_name in dir(self) + if not prop_name.startswith("__") and not prop_name.startswith("_") + } From b027ccc18a4a1049e2587f07bd3ae2fb2f28fbb0 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 6 May 2024 14:46:31 +0800 Subject: [PATCH 092/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E7=88=AC=E8=99=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/crawler.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/f2/apps/douyin/crawler.py b/f2/apps/douyin/crawler.py index 40cfe02c..4a1bc087 100644 --- a/f2/apps/douyin/crawler.py +++ b/f2/apps/douyin/crawler.py @@ -21,6 +21,7 @@ LoginCheckQr, UserFollowing, UserFollower, + QueryUser, ) from f2.apps.douyin.utils import XBogusManager, ClientConfManager @@ -256,6 +257,15 @@ async def fetch_user_follower(self, params: UserFollower): logger.debug(_("用户粉丝列表接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) + async def fetch_query_user(self, params: QueryUser): + endpoint = XBogusManager.model_2_endpoint( + self.headers.get("User-Agent"), + dyendpoint.QUERY_USER, + params.model_dump(), + ) + logger.debug(_("查询用户接口地址：{0}").format(endpoint)) + return await self._fetch_get_json(endpoint) + async def __aenter__(self): return self From 6b782c966fd57ca5bd06c4ba9b680b7e54d4c6b6 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 6 May 2024 14:47:14 +0800 Subject: [PATCH 093/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7handler=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/handler.py | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/f2/apps/douyin/handler.py b/f2/apps/douyin/handler.py index a88abc2b..a5b1ec8b 100644 --- a/f2/apps/douyin/handler.py +++ b/f2/apps/douyin/handler.py @@ -29,6 +29,7 @@ UserFollower, PostRelated, FriendFeed, + QueryUser, ) from f2.apps.douyin.filter import ( UserPostFilter, @@ -46,6 +47,7 @@ UserFollowerFilter, PostRelatedFilter, FriendFeedFilter, + QueryUserFilter, ) from f2.apps.douyin.utils import ( SecUserIdFetcher, @@ -1556,6 +1558,35 @@ async def fetch_user_follower( logger.info(_("爬取结束，共爬取 {0} 个用户").format(users_collected)) + async def fetch_query_user(self) -> QueryUserFilter: + """ + 用于查询用户信息，仅返回用户的基本信息，若需要获取更多信息请使用`fetch_user_profile`。 + + Return: + user: QueryUserFilter: 用户数据过滤器，包含用户数据的_to_raw、_to_dict、_to_list方法 + """ + + logger.info(_("开始查询用户信息")) + logger.debug("===================================") + + async with DouyinCrawler(self.kwargs) as crawler: + params = QueryUser() + response = await crawler.fetch_query_user(params) + user = QueryUserFilter(response) + + if user.status_code is None: + logger.debug( + _("用户UniqueID：{0} 用户ID：{1} 用户创建时间：{2}").format( + user.user_unique_id, user.user_uid, user.create_time + ) + ) + logger.debug("===================================") + logger.info(_("用户信息查询结束")) + else: + logger.warning(_("请提供正确的ttwid")), + + return user + async def handle_sso_login(): """ From 62680a90c04574520a968e97e9eedbe17ba9adce Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 6 May 2024 14:47:55 +0800 Subject: [PATCH 094/299] =?UTF-8?q?perf:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E7=9A=84=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=BF=87=E6=BB=A4=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/filter.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/f2/apps/douyin/filter.py b/f2/apps/douyin/filter.py index 41acadea..2cf9cf31 100644 --- a/f2/apps/douyin/filter.py +++ b/f2/apps/douyin/filter.py @@ -2056,6 +2056,14 @@ def _to_dict(self) -> dict: } class QueryUserFilter(JSONModel): + @property + def status_code(self): + return self._get_attr_value("$.status_code") + + @property + def status_msg(self): + return self._get_attr_value("$.status_msg") + @property def browser_name(self): return self._get_attr_value("$.browser_name") From d44f71f458a855a5310d69aca8794e889845ffbc Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 6 May 2024 14:49:08 +0800 Subject: [PATCH 095/299] =?UTF-8?q?tests:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E4=BB=A3=E7=A0=81=E7=89=87?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/snippets/douyin/query-user.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 docs/snippets/douyin/query-user.py diff --git a/docs/snippets/douyin/query-user.py b/docs/snippets/douyin/query-user.py new file mode 100644 index 00000000..dc714941 --- /dev/null +++ b/docs/snippets/douyin/query-user.py @@ -0,0 +1,26 @@ +import asyncio +from f2.apps.douyin.handler import DouyinHandler +from f2.apps.douyin.utils import TokenManager + +kwargs = { + "headers": { + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 Edg/122.0.0.0", + "Referer": "https://www.douyin.com/", + }, + "proxies": {"http://": None, "https://": None}, + "timeout": 10, + "cookie": f"ttwid={TokenManager.gen_ttwid()}", +} + + +async def main(): + + user = await DouyinHandler(kwargs).fetch_query_user() + print("=================_to_raw================") + print(user._to_raw()) + # print("=================_to_dict===============") + # print(aweme_data_list._to_dict()) + + +if __name__ == "__main__": + asyncio.run(main()) From 037b5dadf003c775719a3da028564b8c12e1aa05 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 6 May 2024 14:49:38 +0800 Subject: [PATCH 096/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0conf.yaml?= =?UTF-8?q?=E7=9A=84ua=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/conf/conf.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/f2/conf/conf.yaml b/f2/conf/conf.yaml index 121c8366..a15bf046 100644 --- a/f2/conf/conf.yaml +++ b/f2/conf/conf.yaml @@ -2,7 +2,7 @@ f2: douyin: headers: - User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36 + User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 Edg/122.0.0.0 Referer: https://www.douyin.com/ proxies: @@ -15,7 +15,6 @@ f2: version: 1 dataType: 8 strData: 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 - User-Agent: 5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36 Edg/117.0.2045.47 ttwid: url: https://ttwid.bytedance.com/ttwid/union/register/ @@ -24,7 +23,7 @@ f2: tiktok: headers: - User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36 + User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 Edg/122.0.0.0 Referer: https://www.tiktok.com/ proxies: @@ -37,7 +36,6 @@ f2: version: 1 dataType: 8 strData: 3BvqYbNXLLOcZehvxZVbjpAu7vq82RoWmFSJHLFwzDwJIZevE0AeilQfP55LridxmdGGjknoksqIsLqlMHMif0IFK/Br7JWqxOHnYuMwVCnttFc0Y4MFvdVWM5FECiEulJC0Dc+eeVsNSrFnAc9K7fazqdglyJgGLSfXIJmgyCvvQ4pg0u5HBVVugLSWs242X42fjoWymaUCLZJQo6vi6WLyuV7l5IC3Mg+lelr5xBQD6Q7hBIFEw8zzxJ1n2DyA4xLbOHTQdKvEtsK7XzyWwjpRnojPTbBl69Zosnuru+lOBIl+tFu/+hCQ1m0jYZwTP4rVE75L3Du6+KZ5v/9TyFYjq7y3y9bGLP4d7yQueJbF90G1yrZ6htElrZ2vqZKDrIqBVbmOZr/nph12k2JKrITtN0R/pMsp0sJ4gesQnXxcD/pLOFAINHk7umgbe6LzJ7+TLUdGuO4M7xiEg/jCqhjgJX1izZ4NPoBDp35zRxj6Y6OrcstlTN/cv5sz663+Nco/mEwhGq2VwrL4gAIAPycndIsb48dPdtngmLqNDNN0ZyVRjgqVIDXXrxigXCkR9CH89Dlrrb7QQqWVgRXz9/k5ihEM43BR3sd3mMU/XgFLN1Aoxf6GzzdxP2QPBI75/ZoHoAmu54v8gTmA3ntCGlEF0zgaFGTdpkGdb+oZgyQM4pw1aAyxmFINXkpD3IKKoGev9kD9gTFnhiQMGCMemhZS7ZYdbuGu0Cb+lQKaL/QTt80FMyGmW8kzVy9xW/ja9BcdEJYRoaufuFRkBFG5ay8x4WHLR6hEapXqQial/cREbLL4sQytpjtmnndFqvT7xN5DhgsLY2Z7451MJhD6NJXKNrMafGZSbItzQWY= - User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36 ttwid: url: https://www.tiktok.com/ttwid/check/ From d236794447df775a967a95523990fc8da368d27a Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 6 May 2024 14:51:04 +0800 Subject: [PATCH 097/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0douyin?= =?UTF-8?q?=E7=9A=84TokenManager?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 生成的ttwid将绑定ua 2. 为生成ttwid的方法添加代理 --- f2/apps/douyin/utils.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/f2/apps/douyin/utils.py b/f2/apps/douyin/utils.py index 7c8cdf02..91b6c561 100644 --- a/f2/apps/douyin/utils.py +++ b/f2/apps/douyin/utils.py @@ -95,15 +95,15 @@ def gen_real_msToken(cls) -> str: ) headers = { "User-Agent": cls.user_agent, - "Content-Type": "application/json", + "Content-Type": "application/json; charset=utf-8", } transport = httpx.HTTPTransport(retries=5) - with httpx.Client(transport=transport, proxies=cls.proxies) as client: + with httpx.Client( + transport=transport, headers=headers, proxies=cls.proxies + ) as client: try: - response = client.post( - cls.token_conf["url"], content=payload, headers=headers - ) + response = client.post(cls.token_conf["url"], content=payload) response.raise_for_status() msToken = str(httpx.Cookies(response.cookies).get("msToken")) @@ -199,7 +199,13 @@ def gen_ttwid(cls) -> str: """ transport = httpx.HTTPTransport(retries=5) - with httpx.Client(transport=transport) as client: + headers = { + "User-Agent": cls.user_agent, + "Content-Type": "application/json; charset=utf-8", + } + with httpx.Client( + transport=transport, headers=headers, proxies=cls.proxies + ) as client: try: response = client.post( cls.ttwid_conf["url"], content=cls.ttwid_conf["data"] From 615985a557667c3b3e45444a87689570b97f4add Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 6 May 2024 16:35:41 +0800 Subject: [PATCH 098/299] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96self.headers=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/crawler.py | 12 ++---------- f2/apps/tiktok/crawler.py | 10 +--------- f2/dl/base_downloader.py | 9 ++------- 3 files changed, 5 insertions(+), 26 deletions(-) diff --git a/f2/apps/douyin/crawler.py b/f2/apps/douyin/crawler.py index 4a1bc087..d570f35b 100644 --- a/f2/apps/douyin/crawler.py +++ b/f2/apps/douyin/crawler.py @@ -23,7 +23,7 @@ UserFollower, QueryUser, ) -from f2.apps.douyin.utils import XBogusManager, ClientConfManager +from f2.apps.douyin.utils import XBogusManager class DouyinCrawler(BaseCrawler): @@ -33,15 +33,7 @@ def __init__( ): # 需要与cli同步 proxies = kwargs.get("proxies", {"http://": None, "https://": None}) - - self.user_agent = ClientConfManager.user_agent() - self.referrer = ClientConfManager.referer() - self.headers = { - "User-Agent": self.user_agent, - "Referer": self.referrer, - "Cookie": kwargs["cookie"], - } - + self.headers = kwargs.get("headers") | {"Cookie": kwargs["cookie"]} super().__init__(proxies=proxies, crawler_headers=self.headers) async def fetch_user_profile(self, params: UserProfile): diff --git a/f2/apps/tiktok/crawler.py b/f2/apps/tiktok/crawler.py index 812a4fbe..28096783 100644 --- a/f2/apps/tiktok/crawler.py +++ b/f2/apps/tiktok/crawler.py @@ -26,15 +26,7 @@ def __init__( ): # 需要与cli同步 proxies = kwargs.get("proxies", {"http://": None, "https://": None}) - - self.user_agent = ClientConfManager.user_agent() - self.referrer = ClientConfManager.referer() - self.headers = { - "User-Agent": self.user_agent, - "Referer": self.referrer, - "Cookie": kwargs["cookie"], - } - + self.headers = kwargs.get("headers") | {"Cookie": kwargs["cookie"]} super().__init__(proxies=proxies, crawler_headers=self.headers) async def fetch_user_profile(self, params: UserProfile): diff --git a/f2/dl/base_downloader.py b/f2/dl/base_downloader.py index c478c86a..d0d69d95 100644 --- a/f2/dl/base_downloader.py +++ b/f2/dl/base_downloader.py @@ -32,14 +32,9 @@ class BaseDownloader(BaseCrawler): def __init__(self, kwargs: dict = ...): proxies = kwargs.get("proxies", {"http://": None, "https://": None}) - - self.headers = { - "User-Agent": kwargs["headers"]["User-Agent"], - "Referer": kwargs["headers"]["Referer"], - "Cookie": kwargs["cookie"], - } - + self.headers = kwargs.get("headers") | {"Cookie": kwargs["cookie"]} super().__init__(proxies=proxies, crawler_headers=self.headers) + self.progress = RichConsoleManager().progress self.download_tasks = [] From 45d7d9f1797073159d74e3eb8f7a41554ff72175 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 6 May 2024 16:50:46 +0800 Subject: [PATCH 099/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E5=BC=B9=E5=B9=95=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/api.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/f2/apps/douyin/api.py b/f2/apps/douyin/api.py index 2e59b6c4..5ef8b6df 100644 --- a/f2/apps/douyin/api.py +++ b/f2/apps/douyin/api.py @@ -99,6 +99,9 @@ class DouyinAPIEndpoints: # 直播用户信息 (Live User Info) LIVE_USER_INFO = f"{LIVE_DOMAIN}/webcast/user/me/" + # 直播弹幕初始化 (Live Danmaku Init) + LIVE_IM_FETCH = f"{LIVE_DOMAIN}/webcast/im/fetch/" + # 推荐搜索词 (Suggest Words) SUGGEST_WORDS = f"{DOUYIN_DOMAIN}/aweme/v1/web/api/suggest_words/" From 9c6116def3f60c27306cd3f1852baf49d4e5eaaa Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 6 May 2024 16:51:18 +0800 Subject: [PATCH 100/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E5=9F=BA=E7=A1=80=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/model.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/f2/apps/douyin/model.py b/f2/apps/douyin/model.py index 948a4f79..ed443954 100644 --- a/f2/apps/douyin/model.py +++ b/f2/apps/douyin/model.py @@ -80,6 +80,34 @@ class BaseLoginModel(BaseModel): language: str = "zh" +class BaseWebCastModel(BaseModel): + app_name: str = "douyin_web" + version_code: str = "180800" + device_platform: str = "web" + cookie_enabled: str = "true" + screen_width: int = 1920 + screen_height: int = 1080 + browser_language: str = "zh-CN" + browser_platform: str = "Win32" + browser_name: str = "Mozilla" + browser_version: str = quote( + "5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 Edg/122.0.0.0", + safe="", + ) + browser_online: str = "true" + tz_name: str = "Asia/Hong_Kong" + host: str = "https://live.douyin.com" + aid: int = 6383 + live_id: int = 1 + did_rule: int = 3 + endpoint: str = "live_pc" + support_wrds: int = 1 + identity: str = "audience" + need_persist_msg_count: int = 15 + insert_task_id: Any = "" + live_reason: Any = "" + + # Model class UserProfile(BaseRequestModel): sec_user_id: str From f8919c4e556d33bff4b9b9045db9df40519e3267 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 6 May 2024 16:51:50 +0800 Subject: [PATCH 101/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E5=BC=B9=E5=B9=95=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/model.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/f2/apps/douyin/model.py b/f2/apps/douyin/model.py index ed443954..1583e424 100644 --- a/f2/apps/douyin/model.py +++ b/f2/apps/douyin/model.py @@ -298,6 +298,17 @@ class UserFollower(BaseRequestModel): gps_access: int = 0 address_book_access: int = 0 is_top: int = 1 +class LiveImFetch(BaseWebCastModel): + # resp_content_type: str = "protobuf" + resp_content_type: str = "json" + fetch_rule: int = 1 + last_rtt: int = 0 + cursor: str = "" + internal_ext: str = "" + room_id: str + user_unique_id: str + + class QueryUser(BaseRequestModel): publish_video_strategy_type: int = 2 update_version_code: str = "170400" From 9acd25b7c76cfda7cc353035d0608b114243db7f Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 6 May 2024 16:52:17 +0800 Subject: [PATCH 102/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E5=BC=B9=E5=B9=95=E5=88=9D=E5=A7=8B=E5=8C=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/filter.py | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/f2/apps/douyin/filter.py b/f2/apps/douyin/filter.py index 2cf9cf31..87cf903d 100644 --- a/f2/apps/douyin/filter.py +++ b/f2/apps/douyin/filter.py @@ -2055,6 +2055,46 @@ def _to_dict(self) -> dict: if not prop_name.startswith("__") and not prop_name.startswith("_") } +class LiveImFetchFilter(JSONModel): + @property + def status_code(self): + return self._get_attr_value("$.status_code") + + @property + def is_show_msg(self): + return self._get_attr_value("$.data[0].common.is_show_msg") + + @property + def msg_id(self): + return self._get_attr_value("$.data[0].common.msg_id") + + @property + def room_id(self): + return self._get_attr_value("$.data[0].common.room_id") + + @property + def internal_ext(self): + return self._get_attr_value("$.internal_ext") + + @property + def cursor(self): + return self._get_attr_value("$.extra.cursor") + + @property + def now(self): + return timestamp_2_str(str(self._get_attr_value("$.extra.now"))) + + def _to_raw(self) -> dict: + return self._data + + def _to_dict(self) -> dict: + return { + prop_name: getattr(self, prop_name) + for prop_name in dir(self) + if not prop_name.startswith("__") and not prop_name.startswith("_") + } + + class QueryUserFilter(JSONModel): @property def status_code(self): From 0eb6fe915fc93ed43bedbd0626587e0c27ea3cdc Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 6 May 2024 16:52:37 +0800 Subject: [PATCH 103/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E5=BC=B9=E5=B9=95=E5=88=9D=E5=A7=8B=E5=8C=96=E7=88=AC=E8=99=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/crawler.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/f2/apps/douyin/crawler.py b/f2/apps/douyin/crawler.py index d570f35b..c7fd848b 100644 --- a/f2/apps/douyin/crawler.py +++ b/f2/apps/douyin/crawler.py @@ -21,6 +21,7 @@ LoginCheckQr, UserFollowing, UserFollower, + LiveImFetch, QueryUser, ) from f2.apps.douyin.utils import XBogusManager @@ -249,6 +250,15 @@ async def fetch_user_follower(self, params: UserFollower): logger.debug(_("用户粉丝列表接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) + async def fetch_live_im_fetch(self, params: LiveImFetch): + endpoint = XBogusManager.model_2_endpoint( + self.headers.get("User-Agent"), + dyendpoint.LIVE_IM_FETCH, + params.model_dump(), + ) + logger.debug(_("直播弹幕初始化接口地址：{0}").format(endpoint)) + return await self._fetch_get_json(endpoint) + async def fetch_query_user(self, params: QueryUser): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), From 47ba4aeca5c125ab96de33d16bc1fe111716ef45 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 6 May 2024 16:53:11 +0800 Subject: [PATCH 104/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E5=BC=B9=E5=B9=95=E5=88=9D=E5=A7=8B=E5=8C=96handler=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/handler.py | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/f2/apps/douyin/handler.py b/f2/apps/douyin/handler.py index a5b1ec8b..53e65f03 100644 --- a/f2/apps/douyin/handler.py +++ b/f2/apps/douyin/handler.py @@ -29,6 +29,7 @@ UserFollower, PostRelated, FriendFeed, + LiveImFetch, QueryUser, ) from f2.apps.douyin.filter import ( @@ -47,6 +48,7 @@ UserFollowerFilter, PostRelatedFilter, FriendFeedFilter, + LiveImFetchFilter, QueryUserFilter, ) from f2.apps.douyin.utils import ( @@ -1587,6 +1589,40 @@ async def fetch_query_user(self) -> QueryUserFilter: return user + async def fetch_live_im(self, room_id: str, unique_id: str) -> LiveImFetchFilter: + """ + 用于获取直播间信息。 + + Args: + room_id: str: 直播间ID + + Return: + live_im: LiveImFetchFilter: 直播间信息数据过滤器，包含直播间信息的_to_raw、_to_dict、_to_list方法 + """ + + logger.info(_("开始查询直播间信息")) + logger.debug("===================================") + + # user = await self.fetch_query_user() + + async with DouyinCrawler(self.kwargs) as crawler: + params = LiveImFetch(room_id=room_id, user_unique_id=unique_id) + response = await crawler.fetch_live_im_fetch(params) + live_im = LiveImFetchFilter(response) + + if live_im.status_code == 0: + logger.debug( + _("直播间Room_ID：{0} 弹幕cursor：{1}").format( + live_im.room_id, live_im.cursor + ) + ) + logger.debug("===================================") + logger.info(_("直播间信息查询结束")) + else: + logger.warning(_("请提供正确的Room_ID")) + + return live_im + async def handle_sso_login(): """ From 613095e2a42430e41f15e734bb62daf6cd537b70 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 6 May 2024 16:54:00 +0800 Subject: [PATCH 105/299] =?UTF-8?q?style:=20=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/f2/apps/douyin/api.py b/f2/apps/douyin/api.py index 5ef8b6df..908b165a 100644 --- a/f2/apps/douyin/api.py +++ b/f2/apps/douyin/api.py @@ -133,4 +133,4 @@ class DouyinAPIEndpoints: POST_COMMENT_DIGG = f"{DOUYIN_DOMAIN}/aweme/v1/web/comment/digg" # 查询用户 (Query User) - QUERY_USER = f"{DOUYIN_DOMAIN}/aweme/v1/web/query/user/" \ No newline at end of file + QUERY_USER = f"{DOUYIN_DOMAIN}/aweme/v1/web/query/user/" From 61716cee6816b1cb995aed71e57551227bf1ec69 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 12 May 2024 14:35:11 +0800 Subject: [PATCH 106/299] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=5Fdl=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/utils/_dl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/f2/utils/_dl.py b/f2/utils/_dl.py index 3e19d465..3715330f 100644 --- a/f2/utils/_dl.py +++ b/f2/utils/_dl.py @@ -74,7 +74,7 @@ async def get_content_length(url: str, headers: dict = {}, proxies: dict = {}) - ) return 0 except httpx.RequestError as e: - logger.error(f"httpx 请求错误: {0}, 错误详情: {1}".format(url, e)) + logger.error("httpx 请求错误: {0}, 错误详情: {1}".format(url, e)) return 0 except Exception as e: # 处理未知错误 (Handling unknown errors) From 454fe1deb13a9deb7a6a5f36a48eb11993ff3a0d Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 12 May 2024 15:09:11 +0800 Subject: [PATCH 107/299] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9tiktok?= =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=88=B7=E7=9B=AE=E5=BD=95=E4=B8=BA=E5=85=B6?= =?UTF-8?q?uniqueId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/cli.py | 2 +- f2/apps/tiktok/dl.py | 1 + f2/apps/tiktok/handler.py | 6 +++--- f2/apps/tiktok/utils.py | 29 +++++++++++++++-------------- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/f2/apps/tiktok/cli.py b/f2/apps/tiktok/cli.py index c72c8789..dfe580c1 100644 --- a/f2/apps/tiktok/cli.py +++ b/f2/apps/tiktok/cli.py @@ -126,7 +126,7 @@ def handler_naming( return # 允许的模式和分隔符 - ALLOWED_PATTERNS = ["{nickname}", "{create}", "{aweme_id}", "{desc}", "{uid}"] + ALLOWED_PATTERNS = ["{nickname}", "{uniqueId}", "{create}", "{aweme_id}", "{desc}", "{uid}"] ALLOWED_SEPARATORS = ["-", "_"] # 检查命名是否符合命名规范 diff --git a/f2/apps/tiktok/dl.py b/f2/apps/tiktok/dl.py index b133f749..5e3febca 100644 --- a/f2/apps/tiktok/dl.py +++ b/f2/apps/tiktok/dl.py @@ -288,6 +288,7 @@ async def handler_stream( custom_fields = { "create": timestamp_2_str(timestamp=get_timestamp(unit="sec")), "nickname": webcast_data_dict.get("nickname", ""), + "uniqueId": webcast_data_dict.get("uniqueId", ""), "aweme_id": webcast_data_dict.get("live_room_id", ""), "desc": webcast_data_dict.get("live_title", ""), "uid": webcast_data_dict.get("user_id", ""), diff --git a/f2/apps/tiktok/handler.py b/f2/apps/tiktok/handler.py index 5d1c435f..3b9c879a 100644 --- a/f2/apps/tiktok/handler.py +++ b/f2/apps/tiktok/handler.py @@ -77,7 +77,7 @@ async def fetch_user_profile( params = UserProfile(secUid=secUid, uniqueId=uniqueId) response = await crawler.fetch_user_profile(params) user = UserProfileFilter(response) - if user.nickname is None: + if user.uniqueId is None: raise APIResponseError( _("`fetch_user_profile`请求失败，请更换cookie或稍后再试") ) @@ -112,11 +112,11 @@ async def get_or_add_user_data( ) # 获取当前用户最新昵称 - current_nickname = current_user_data._to_dict().get("nickname") + current_uniqueId = current_user_data.uniqueId # 设置用户目录 user_path = create_or_rename_user_folder( - self.kwargs, local_user_data, current_nickname + self.kwargs, local_user_data, current_uniqueId ) # 如果用户不在数据库中，将其添加到数据库 diff --git a/f2/apps/tiktok/utils.py b/f2/apps/tiktok/utils.py index 6cbf7325..3d34a81c 100644 --- a/f2/apps/tiktok/utils.py +++ b/f2/apps/tiktok/utils.py @@ -935,6 +935,7 @@ def format_file_name( fields = { "create": aweme_data.get("createTime", ""), # 长度固定19 "nickname": aweme_data.get("nickname", ""), # 最长30 + "uniqueId": aweme_data.get("uniqueId", ""), "aweme_id": aweme_data.get("aweme_id", ""), # 长度固定19 "desc": split_filename(aweme_data.get("desc", ""), os_limit), "uid": aweme_data.get("uid", ""), # 固定11 @@ -950,14 +951,14 @@ def format_file_name( raise KeyError(_("文件名模板字段 {0} 不存在，请检查").format(e)) -def create_user_folder(kwargs: dict, nickname: Union[str, int]) -> Path: +def create_user_folder(kwargs: dict, uniqueId: Union[str, int]) -> Path: """ - 根据提供的配置文件和昵称，创建对应的保存目录。 - (Create the corresponding save directory according to the provided conf file and nickname.) + 根据提供的配置文件和uniqueId，创建对应的保存目录。 + (Create the corresponding save directory according to the provided conf file and uniqueId.) Args: kwargs (dict): 配置文件，字典格式。(Conf file, dict format) - nickname (Union[str, int]): 用户的昵称，允许字符串或整数。 (User nickname, allow strings or integers) + uniqueId (Union[str, int]): 用户的uniqueId，允许字符串或整数。 (User uniqueId, allow strings or integers) Note: 如果未在配置文件中指定路径，则默认为 "Download"。 @@ -979,7 +980,7 @@ def create_user_folder(kwargs: dict, nickname: Union[str, int]) -> Path: # 添加下载模式和用户名 user_path = ( - base_path / "tiktok" / kwargs.get("mode", "PLEASE_SETUP_MODE") / str(nickname) + base_path / "tiktok" / kwargs.get("mode", "PLEASE_SETUP_MODE") / str(uniqueId) ) # 获取绝对路径并确保它存在 @@ -991,13 +992,13 @@ def create_user_folder(kwargs: dict, nickname: Union[str, int]) -> Path: return resolve_user_path -def rename_user_folder(old_path: Path, new_nickname: str) -> Path: +def rename_user_folder(old_path: Path, new_uniqueId: str) -> Path: """ 重命名用户目录 (Rename User Folder). Args: old_path (Path): 旧的用户目录路径 (Path of the old user folder) - new_nickname (str): 新的用户昵称 (New user nickname) + new_uniqueId (str): 新的用户uniqueId (New user uniqueId) Returns: Path: 重命名后的用户目录路径 (Path of the renamed user folder) @@ -1006,13 +1007,13 @@ def rename_user_folder(old_path: Path, new_nickname: str) -> Path: parent_directory = old_path.parent # 构建新目录路径 (Construct the new directory path) - new_path = old_path.rename(parent_directory / new_nickname).resolve() + new_path = old_path.rename(parent_directory / new_uniqueId).resolve() return new_path def create_or_rename_user_folder( - kwargs: dict, local_user_data: dict, current_nickname: str + kwargs: dict, local_user_data: dict, current_uniqueId: str ) -> Path: """ 创建或重命名用户目录 (Create or rename user directory) @@ -1020,18 +1021,18 @@ def create_or_rename_user_folder( Args: kwargs (dict): 配置参数 (Conf parameters) local_user_data (dict): 本地用户数据 (Local user data) - current_nickname (str): 当前用户昵称 (Current user nickname) + current_uniqueId (str): 当前用户uniqueId (Current user uniqueId) Returns: user_path (Path): 用户目录路径 (User directory path) """ - user_path = create_user_folder(kwargs, current_nickname) + user_path = create_user_folder(kwargs, current_uniqueId) if not local_user_data: return user_path - if local_user_data.get("nickname") != current_nickname: - # 昵称不一致，触发目录更新操作 - user_path = rename_user_folder(user_path, current_nickname) + if local_user_data.get("uniqueId") != current_uniqueId: + # uniqueId不一致，触发目录更新操作 + user_path = rename_user_folder(user_path, current_uniqueId) return user_path From 32e51cfedc960c1243eb24323fb593e0c2650363 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 12 May 2024 15:09:53 +0800 Subject: [PATCH 108/299] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dtiktok?= =?UTF-8?q?=E7=9A=84utils=E8=8E=B7=E5=8F=96TokenManager=20ua=E7=9A=84?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/f2/apps/tiktok/utils.py b/f2/apps/tiktok/utils.py index 3d34a81c..53a9f9af 100644 --- a/f2/apps/tiktok/utils.py +++ b/f2/apps/tiktok/utils.py @@ -95,7 +95,7 @@ def gen_real_msToken(cls) -> str: ) headers = { - "User-Agent": cls.token_conf["User-Agent"], + "User-Agent": ClientConfManager.user_agent(), "Content-Type": "application/json", } From 75fc72a5b33f8a7c128d30c1110ce3eab0fbc46e Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 12 May 2024 17:16:06 +0800 Subject: [PATCH 109/299] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E7=B1=BB=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/exceptions/api_exceptions.py | 7 ++----- f2/exceptions/db_exceptions.py | 7 ++----- f2/exceptions/file_exceptions.py | 7 ++----- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/f2/exceptions/api_exceptions.py b/f2/exceptions/api_exceptions.py index 9241f791..0a3f87c8 100644 --- a/f2/exceptions/api_exceptions.py +++ b/f2/exceptions/api_exceptions.py @@ -1,15 +1,12 @@ # path: f2/exceptions/api_exceptions.py - -from f2.cli.cli_console import RichConsoleManager - -exception_console = RichConsoleManager().exception_console +from f2.log.logger import logger class APIError(Exception): """基本API异常类，其他API异常都会继承这个类""" def __init__(self, message=None, status_code=None): - exception_console.print( + logger.error( "请前往QA文档 https://johnserf-seed.github.io/f2/question-answer/qa.html 查看相关帮助" ) self.status_code = status_code diff --git a/f2/exceptions/db_exceptions.py b/f2/exceptions/db_exceptions.py index 1edb871f..a023a365 100644 --- a/f2/exceptions/db_exceptions.py +++ b/f2/exceptions/db_exceptions.py @@ -1,15 +1,12 @@ # path: f2/exceptions/db_exceptions.py - -from f2.cli.cli_console import RichConsoleManager - -exception_console = RichConsoleManager().exception_console +from f2.log.logger import logger class DatabaseError(Exception): """基本数据库异常类，其他数据库异常都会继承这个类""" def __init__(self, message=None, db=None): - exception_console.print( + logger.error( "请前往QA文档 https://johnserf-seed.github.io/f2/question-answer/qa.html 查看相关帮助" ) self.db = db diff --git a/f2/exceptions/file_exceptions.py b/f2/exceptions/file_exceptions.py index 6edb2b80..5269f216 100644 --- a/f2/exceptions/file_exceptions.py +++ b/f2/exceptions/file_exceptions.py @@ -1,15 +1,12 @@ # path: f2/exceptions/file_exceptions.py - -from f2.cli.cli_console import RichConsoleManager - -exception_console = RichConsoleManager().exception_console +from f2.log.logger import logger class FileError(Exception): """基本的文件错误异常类，其他文件异常都会继承这个类""" def __init__(self, message, filepath=None): - exception_console.print( + logger.error( "请前往QA文档 https://johnserf-seed.github.io/f2/question-answer/qa.html 查看相关帮助" ) self.filepath = filepath From 162568e4812a4ce1591ef2b22e007fa876994db9 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 12 May 2024 21:41:22 +0800 Subject: [PATCH 110/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0douyin?= =?UTF-8?q?=E5=91=BD=E4=BB=A4=E8=A1=8C=E5=8F=82=E6=95=B0=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E5=90=8E=E7=9B=B4=E6=8E=A5return?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/cli.py | 1 + 1 file changed, 1 insertion(+) diff --git a/f2/apps/douyin/cli.py b/f2/apps/douyin/cli.py index 1aee7b63..da0bc6fc 100644 --- a/f2/apps/douyin/cli.py +++ b/f2/apps/douyin/cli.py @@ -410,6 +410,7 @@ def douyin( if update_config: # 如果指定了 update_config，更新配置文件 update_manger = ConfigManager(config) update_manger.update_config_with_args("douyin", **kwargs) + return # 将kwargs["proxies"]中的tuple转换为dict if kwargs.get("proxies"): From 3f619a398f3ea78a08a8ba389962a373abf0c1e1 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 12 May 2024 21:41:41 +0800 Subject: [PATCH 111/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0tiktok?= =?UTF-8?q?=E5=91=BD=E4=BB=A4=E8=A1=8C=E5=8F=82=E6=95=B0=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E5=90=8E=E7=9B=B4=E6=8E=A5return?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/cli.py | 1 + 1 file changed, 1 insertion(+) diff --git a/f2/apps/tiktok/cli.py b/f2/apps/tiktok/cli.py index dfe580c1..9cac7101 100644 --- a/f2/apps/tiktok/cli.py +++ b/f2/apps/tiktok/cli.py @@ -376,6 +376,7 @@ def tiktok( if update_config: # 如果指定了 update_config，更新配置文件 update_manger = ConfigManager(config) update_manger.update_config_with_args("tiktok", **kwargs) + return # 将kwargs["proxies"]中的tuple转换为dict if kwargs.get("proxies"): From e6e6478d720c31678a286d0144e1de8d156aa50d Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 12 May 2024 21:42:38 +0800 Subject: [PATCH 112/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0httpx?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=AE=A2=E6=88=B7=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/crawlers/base_crawler.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/f2/crawlers/base_crawler.py b/f2/crawlers/base_crawler.py index 36f39f06..8511617d 100644 --- a/f2/crawlers/base_crawler.py +++ b/f2/crawlers/base_crawler.py @@ -63,6 +63,16 @@ def __init__( # 异步客户端 / Asynchronous client self.aclient = httpx.AsyncClient( headers=self.crawler_headers, + verify=False, + proxies=self.proxies, + timeout=self.timeout, + limits=self.limits, + transport=self.atransport, + ) + # 同步客户端 / Synchronous client + self.client = httpx.Client( + headers=self.crawler_headers, + verify=False, proxies=self.proxies, timeout=self.timeout, limits=self.limits, From 06666a4796ea8513853b180b898cf8bf88b28fb2 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 12 May 2024 21:43:52 +0800 Subject: [PATCH 113/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0base=5Fdownlo?= =?UTF-8?q?ader=E7=9A=84=E5=8C=BA=E5=9D=97=E4=B8=8B=E8=BD=BD=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 无需传入异步客户端 --- f2/dl/base_downloader.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/f2/dl/base_downloader.py b/f2/dl/base_downloader.py index d0d69d95..115536e3 100644 --- a/f2/dl/base_downloader.py +++ b/f2/dl/base_downloader.py @@ -44,7 +44,6 @@ def _ensure_path(path: Union[str, Path]) -> Path: async def _download_chunks( self, - client: httpx.AsyncClient, request: httpx.Request, file: Any, content_length: int, @@ -54,7 +53,6 @@ async def _download_chunks( 为给定的任务ID下载块 (Download chunks for a given task ID) Args: - client (httpx.AsyncClient): HTTP客户端 (HTTP client) request (httpx.Request): HTTP请求对象 (HTTP request object) file: 文件对象 (File object) content_length (int): 内容长度 (Content length) @@ -62,7 +60,7 @@ async def _download_chunks( """ try: - response = await client.send(request, stream=True) + response = await self.aclient.send(request, stream=True) async for chunk in response.aiter_bytes(get_chunk_size(content_length)): if SignalManager.is_shutdown_signaled(): break @@ -153,7 +151,7 @@ async def download_file( tmp_path, "ab" if start_byte else "wb" ) as file: await self._download_chunks( - self.aclient, range_request, file, content_length, task_id + range_request, file, content_length, task_id ) # 下载完成后重命名文件 (Rename file after download is complete) From 91bc971eccdba25283a9db267af85598861daddb Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 12 May 2024 22:54:25 +0800 Subject: [PATCH 114/299] =?UTF-8?q?style:=20=E4=BF=AE=E6=94=B9=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E7=BA=A7=E5=88=AB=E4=B8=8E=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/cli.py | 9 ++++++++- f2/dl/base_downloader.py | 4 ++-- f2/utils/_dl.py | 6 +++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/f2/apps/tiktok/cli.py b/f2/apps/tiktok/cli.py index 9cac7101..ffae0797 100644 --- a/f2/apps/tiktok/cli.py +++ b/f2/apps/tiktok/cli.py @@ -126,7 +126,14 @@ def handler_naming( return # 允许的模式和分隔符 - ALLOWED_PATTERNS = ["{nickname}", "{uniqueId}", "{create}", "{aweme_id}", "{desc}", "{uid}"] + ALLOWED_PATTERNS = [ + "{nickname}", + "{uniqueId}", + "{create}", + "{aweme_id}", + "{desc}", + "{uid}", + ] ALLOWED_SEPARATORS = ["-", "_"] # 检查命名是否符合命名规范 diff --git a/f2/dl/base_downloader.py b/f2/dl/base_downloader.py index 115536e3..19b06c76 100644 --- a/f2/dl/base_downloader.py +++ b/f2/dl/base_downloader.py @@ -182,7 +182,7 @@ async def download_file( await self.progress.update( task_id, - description=_("[ 完成 ]："), + description=_("[ 完成 ]:"), filename=trim_filename(full_path.name, 45), state="completed", ) @@ -196,7 +196,7 @@ async def download_file( logger.warning("所有链接都无法下载") await self.progress.update( task_id, - description=_("[ 丢失 ]：所有链接都无法下载"), + description=_("[ 丢失 ]："), filename=trim_filename(full_path.name, 45), state="error", ) diff --git a/f2/utils/_dl.py b/f2/utils/_dl.py index 3715330f..626e661f 100644 --- a/f2/utils/_dl.py +++ b/f2/utils/_dl.py @@ -39,9 +39,9 @@ async def get_content_length(url: str, headers: dict = {}, proxies: dict = {}) - except httpx.ConnectTimeout: # 连接超时错误处理 (Handling connection timeout errors) logger.error(_("连接超时错误: {0}".format(url))) - logger.error("===================================") - logger.error(f"headers:{headers}, proxies:{proxies}") - logger.error("===================================") + logger.debug("===================================") + logger.debug(f"headers:{headers}, proxies:{proxies}") + logger.debug("===================================") return 0 # 对HTTP状态错误进行处理 (Handling HTTP status errors) except httpx.HTTPStatusError as exc: From 255b92bfe8e7e9403c37ae9a143c4a2359e3633c Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 20 May 2024 15:31:08 +0800 Subject: [PATCH 115/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E5=AF=B9=E7=9F=AD=E5=89=A7=E4=BD=9C=E5=93=81=E7=9A=84=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E6=94=AF=E6=8C=81=20#91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/dl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/f2/apps/douyin/dl.py b/f2/apps/douyin/dl.py index 22812629..ee88879c 100644 --- a/f2/apps/douyin/dl.py +++ b/f2/apps/douyin/dl.py @@ -237,7 +237,7 @@ async def handler_download( ) # 处理不同类型的作品下载任务 - if aweme_type in [0, 55, 61, 109]: + if aweme_type in [0, 55, 61, 109, 201]: video_name = ( format_file_name( kwargs.get("naming", "{create}_{desc}"), aweme_data_dict From 58581e134709220c453725d13b2ee6005deda340 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 20 May 2024 15:34:32 +0800 Subject: [PATCH 116/299] =?UTF-8?q?perf:=20=E9=87=8D=E6=9E=84tiktok?= =?UTF-8?q?=E7=9A=84TokenManager=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加traceback输出 --- f2/apps/tiktok/utils.py | 396 ++++++++++++++++++++-------------------- 1 file changed, 200 insertions(+), 196 deletions(-) diff --git a/f2/apps/tiktok/utils.py b/f2/apps/tiktok/utils.py index 53a9f9af..2d5b4b6d 100644 --- a/f2/apps/tiktok/utils.py +++ b/f2/apps/tiktok/utils.py @@ -5,6 +5,7 @@ import json import httpx import asyncio +import traceback from typing import Union from pathlib import Path @@ -19,6 +20,7 @@ extract_valid_urls, split_filename, ) +from f2.crawlers.base_crawler import BaseCrawler from f2.exceptions.api_exceptions import ( APIConnectionError, APIResponseError, @@ -70,239 +72,241 @@ def odin_tt(cls) -> str: return cls.client_conf.get("odin_tt", {}) -class TokenManager: +class TokenManager(BaseCrawler): token_conf = ClientConfManager.msToken() ttwid_conf = ClientConfManager.ttwid() odin_tt_conf = ClientConfManager.odin_tt() proxies = ClientConfManager.proxies() + mstoken_headers = { + "Content-Type": "application/json", + "User-Agent": ClientConfManager.user_agent(), + } + ttwid_headers = { + "Cookie": ttwid_conf.get("cookie"), + "Content-Type": "text/plain", + "User-Agent": ClientConfManager.user_agent(), + } - @classmethod - def gen_real_msToken(cls) -> str: + def __init__(self): + super().__init__(proxies=self.proxies) + + def gen_real_msToken(self) -> str: """ 生成真实的msToken,当出现错误时返回虚假的值 (Generate a real msToken and return a false value when an error occurs) """ - payload = json.dumps( - { - "magic": cls.token_conf["magic"], - "version": cls.token_conf["version"], - "dataType": cls.token_conf["dataType"], - "strData": cls.token_conf["strData"], - "tspFromClient": get_timestamp(), - } - ) - - headers = { - "User-Agent": ClientConfManager.user_agent(), - "Content-Type": "application/json", - } - - transport = httpx.HTTPTransport(retries=5) - with httpx.Client(transport=transport, proxies=cls.proxies) as client: - try: - response = client.post( - cls.token_conf["url"], headers=headers, content=payload + try: + payload = json.dumps( + { + "magic": self.token_conf["magic"], + "version": self.token_conf["version"], + "dataType": self.token_conf["dataType"], + "strData": self.token_conf["strData"], + "tspFromClient": get_timestamp(), + } + ) + response = self.client.post( + self.token_conf["url"], + content=payload, + headers=self.mstoken_headers, + ) + response.raise_for_status() + + msToken = str(httpx.Cookies(response.cookies).get("msToken")) + + if len(msToken) not in [148]: + raise APIResponseError(_("{0} 内容不符合要求").format("msToken")) + + logger.debug(_("生成真实的msToken：{0}").format(msToken)) + return msToken + + # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + except httpx.TimeoutException as exc: + logger.error(traceback.format_exc()) + raise APITimeoutError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求端点超时"), + self.token_conf["url"], + ClientConfManager.proxies(), + self.__class__.__name__, + exc, ) - response.raise_for_status() - - msToken = str(httpx.Cookies(response.cookies).get("msToken")) + ) - if len(msToken) not in [148]: - raise APIResponseError(_("{0} 内容不符合要求").format("msToken")) - logger.debug(_("生成真实的msToken")) - return msToken + except httpx.NetworkError as exc: + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("网络连接失败，请检查当前网络环境"), + self.token_conf["url"], + ClientConfManager.proxies(), + self.__class__.__name__, + exc, + ) + ) - # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) - except httpx.TimeoutException as exc: - raise APITimeoutError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求端点超时"), - cls.token_conf["url"], - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + except httpx.ProtocolError as exc: + raise APIUnauthorizedError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求协议错误"), + self.token_conf["url"], + ClientConfManager.proxies(), + self.__name__, + exc, ) + ) - except httpx.NetworkError as exc: - raise APIConnectionError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("网络连接失败，请检查当前网络环境"), - cls.token_conf["url"], - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + except httpx.ProxyError as exc: + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求代理错误"), + self.token_conf["url"], + ClientConfManager.proxies(), + self.__name__, + exc, ) + ) - except httpx.ProtocolError as exc: + except httpx.HTTPStatusError as exc: + # 捕获 httpx 的状态代码错误 (captures specific status code errors from httpx) + logger.error(_("msToken API错误：{0}").format(exc)) + if response.status_code == 401: raise APIUnauthorizedError( _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求协议错误"), - cls.token_conf["url"], - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + "参数验证失败，请更新 F2 配置文件中的 {0}，以匹配 {1} 新规则" + ).format("msToken", "tiktok") ) - except httpx.ProxyError as exc: - raise APIConnectionError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求代理错误"), - cls.token_conf["url"], - ClientConfManager.proxies(), - cls.__name__, - exc, + elif response.status_code == 404: + raise APINotFoundError(_("{0} 无法找到API端点").format("msToken")) + else: + raise APIResponseError( + _("链接：{0}，状态码 {1}：{2} ").format( + exc.response.url, + exc.response.status_code, + exc.response.text, ) ) - except httpx.HTTPStatusError as exc: - # 捕获 httpx 的状态代码错误 (captures specific status code errors from httpx) - logger.error(_("msToken API错误：{0}").format(exc)) - if response.status_code == 401: - raise APIUnauthorizedError( - _( - "参数验证失败，请更新 F2 配置文件中的 {0}，以匹配 {1} 新规则" - ).format("msToken", "tiktok") - ) - - elif response.status_code == 404: - raise APINotFoundError(_("{0} 无法找到API端点").format("msToken")) - else: - raise APIResponseError( - _("链接：{0}，状态码 {1}：{2} ").format( - exc.response.url, - exc.response.status_code, - exc.response.text, - ) - ) - @classmethod def gen_false_msToken(cls) -> str: """生成随机msToken (Generate random msToken)""" - logger.debug(_("生成虚假的msToken")) - return gen_random_str(146) + "==" + false_msToken = gen_random_str(146) + "==" + logger.debug(_("生成虚假的msToken：{0}").format(false_msToken)) + return false_msToken - @classmethod - def gen_ttwid(cls) -> str: + def gen_ttwid(self) -> str: """ 生成请求必带的ttwid (Generate the essential ttwid for requests) """ - transport = httpx.HTTPTransport(retries=5) - with httpx.Client(transport=transport, proxies=cls.proxies) as client: - try: - response = client.post( - cls.ttwid_conf["url"], - content=cls.ttwid_conf["data"], - headers={ - "Cookie": cls.ttwid_conf.get("cookie"), - "Content-Type": "text/plain", - }, - ) - response.raise_for_status() - ttwid = httpx.Cookies(response.cookies).get("ttwid") + try: + response = self.client.post( + self.ttwid_conf["url"], + content=self.ttwid_conf["data"], + headers=self.ttwid_headers, + ) + response.raise_for_status() - if ttwid is None: - raise APIResponseError( - _("ttwid: 检查没有通过, 请更新配置文件中的ttwid") - ) + ttwid = httpx.Cookies(response.cookies).get("ttwid") - return ttwid + if ttwid is None: + raise APIResponseError( + _("ttwid: 检查没有通过, 请更新配置文件中的ttwid") + ) - # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) - except httpx.TimeoutException as exc: - raise APITimeoutError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求端点超时"), - cls.ttwid_conf["url"], - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + logger.debug(_("生成ttwid：{0}").format(str(ttwid))) + return str(ttwid) + + # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + except httpx.TimeoutException as exc: + raise APITimeoutError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求端点超时"), + self.ttwid_conf["url"], + ClientConfManager.proxies(), + self.__class__.__name__, + exc, ) + ) - except httpx.NetworkError as exc: - raise APIConnectionError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("网络连接失败，请检查当前网络环境"), - cls.ttwid_conf["url"], - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + except httpx.NetworkError as exc: + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("网络连接失败，请检查当前网络环境"), + self.ttwid_conf["url"], + ClientConfManager.proxies(), + self.__class__.__name__, + exc, ) + ) - except httpx.ProtocolError as exc: - raise APIUnauthorizedError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求协议错误"), - cls.ttwid_conf["url"], - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + except httpx.ProtocolError as exc: + raise APIUnauthorizedError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求协议错误"), + self.ttwid_conf["url"], + ClientConfManager.proxies(), + self.__class__.__name__, + exc, ) + ) - except httpx.ProxyError as exc: - raise APIConnectionError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求代理错误"), - cls.ttwid_conf["url"], - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + except httpx.ProxyError as exc: + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求代理错误"), + self.ttwid_conf["url"], + ClientConfManager.proxies(), + self.__class__.__name__, + exc, ) + ) - except httpx.HTTPStatusError as exc: - # 捕获 httpx 的状态代码错误 (captures specific status code errors from httpx) - if response.status_code == 401: - raise APIUnauthorizedError( - _( - "参数验证失败，请更新 F2 配置文件中的 {0}，以匹配 {1} 新规则" - ).format("ttwid", "tiktok") - ) + except httpx.HTTPStatusError as exc: + # 捕获 httpx 的状态代码错误 (captures specific status code errors from httpx) + if response.status_code == 401: + raise APIUnauthorizedError( + _( + "参数验证失败，请更新 F2 配置文件中的 {0}，以匹配 {1} 新规则" + ).format("ttwid", "tiktok") + ) - elif response.status_code == 404: - raise APINotFoundError(_("{0} 无法找到API端点").format("ttwid")) - else: - raise APIResponseError( - _("链接：{0}，状态码 {1}：{2} ").format( - exc.response.url, - exc.response.status_code, - exc.response.text, - ) + elif response.status_code == 404: + raise APINotFoundError(_("{0} 无法找到API端点").format("ttwid")) + else: + raise APIResponseError( + _("链接：{0}，状态码 {1}：{2} ").format( + exc.response.url, + exc.response.status_code, + exc.response.text, ) + ) - @classmethod - def gen_odin_tt(cls): + def gen_odin_tt(self): """ 生成请求必带的odin_tt (Generate the essential odin_tt for requests) """ - transport = httpx.HTTPTransport(retries=5) - with httpx.Client(transport=transport, proxies=cls.proxies) as client: - try: - response = client.get(cls.odin_tt_conf["url"]) + + try: + response = self.client.get(self.odin_tt_conf["url"]) response.raise_for_status() odin_tt = httpx.Cookies(response.cookies).get("odin_tt") @@ -313,59 +317,59 @@ def gen_odin_tt(cls): return odin_tt # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) - except httpx.TimeoutException as exc: + except httpx.TimeoutException as exc: raise APITimeoutError( _( "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" ).format( _("请求端点超时"), - cls.odin_tt_conf["url"], + self.odin_tt_conf["url"], ClientConfManager.proxies(), - cls.__name__, + self.__class__.__name__, exc, ) ) - except httpx.NetworkError as exc: + except httpx.NetworkError as exc: raise APIConnectionError( _( "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" ).format( _("网络连接失败，请检查当前网络环境"), - cls.odin_tt_conf["url"], + self.odin_tt_conf["url"], ClientConfManager.proxies(), - cls.__name__, + self.__class__.__name__, exc, ) ) - except httpx.ProtocolError as exc: + except httpx.ProtocolError as exc: raise APIUnauthorizedError( _( "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" ).format( _("请求协议错误"), - cls.odin_tt_conf["url"], + self.odin_tt_conf["url"], ClientConfManager.proxies(), - cls.__name__, + self.__class__.__name__, exc, ) ) - except httpx.ProxyError as exc: + except httpx.ProxyError as exc: raise APIConnectionError( _( "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" ).format( _("请求代理错误"), - cls.odin_tt_conf["url"], + self.odin_tt_conf["url"], ClientConfManager.proxies(), - cls.__name__, + self.__class__.__name__, exc, ) ) - except httpx.HTTPStatusError as exc: + except httpx.HTTPStatusError as exc: # 捕获 httpx 的状态代码错误 (captures specific status code errors from httpx) if response.status_code == 401: raise APIUnauthorizedError( From 47e15f96f8f6d7b6152c565066e65025fc0dd96c Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 20 May 2024 16:09:29 +0800 Subject: [PATCH 117/299] =?UTF-8?q?tests:=20=E6=A0=BC=E5=BC=8F=E5=8C=96tik?= =?UTF-8?q?tok=E4=BB=A3=E7=A0=81=E7=89=87=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/snippets/tiktok/sec-uid.py | 4 ++++ docs/snippets/tiktok/unique-id.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/docs/snippets/tiktok/sec-uid.py b/docs/snippets/tiktok/sec-uid.py index 953cf512..b9586c71 100644 --- a/docs/snippets/tiktok/sec-uid.py +++ b/docs/snippets/tiktok/sec-uid.py @@ -2,11 +2,13 @@ import asyncio from f2.apps.tiktok.utils import SecUserIdFetcher + async def main(): raw_url = "https://www.tiktok.com/@vantoan___" # 对于单个URL return await SecUserIdFetcher.get_secuid(raw_url) + if __name__ == "__main__": print(asyncio.run(main())) @@ -18,6 +20,7 @@ async def main(): from f2.apps.tiktok.utils import SecUserIdFetcher from f2.utils.utils import extract_valid_urls + async def main(): raw_urls = [ "https://www.tiktok.com/@vantoan___/", @@ -31,6 +34,7 @@ async def main(): # 对于URL列表 return await SecUserIdFetcher.get_all_secuid(urls) + if __name__ == "__main__": print(asyncio.run(main())) diff --git a/docs/snippets/tiktok/unique-id.py b/docs/snippets/tiktok/unique-id.py index db38226b..e859b597 100644 --- a/docs/snippets/tiktok/unique-id.py +++ b/docs/snippets/tiktok/unique-id.py @@ -2,11 +2,13 @@ import asyncio from f2.apps.tiktok.utils import SecUserIdFetcher + async def main(): raw_url = "https://www.tiktok.com/@vantoan___" # 对于单个URL return await SecUserIdFetcher.get_uniqueid(raw_url) + if __name__ == "__main__": print(asyncio.run(main())) @@ -18,6 +20,7 @@ async def main(): from f2.apps.tiktok.utils import SecUserIdFetcher from f2.utils.utils import extract_valid_urls + async def main(): raw_urls = [ "https://www.tiktok.com/@vantoan___/", @@ -31,6 +34,7 @@ async def main(): # 对于URL列表 return await SecUserIdFetcher.get_all_uniqueid(urls) + if __name__ == "__main__": print(asyncio.run(main())) From 7c6976eac3c41d83c4b32a56e4508cc4dbcfe029 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 20 May 2024 16:11:51 +0800 Subject: [PATCH 118/299] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84tiktok?= =?UTF-8?q?=E7=9A=84SecUserIdFetcher=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 添加了类注释 2. 继承了BaseCrawler 3. 优化了代码 --- f2/apps/tiktok/utils.py | 448 +++++++++++++++++++++------------------- 1 file changed, 241 insertions(+), 207 deletions(-) diff --git a/f2/apps/tiktok/utils.py b/f2/apps/tiktok/utils.py index 2d5b4b6d..5c6fa176 100644 --- a/f2/apps/tiktok/utils.py +++ b/f2/apps/tiktok/utils.py @@ -430,164 +430,192 @@ def model_2_endpoint( return final_endpoint -class SecUserIdFetcher: - # 预编译正则表达式 +class SecUserIdFetcher(BaseCrawler): + """ + SecUserIdFetcher 类用于从 TikTok 用户主页链接中提取用户的 sec_uid 和 unique_id。 + + 该类继承自 BaseCrawler，利用其中的 aclient 进行 HTTP 请求。主要包含四个方法： + - get_secuid: 异步类方法，用于获取单个 TikTok 用户的 sec_uid。 + - get_all_secuid: 异步类方法，用于获取多个 TikTok 用户的 sec_uid 列表。 + - get_uniqueid: 异步类方法，用于获取单个 TikTok 用户的 unique_id。 + - get_all_uniqueid: 异步类方法，用于获取多个 TikTok 用户的 unique_id 列表。 + + 类属性: + - _TIKTOK_SECUID_PARREN: 编译后的正则表达式，用于匹配 sec_uid。 + - _TIKTOK_UNIQUEID_PARREN: 编译后的正则表达式，用于匹配 unique_id。 + - _TIKTOK_NOTFOUND_PARREN: 编译后的正则表达式，用于检查页面是否不存在。 + - proxies: 从 ClientConfManager 获取的代理配置。 + + 方法: + - __init__: 初始化 SecUserIdFetcher 实例，并调用父类的初始化方法。 + - get_secuid: 异步类方法，接受一个用户主页链接，返回对应用户的 sec_uid。 + - get_all_secuid: 异步类方法，接受一个用户主页链接列表，返回对应用户的 sec_uid 列表。 + - get_uniqueid: 异步类方法，接受一个用户主页链接，返回对应用户的 unique_id。 + - get_all_uniqueid: 异步类方法，接受一个用户主页链接列表，返回对应用户的 unique_id 列表。 + + 异常处理: + - 在 HTTP 请求过程中，处理可能出现的 TimeoutException、NetworkError、ProtocolError、ProxyError 和 HTTPStatusError 异常，并记录相应的错误信息。 + + 使用示例: + # 获取单个用户的 sec_uid + url = "https://www.tiktok.com/@someuser" + sec_uid = await SecUserIdFetcher.get_secuid(url) + + # 获取多个用户的 sec_uid 列表 + urls = [ + "https://www.tiktok.com/@user1", + "https://www.tiktok.com/@user2", + "https://www.tiktok.com/@user3" + ] + sec_uids = await SecUserIdFetcher.get_all_secuid(urls) + + # 获取单个用户的 unique_id + unique_id = await SecUserIdFetcher.get_uniqueid(url) + + # 获取多个用户的 unique_id 列表 + unique_ids = await SecUserIdFetcher.get_all_uniqueid(urls) + """ + _TIKTOK_SECUID_PARREN = re.compile( r"" ) _TIKTOK_UNIQUEID_PARREN = re.compile(r"/@([^/?]*)") _TIKTOK_NOTFOUND_PARREN = re.compile(r"notfound") + proxies = ClientConfManager.proxies() + + def __init__(self): + super().__init__(proxies=self.proxies) + @classmethod async def get_secuid(cls, url: str) -> str: """ - 获取TikTok用户sec_uid + 获取TikTok用户sec_uid。 + Args: url: 用户主页链接 - Return: + + Returns: sec_uid: 用户唯一标识 + + Raises: + TypeError: 如果输入的 URL 不是字符串。 + APINotFoundError: 如果输入的 URL 不合法或页面不可用。 + APIResponseError: 如果在响应中未找到 sec_uid。 + ConnectionError: 如果接口状态码异常。 + APITimeoutError: 如果请求端点超时。 + APIConnectionError: 如果网络连接失败。 + APIUnauthorizedError: 如果请求协议错误。 """ - # 进行参数检查 if not isinstance(url, str): raise TypeError("输入参数必须是字符串") - # 提取有效URL url = extract_valid_urls(url) if url is None: - raise ( - APINotFoundError(_("输入的URL不合法。类名：{0}").format(cls.__name__)) - ) + raise APINotFoundError("输入的URL不合法。类名：{0}".format(cls.__name__)) - transport = httpx.AsyncHTTPTransport(retries=5) - async with httpx.AsyncClient( - transport=transport, proxies=ClientConfManager.proxies(), timeout=10 - ) as client: - try: - response = await client.get(url, follow_redirects=True) - # 444一般为Nginx拦截，不返回状态 (444 is generally intercepted by Nginx and does not return status) - if response.status_code in {200, 444}: - if cls._TIKTOK_NOTFOUND_PARREN.search(str(response.url)): - raise APINotFoundError( - _( - "页面不可用，可能是由于区域限制（代理）造成的。类名: {0}" - ).format(cls.__name__) - ) + # 创建一个实例以访问 aclient + instance = cls() - match = cls._TIKTOK_SECUID_PARREN.search(str(response.text)) - if not match: - raise APIResponseError( - _( - "未在响应中找到 {0}，检查链接是否为用户主页。类名: {1}" - ).format("sec_uid", cls.__name__) - ) + try: + response = await instance.aclient.get(url, follow_redirects=True) + if response.status_code in {200, 444}: + if cls._TIKTOK_NOTFOUND_PARREN.search(str(response.url)): + raise APINotFoundError( + "页面不可用，可能是由于区域限制（代理）造成的。" + ) - # 提取SIGI_STATE对象中的sec_uid - data = json.loads(match.group(1)) - default_scope = data.get("__DEFAULT_SCOPE__", {}) - user_detail = default_scope.get("webapp.user-detail", {}) - user_info = user_detail.get("userInfo", {}).get("user", {}) - sec_uid = user_info.get("secUid") + match = cls._TIKTOK_SECUID_PARREN.search(str(response.text)) + if not match: + raise APIResponseError( + _( + "未在响应中找到 {0}，检查链接是否为用户主页。类名：{1}" + ).format("sec_uid", cls.__name__) + ) - if sec_uid is None: - raise RuntimeError( - _("获取 {0} 失败，{1}").format(sec_uid, user_info) - ) + data = json.loads(match.group(1)) + default_scope = data.get("__DEFAULT_SCOPE__", {}) + user_detail = default_scope.get("webapp.user-detail", {}) + user_info = user_detail.get("userInfo", {}).get("user", {}) + sec_uid = user_info.get("secUid") - return sec_uid - else: - raise ConnectionError(_("接口状态码异常, 请检查重试")) + if sec_uid is None: + raise RuntimeError(_("获取 {0} 失败").format("sec_uid")) - # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) - except httpx.TimeoutException as exc: - raise APITimeoutError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求端点超时"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + return sec_uid + else: + raise ConnectionError("接口状态码异常，请检查重试") + + except httpx.TimeoutException as exc: + logger.error(traceback.format_exc()) + raise APITimeoutError( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}".format( + "请求端点超时", url, cls.proxies, cls.__name__, exc ) + ) - except httpx.NetworkError as exc: - raise APIConnectionError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("网络连接失败，请检查当前网络环境"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + except httpx.NetworkError as exc: + logger.error(traceback.format_exc()) + raise APIConnectionError( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}".format( + "网络连接失败，请检查当前网络环境", + url, + cls.proxies, + cls.__name__, + exc, ) + ) - except httpx.ProtocolError as exc: - raise APIUnauthorizedError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求协议错误"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + except httpx.ProtocolError as exc: + logger.error(traceback.format_exc()) + raise APIUnauthorizedError( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}".format( + "请求协议错误", url, cls.proxies, cls.__name__, exc ) + ) - except httpx.ProxyError as exc: - raise APIConnectionError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求代理错误"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + except httpx.ProxyError as exc: + logger.error(traceback.format_exc()) + raise APIConnectionError( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}".format( + "请求代理错误", url, cls.proxies, cls.__name__, exc ) + ) - except httpx.HTTPStatusError as exc: - raise APIResponseError( - _( - "{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("状态码错误"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + except httpx.HTTPStatusError as exc: + logger.error(traceback.format_exc()) + raise APIResponseError( + "{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}".format( + "状态码错误", url, cls.proxies, cls.__name__, exc ) + ) @classmethod async def get_all_secuid(cls, urls: list) -> list: """ - 获取列表secuid列表 (Get list sec_user_id list) + 获取多个TikTok用户的sec_uid。 Args: - urls: list: 用户url列表 (User url list) + urls: 用户主页链接列表 - Return: - secuids: list: 用户secuid列表 (User secuid list) + Returns: + secuids: 用户sec_uid列表 + + Raises: + TypeError: 如果输入的 URL 列表不是列表类型。 + APINotFoundError: 如果输入的 URL 列表不合法。 """ if not isinstance(urls, list): - raise TypeError(_("参数必须是列表类型")) + raise TypeError("参数必须是列表类型") - # 提取有效URL urls = extract_valid_urls(urls) if urls == []: - raise ( - APINotFoundError( - _("输入的URL List不合法。类名：{0}").format(cls.__name__) - ) + raise APINotFoundError( + "输入的URL List不合法。类名：{0}".format(cls.__name__) ) secuids = [cls.get_secuid(url) for url in urls] @@ -596,145 +624,151 @@ async def get_all_secuid(cls, urls: list) -> list: @classmethod async def get_uniqueid(cls, url: str) -> str: """ - 获取TikTok用户unique_id + 获取TikTok用户unique_id。 + Args: url: 用户主页链接 - Return: - unique_id: 用户唯一id + + Returns: + unique_id: 用户唯一标识 + + Raises: + TypeError: 如果输入的 URL 不是字符串。 + APINotFoundError: 如果输入的 URL 不合法或页面不可用。 + APIResponseError: 如果在响应中未找到 unique_id。 + ConnectionError: 如果接口状态码异常。 + APITimeoutError: 如果请求端点超时。 + APIConnectionError: 如果网络连接失败。 + APIUnauthorizedError: 如果请求协议错误。 """ - # 进行参数检查 if not isinstance(url, str): raise TypeError("输入参数必须是字符串") - # 提取有效URL url = extract_valid_urls(url) if url is None: - raise ( - APINotFoundError(_("输入的URL不合法。类名：{0}").format(cls.__name__)) - ) + raise APINotFoundError(_("输入的URL不合法。类名：{0}").format(cls.__name__)) - transport = httpx.AsyncHTTPTransport(retries=5) - async with httpx.AsyncClient( - transport=transport, proxies=ClientConfManager.proxies(), timeout=10 - ) as client: - try: - response = await client.get(url, follow_redirects=True) - if response.status_code in {200, 444}: - if cls._TIKTOK_NOTFOUND_PARREN.search(str(response.url)): - raise APINotFoundError( - _( - "页面不可用，可能是由于区域限制（代理）造成的。类名: {0}" - ).format(cls.__name__) - ) + # 创建一个实例以访问 aclient + instance = cls() - match = cls._TIKTOK_UNIQUEID_PARREN.search(str(response.url)) - if not match: - raise APIResponseError( - _("未在响应中找到 {0}").format("unique_id") - ) + try: + response = await instance.aclient.get(url, follow_redirects=True) + if response.status_code in {200, 444}: + if cls._TIKTOK_NOTFOUND_PARREN.search(str(response.url)): + raise APINotFoundError( + "页面不可用，可能是由于区域限制（代理）造成的。" + ) - unique_id = match.group(1) + match = cls._TIKTOK_UNIQUEID_PARREN.search(str(response.url)) + if not match: + raise APIResponseError(_("未在响应中找到 {0}").format("unique_id")) - if unique_id is None: - raise RuntimeError( - _("获取 {0} 失败，{1}").format("unique_id", response.url) - ) + unique_id = match.group(1) - return unique_id + if unique_id is None: + raise RuntimeError( + _("获取 {0} 失败，{1}").format("unique_id", response.url) + ) - response.raise_for_status() + return unique_id - # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) - except httpx.TimeoutException as exc: - raise APITimeoutError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求端点超时"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + else: + raise ConnectionError("接口状态码异常，请检查重试") + + except httpx.TimeoutException as exc: + logger.error(traceback.format_exc()) + raise APITimeoutError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + "请求端点超时", + url, + cls.proxies, + cls.__name__, + exc, ) + ) - except httpx.NetworkError as exc: - raise APIConnectionError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("网络连接失败，请检查当前网络环境"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + except httpx.NetworkError as exc: + logger.error(traceback.format_exc()) + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + "网络连接失败，请检查当前网络环境", + url, + cls.proxies, + cls.__name__, + exc, ) + ) - except httpx.ProtocolError as exc: - raise APIUnauthorizedError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求协议错误"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + except httpx.ProtocolError as exc: + logger.error(traceback.format_exc()) + raise APIUnauthorizedError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + "请求协议错误", + url, + cls.proxies, + cls.__name__, + exc, ) + ) - except httpx.ProxyError as exc: - raise APIConnectionError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求代理错误"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + except httpx.ProxyError as exc: + logger.error(traceback.format_exc()) + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + "请求代理错误", + url, + cls.proxies, + cls.__name__, + exc, ) + ) - except httpx.HTTPStatusError as exc: - raise APIResponseError( - _( - "{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("状态码错误"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + except httpx.HTTPStatusError as exc: + logger.error(traceback.format_exc()) + raise APIResponseError( + _("{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}").format( + "状态码错误", + url, + cls.proxies, + cls.__name__, + exc, ) + ) @classmethod async def get_all_uniqueid(cls, urls: list) -> list: """ - 获取列表unique_id列表 (Get list sec_user_id list) + 获取多个TikTok用户的unique_id。 Args: - urls: list: 用户url列表 (User url list) + urls: 用户主页链接列表 - Return: - unique_ids: list: 用户unique_id列表 (User unique_id list) + Returns: + unique_ids: 用户unique_id列表 + + Raises: + TypeError: 如果输入的 URL 列表不是列表类型。 + APINotFoundError: 如果输入的 URL 列表不合法。 """ if not isinstance(urls, list): raise TypeError(_("参数必须是列表类型")) - # 提取有效URL urls = extract_valid_urls(urls) if urls == []: - raise ( - APINotFoundError( - _("输入的URL List不合法。类名：{0}").format(cls.__name__) - ) + raise APINotFoundError( + _("输入的URL List不合法。类名：{0}").format(cls.__name__) ) unique_ids = [cls.get_uniqueid(url) for url in urls] From 1ff7b80012fec04fc870801b4ad69d0569fefc83 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 20 May 2024 16:23:21 +0800 Subject: [PATCH 119/299] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84tiktok?= =?UTF-8?q?=E7=9A=84AwemeIdFetcher=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 添加了类注释 2. 继承了BaseCrawler 3. 优化了代码 --- docs/snippets/tiktok/aweme-id.py | 9 +- f2/apps/tiktok/utils.py | 250 ++++++++++++++++++------------- 2 files changed, 153 insertions(+), 106 deletions(-) diff --git a/docs/snippets/tiktok/aweme-id.py b/docs/snippets/tiktok/aweme-id.py index 489b5e0b..94e1d838 100644 --- a/docs/snippets/tiktok/aweme-id.py +++ b/docs/snippets/tiktok/aweme-id.py @@ -2,11 +2,13 @@ import asyncio from f2.apps.tiktok.utils import AwemeIdFetcher + async def main(): raw_url = "https://www.tiktok.com/@vantoan___/video/7283528426256911649" - # 对于单个URL + # 支持短链解析但其具有时效性，故不举例 return await AwemeIdFetcher.get_aweme_id(raw_url) + if __name__ == "__main__": print(asyncio.run(main())) @@ -18,12 +20,12 @@ async def main(): from f2.apps.tiktok.utils import AwemeIdFetcher from f2.utils.utils import extract_valid_urls + async def main(): raw_urls = [ "https://www.tiktok.com/@vantoan___/video/7316948869764484384", "https://www.tiktok.com/@vantoan___/video/7316948869764484384?is_from_webapp=1&sender_device=pc&web_id=7306060721837852167", - # "https://vt.tiktok.com/xxxxxxxxxx/", - "https://www.tiktok.com/t/ZT8mxMcYh/" + # 支持短链解析但其具有时效性，故不举例 ] # 提取有效URL @@ -32,6 +34,7 @@ async def main(): # 对于URL列表 return await AwemeIdFetcher.get_all_aweme_id(urls) + if __name__ == "__main__": print(asyncio.run(main())) diff --git a/f2/apps/tiktok/utils.py b/f2/apps/tiktok/utils.py index 5c6fa176..e7637f4e 100644 --- a/f2/apps/tiktok/utils.py +++ b/f2/apps/tiktok/utils.py @@ -775,159 +775,203 @@ async def get_all_uniqueid(cls, urls: list) -> list: return await asyncio.gather(*unique_ids) -class AwemeIdFetcher: - # https://www.tiktok.com/@scarlettjonesuk/video/7255716763118226715 - # https://www.tiktok.com/@scarlettjonesuk/video/7255716763118226715?is_from_webapp=1&sender_device=pc&web_id=7306060721837852167 +class AwemeIdFetcher(BaseCrawler): + """ + AwemeIdFetcher 类用于从 TikTok 视频链接中提取视频的 aweme_id。 + + 该类继承自 BaseCrawler，利用其中的 aclient 进行 HTTP 请求。主要包含两个方法： + - get_aweme_id: 异步类方法，用于获取单个 TikTok 视频的 aweme_id。 + - get_all_aweme_id: 异步类方法，用于获取多个 TikTok 视频的 aweme_id 列表。 + + 类属性: + - _TIKTOK_AWEMEID_PARREN: 编译后的正则表达式，用于匹配 aweme_id。 + - _TIKTOK_NOTFOUND_PARREN: 编译后的正则表达式，用于检查页面是否不存在。 + - proxies: 从 ClientConfManager 获取的代理配置。 + + 方法: + - __init__: 初始化 AwemeIdFetcher 实例，并调用父类的初始化方法。 + - get_aweme_id: 异步类方法，接受一个视频链接，返回对应视频的 aweme_id。 + - get_all_aweme_id: 异步类方法，接受一个视频链接列表，返回对应视频的 aweme_id 列表。 + + 异常处理: + - 在 HTTP 请求过程中，处理可能出现的 TimeoutException、NetworkError、ProtocolError、ProxyError 和 HTTPStatusError 异常，并记录相应的错误信息。 + + 使用示例: + # 获取单个视频的 aweme_id + url = "https://www.tiktok.com/@scarlettjonesuk/video/7255716763118226715" + aweme_id = await AwemeIdFetcher.get_aweme_id(url) + + # 获取多个视频的 aweme_id 列表 + urls = [ + "https://www.tiktok.com/@scarlettjonesuk/video/7255716763118226715", + "https://www.tiktok.com/@scarlettjonesuk/video/7255716763118226715?is_from_webapp=1&sender_device=pc&web_id=7306060721837852167" + ] + aweme_ids = await AwemeIdFetcher.get_all_aweme_id(urls) + """ - # 预编译正则表达式 _TIKTOK_AWEMEID_PARREN = re.compile(r"video/(\d*)") _TIKTOK_NOTFOUND_PARREN = re.compile(r"notfound") + proxies = ClientConfManager.proxies() + + def __init__(self): + super().__init__(proxies=self.proxies) + @classmethod async def get_aweme_id(cls, url: str) -> str: """ - 获取TikTok作品aweme_id + 获取TikTok作品aweme_id。 + Args: url: 作品链接 - Return: + + Returns: aweme_id: 作品唯一标识 + + Raises: + TypeError: 如果输入的 URL 不是字符串。 + APINotFoundError: 如果输入的 URL 不合法或页面不可用。 + APIResponseError: 如果在响应中未找到 aweme_id。 + ConnectionError: 如果接口状态码异常。 + APITimeoutError: 如果请求端点超时。 + APIConnectionError: 如果网络连接失败。 + APIUnauthorizedError: 如果请求协议错误。 """ - # 进行参数检查 if not isinstance(url, str): raise TypeError("输入参数必须是字符串") - # 提取有效URL url = extract_valid_urls(url) if url is None: - raise ( - APINotFoundError(_("输入的URL不合法。类名：{0}").format(cls.__name__)) - ) + raise APINotFoundError(_("输入的URL不合法。类名：{0}").format(cls.__name__)) - transport = httpx.AsyncHTTPTransport(retries=5) - async with httpx.AsyncClient( - transport=transport, proxies=ClientConfManager.proxies(), timeout=10 - ) as client: - try: - response = await client.get(url, follow_redirects=True) - - if response.status_code in {200, 444}: - if cls._TIKTOK_NOTFOUND_PARREN.search(str(response.url)): - raise APINotFoundError( - _( - "页面不可用，可能是由于区域限制（代理）造成的。类名: {0}" - ).format(cls.__name__) - ) + # 创建一个实例以访问 aclient + instance = cls() - match = cls._TIKTOK_AWEMEID_PARREN.search(str(response.url)) - if not match: - raise APIResponseError( - _("未在响应中找到 {0}").format("aweme_id") + try: + response = await instance.aclient.get(url, follow_redirects=True) + if response.status_code in {200, 444}: + if cls._TIKTOK_NOTFOUND_PARREN.search(str(response.url)): + raise APINotFoundError( + "页面不可用，可能是由于区域限制（代理）造成的。类名：{0}".format( + cls.__name__ ) + ) - aweme_id = match.group(1) - - if aweme_id is None: - raise RuntimeError( - _("获取 {0} 失败，{1}").format("aweme_id", response.url) + match = cls._TIKTOK_AWEMEID_PARREN.search(str(response.url)) + if not match: + raise APIResponseError( + _("未在响应中找到 {0}，请检查链接。类名：{1}").format( + "aweme_id", cls.__name__ ) - - return aweme_id - else: - raise ConnectionError( - _("接口状态码异常 {0}，请检查重试").format(response.status_code) ) - # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) - except httpx.TimeoutException as exc: - raise APITimeoutError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求端点超时"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, + aweme_id = match.group(1) + + if aweme_id is None: + raise RuntimeError( + _("获取 {0} 失败，{1}").format("aweme_id", response.url) ) + + return aweme_id + else: + raise ConnectionError( + _("接口状态码异常 {0}，请检查重试").format(response.status_code) ) - except httpx.NetworkError as exc: - raise APIConnectionError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("网络连接失败，请检查当前网络环境"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + except httpx.TimeoutException as exc: + logger.error(traceback.format_exc()) + raise APITimeoutError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求端点超时"), + url, + cls.proxies, + cls.__name__, + exc, ) + ) - except httpx.ProtocolError as exc: - raise APIUnauthorizedError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求协议错误"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + except httpx.NetworkError as exc: + logger.error(traceback.format_exc()) + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("网络连接失败，请检查当前网络环境"), + url, + cls.proxies, + cls.__name__, + exc, ) + ) - except httpx.ProxyError as exc: - raise APIConnectionError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求代理错误"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + except httpx.ProtocolError as exc: + logger.error(traceback.format_exc()) + raise APIUnauthorizedError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求协议错误"), + url, + cls.proxies, + cls.__name__, + exc, ) + ) - except httpx.HTTPStatusError as exc: - raise APIResponseError( - _( - "{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("状态码错误"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + except httpx.ProxyError as exc: + logger.error(traceback.format_exc()) + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求代理错误"), + url, + cls.proxies, + cls.__name__, + exc, ) + ) + + except httpx.HTTPStatusError as exc: + logger.error(traceback.format_exc()) + raise APIResponseError( + _("{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}").format( + _("状态码错误"), + url, + cls.proxies, + cls.__name__, + exc, + ) + ) @classmethod async def get_all_aweme_id(cls, urls: list) -> list: """ - 获取视频aweme_id,传入列表url都可以解析出aweme_id (Get video aweme_id, pass in the list url can parse out aweme_id) + 获取多个TikTok视频的aweme_id。 Args: - urls: list: 列表url (list url) + urls: 视频链接列表 + + Returns: + aweme_ids: 视频的唯一标识列表 - Return: - aweme_ids: list: 视频的唯一标识，返回列表 (The unique identifier of the video, return list) + Raises: + TypeError: 如果输入的 URL 列表不是列表类型。 + APINotFoundError: 如果输入的 URL 列表不合法。 """ if not isinstance(urls, list): raise TypeError(_("参数必须是列表类型")) - # 提取有效URL urls = extract_valid_urls(urls) if urls == []: - raise ( - APINotFoundError( - _("输入的URL List不合法。类名：{0}").format(cls.__name__) - ) + raise APINotFoundError( + _("输入的URL List不合法。类名：{0}").format(cls.__name__) ) aweme_ids = [cls.get_aweme_id(url) for url in urls] From f39b4cef535708e6ad63fb87ea987dba89b1442e Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 20 May 2024 21:51:18 +0800 Subject: [PATCH 120/299] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84tiktok?= =?UTF-8?q?=E7=9A=84TokenManager=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 添加了类注释 2. 继承了BaseCrawler 3. 优化了代码 --- f2/apps/tiktok/utils.py | 350 ++++++++++++++++++++++------------------ 1 file changed, 191 insertions(+), 159 deletions(-) diff --git a/f2/apps/tiktok/utils.py b/f2/apps/tiktok/utils.py index e7637f4e..aa998e10 100644 --- a/f2/apps/tiktok/utils.py +++ b/f2/apps/tiktok/utils.py @@ -73,6 +73,23 @@ def odin_tt(cls) -> str: class TokenManager(BaseCrawler): + """ + TokenManager 类用于生成和管理 TikTok 请求所需的各种令牌。 + + 该类继承自 BaseCrawler，利用其中的 client 进行 HTTP 请求。主要包含以下方法： + - gen_real_msToken: 生成真实的 msToken。 + - gen_false_msToken: 生成虚假的 msToken。 + - gen_ttwid: 生成 ttwid。 + - gen_odin_tt: 生成 odin_tt。 + + 类属性: + - token_conf: 从 ClientConfManager 获取的 msToken 配置。 + - ttwid_conf: 从 ClientConfManager 获取的 ttwid 配置。 + - odin_tt_conf: 从 ClientConfManager 获取的 odin_tt 配置。 + - proxies: 从 ClientConfManager 获取的代理配置。 + - mstoken_headers: 生成 msToken 请求所需的 HTTP 头信息。 + - ttwid_headers: 生成 ttwid 请求所需的 HTTP 头信息。 + """ token_conf = ClientConfManager.msToken() ttwid_conf = ClientConfManager.ttwid() @@ -91,129 +108,144 @@ class TokenManager(BaseCrawler): def __init__(self): super().__init__(proxies=self.proxies) - def gen_real_msToken(self) -> str: + @classmethod + def gen_real_msToken(cls) -> str: """ - 生成真实的msToken,当出现错误时返回虚假的值 - (Generate a real msToken and return a false value when an error occurs) + 生成真实的 msToken。 + + Returns: + msToken: 生成的 msToken + + Raises: + APITimeoutError: 如果请求超时。 + APIConnectionError: 如果网络连接失败。 + APIUnauthorizedError: 如果请求协议错误。 + APIResponseError: 如果响应不符合要求。 """ + instance = cls() + try: payload = json.dumps( { - "magic": self.token_conf["magic"], - "version": self.token_conf["version"], - "dataType": self.token_conf["dataType"], - "strData": self.token_conf["strData"], + "magic": instance.token_conf["magic"], + "version": instance.token_conf["version"], + "dataType": instance.token_conf["dataType"], + "strData": instance.token_conf["strData"], "tspFromClient": get_timestamp(), } ) - response = self.client.post( - self.token_conf["url"], + response = instance.client.post( + instance.token_conf["url"], content=payload, - headers=self.mstoken_headers, + headers=instance.mstoken_headers, ) response.raise_for_status() msToken = str(httpx.Cookies(response.cookies).get("msToken")) - if len(msToken) not in [148]: + if len(msToken) != 148: raise APIResponseError(_("{0} 内容不符合要求").format("msToken")) - logger.debug(_("生成真实的msToken：{0}").format(msToken)) + logger.debug(_("生成真实的 msToken：{0}").format(msToken)) return msToken - # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) except httpx.TimeoutException as exc: logger.error(traceback.format_exc()) raise APITimeoutError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( + _("{0}。链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}").format( _("请求端点超时"), - self.token_conf["url"], - ClientConfManager.proxies(), - self.__class__.__name__, + instance.token_conf["url"], + cls.proxies, + cls.__name__, exc, ) ) except httpx.NetworkError as exc: + logger.error(traceback.format_exc()) raise APIConnectionError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( + _("{0}。链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}").format( _("网络连接失败，请检查当前网络环境"), - self.token_conf["url"], - ClientConfManager.proxies(), - self.__class__.__name__, + instance.token_conf["url"], + cls.proxies, + cls.__name__, exc, ) ) except httpx.ProtocolError as exc: + logger.error(traceback.format_exc()) raise APIUnauthorizedError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( + _("{0}。链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}").format( _("请求协议错误"), - self.token_conf["url"], - ClientConfManager.proxies(), - self.__name__, + instance.token_conf["url"], + cls.proxies, + cls.__name__, exc, ) ) except httpx.ProxyError as exc: + logger.error(traceback.format_exc()) raise APIConnectionError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( + _("{0}。链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}").format( _("请求代理错误"), - self.token_conf["url"], - ClientConfManager.proxies(), - self.__name__, + instance.token_conf["url"], + cls.proxies, + cls.__name__, exc, ) ) except httpx.HTTPStatusError as exc: - # 捕获 httpx 的状态代码错误 (captures specific status code errors from httpx) - logger.error(_("msToken API错误：{0}").format(exc)) - if response.status_code == 401: - raise APIUnauthorizedError( - _( - "参数验证失败，请更新 F2 配置文件中的 {0}，以匹配 {1} 新规则" - ).format("msToken", "tiktok") + logger.error(traceback.format_exc()) + raise APIResponseError( + _("{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}").format( + _("状态码错误"), + instance.token_conf["url"], + cls.token_conf["proxies"], + cls.proxies, + cls.__name__, + exc, ) + ) - elif response.status_code == 404: - raise APINotFoundError(_("{0} 无法找到API端点").format("msToken")) - else: - raise APIResponseError( - _("链接：{0}，状态码 {1}：{2} ").format( - exc.response.url, - exc.response.status_code, - exc.response.text, - ) - ) @classmethod def gen_false_msToken(cls) -> str: - """生成随机msToken (Generate random msToken)""" + """ + 生成随机的虚假 msToken。 + + Returns: + false_msToken: 生成的虚假 msToken + """ false_msToken = gen_random_str(146) + "==" - logger.debug(_("生成虚假的msToken：{0}").format(false_msToken)) + logger.debug(_("生成虚假的 msToken：{0}").format(false_msToken)) return false_msToken - def gen_ttwid(self) -> str: + @classmethod + def gen_ttwid(cls) -> str: """ - 生成请求必带的ttwid (Generate the essential ttwid for requests) + 生成请求必带的 ttwid。 + + Returns: + ttwid: 生成的 ttwid + + Raises: + APITimeoutError: 如果请求超时。 + APIConnectionError: 如果网络连接失败。 + APIUnauthorizedError: 如果请求协议错误。 + APIResponseError: 如果响应不符合要求。 """ + instance = cls() + try: - response = self.client.post( - self.ttwid_conf["url"], - content=self.ttwid_conf["data"], - headers=self.ttwid_headers, + response = instance.client.post( + instance.ttwid_conf["url"], + content=instance.ttwid_conf["data"], + headers=instance.ttwid_headers, ) response.raise_for_status() @@ -221,75 +253,69 @@ def gen_ttwid(self) -> str: if ttwid is None: raise APIResponseError( - _("ttwid: 检查没有通过, 请更新配置文件中的ttwid") + _("ttwid: 检查没有通过, 请更新配置文件中的 ttwid") ) - logger.debug(_("生成ttwid：{0}").format(str(ttwid))) + logger.debug(_("生成 ttwid：{0}").format(str(ttwid))) return str(ttwid) - # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) except httpx.TimeoutException as exc: + logger.error(traceback.format_exc()) raise APITimeoutError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( + _("{0}。链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}").format( _("请求端点超时"), - self.ttwid_conf["url"], - ClientConfManager.proxies(), - self.__class__.__name__, + instance.ttwid_conf["url"], + cls.proxies, + cls.__name__, exc, ) ) except httpx.NetworkError as exc: + logger.error(traceback.format_exc()) raise APIConnectionError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( + _("{0}。链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}").format( _("网络连接失败，请检查当前网络环境"), - self.ttwid_conf["url"], - ClientConfManager.proxies(), - self.__class__.__name__, + instance.ttwid_conf["url"], + cls.proxies, + cls.__name__, exc, ) ) except httpx.ProtocolError as exc: + logger.error(traceback.format_exc()) raise APIUnauthorizedError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( + _("{0}。链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}").format( _("请求协议错误"), - self.ttwid_conf["url"], - ClientConfManager.proxies(), - self.__class__.__name__, + instance.ttwid_conf["url"], + cls.proxies, + cls.__name__, exc, ) ) except httpx.ProxyError as exc: + logger.error(traceback.format_exc()) raise APIConnectionError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( + _("{0}。链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}").format( _("请求代理错误"), - self.ttwid_conf["url"], - ClientConfManager.proxies(), - self.__class__.__name__, + instance.ttwid_conf["url"], + cls.proxies, + cls.__name__, exc, ) ) except httpx.HTTPStatusError as exc: - # 捕获 httpx 的状态代码错误 (captures specific status code errors from httpx) - if response.status_code == 401: + logger.error(traceback.format_exc()) + if exc.response.status_code == 401: raise APIUnauthorizedError( _( "参数验证失败，请更新 F2 配置文件中的 {0}，以匹配 {1} 新规则" ).format("ttwid", "tiktok") ) - - elif response.status_code == 404: + elif exc.response.status_code == 404: raise APINotFoundError(_("{0} 无法找到API端点").format("ttwid")) else: raise APIResponseError( @@ -300,94 +326,100 @@ def gen_ttwid(self) -> str: ) ) - def gen_odin_tt(self): + @classmethod + def gen_odin_tt(cls) -> str: """ - 生成请求必带的odin_tt (Generate the essential odin_tt for requests) + 生成请求必带的 odin_tt。 + + Returns: + odin_tt: 生成的 odin_tt + + Raises: + APITimeoutError: 如果请求超时。 + APIConnectionError: 如果网络连接失败。 + APIUnauthorizedError: 如果请求协议错误。 + APIResponseError: 如果响应不符合要求。 """ + instance = cls() + try: - response = self.client.get(self.odin_tt_conf["url"]) - response.raise_for_status() + response = instance.client.get(instance.odin_tt_conf["url"]) + response.raise_for_status() - odin_tt = httpx.Cookies(response.cookies).get("odin_tt") + odin_tt = httpx.Cookies(response.cookies).get("odin_tt") - if odin_tt is None: - raise APIResponseError(_("{0} 内容不符合要求").format("odin_tt")) + if odin_tt is None: + raise APIResponseError(_("{0} 内容不符合要求").format("odin_tt")) - return odin_tt + return odin_tt - # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) except httpx.TimeoutException as exc: - raise APITimeoutError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求端点超时"), - self.odin_tt_conf["url"], - ClientConfManager.proxies(), - self.__class__.__name__, - exc, - ) + logger.error(traceback.format_exc()) + raise APITimeoutError( + _("{0}。链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}").format( + _("请求端点超时"), + instance.odin_tt_conf["url"], + cls.proxies, + cls.__name__, + exc, ) + ) except httpx.NetworkError as exc: - raise APIConnectionError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("网络连接失败，请检查当前网络环境"), - self.odin_tt_conf["url"], - ClientConfManager.proxies(), - self.__class__.__name__, - exc, - ) + logger.error(traceback.format_exc()) + raise APIConnectionError( + _("{0}。链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}").format( + _("网络连接失败，请检查当前网络环境"), + instance.odin_tt_conf["url"], + cls.proxies, + cls.__name__, + exc, ) + ) except httpx.ProtocolError as exc: - raise APIUnauthorizedError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求协议错误"), - self.odin_tt_conf["url"], - ClientConfManager.proxies(), - self.__class__.__name__, - exc, - ) + logger.error(traceback.format_exc()) + raise APIUnauthorizedError( + _("{0}。链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}").format( + _("请求协议错误"), + instance.odin_tt_conf["url"], + cls.proxies, + cls.__name__, + exc, ) + ) except httpx.ProxyError as exc: - raise APIConnectionError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求代理错误"), - self.odin_tt_conf["url"], - ClientConfManager.proxies(), - self.__class__.__name__, - exc, - ) + logger.error(traceback.format_exc()) + raise APIConnectionError( + _("{0}。链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}").format( + _("请求代理错误"), + instance.odin_tt_conf["url"], + cls.proxies, + cls.__name__, + exc, ) + ) except httpx.HTTPStatusError as exc: - # 捕获 httpx 的状态代码错误 (captures specific status code errors from httpx) - if response.status_code == 401: - raise APIUnauthorizedError( - _( - "参数验证失败，请更新 F2 配置文件中的 {0}，以匹配 {1} 新规则" - ).format("odin_tt", "tiktok") - ) - - elif response.status_code == 404: - raise APINotFoundError(_("{0} 无法找到API端点").format("odin_tt")) - else: - raise APIResponseError( - _("链接：{0}，状态码 {1}：{2} ").format( - exc.response.url, - exc.response.status_code, - exc.response.text, - ) + logger.error(traceback.format_exc()) + if exc.response.status_code == 401: + raise APIUnauthorizedError( + _( + "参数验证失败，请更新 F2 配置文件中的 {0}，以匹配 {1} 新规则" + ).format("odin_tt", "tiktok") + ) + elif exc.response.status_code == 404: + raise APINotFoundError(_("{0} 无法找到API端点").format("odin_tt")) + else: + raise APIResponseError( + _("链接：{0}，状态码 {1}：{2} ").format( + exc.response.url, + exc.response.status_code, + exc.response.text, ) + ) class XBogusManager: From 848b6e646055249ad0ad91443e0b9bb8ffc0fdd6 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 20 May 2024 21:52:21 +0800 Subject: [PATCH 121/299] =?UTF-8?q?perf:=20=E6=94=B9=E8=BF=9Btiktok?= =?UTF-8?q?=E7=9A=84utils=E5=87=A0=E4=B8=AA=E5=BC=82=E5=B8=B8=E8=BE=93?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/utils.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/f2/apps/tiktok/utils.py b/f2/apps/tiktok/utils.py index aa998e10..dc24b93a 100644 --- a/f2/apps/tiktok/utils.py +++ b/f2/apps/tiktok/utils.py @@ -556,15 +556,15 @@ async def get_secuid(cls, url: str) -> str: if response.status_code in {200, 444}: if cls._TIKTOK_NOTFOUND_PARREN.search(str(response.url)): raise APINotFoundError( - "页面不可用，可能是由于区域限制（代理）造成的。" - ) + "页面不可用，可能是由于区域限制（代理）造成的。类名：{0}" + ).format(cls.__name__) match = cls._TIKTOK_SECUID_PARREN.search(str(response.text)) if not match: raise APIResponseError( - _( - "未在响应中找到 {0}，检查链接是否为用户主页。类名：{1}" - ).format("sec_uid", cls.__name__) + _("未在响应中找到 {0}，请检查链接。类名：{1}").format( + "sec_uid", cls.__name__ + ) ) data = json.loads(match.group(1)) @@ -690,12 +690,16 @@ async def get_uniqueid(cls, url: str) -> str: if response.status_code in {200, 444}: if cls._TIKTOK_NOTFOUND_PARREN.search(str(response.url)): raise APINotFoundError( - "页面不可用，可能是由于区域限制（代理）造成的。" - ) + "页面不可用，可能是由于区域限制（代理）造成的。类名：{0}" + ).format(cls.__name__) match = cls._TIKTOK_UNIQUEID_PARREN.search(str(response.url)) if not match: - raise APIResponseError(_("未在响应中找到 {0}").format("unique_id")) + raise APIResponseError( + _("未在响应中找到 {0}，请检查链接。类名：{1}").format( + "unique_id", cls.__name__ + ) + ) unique_id = match.group(1) From 1a3ee2c40fec318db8d89843e32f293850fad6ff Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Tue, 21 May 2024 16:36:57 +0800 Subject: [PATCH 122/299] =?UTF-8?q?perf:=20=E6=9A=82=E6=97=B6=E5=BC=83?= =?UTF-8?q?=E7=94=A8douyin=E6=89=AB=E7=A0=81=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/cli.py | 68 +++++----- f2/apps/douyin/handler.py | 258 +++++++++++++++++++------------------- 2 files changed, 163 insertions(+), 163 deletions(-) diff --git a/f2/apps/douyin/cli.py b/f2/apps/douyin/cli.py index da0bc6fc..ea8fc7d0 100644 --- a/f2/apps/douyin/cli.py +++ b/f2/apps/douyin/cli.py @@ -19,7 +19,7 @@ ) from f2.utils.conf_manager import ConfigManager from f2.i18n.translator import TranslationManager, _ -from f2.apps.douyin.handler import handle_sso_login +# from f2.apps.douyin.handler import handle_sso_login from f2.apps.douyin.utils import ClientConfManager @@ -145,39 +145,39 @@ def handler_naming( return value -def handler_sso_login( - ctx: click.Context, - param: typing.Union[click.Option, click.Parameter], - value: typing.Any, -) -> None: - """处理SSO登录 (Handle SSO login) +# def handler_sso_login( +# ctx: click.Context, +# param: typing.Union[click.Option, click.Parameter], +# value: typing.Any, +# ) -> None: +# """处理SSO登录 (Handle SSO login) - Args: - ctx (click.Context): click的上下文对象 (Click's context object) - param (typing.Union[click.Option, click.Parameter]): 提供的参数或选项 (The provided parameter or option) - value (typing.Any): 参数或选项的值 (The value of the parameter or option) +# Args: +# ctx (click.Context): click的上下文对象 (Click's context object) +# param (typing.Union[click.Option, click.Parameter]): 提供的参数或选项 (The provided parameter or option) +# value (typing.Any): 参数或选项的值 (The value of the parameter or option) - Raises: - click.UsageError: 如果SSO登录失败 (If SSO login failed) +# Raises: +# click.UsageError: 如果SSO登录失败 (If SSO login failed) - Returns: - 更新配置文件 (Update the configuration file) - """ - if not value or ctx.resilient_parsing: - return +# Returns: +# 更新配置文件 (Update the configuration file) +# """ +# if not value or ctx.resilient_parsing: +# return - if ctx.params.get("cookie"): - return +# if ctx.params.get("cookie"): +# return - is_login, login_cookie = asyncio.run(handle_sso_login()) +# is_login, login_cookie = asyncio.run(handle_sso_login()) - if is_login: - manager = ConfigManager( - ctx.params.get("config", get_resource_path(f2.APP_CONFIG_FILE_PATH)) - ) - manager.update_config_with_args("douyin", cookie=login_cookie) - else: - raise click.UsageError(_("SSO登录失败，请重试！")) +# if is_login: +# manager = ConfigManager( +# ctx.params.get("config", get_resource_path(f2.APP_CONFIG_FILE_PATH)) +# ) +# manager.update_config_with_args("douyin", cookie=login_cookie) +# else: +# raise click.UsageError(_("SSO登录失败，请重试！")) @click.command(name="douyin", help=_("抖音无水印解析")) @@ -339,12 +339,12 @@ def handler_sso_login( help=_("自动从浏览器获取cookie，使用该命令前请确保关闭所选的浏览器"), callback=handler_auto_cookie, ) -@click.option( - "--sso-login", - is_flag=True, - help=_("使用SSO扫码登录获取cookie，保存低频主配置文件"), - callback=handler_sso_login, -) +# @click.option( +# "--sso-login", +# is_flag=True, +# help=_("使用SSO扫码登录获取cookie，保存低频主配置文件"), +# callback=handler_sso_login, +# ) @click.option( "-h", is_flag=True, diff --git a/f2/apps/douyin/handler.py b/f2/apps/douyin/handler.py index 53e65f03..2b88b848 100644 --- a/f2/apps/douyin/handler.py +++ b/f2/apps/douyin/handler.py @@ -7,7 +7,7 @@ from f2.log.logger import logger from f2.i18n.translator import _ from f2.utils.mode_handler import mode_handler, mode_function_map -from f2.utils.utils import split_set_cookie +# from f2.utils.utils import split_set_cookie from f2.apps.douyin.db import AsyncUserDB, AsyncVideoDB from f2.apps.douyin.crawler import DouyinCrawler from f2.apps.douyin.dl import DouyinDownloader @@ -23,8 +23,8 @@ PostDetail, UserLive, UserLive2, - LoginGetQr, - LoginCheckQr, + # LoginGetQr, + # LoginCheckQr, UserFollowing, UserFollower, PostRelated, @@ -42,8 +42,8 @@ PostDetailFilter, UserLiveFilter, UserLive2Filter, - GetQrcodeFilter, - CheckQrcodeFilter, + # GetQrcodeFilter, + # CheckQrcodeFilter, UserFollowingFilter, UserFollowerFilter, PostRelatedFilter, @@ -56,9 +56,9 @@ AwemeIdFetcher, MixIdFetcher, WebCastIdFetcher, - VerifyFpManager, + # VerifyFpManager, create_or_rename_user_folder, - show_qrcode, + # show_qrcode, ) from f2.cli.cli_console import RichConsoleManager from f2.exceptions.api_exceptions import APIResponseError @@ -1624,128 +1624,128 @@ async def fetch_live_im(self, room_id: str, unique_id: str) -> LiveImFetchFilter return live_im -async def handle_sso_login(): - """ - 用于处理用户登录 (Used to process user login) - """ - - kwargs = { - "proxies": {"http://": None, "https://": None}, - "cookie": "", - "headers": { - "Referer": "https://www.douyin.com/", - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML,like Gecko) Chrome/104.0.0.0 Safari/537.36", - }, - } - - async def get_qrcode() -> str: - params = LoginGetQr(verifyFp=verify_fp, fp=verify_fp) - async with DouyinCrawler(kwargs) as crawler: - response = await crawler.fetch_login_qrcode(params) - sso = GetQrcodeFilter(response) - show_qrcode(sso.qrcode_index_url) - return await check_qrcode(sso.token, crawler) - - async def check_qrcode(token: str, crawler) -> bool: - """ - 检查二维码状态 - - Args: - token (str): 二维码token - - Returns: - bool: 是否成功登录 - """ - logger.debug(f"check_qrcode token:{token}") - - status_mapping = { - "1": {"message": _("[ 登录 ]:等待二维码扫描！"), "log": logger.info}, - "2": {"message": _("[ 登录 ]:扫描二维码成功！"), "log": logger.info}, - "3": {"message": _("[ 登录 ]:确认二维码登录！"), "log": logger.info}, - "4": { - "message": _("[ 登录 ]:访问频繁，请检查参数！"), - "log": logger.warning, - }, - "5": { - "message": _("[ 登录 ]:二维码过期，重新获取！"), - "log": logger.warning, - }, - "2046": { - "messages": _("[ 登录 ]:扫码环境异常，请前往app验证！"), - "log": logger.warning, - }, - } - - while True: - params = LoginCheckQr(token=token, verifyFp=verify_fp, fp=verify_fp) - check_response = await crawler.fetch_check_qrcode(params) - check = CheckQrcodeFilter(check_response.json()) - check_status = check.status - check_status = "2046" if check_status is None else check_status - - status_info = status_mapping.get(check_status, {}) - message = status_info.get("message", "") - log_func = status_info.get("log", logger.info) - logger.info(message) - log_func(message) - - if check_status == "3": - login_cookies = split_set_cookie( - check_response.headers.get("set-cookie", "") - ) - is_login, login_cookie = await login_redirect( - check.redirect_url, login_cookies, crawler - ) - return is_login, login_cookie - elif check_status == "5": - get_qrcode() - break - elif check_status is None: - break - - await asyncio.sleep(5) - - async def login_redirect(redirect_url: str, login_cookies: str, crawler): - """ - 登录重定向，获取登录后Cookie - - Args: - redirect_url (str): 重定向url - login_cookies (str): 登录cookie - - Returns: - is_login (bool): 是否成功登录 - login_cookie (str): 登录cookie - """ - crawler.headers["Cookie"] = login_cookies - redirect_response = await crawler.get_fetch_data(redirect_url) - - if redirect_response.history and len(redirect_response.history) > 1: - logger.debug(f"login_redirect headers:{redirect_response.headers}") - logger.debug(f"login_redirect history:{redirect_response.history}") - logger.debug( - f"login_redirect history[0] headers:{redirect_response.history[0].headers}" - ) - logger.debug( - f"login_redirect history[1] headers:{redirect_response.history[1].headers}" - ) - # 获取重最后一个重定向里的Cookie - login_cookie = split_set_cookie( - redirect_response.history[1].headers.get("set-cookie", "") - ) - logger.debug(f"login_cookie:{login_cookie}") - return True, login_cookie - else: - logger.warning("[ 登录 ]:自动重定向登录失败") - if redirect_response: - error_message = f"网络异常: 自动重定向登录失败。 状态码: {redirect_response.status_code}, 响应体: {redirect_response.text}" - else: - error_message = f"网络异常: 自动重定向登录失败。 无法连接到服务器。" - logger.warning(error_message) - return False, "" - - verify_fp = VerifyFpManager.gen_verify_fp() - return await get_qrcode() +# async def handle_sso_login(): +# """ +# 用于处理用户登录 (Used to process user login) +# """ + +# kwargs = { +# "proxies": {"http://": None, "https://": None}, +# "cookie": "", +# "headers": { +# "Referer": "https://www.douyin.com/", +# "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML,like Gecko) Chrome/104.0.0.0 Safari/537.36", +# }, +# } + +# async def get_qrcode() -> str: +# params = LoginGetQr(verifyFp=verify_fp, fp=verify_fp) +# async with DouyinCrawler(kwargs) as crawler: +# response = await crawler.fetch_login_qrcode(params) +# sso = GetQrcodeFilter(response) +# show_qrcode(sso.qrcode_index_url) +# return await check_qrcode(sso.token, crawler) + +# async def check_qrcode(token: str, crawler) -> bool: +# """ +# 检查二维码状态 + +# Args: +# token (str): 二维码token + +# Returns: +# bool: 是否成功登录 +# """ +# logger.debug(f"check_qrcode token:{token}") + +# status_mapping = { +# "1": {"message": _("[ 登录 ]:等待二维码扫描！"), "log": logger.info}, +# "2": {"message": _("[ 登录 ]:扫描二维码成功！"), "log": logger.info}, +# "3": {"message": _("[ 登录 ]:确认二维码登录！"), "log": logger.info}, +# "4": { +# "message": _("[ 登录 ]:访问频繁，请检查参数！"), +# "log": logger.warning, +# }, +# "5": { +# "message": _("[ 登录 ]:二维码过期，重新获取！"), +# "log": logger.warning, +# }, +# "2046": { +# "messages": _("[ 登录 ]:扫码环境异常，请前往app验证！"), +# "log": logger.warning, +# }, +# } + +# while True: +# params = LoginCheckQr(token=token, verifyFp=verify_fp, fp=verify_fp) +# check_response = await crawler.fetch_check_qrcode(params) +# check = CheckQrcodeFilter(check_response.json()) +# check_status = check.status +# check_status = "2046" if check_status is None else check_status + +# status_info = status_mapping.get(check_status, {}) +# message = status_info.get("message", "") +# log_func = status_info.get("log", logger.info) +# logger.info(message) +# log_func(message) + +# if check_status == "3": +# login_cookies = split_set_cookie( +# check_response.headers.get("set-cookie", "") +# ) +# is_login, login_cookie = await login_redirect( +# check.redirect_url, login_cookies, crawler +# ) +# return is_login, login_cookie +# elif check_status == "5": +# get_qrcode() +# break +# elif check_status is None: +# break + +# await asyncio.sleep(5) + +# async def login_redirect(redirect_url: str, login_cookies: str, crawler): +# """ +# 登录重定向，获取登录后Cookie + +# Args: +# redirect_url (str): 重定向url +# login_cookies (str): 登录cookie + +# Returns: +# is_login (bool): 是否成功登录 +# login_cookie (str): 登录cookie +# """ +# crawler.headers["Cookie"] = login_cookies +# redirect_response = await crawler.get_fetch_data(redirect_url) + +# if redirect_response.history and len(redirect_response.history) > 1: +# logger.debug(f"login_redirect headers:{redirect_response.headers}") +# logger.debug(f"login_redirect history:{redirect_response.history}") +# logger.debug( +# f"login_redirect history[0] headers:{redirect_response.history[0].headers}" +# ) +# logger.debug( +# f"login_redirect history[1] headers:{redirect_response.history[1].headers}" +# ) +# # 获取重最后一个重定向里的Cookie +# login_cookie = split_set_cookie( +# redirect_response.history[1].headers.get("set-cookie", "") +# ) +# logger.debug(f"login_cookie:{login_cookie}") +# return True, login_cookie +# else: +# logger.warning("[ 登录 ]:自动重定向登录失败") +# if redirect_response: +# error_message = f"网络异常: 自动重定向登录失败。 状态码: {redirect_response.status_code}, 响应体: {redirect_response.text}" +# else: +# error_message = f"网络异常: 自动重定向登录失败。 无法连接到服务器。" +# logger.warning(error_message) +# return False, "" + +# verify_fp = VerifyFpManager.gen_verify_fp() +# return await get_qrcode() async def main(kwargs): From 45459e3554f6cd61da73d45e406f999c5c51d1d3 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Tue, 21 May 2024 16:43:32 +0800 Subject: [PATCH 123/299] =?UTF-8?q?style:=20=E6=B3=A8=E9=87=8A=E4=B8=8E?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/guide/apps/douyin/index.md | 2 +- docs/snippets/douyin/query-user.py | 2 +- docs/snippets/douyin/sso-login.py | 8 ++++---- f2/apps/tiktok/crawler.py | 2 +- f2/apps/tiktok/handler.py | 12 ++++++++++-- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/docs/guide/apps/douyin/index.md b/docs/guide/apps/douyin/index.md index f4f0f314..a1bef088 100644 --- a/docs/guide/apps/douyin/index.md +++ b/docs/guide/apps/douyin/index.md @@ -35,7 +35,7 @@ outline: deep | 获取指定用户名 | get_user_nickname | 🔴 | | 创建用户记录与目录 | get_or_add_user_data | 🟡 | | 创建作品下载记录 | get_or_add_video_data | 🟢 | -| SSO登录 | handle_sso_login | 🟢 | +| SSO登录 | handle_sso_login | 🟢🟡 | ::: ::: details utils接口列表 diff --git a/docs/snippets/douyin/query-user.py b/docs/snippets/douyin/query-user.py index dc714941..933d428a 100644 --- a/docs/snippets/douyin/query-user.py +++ b/docs/snippets/douyin/query-user.py @@ -19,7 +19,7 @@ async def main(): print("=================_to_raw================") print(user._to_raw()) # print("=================_to_dict===============") - # print(aweme_data_list._to_dict()) + # print(user._to_dict()) if __name__ == "__main__": diff --git a/docs/snippets/douyin/sso-login.py b/docs/snippets/douyin/sso-login.py index 0110e214..d4a7a4ab 100644 --- a/docs/snippets/douyin/sso-login.py +++ b/docs/snippets/douyin/sso-login.py @@ -1,5 +1,5 @@ -import asyncio -from f2.apps.douyin.handler import handle_sso_login +# import asyncio +# from f2.apps.douyin.handler import handle_sso_login -if __name__ == "__main__": - asyncio.run(handle_sso_login()) +# if __name__ == "__main__": +# asyncio.run(handle_sso_login()) diff --git a/f2/apps/tiktok/crawler.py b/f2/apps/tiktok/crawler.py index 28096783..f833d0f5 100644 --- a/f2/apps/tiktok/crawler.py +++ b/f2/apps/tiktok/crawler.py @@ -16,7 +16,7 @@ PostSearch, UserLive, ) -from f2.apps.tiktok.utils import XBogusManager, ClientConfManager +from f2.apps.tiktok.utils import XBogusManager class TiktokCrawler(BaseCrawler): diff --git a/f2/apps/tiktok/handler.py b/f2/apps/tiktok/handler.py index 3b9c879a..b20bd5dd 100644 --- a/f2/apps/tiktok/handler.py +++ b/f2/apps/tiktok/handler.py @@ -241,7 +241,11 @@ async def handler_user_post(self): ) async def fetch_user_post_videos( - self, secUid: str, cursor: int, page_counts: int, max_counts: float + self, + secUid: str, + cursor: int, + page_counts: int, + max_counts: float, ) -> AsyncGenerator[UserPostFilter, Any]: """ 用于获取指定用户发布的作品列表 @@ -274,7 +278,11 @@ async def fetch_user_post_videos( logger.debug(_("开始爬取第 {0} 页").format(cursor)) async with TiktokCrawler(self.kwargs) as crawler: - params = UserPost(secUid=secUid, cursor=cursor, count=page_counts) + params = UserPost( + secUid=secUid, + cursor=cursor, + count=page_counts, + ) response = await crawler.fetch_user_post(params) video = UserPostFilter(response) From 30d5855cd43ecaa537abbd7e0d2706ce72d3bc31 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Tue, 21 May 2024 16:47:47 +0800 Subject: [PATCH 124/299] =?UTF-8?q?perf:=20=E6=B7=BB=E5=8A=A0traceback?= =?UTF-8?q?=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/dl/base_downloader.py | 23 ++++++++++++++++++++--- f2/utils/_dl.py | 5 +++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/f2/dl/base_downloader.py b/f2/dl/base_downloader.py index 19b06c76..1812a78e 100644 --- a/f2/dl/base_downloader.py +++ b/f2/dl/base_downloader.py @@ -68,10 +68,27 @@ async def _download_chunks( await self.progress.update( task_id, advance=len(chunk), total=int(content_length) ) - except httpx.ReadTimeout as e: - logger.warning(_("文件区块下载超时：{0}").format(e)) + except httpx.TimeoutException as e: + logger.error(traceback.format_exc()) + logger.error(_("文件区块超时：{0}").format(e)) + except httpx.NetworkError as e: + logger.error(traceback.format_exc()) + logger.error(_("文件区块网络错误：{0}").format(e)) + except httpx.HTTPStatusError as e: + logger.error(traceback.format_exc()) + logger.error(_("文件区块HTTP错误：{0}").format(e)) + except httpx.ProxyError as e: + logger.error(traceback.format_exc()) + logger.error(_("文件区块代理错误：{0}").format(e)) + except httpx.UnsupportedProtocol as e: + logger.error(traceback.format_exc()) + logger.error(_("文件区块协议错误：{0}").format(e)) + except httpx.StreamError as e: + logger.error(traceback.format_exc()) + logger.error(_("文件区块流错误：{0}").format(e)) except Exception as e: - logger.error(_("文件区块下载失败：{0}").format(e)) + logger.error(traceback.format_exc()) + logger.error(_("文件区块下载失败：{0} Exception：{1}").format(request, e)) async def download_file( self, diff --git a/f2/utils/_dl.py b/f2/utils/_dl.py index 626e661f..cdf267dc 100644 --- a/f2/utils/_dl.py +++ b/f2/utils/_dl.py @@ -2,6 +2,7 @@ import m3u8 import httpx +import traceback from pathlib import Path from typing import Union @@ -38,6 +39,7 @@ async def get_content_length(url: str, headers: dict = {}, proxies: dict = {}) - except httpx.ConnectTimeout: # 连接超时错误处理 (Handling connection timeout errors) + logger.error(traceback.format_exc()) logger.error(_("连接超时错误: {0}".format(url))) logger.debug("===================================") logger.debug(f"headers:{headers}, proxies:{proxies}") @@ -56,6 +58,7 @@ async def get_content_length(url: str, headers: dict = {}, proxies: dict = {}) - response = await client.send(request, stream=True) response.raise_for_status() except Exception as e: + logger.error(traceback.format_exc()) logger.error( _( "HTTP状态错误, 尝试GET请求失败: {0}, 错误详情: {1}".format( @@ -74,10 +77,12 @@ async def get_content_length(url: str, headers: dict = {}, proxies: dict = {}) - ) return 0 except httpx.RequestError as e: + logger.error(traceback.format_exc()) logger.error("httpx 请求错误: {0}, 错误详情: {1}".format(url, e)) return 0 except Exception as e: # 处理未知错误 (Handling unknown errors) + logger.error(traceback.format_exc()) logger.error( _( "f2 请求 Content-Length 时发生未知错误: {0}, 错误详情: {1}".format( From 4f96aaf636e075d909f7982fd3aa1fee8e47abbe Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Tue, 21 May 2024 18:45:10 +0800 Subject: [PATCH 125/299] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84douyin?= =?UTF-8?q?=E7=9A=84TokenManager=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 添加了类注释 2. 继承了BaseCrawler 3. 优化了代码 --- f2/apps/douyin/utils.py | 403 ++++++++++++++++++++++------------------ 1 file changed, 221 insertions(+), 182 deletions(-) diff --git a/f2/apps/douyin/utils.py b/f2/apps/douyin/utils.py index 91b6c561..fd059771 100644 --- a/f2/apps/douyin/utils.py +++ b/f2/apps/douyin/utils.py @@ -8,6 +8,7 @@ import qrcode import random import asyncio +import traceback from typing import Union from pathlib import Path @@ -22,8 +23,8 @@ extract_valid_urls, split_filename, ) +from f2.crawlers.base_crawler import BaseCrawler from f2.exceptions.api_exceptions import ( - APIError, APIConnectionError, APIResponseError, APIUnavailableError, @@ -71,228 +72,266 @@ def ttwid(cls) -> str: return cls.client_conf.get("ttwid", {}) -class TokenManager: +class TokenManager(BaseCrawler): + """ + TokenManager 类用于生成和管理与抖音相关的 token，包括 msToken 和 ttwid。 + + 该类继承自 BaseCrawler，利用其中的 HTTP 客户端来发送请求。主要包含以下方法： + - gen_real_msToken: 生成真实的 msToken。 + - gen_false_msToken: 生成虚假的 msToken。 + - gen_ttwid: 生成请求必带的 ttwid。 + + 类属性: + - token_conf: 配置 msToken 的相关信息。 + - ttwid_conf: 配置 ttwid 的相关信息。 + - proxies: 代理配置。 + - user_agent: 用户代理字符串。 + - mstoken_headers: 生成 msToken 的请求头。 + - ttwid_headers: 生成 ttwid 的请求头。 + + 方法: + - __init__: 初始化 TokenManager 实例，并调用父类的初始化方法。 + - gen_real_msToken: 类方法，生成真实的 msToken，当出现错误时返回虚假的值。 + - gen_false_msToken: 类方法，生成随机 msToken。 + - gen_ttwid: 类方法，生成请求必带的 ttwid。 + + 异常处理: + - 在 HTTP 请求过程中，处理可能出现的 TimeoutException、NetworkError、ProtocolError、ProxyError 和 HTTPStatusError 异常，并记录相应的错误信息。 + """ + token_conf = ClientConfManager.msToken() ttwid_conf = ClientConfManager.ttwid() proxies = ClientConfManager.proxies() user_agent = ClientConfManager.user_agent() + mstoken_headers = { + "Content-Type": "application/json; charset=utf-8", + "User-Agent": user_agent, + } + ttwid_headers = { + "User-Agent": user_agent, + "Content-Type": "application/json; charset=utf-8", + } + + def __init__(self): + super().__init__(proxies=self.proxies) @classmethod def gen_real_msToken(cls) -> str: """ - 生成真实的msToken,当出现错误时返回虚假的值 - (Generate a real msToken and return a false value when an error occurs) + 生成真实的 msToken。 + + Returns: + str: 生成的 msToken。 + + Raises: + APITimeoutError: 请求超时错误。 + APIConnectionError: 网络连接错误。 + APIUnauthorizedError: 请求协议错误。 + APIResponseError: 状态码错误或响应内容不符合要求。 """ - payload = json.dumps( - { - "magic": cls.token_conf["magic"], - "version": cls.token_conf["version"], - "dataType": cls.token_conf["dataType"], - "strData": cls.token_conf["strData"], - "tspFromClient": get_timestamp(), - } - ) - headers = { - "User-Agent": cls.user_agent, - "Content-Type": "application/json; charset=utf-8", - } - - transport = httpx.HTTPTransport(retries=5) - with httpx.Client( - transport=transport, headers=headers, proxies=cls.proxies - ) as client: - try: - response = client.post(cls.token_conf["url"], content=payload) - response.raise_for_status() + instance = cls() - msToken = str(httpx.Cookies(response.cookies).get("msToken")) - if len(msToken) not in [120, 128]: - raise APIResponseError(_("{0} 内容不符合要求").format("msToken")) - logger.debug(_("生成真实的msToken")) - return msToken + try: + payload = json.dumps( + { + "magic": instance.token_conf["magic"], + "version": instance.token_conf["version"], + "dataType": instance.token_conf["dataType"], + "strData": instance.token_conf["strData"], + "tspFromClient": get_timestamp(), + } + ) + response = instance.client.post( + instance.token_conf["url"], + content=payload, + headers=instance.mstoken_headers, + ) + response.raise_for_status() - # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) - except httpx.TimeoutException as exc: - raise APITimeoutError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求端点超时"), - cls.token_conf["url"], - cls.proxies, - cls.__name__, - exc, - ) - ) + msToken = str(httpx.Cookies(response.cookies).get("msToken")) + if len(msToken) not in [120, 128]: + raise APIResponseError(_("{0} 内容不符合要求").format("msToken")) - except httpx.NetworkError as exc: - raise APIConnectionError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("网络连接失败，请检查当前网络环境"), - cls.token_conf["url"], - cls.proxies, - cls.__name__, - exc, - ) + logger.debug(_("生成真实的msToken")) + return msToken + + except httpx.TimeoutException as exc: + logger.error(traceback.format_exc()) + raise APITimeoutError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求端点超时"), + instance.token_conf["url"], + cls.proxies, + cls.__name__, + exc, ) + ) - except httpx.ProtocolError as exc: - raise APIUnauthorizedError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求协议错误"), - cls.token_conf["url"], - cls.proxies, - cls.__name__, - exc, - ) + except httpx.NetworkError as exc: + logger.error(traceback.format_exc()) + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("网络连接失败，请检查当前网络环境"), + instance.token_conf["url"], + cls.proxies, + cls.__name__, + exc, ) + ) - except httpx.ProxyError as exc: - raise APIConnectionError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求代理错误"), - cls.token_conf["url"], - cls.proxies, - cls.__name__, - exc, - ) + except httpx.ProtocolError as exc: + logger.error(traceback.format_exc()) + raise APIUnauthorizedError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求协议错误"), + instance.token_conf["url"], + cls.proxies, + cls.__name__, + exc, ) + ) - except httpx.HTTPStatusError as exc: - # 捕获 httpx 的状态代码错误 (captures specific status code errors from httpx) - if exc.response.status_code == 401: - raise APIUnauthorizedError( - _( - "参数验证失败，请更新 F2 配置文件中的 {0}，以匹配 {1} 新规则" - ).format("msToken", "douyin") - ) + except httpx.ProxyError as exc: + logger.error(traceback.format_exc()) + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求代理错误"), + instance.token_conf["url"], + cls.proxies, + cls.__name__, + exc, + ) + ) - elif exc.response.status_code == 404: - raise APINotFoundError(_("{0} 无法找到API端点").format("msToken")) - else: - raise APIResponseError( - _("链接：{0}，状态码 {1}：{2} ").format( - exc.response.url, - exc.response.status_code, - exc.response.text, - ) - ) + except httpx.HTTPStatusError as exc: + logger.error(traceback.format_exc()) + raise APIResponseError( + _("{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}").format( + _("状态码错误"), + instance.token_conf["url"], + cls.proxies, + cls.__name__, + exc, + ) + ) @classmethod def gen_false_msToken(cls) -> str: - """生成随机msToken (Generate random msToken)""" - logger.debug(_("生成虚假的msToken")) - return gen_random_str(126) + "==" + """生成随机 msToken (Generate random msToken)""" + false_msToken = gen_random_str(126) + "==" + logger.debug(_("生成虚假的 msToken：{0}").format(false_msToken)) + return false_msToken @classmethod def gen_ttwid(cls) -> str: """ - 生成请求必带的ttwid - (Generate the essential ttwid for requests) - """ + 生成请求必带的 ttwid。 - transport = httpx.HTTPTransport(retries=5) - headers = { - "User-Agent": cls.user_agent, - "Content-Type": "application/json; charset=utf-8", - } - with httpx.Client( - transport=transport, headers=headers, proxies=cls.proxies - ) as client: - try: - response = client.post( - cls.ttwid_conf["url"], content=cls.ttwid_conf["data"] - ) - response.raise_for_status() + Returns: + str: 生成的 ttwid。 - ttwid = httpx.Cookies(response.cookies).get("ttwid") + Raises: + APITimeoutError: 请求超时错误。 + APIConnectionError: 网络连接错误。 + APIUnauthorizedError: 请求协议错误。 + APIResponseError: 状态码错误或响应内容不符合要求。 + """ - if ttwid is None: - raise APIResponseError( - _("ttwid: 检查没有通过, 请更新配置文件中的ttwid") - ) + instance = cls() - return ttwid + try: + response = instance.client.post( + instance.ttwid_conf["url"], + content=instance.ttwid_conf["data"], + headers=instance.ttwid_headers, + ) + response.raise_for_status() - # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) - except httpx.TimeoutException as exc: - raise APITimeoutError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求端点超时"), - cls.ttwid_conf["url"], - cls.proxies, - cls.__name__, - exc, - ) + ttwid = httpx.Cookies(response.cookies).get("ttwid") + + if ttwid is None: + raise APIResponseError( + _("ttwid: 检查没有通过, 请更新配置文件中的 ttwid") ) - except httpx.NetworkError as exc: - raise APIConnectionError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("网络连接失败，请检查当前网络环境"), - cls.ttwid_conf["url"], - cls.proxies, - cls.__name__, - exc, - ) + return ttwid + + except httpx.TimeoutException as exc: + logger.error(traceback.format_exc()) + raise APITimeoutError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求端点超时"), + instance.ttwid_conf["url"], + cls.proxies, + cls.__name__, + exc, ) + ) - except httpx.ProtocolError as exc: - raise APIUnauthorizedError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求协议错误"), - cls.ttwid_conf["url"], - cls.proxies, - cls.__name__, - exc, - ) + except httpx.NetworkError as exc: + logger.error(traceback.format_exc()) + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("网络连接失败，请检查当前网络环境"), + instance.ttwid_conf["url"], + cls.proxies, + cls.__name__, + exc, ) + ) - except httpx.ProxyError as exc: - raise APIConnectionError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求代理错误"), - cls.ttwid_conf["url"], - cls.proxies, - cls.__name__, - exc, - ) + except httpx.ProtocolError as exc: + logger.error(traceback.format_exc()) + raise APIUnauthorizedError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求协议错误"), + instance.ttwid_conf["url"], + cls.proxies, + cls.__name__, + exc, ) + ) - except httpx.HTTPStatusError as exc: - # 捕获 httpx 的状态代码错误 (captures specific status code errors from httpx) - if exc.response.status_code == 401: - raise APIUnauthorizedError( - _( - "参数验证失败，请更新 F2 配置文件中的 {0}，以匹配 {1} 新规则" - ).format("ttwid", "douyin") - ) + except httpx.ProxyError as exc: + logger.error(traceback.format_exc()) + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求代理错误"), + instance.ttwid_conf["url"], + cls.proxies, + cls.__name__, + exc, + ) + ) - elif exc.response.status_code == 404: - raise APINotFoundError(_("ttwid无法找到API端点")) - else: - raise APIResponseError( - _("链接：{0}，状态码 {1}：{2} ").format( - exc.response.url, - exc.response.status_code, - exc.response.text, - ) - ) + except httpx.HTTPStatusError as exc: + logger.error(traceback.format_exc()) + raise APIResponseError( + _("{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}").format( + _("状态码错误"), + instance.ttwid_conf["url"], + cls.proxies, + cls.__name__, + exc, + ) + ) class VerifyFpManager: From 0f293f9b1d8b1b935ea2e6739e0d66429e5d9062 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 23 May 2024 19:05:14 +0800 Subject: [PATCH 126/299] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84douyin?= =?UTF-8?q?=E7=9A=84SecUserIdFetcher=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 添加了类注释 2. 继承了BaseCrawler 3. 优化了代码 --- f2/apps/douyin/utils.py | 115 ++++++++++++++++++++-------------------- 1 file changed, 58 insertions(+), 57 deletions(-) diff --git a/f2/apps/douyin/utils.py b/f2/apps/douyin/utils.py index fd059771..b484ff47 100644 --- a/f2/apps/douyin/utils.py +++ b/f2/apps/douyin/utils.py @@ -409,10 +409,28 @@ def model_2_endpoint( return final_endpoint -class SecUserIdFetcher: - # 预编译正则表达式 +class SecUserIdFetcher(BaseCrawler): + """ + SecUserIdFetcher 用于从给定的 URL 中获取 sec_user_id。 + + 该类继承自 BaseCrawler，并利用其 HTTP 客户端功能来发送请求。 + + 类属性: + - _DOUYIN_URL_PATTERN (re.Pattern): 抖音用户主页 URL 的正则表达式模式。 + - _REDIRECT_URL_PATTERN (re.Pattern): 重定向 URL 中 sec_uid 的正则表达式模式。 + - proxies (dict): 代理配置。 + + 方法: + - get_sec_user_id: 从单个 URL 中获取 sec_user_id。 + - get_all_sec_user_id: 从 URL 列表中获取所有 sec_user_id。 + """ + _DOUYIN_URL_PATTERN = re.compile(r"user/([^/?]*)") _REDIRECT_URL_PATTERN = re.compile(r"sec_uid=([^&]*)") + proxies = ClientConfManager.proxies() + + def __init__(self): + super().__init__(proxies=self.proxies) @classmethod async def get_sec_user_id(cls, url: str) -> str: @@ -424,6 +442,14 @@ async def get_sec_user_id(cls, url: str) -> str: Returns: str: 匹配到的sec_user_id (Matched sec_user_id)。 + + Raises: + TypeError: 参数不是字符串类型。 + APINotFoundError: 输入的URL不合法。 + APITimeoutError: 请求超时。 + APIConnectionError: 网络连接失败。 + APIUnauthorizedError: 请求协议错误。 + APIResponseError: 未找到sec_user_id或状态码错误。 """ if not isinstance(url, str): @@ -433,9 +459,10 @@ async def get_sec_user_id(cls, url: str) -> str: url = extract_valid_urls(url) if url is None: - raise ( - APINotFoundError(_("输入的URL不合法。类名：{0}").format(cls.__name__)) - ) + raise APINotFoundError(_("输入的URL不合法。类名：{0}").format(cls.__name__)) + + # 创建一个实例以访问 aclient + instance = cls() pattern = ( cls._REDIRECT_URL_PATTERN @@ -444,36 +471,24 @@ async def get_sec_user_id(cls, url: str) -> str: ) try: - transport = httpx.AsyncHTTPTransport(retries=5) - async with httpx.AsyncClient( - transport=transport, proxies=ClientConfManager.proxies(), timeout=10 - ) as client: - response = await client.get(url, follow_redirects=True) - # 444一般为Nginx拦截，不返回状态 (444 is generally intercepted by Nginx and does not return status) - if response.status_code in {200, 444}: - match = pattern.search(str(response.url)) - if match: - return match.group(1) - else: - raise APIResponseError( - _( - "未在响应的地址中找到sec_user_id，检查链接是否为用户主页类名：{0}" - ).format(cls.__name__) - ) - response.raise_for_status() + response = await instance.aclient.get(url, follow_redirects=True) + if response.status_code in {200, 444}: + match = pattern.search(str(response.url)) + if match: + return match.group(1) + else: + raise APIResponseError( + _( + "未在响应的地址中找到sec_user_id，检查链接是否为用户主页类名：{0}" + ).format(cls.__name__) + ) + response.raise_for_status() - # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) except httpx.TimeoutException as exc: raise APITimeoutError( _( "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求端点超时"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + ).format(_("请求端点超时"), url, cls.proxies, cls.__name__, exc) ) except httpx.NetworkError as exc: @@ -483,7 +498,7 @@ async def get_sec_user_id(cls, url: str) -> str: ).format( _("网络连接失败，请检查当前网络环境"), url, - ClientConfManager.proxies(), + cls.proxies, cls.__name__, exc, ) @@ -493,36 +508,20 @@ async def get_sec_user_id(cls, url: str) -> str: raise APIUnauthorizedError( _( "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求协议错误"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + ).format(_("请求协议错误"), url, cls.proxies, cls.__name__, exc) ) except httpx.ProxyError as exc: raise APIConnectionError( _( "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求代理错误"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + ).format(_("请求代理错误"), url, cls.proxies, cls.__name__, exc) ) except httpx.HTTPStatusError as exc: raise APIResponseError( _("{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}").format( - _("状态码错误"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, + _("状态码错误"), url, cls.proxies, cls.__name__, exc ) ) @@ -532,10 +531,14 @@ async def get_all_sec_user_id(cls, urls: list) -> list: 获取列表sec_user_id列表 (Get list sec_user_id list) Args: - urls: list: 用户url列表 (User url list) + urls (list): 用户url列表 (User url list) - Return: - sec_user_ids: list: 用户sec_user_id列表 (User sec_user_id list) + Returns: + list: 用户sec_user_id列表 (User sec_user_id list) + + Raises: + TypeError: 参数不是列表类型。 + APINotFoundError: 输入的URL List不合法。 """ if not isinstance(urls, list): @@ -545,10 +548,8 @@ async def get_all_sec_user_id(cls, urls: list) -> list: urls = extract_valid_urls(urls) if urls == []: - raise ( - APINotFoundError( - _("输入的URL List不合法。类名：{0}").format(cls.__name__) - ) + raise APINotFoundError( + _("输入的URL List不合法。类名：{0}").format(cls.__name__) ) sec_user_ids = [cls.get_sec_user_id(url) for url in urls] From cfbcae725d06f332a1ace3bf07a9ae9fd79d9c5d Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 23 May 2024 19:05:54 +0800 Subject: [PATCH 127/299] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84douyin?= =?UTF-8?q?=E7=9A=84AwemeIdFetcher=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 添加了类注释 2. 继承了BaseCrawler 3. 优化了代码 --- f2/apps/douyin/utils.py | 179 ++++++++++++++++++++-------------------- 1 file changed, 89 insertions(+), 90 deletions(-) diff --git a/f2/apps/douyin/utils.py b/f2/apps/douyin/utils.py index b484ff47..cb297106 100644 --- a/f2/apps/douyin/utils.py +++ b/f2/apps/douyin/utils.py @@ -556,10 +556,28 @@ async def get_all_sec_user_id(cls, urls: list) -> list: return await asyncio.gather(*sec_user_ids) -class AwemeIdFetcher: - # 预编译正则表达式 +class AwemeIdFetcher(BaseCrawler): + """ + AwemeIdFetcher 用于从给定的 URL 中获取 aweme_id。 + + 该类继承自 BaseCrawler，并利用其 HTTP 客户端功能来发送请求。 + + 类属性: + - _DOUYIN_VIDEO_URL_PATTERN (re.Pattern): 抖音视频 URL 的正则表达式模式。 + - _DOUYIN_NOTE_URL_PATTERN (re.Pattern): 抖音笔记 URL 的正则表达式模式。 + - proxies (dict): 代理配置。 + + 方法: + - get_aweme_id: 从单个 URL 中获取 aweme_id。 + - get_all_aweme_id: 从 URL 列表中获取所有 aweme_id。 + """ + _DOUYIN_VIDEO_URL_PATTERN = re.compile(r"video/([^/?]*)") _DOUYIN_NOTE_URL_PATTERN = re.compile(r"note/([^/?]*)") + proxies = ClientConfManager.proxies() + + def __init__(self): + super().__init__(proxies=self.proxies) @classmethod async def get_aweme_id(cls, url: str) -> str: @@ -571,6 +589,14 @@ async def get_aweme_id(cls, url: str) -> str: Returns: str: 匹配到的aweme_id (Matched aweme_id)。 + + Raises: + TypeError: 参数不是字符串类型。 + APINotFoundError: 输入的URL不合法。 + APITimeoutError: 请求超时。 + APIConnectionError: 网络连接失败。 + APIUnauthorizedError: 请求协议错误。 + APIResponseError: 未找到aweme_id或状态码错误。 """ if not isinstance(url, str): @@ -580,100 +606,71 @@ async def get_aweme_id(cls, url: str) -> str: url = extract_valid_urls(url) if url is None: - raise ( - APINotFoundError(_("输入的URL不合法。类名：{0}").format(cls.__name__)) - ) + raise APINotFoundError(_("输入的URL不合法。类名：{0}").format(cls.__name__)) - # 重定向到完整链接 - transport = httpx.AsyncHTTPTransport(retries=5) - async with httpx.AsyncClient( - transport=transport, proxies=ClientConfManager.proxies(), timeout=10 - ) as client: - try: - response = await client.get(url, follow_redirects=True) - response.raise_for_status() + # 创建一个实例以访问 aclient + instance = cls() - video_pattern = cls._DOUYIN_VIDEO_URL_PATTERN - note_pattern = cls._DOUYIN_NOTE_URL_PATTERN + try: + response = await instance.aclient.get(url, follow_redirects=True) + response.raise_for_status() + + video_pattern = cls._DOUYIN_VIDEO_URL_PATTERN + note_pattern = cls._DOUYIN_NOTE_URL_PATTERN - match = video_pattern.search(str(response.url)) + match = video_pattern.search(str(response.url)) + if match: + aweme_id = match.group(1) + else: + match = note_pattern.search(str(response.url)) if match: aweme_id = match.group(1) else: - match = note_pattern.search(str(response.url)) - if match: - aweme_id = match.group(1) - else: - raise APIResponseError( - _("未在响应的地址中找到aweme_id，检查链接是否为作品页") - ) - return aweme_id - - # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) - except httpx.TimeoutException as exc: - raise APITimeoutError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求端点超时"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, + raise APIResponseError( + _("未在响应的地址中找到aweme_id，检查链接是否为作品页") ) - ) + return aweme_id - except httpx.NetworkError as exc: - raise APIConnectionError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("网络连接失败，请检查当前网络环境"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) - ) + except httpx.TimeoutException as exc: + raise APITimeoutError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format(_("请求端点超时"), url, cls.proxies, cls.__name__, exc) + ) - except httpx.ProtocolError as exc: - raise APIUnauthorizedError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求协议错误"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + except httpx.NetworkError as exc: + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("网络连接失败，请检查当前网络环境"), + url, + cls.proxies, + cls.__name__, + exc, ) + ) - except httpx.ProxyError as exc: - raise APIConnectionError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求代理错误"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) - ) + except httpx.ProtocolError as exc: + raise APIUnauthorizedError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format(_("请求协议错误"), url, cls.proxies, cls.__name__, exc) + ) - except httpx.HTTPStatusError as exc: - raise APIResponseError( - _( - "{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("状态码错误"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + except httpx.ProxyError as exc: + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format(_("请求代理错误"), url, cls.proxies, cls.__name__, exc) + ) + + except httpx.HTTPStatusError as exc: + raise APIResponseError( + _("{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}").format( + _("状态码错误"), url, cls.proxies, cls.__name__, exc ) + ) @classmethod async def get_all_aweme_id(cls, urls: list) -> list: @@ -681,10 +678,14 @@ async def get_all_aweme_id(cls, urls: list) -> list: 获取视频aweme_id,传入列表url都可以解析出aweme_id (Get video aweme_id, pass in the list url can parse out aweme_id) Args: - urls: list: 列表url (list url) + urls (list): 列表url (list url) - Return: - aweme_ids: list: 视频的唯一标识，返回列表 (The unique identifier of the video, return list) + Returns: + list: 视频的唯一标识，返回列表 (The unique identifier of the video, return list) + + Raises: + TypeError: 参数不是列表类型。 + APINotFoundError: 输入的URL List不合法。 """ if not isinstance(urls, list): @@ -694,10 +695,8 @@ async def get_all_aweme_id(cls, urls: list) -> list: urls = extract_valid_urls(urls) if urls == []: - raise ( - APINotFoundError( - _("输入的URL List不合法。类名：{0}").format(cls.__name__) - ) + raise APINotFoundError( + _("输入的URL List不合法。类名：{0}").format(cls.__name__) ) aweme_ids = [cls.get_aweme_id(url) for url in urls] From d5fdaf72d4b9abc68ff927e3ccc2d9b9937b3ab1 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 23 May 2024 19:06:29 +0800 Subject: [PATCH 128/299] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84douyin?= =?UTF-8?q?=E7=9A=84MixIdFetcher=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 添加了类注释 2. 继承了BaseCrawler 3. 优化了代码 --- f2/apps/douyin/utils.py | 176 ++++++++++++++++++++-------------------- 1 file changed, 87 insertions(+), 89 deletions(-) diff --git a/f2/apps/douyin/utils.py b/f2/apps/douyin/utils.py index cb297106..3dd17b94 100644 --- a/f2/apps/douyin/utils.py +++ b/f2/apps/douyin/utils.py @@ -703,9 +703,26 @@ async def get_all_aweme_id(cls, urls: list) -> list: return await asyncio.gather(*aweme_ids) -class MixIdFetcher: - # 预编译正则表达式 +class MixIdFetcher(BaseCrawler): + """ + MixIdFetcher 用于从给定的 URL 中获取 mix_id。 + + 该类继承自 BaseCrawler，并利用其 HTTP 客户端功能来发送请求。 + + 类属性: + - _DOUYIN_MIX_URL_PATTERN (re.Pattern): 抖音合集 URL 的正则表达式模式。 + - proxies (dict): 代理配置。 + + 方法: + - get_mix_id: 从单个 URL 中获取 mix_id。 + - get_all_mix_id: 从 URL 列表中获取所有 mix_id。 + """ + _DOUYIN_MIX_URL_PATTERN = re.compile(r"collection/([^/?]*)") + proxies = ClientConfManager.proxies() + + def __init__(self): + super().__init__(proxies=self.proxies) @classmethod async def get_mix_id(cls, url: str) -> str: @@ -717,6 +734,14 @@ async def get_mix_id(cls, url: str) -> str: Returns: str: 匹配到的mix_id (Matched mix_id)。 + + Raises: + TypeError: 参数不是字符串类型。 + APINotFoundError: 输入的URL不合法。 + APITimeoutError: 请求超时。 + APIConnectionError: 网络连接失败。 + APIUnauthorizedError: 请求协议错误。 + APIResponseError: 未找到mix_id或状态码错误。 """ if not isinstance(url, str): @@ -726,105 +751,80 @@ async def get_mix_id(cls, url: str) -> str: url = extract_valid_urls(url) if url is None: - raise ( - APINotFoundError(_("输入的URL不合法。类名：{0}").format(cls.__name__)) - ) + raise APINotFoundError(_("输入的URL不合法。类名：{0}").format(cls.__name__)) - # 重定向到完整链接 - transport = httpx.AsyncHTTPTransport(retries=5) - async with httpx.AsyncClient( - transport=transport, proxies=ClientConfManager.proxies(), timeout=10 - ) as client: - try: - response = await client.get(url, follow_redirects=True) - response.raise_for_status() + instance = cls() - mix_pattern = cls._DOUYIN_MIX_URL_PATTERN + try: + response = await instance.aclient.get(url, follow_redirects=True) + response.raise_for_status() - match = mix_pattern.search(str(response.url)) - if match: - mix_id = match.group(1) - else: - raise APIResponseError( - _("未在响应的地址中找到mix_id，检查链接是否为合集页"), 404 - ) - return mix_id - - # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) - except httpx.TimeoutException as exc: - raise APITimeoutError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求端点超时"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) - ) + mix_pattern = cls._DOUYIN_MIX_URL_PATTERN - except httpx.NetworkError as exc: - raise APIConnectionError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("网络连接失败，请检查当前网络环境"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + match = mix_pattern.search(str(response.url)) + if match: + mix_id = match.group(1) + else: + raise APIResponseError( + _("未在响应的地址中找到mix_id，检查链接是否为合集页") ) + return mix_id - except httpx.ProtocolError as exc: - raise APIUnauthorizedError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求协议错误"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) - ) + except httpx.TimeoutException as exc: + raise APITimeoutError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format(_("请求端点超时"), url, cls.proxies, cls.__name__, exc) + ) - except httpx.ProxyError as exc: - raise APIConnectionError( - _( - "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求代理错误"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + except httpx.NetworkError as exc: + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("网络连接失败，请检查当前网络环境"), + url, + cls.proxies, + cls.__name__, + exc, ) + ) - except httpx.HTTPStatusError as exc: - raise APIResponseError( - _( - "{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("状态码错误"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + except httpx.ProtocolError as exc: + raise APIUnauthorizedError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format(_("请求协议错误"), url, cls.proxies, cls.__name__, exc) + ) + + except httpx.ProxyError as exc: + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format(_("请求代理错误"), url, cls.proxies, cls.__name__, exc) + ) + + except httpx.HTTPStatusError as exc: + raise APIResponseError( + _("{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}").format( + _("状态码错误"), url, cls.proxies, cls.__name__, exc ) + ) - async def get_all_mix_id(cls, urls: list) -> str: + @classmethod + async def get_all_mix_id(cls, urls: list) -> list: """ 获取合集mix_id,传入列表url都可以解析出mix_id (Get video mix_id, pass in the list url can parse out aweme_id) Args: - urls: list: 列表url (list url) + urls (list): 列表url (list url) - Return: - mix_ids: list: 视频的唯一标识，返回列表 (The unique identifier of the video, return list) + Returns: + list: 视频的唯一标识，返回列表 (The unique identifier of the video, return list) + + Raises: + TypeError: 参数不是列表类型。 + APINotFoundError: 输入的URL List不合法。 """ if not isinstance(urls, list): raise TypeError(_("参数必须是列表类型")) @@ -833,10 +833,8 @@ async def get_all_mix_id(cls, urls: list) -> str: urls = extract_valid_urls(urls) if urls == []: - raise ( - APINotFoundError( - _("输入的URL List不合法。类名：{0}").format(cls.__name__) - ) + raise APINotFoundError( + _("输入的URL List不合法。类名：{0}").format(cls.__name__) ) mix_ids = [cls.get_mix_id(url) for url in urls] From 4f64590b111a42895cea25d5702671fa2d62a572 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 23 May 2024 19:06:54 +0800 Subject: [PATCH 129/299] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84douyin?= =?UTF-8?q?=E7=9A=84WebCastIdFetcher=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 添加了类注释 2. 继承了BaseCrawler 3. 优化了代码 --- f2/apps/douyin/utils.py | 144 +++++++++++++++++++--------------------- 1 file changed, 70 insertions(+), 74 deletions(-) diff --git a/f2/apps/douyin/utils.py b/f2/apps/douyin/utils.py index 3dd17b94..61660316 100644 --- a/f2/apps/douyin/utils.py +++ b/f2/apps/douyin/utils.py @@ -841,14 +841,30 @@ async def get_all_mix_id(cls, urls: list) -> list: return await asyncio.gather(*mix_ids) -class WebCastIdFetcher: - # 预编译正则表达式 +class WebCastIdFetcher(BaseCrawler): + """ + WebCastIdFetcher 用于从给定的 URL 中获取 webcast_id。 + + 该类继承自 BaseCrawler，并利用其 HTTP 客户端功能来发送请求。 + + 类属性: + - _DOUYIN_LIVE_URL_PATTERN (re.Pattern): 抖音直播 URL 的正则表达式模式。 + - _DOUYIN_LIVE_URL_PATTERN2 (re.Pattern): 抖音直播 URL 的第二种正则表达式模式。 + - _DOUYIN_LIVE_URL_PATTERN3 (re.Pattern): 抖音直播 URL 的第三种正则表达式模式。 + - proxies (dict): 代理配置。 + + 方法: + - get_webcast_id: 从单个 URL 中获取 webcast_id。 + - get_all_webcast_id: 从 URL 列表中获取所有 webcast_id。 + """ + _DOUYIN_LIVE_URL_PATTERN = re.compile(r"live/([^/?]*)") - # https://live.douyin.com/766545142636?cover_type=0&enter_from_merge=web_live&enter_method=web_card&game_name=&is_recommend=1&live_type=game&more_detail=&request_id=20231110224012D47CD00C18B4AE4BFF9B&room_id=7299828646049827596&stream_type=vertical&title_type=1&web_live_page=hot_live&web_live_tab=all - # https://live.douyin.com/766545142636 _DOUYIN_LIVE_URL_PATTERN2 = re.compile(r"http[s]?://live.douyin.com/(\d+)") - # https://webcast.amemv.com/douyin/webcast/reflow/7318296342189919011?u_code=l1j9bkbd&did=MS4wLjABAAAAEs86TBQPNwAo-RGrcxWyCdwKhI66AK3Pqf3ieo6HaxI&iid=MS4wLjABAAAA0ptpM-zzoliLEeyvWOCUt-_dQza4uSjlIvbtIazXnCY&with_sec_did=1&use_link_command=1&ecom_share_track_params=&extra_params={"from_request_id":"20231230162057EC005772A8EAA0199906","im_channel_invite_id":"0"}&user_id=3644207898042206&liveId=7318296342189919011&from=share&style=share&enter_method=click_share&roomId=7318296342189919011&activity_info={} _DOUYIN_LIVE_URL_PATTERN3 = re.compile(r"reflow/([^/?]*)") + proxies = ClientConfManager.proxies() + + def __init__(self): + super().__init__(proxies=self.proxies) @classmethod async def get_webcast_id(cls, url: str) -> str: @@ -860,6 +876,14 @@ async def get_webcast_id(cls, url: str) -> str: Returns: str: 匹配到的webcast_id (Matched webcast_id)。 + + Raises: + TypeError: 参数不是字符串类型。 + APINotFoundError: 输入的URL不合法。 + APITimeoutError: 请求超时。 + APIConnectionError: 网络连接失败。 + APIUnauthorizedError: 请求协议错误。 + APIResponseError: 未找到webcast_id或状态码错误。 """ if not isinstance(url, str): @@ -869,55 +893,42 @@ async def get_webcast_id(cls, url: str) -> str: url = extract_valid_urls(url) if url is None: - raise ( - APINotFoundError(_("输入的URL不合法。类名：{0}").format(cls.__name__)) - ) + raise APINotFoundError(_("输入的URL不合法。类名：{0}").format(cls.__name__)) + + instance = cls() + try: - # 重定向到完整链接 - transport = httpx.AsyncHTTPTransport(retries=5) - async with httpx.AsyncClient( - transport=transport, proxies=ClientConfManager.proxies(), timeout=10 - ) as client: - response = await client.get(url, follow_redirects=True) - response.raise_for_status() - url = str(response.url) - - live_pattern = cls._DOUYIN_LIVE_URL_PATTERN - live_pattern2 = cls._DOUYIN_LIVE_URL_PATTERN2 - live_pattern3 = cls._DOUYIN_LIVE_URL_PATTERN3 - - if live_pattern.search(url): - match = live_pattern.search(url) - elif live_pattern2.search(url): - match = live_pattern2.search(url) - elif live_pattern3.search(url): - match = live_pattern3.search(url) - logger.warning( - _( - "该链接返回的是room_id，请使用`fetch_user_live_videos_by_room_id`接口" - ) - ) - else: - raise APIResponseError( - _("未在响应的地址中找到webcast_id，检查链接是否为直播页") + response = await instance.aclient.get(url, follow_redirects=True) + response.raise_for_status() + url = str(response.url) + + live_pattern = cls._DOUYIN_LIVE_URL_PATTERN + live_pattern2 = cls._DOUYIN_LIVE_URL_PATTERN2 + live_pattern3 = cls._DOUYIN_LIVE_URL_PATTERN3 + + if live_pattern.search(url): + match = live_pattern.search(url) + elif live_pattern2.search(url): + match = live_pattern2.search(url) + elif live_pattern3.search(url): + match = live_pattern3.search(url) + logger.warning( + _( + "该链接返回的是room_id，请使用`fetch_user_live_videos_by_room_id`接口" ) + ) + else: + raise APIResponseError( + _("未在响应的地址中找到webcast_id，检查链接是否为直播页") + ) - return match.group(1) - - # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + return match.group(1) except httpx.TimeoutException as exc: raise APITimeoutError( _( "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求端点超时"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + ).format(_("请求端点超时"), url, cls.proxies, cls.__name__, exc) ) - except httpx.NetworkError as exc: raise APIConnectionError( _( @@ -925,46 +936,29 @@ async def get_webcast_id(cls, url: str) -> str: ).format( _("网络连接失败，请检查当前网络环境"), url, - ClientConfManager.proxies(), + cls.proxies, cls.__name__, exc, ) ) - except httpx.ProtocolError as exc: raise APIUnauthorizedError( _( "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求协议错误"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + ).format(_("请求协议错误"), url, cls.proxies, cls.__name__, exc) ) except httpx.ProxyError as exc: raise APIConnectionError( _( "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" - ).format( - _("请求代理错误"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, - ) + ).format(_("请求代理错误"), url, cls.proxies, cls.__name__, exc) ) except httpx.HTTPStatusError as exc: raise APIResponseError( _("{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}").format( - _("状态码错误"), - url, - ClientConfManager.proxies(), - cls.__name__, - exc, + _("状态码错误"), url, cls.proxies, cls.__name__, exc ) ) @@ -974,10 +968,14 @@ async def get_all_webcast_id(cls, urls: list) -> list: 获取直播webcast_id,传入列表url都可以解析出webcast_id (Get live webcast_id, pass in the list url can parse out webcast_id) Args: - urls: list: 列表url (list url) + urls (list): 列表url (list url) + + Returns: + list: 直播的唯一标识，返回列表 (The unique identifier of the live, return list) - Return: - webcast_ids: list: 直播的唯一标识，返回列表 (The unique identifier of the live, return list) + Raises: + TypeError: 参数不是列表类型。 + APINotFoundError: 输入的URL List不合法。 """ if not isinstance(urls, list): @@ -987,10 +985,8 @@ async def get_all_webcast_id(cls, urls: list) -> list: urls = extract_valid_urls(urls) if urls == []: - raise ( - APINotFoundError( - _("输入的URL List不合法。类名：{0}").format(cls.__name__) - ) + raise APINotFoundError( + _("输入的URL List不合法。类名：{0}").format(cls.__name__) ) webcast_ids = [cls.get_webcast_id(url) for url in urls] From 4266c1d71b8254d7a8ce1cc741a7e8383a570f08 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 23 May 2024 19:22:58 +0800 Subject: [PATCH 130/299] =?UTF-8?q?fix:=20=E4=B8=BA=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=B7=BB=E5=8A=A0=E5=90=8C=E6=AD=A5?= =?UTF-8?q?transport?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/snippets/douyin/mix-id.py | 0 f2/crawlers/base_crawler.py | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 docs/snippets/douyin/mix-id.py diff --git a/docs/snippets/douyin/mix-id.py b/docs/snippets/douyin/mix-id.py new file mode 100644 index 00000000..e69de29b diff --git a/f2/crawlers/base_crawler.py b/f2/crawlers/base_crawler.py index 8511617d..ad3f8dc6 100644 --- a/f2/crawlers/base_crawler.py +++ b/f2/crawlers/base_crawler.py @@ -56,6 +56,7 @@ def __init__( self._max_retries = max_retries # 底层连接重试次数 / Underlying connection retry count self.atransport = httpx.AsyncHTTPTransport(retries=max_retries) + self.transport = httpx.HTTPTransport(retries=max_retries) # 超时等待时间 / Timeout waiting time self._timeout = timeout @@ -76,7 +77,7 @@ def __init__( proxies=self.proxies, timeout=self.timeout, limits=self.limits, - transport=self.atransport, + transport=self.transport, ) async def _fetch_response(self, endpoint: str) -> Response: From 78eb9f09c4d91e96a17e222842b6413bd0bee810 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 23 May 2024 19:24:11 +0800 Subject: [PATCH 131/299] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96tiktok?= =?UTF-8?q?=E7=9A=84utils=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/utils.py | 54 +++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 34 deletions(-) diff --git a/f2/apps/tiktok/utils.py b/f2/apps/tiktok/utils.py index dc24b93a..d416b052 100644 --- a/f2/apps/tiktok/utils.py +++ b/f2/apps/tiktok/utils.py @@ -95,14 +95,15 @@ class TokenManager(BaseCrawler): ttwid_conf = ClientConfManager.ttwid() odin_tt_conf = ClientConfManager.odin_tt() proxies = ClientConfManager.proxies() + user_agent = ClientConfManager.user_agent() mstoken_headers = { "Content-Type": "application/json", - "User-Agent": ClientConfManager.user_agent(), + "User-Agent": user_agent, } ttwid_headers = { "Cookie": ttwid_conf.get("cookie"), "Content-Type": "text/plain", - "User-Agent": ClientConfManager.user_agent(), + "User-Agent": user_agent, } def __init__(self): @@ -204,7 +205,6 @@ def gen_real_msToken(cls) -> str: _("{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}").format( _("状态码错误"), instance.token_conf["url"], - cls.token_conf["proxies"], cls.proxies, cls.__name__, exc, @@ -309,22 +309,15 @@ def gen_ttwid(cls) -> str: except httpx.HTTPStatusError as exc: logger.error(traceback.format_exc()) - if exc.response.status_code == 401: - raise APIUnauthorizedError( - _( - "参数验证失败，请更新 F2 配置文件中的 {0}，以匹配 {1} 新规则" - ).format("ttwid", "tiktok") - ) - elif exc.response.status_code == 404: - raise APINotFoundError(_("{0} 无法找到API端点").format("ttwid")) - else: - raise APIResponseError( - _("链接：{0}，状态码 {1}：{2} ").format( - exc.response.url, - exc.response.status_code, - exc.response.text, - ) + raise APIResponseError( + _("{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}").format( + _("状态码错误"), + instance.ttwid_conf["url"], + cls.proxies, + cls.__name__, + exc, ) + ) @classmethod def gen_odin_tt(cls) -> str: @@ -404,22 +397,15 @@ def gen_odin_tt(cls) -> str: except httpx.HTTPStatusError as exc: logger.error(traceback.format_exc()) - if exc.response.status_code == 401: - raise APIUnauthorizedError( - _( - "参数验证失败，请更新 F2 配置文件中的 {0}，以匹配 {1} 新规则" - ).format("odin_tt", "tiktok") - ) - elif exc.response.status_code == 404: - raise APINotFoundError(_("{0} 无法找到API端点").format("odin_tt")) - else: - raise APIResponseError( - _("链接：{0}，状态码 {1}：{2} ").format( - exc.response.url, - exc.response.status_code, - exc.response.text, - ) + raise APIResponseError( + _("{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}").format( + _("状态码错误"), + instance.odin_tt_conf["url"], + cls.proxies, + cls.__name__, + exc, ) + ) class XBogusManager: @@ -1016,7 +1002,7 @@ async def get_all_aweme_id(cls, urls: list) -> list: def format_file_name( naming_template: str, - aweme_data: dict = {}, + aweme_data: dict = ..., custom_fields: dict = {}, ) -> str: """ From 8ef03d4661e2f12356882b02708106605ad10fe3 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 23 May 2024 22:04:53 +0800 Subject: [PATCH 132/299] =?UTF-8?q?style:=20=E4=BD=BF=E7=94=A8black?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/snippets/douyin/aweme-id.py | 8 +++++++- docs/snippets/douyin/webcast-id.py | 4 ++++ f2/__main__.py | 3 +-- f2/apps/douyin/cli.py | 1 + f2/apps/douyin/utils.py | 15 +++++++++++++++ f2/apps/tiktok/utils.py | 1 - f2/utils/_signal.py | 5 ++++- 7 files changed, 32 insertions(+), 5 deletions(-) diff --git a/docs/snippets/douyin/aweme-id.py b/docs/snippets/douyin/aweme-id.py index 9d2efd18..9734e471 100644 --- a/docs/snippets/douyin/aweme-id.py +++ b/docs/snippets/douyin/aweme-id.py @@ -2,10 +2,14 @@ import asyncio from f2.apps.douyin.utils import AwemeIdFetcher + async def main(): - raw_url = "https://www.douyin.com/video/7298145681699622182?previous_page=web_code_link" + raw_url = ( + "https://www.douyin.com/video/7298145681699622182?previous_page=web_code_link" + ) return await AwemeIdFetcher.get_aweme_id(raw_url) + if __name__ == "__main__": print(asyncio.run(main())) @@ -17,6 +21,7 @@ async def main(): from f2.apps.douyin.utils import AwemeIdFetcher from f2.utils.utils import extract_valid_urls + async def main(): raw_urls = [ "0.53 02/26 I@v.sE Fus:/ 你别太帅了郑润泽# 现场版live # 音乐节 # 郑润泽 https://v.douyin.com/iRNBho6u/ 复制此链接，打开Dou音搜索，直接观看视频!", @@ -32,6 +37,7 @@ async def main(): # 对于URL列表 return await AwemeIdFetcher.get_all_aweme_id(urls) + if __name__ == "__main__": print(asyncio.run(main())) diff --git a/docs/snippets/douyin/webcast-id.py b/docs/snippets/douyin/webcast-id.py index c360ec30..b161de44 100644 --- a/docs/snippets/douyin/webcast-id.py +++ b/docs/snippets/douyin/webcast-id.py @@ -2,10 +2,12 @@ import asyncio from f2.apps.douyin.utils import WebCastIdFetcher + async def main(): raw_url = "https://live.douyin.com/775841227732" return await WebCastIdFetcher.get_webcast_id(raw_url) + if __name__ == "__main__": print(asyncio.run(main())) @@ -17,6 +19,7 @@ async def main(): from f2.apps.douyin.utils import WebCastIdFetcher from f2.utils.utils import extract_valid_urls + async def main(): raw_urls = [ "https://live.douyin.com/775841227732", @@ -32,6 +35,7 @@ async def main(): # 对于URL列表 return await WebCastIdFetcher.get_all_webcast_id(urls) + if __name__ == "__main__": print(asyncio.run(main())) diff --git a/f2/__main__.py b/f2/__main__.py index 8c15d876..c1dbeebb 100644 --- a/f2/__main__.py +++ b/f2/__main__.py @@ -1,4 +1,3 @@ - from f2.cli.cli_commands import main -main() \ No newline at end of file +main() diff --git a/f2/apps/douyin/cli.py b/f2/apps/douyin/cli.py index ea8fc7d0..084d3e65 100644 --- a/f2/apps/douyin/cli.py +++ b/f2/apps/douyin/cli.py @@ -19,6 +19,7 @@ ) from f2.utils.conf_manager import ConfigManager from f2.i18n.translator import TranslationManager, _ + # from f2.apps.douyin.handler import handle_sso_login from f2.apps.douyin.utils import ClientConfManager diff --git a/f2/apps/douyin/utils.py b/f2/apps/douyin/utils.py index 61660316..e23b57db 100644 --- a/f2/apps/douyin/utils.py +++ b/f2/apps/douyin/utils.py @@ -716,6 +716,21 @@ class MixIdFetcher(BaseCrawler): 方法: - get_mix_id: 从单个 URL 中获取 mix_id。 - get_all_mix_id: 从 URL 列表中获取所有 mix_id。 + + 异常处理: + - 在 HTTP 请求过程中，处理可能出现的 TimeoutException、NetworkError、ProtocolError、ProxyError 和 HTTPStatusError 异常，并记录相应的错误信息。 + + 使用示例: + # 获取单个合集的 mix_id + url = "https://www.douyin.com/collection/7360898383181809676" + mix_id = await MixIdFetcher.get_mix_id(url) + + # 获取多个合集的 mix_id + urls = [ + "https://www.douyin.com/collection/6812345678901234567", + "https://www.douyin.com/collection/6812345678901234568", + ] + mix_ids = await MixIdFetcher.get_all_mix_id(urls) """ _DOUYIN_MIX_URL_PATTERN = re.compile(r"collection/([^/?]*)") diff --git a/f2/apps/tiktok/utils.py b/f2/apps/tiktok/utils.py index d416b052..d9a7d58a 100644 --- a/f2/apps/tiktok/utils.py +++ b/f2/apps/tiktok/utils.py @@ -211,7 +211,6 @@ def gen_real_msToken(cls) -> str: ) ) - @classmethod def gen_false_msToken(cls) -> str: """ diff --git a/f2/utils/_signal.py b/f2/utils/_signal.py index 0b4be5be..0f70e41a 100644 --- a/f2/utils/_signal.py +++ b/f2/utils/_signal.py @@ -6,6 +6,7 @@ from f2.utils._singleton import Singleton from f2.cli.cli_console import RichConsoleManager + class SignalManager(metaclass=Singleton): def __init__(self): self._shutdown_event = asyncio.Event() @@ -33,7 +34,9 @@ def _handle_signal(self, received_signal, frame): def register_shutdown_signal(self): """注册一个处理程序来捕获关闭信号""" signal.signal(signal.SIGINT, self._handle_signal) - signal.signal(signal.SIGTERM, self._handle_signal) # 捕获SIGTERM信号，确保更好的跨平台兼容性 + signal.signal( + signal.SIGTERM, self._handle_signal + ) # 捕获SIGTERM信号，确保更好的跨平台兼容性 @classmethod def is_shutdown_signaled(cls): From bd4eca52f4873e365ec13c5b9418afc728dedca1 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 23 May 2024 22:19:57 +0800 Subject: [PATCH 133/299] =?UTF-8?q?docs:=20=E8=A1=A5=E5=85=85douyin?= =?UTF-8?q?=E7=9A=84utils=E7=B1=BB=E6=96=B9=E6=B3=95=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/utils.py | 46 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/f2/apps/douyin/utils.py b/f2/apps/douyin/utils.py index e23b57db..5e903c59 100644 --- a/f2/apps/douyin/utils.py +++ b/f2/apps/douyin/utils.py @@ -423,6 +423,21 @@ class SecUserIdFetcher(BaseCrawler): 方法: - get_sec_user_id: 从单个 URL 中获取 sec_user_id。 - get_all_sec_user_id: 从 URL 列表中获取所有 sec_user_id。 + + 异常处理: + - 在 HTTP 请求过程中，处理可能出现的 TimeoutException、NetworkError、ProtocolError、ProxyError 和 HTTPStatusError 异常，并记录相应的错误信息。 + + 使用示例: + # 获取单个用户的 sec_user_id + url = "https://www.douyin.com/user/MS4wLjABAAAAEc8EKgWVEpEQoDRRp8_M53psgc-BoKqre-jICyt6aBA" + sec_user_id = await SecUserIdFetcher.get_sec_user_id(url) + + # 获取多个用户的 sec_user_id + urls = [ + "https://www.douyin.com/user/MS4wLjABAAAAEc8EKgWVEpEQoDRRp8_M53psgc-BoKqre-jICyt6aBA", + "https://v.douyin.com/i2wyU53P/", + ] + sec_user_ids = await SecUserIdFetcher.get_all_sec_user_id(urls) """ _DOUYIN_URL_PATTERN = re.compile(r"user/([^/?]*)") @@ -570,6 +585,22 @@ class AwemeIdFetcher(BaseCrawler): 方法: - get_aweme_id: 从单个 URL 中获取 aweme_id。 - get_all_aweme_id: 从 URL 列表中获取所有 aweme_id。 + + 异常处理: + - 在 HTTP 请求过程中，处理可能出现的 TimeoutException、NetworkError、ProtocolError、ProxyError 和 HTTPStatusError 异常，并记录相应的错误信息。 + + 使用示例: + # 获取单个作品的 aweme_id + url = "https://www.douyin.com/video/6969696969696969696" + aweme_id = await AwemeIdFetcher.get_aweme_id(url) + + # 获取多个作品的 aweme_id + urls = [ + "https://www.douyin.com/video/6969696969696969696", + "https://www.douyin.com/note/6969696969696969696", + "https://v.douyin.com/tttttttt/", + ] + aweme_ids = await AwemeIdFetcher.get_all_aweme_id(urls) """ _DOUYIN_VIDEO_URL_PATTERN = re.compile(r"video/([^/?]*)") @@ -871,6 +902,21 @@ class WebCastIdFetcher(BaseCrawler): 方法: - get_webcast_id: 从单个 URL 中获取 webcast_id。 - get_all_webcast_id: 从 URL 列表中获取所有 webcast_id。 + + 异常处理: + - 在 HTTP 请求过程中，处理可能出现的 TimeoutException、NetworkError、ProtocolError、ProxyError 和 HTTPStatusError 异常，并记录相应的错误信息。 + + 使用示例: + # 获取单个直播的 webcast_id + url = "https://live.douyin.com/36299127202" + webcast_id = await WebCastIdFetcher.get_webcast_id(url) + + # 获取多个直播的 webcast_id + urls = [ + "https://live.douyin.com/36299127202", + "https://live.douyin.com/36299127202?enter_from_merge=link_share&enter_method=copy_link_share&action_type=click&from=web_code_link", + ] + webcast_ids = await WebCastIdFetcher.get_all_webcast_id(urls) """ _DOUYIN_LIVE_URL_PATTERN = re.compile(r"live/([^/?]*)") From 20a9a3892bc431e80d7bc4afd3157373ddb9b0e3 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 23 May 2024 22:25:31 +0800 Subject: [PATCH 134/299] =?UTF-8?q?test:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E5=90=88=E9=9B=86id=E8=8E=B7=E5=8F=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=89=87=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/snippets/douyin/mix-id.py | 40 ++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/docs/snippets/douyin/mix-id.py b/docs/snippets/douyin/mix-id.py index e69de29b..afe7b360 100644 --- a/docs/snippets/douyin/mix-id.py +++ b/docs/snippets/douyin/mix-id.py @@ -0,0 +1,40 @@ +// #region single-mix-id-snippet +import asyncio +from f2.apps.douyin.utils import MixIdFetcher + + +async def main(): + raw_url = "https://www.douyin.com/collection/7360898383181809676" + + return await MixIdFetcher.get_mix_id(raw_url) + + +if __name__ == "__main__": + print(asyncio.run(main())) + +// #endregion single-mix-id-snippet + + +// #region multi-mix-id-snippet +import asyncio +from f2.apps.douyin.utils import MixIdFetcher +from f2.utils.utils import extract_valid_urls + + +async def main(): + raw_urls = [ + "https://www.douyin.com/collection/7360898383181809676", + "https://www.douyin.com/collection/7270895771149404160", + ] + + # 提取有效URL + urls = extract_valid_urls(raw_urls) + + # 对于URL列表 + return await MixIdFetcher.get_all_mix_id(urls) + + +if __name__ == "__main__": + print(asyncio.run(main())) + +// #endregion multi-mix-id-snippet \ No newline at end of file From bfb1d14bf8193989c4f1e64dd57abf335897ea99 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 23 May 2024 22:40:07 +0800 Subject: [PATCH 135/299] =?UTF-8?q?test:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E9=9B=86=E6=88=90=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/test/test_crawler.py | 27 +++++++++++++++++++++++++++ f2/apps/tiktok/test/test_token.py | 22 ++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 f2/apps/tiktok/test/test_crawler.py create mode 100644 f2/apps/tiktok/test/test_token.py diff --git a/f2/apps/tiktok/test/test_crawler.py b/f2/apps/tiktok/test/test_crawler.py new file mode 100644 index 00000000..f5ae266a --- /dev/null +++ b/f2/apps/tiktok/test/test_crawler.py @@ -0,0 +1,27 @@ +import pytest +from f2.apps.tiktok.model import UserPost +from f2.apps.tiktok.filter import UserPostFilter +from f2.apps.tiktok.crawler import TiktokCrawler +from f2.utils.conf_manager import TestConfigManager + + +@pytest.fixture +def cookie_fixture(): + return TestConfigManager.get_test_config("tiktok") + + +@pytest.mark.asyncio +async def test_crawler_fetcher(cookie_fixture): + async with TiktokCrawler(cookie_fixture) as crawler: + params = UserPost( + max_cursor=0, + count=1, + secUid="", + sec_user_id="MS4wLjABAAAAu8qwDm1-muGuMhZZ-tVzyPVWlUxIbQRNJN_9k83OhWU", + ) + response = await crawler.fetch_user_post(params) + assert response, "Failed to fetch user post" + + video = UserPostFilter(response) + video_id = video.aweme_id + assert video_id, "Failed to extract video ID" diff --git a/f2/apps/tiktok/test/test_token.py b/f2/apps/tiktok/test/test_token.py new file mode 100644 index 00000000..c177487c --- /dev/null +++ b/f2/apps/tiktok/test/test_token.py @@ -0,0 +1,22 @@ +import pytest +from f2.apps.tiktok.utils import TokenManager + +def test_gen_real_msToken(): + token = TokenManager.gen_real_msToken() + assert token is not None, "gen_real_msToken() should return a valid token" + assert isinstance(token, str), "gen_real_msToken() should return a string" + +def test_gen_false_msToken(): + token = TokenManager.gen_false_msToken() + assert token is not None, "gen_false_msToken() should return a valid token" + assert isinstance(token, str), "gen_false_msToken() should return a string" + +def test_gen_ttwid(): + ttwid = TokenManager.gen_ttwid() + assert ttwid is not None, "gen_ttwid() should return a valid ttwid" + assert isinstance(ttwid, str), "gen_ttwid() should return a string" + +def test_gen_odin_tt(): + csrf_token = TokenManager.gen_odin_tt() + assert csrf_token is not None, "gen_odin_tt() should return a valid csrf token" + assert isinstance(csrf_token, str), "gen_odin_tt() should return a string" From 1223543fa172df0046c58696a4958b9cdd4eb648 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 23 May 2024 22:49:25 +0800 Subject: [PATCH 136/299] =?UTF-8?q?docs:=20=E6=B7=BB=E5=8A=A0=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E5=88=86=E6=94=AF=E4=B8=8Edc=E5=BE=BD=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 2 ++ README.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/README.en.md b/README.en.md index 94159204..06275f77 100644 --- a/README.en.md +++ b/README.en.md @@ -4,6 +4,8 @@ [![Downloads](https://pepy.tech/badge/f2/month)](https://pepy.tech/project/f2) [![PyPI version](https://badge.fury.io/py/f2.svg)](https://badge.fury.io/py/f2) +[![Dev Branch](https://badgen.net/badge/branch/v0.0.1.6-pw2/blue)](https://github.com/Johnserf-Seed/f2/tree/v0.0.1.6-pw2) +[![Discord](https://img.shields.io/discord/1146473603450282004?label=Discord)](https://discord.gg/3PhtPmgHf8) [![codecov](https://codecov.io/gh/Johnserf-Seed/f2/graph/badge.svg?token=T9DH4QPZSS)](https://codecov.io/gh/Johnserf-Seed/f2) [![APACHE-2.0](https://img.shields.io/github/license/johnserf-seed/f2)](https://github.com/Johnserf-Seed/f2/blob/main/LICENSE) diff --git a/README.md b/README.md index 6ffde614..e2635d9d 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ [![Downloads](https://pepy.tech/badge/f2/month)](https://pepy.tech/project/f2) [![PyPI version](https://badge.fury.io/py/f2.svg)](https://badge.fury.io/py/f2) +[![Dev Branch](https://badgen.net/badge/branch/v0.0.1.6-pw2/blue)](https://github.com/Johnserf-Seed/f2/tree/v0.0.1.6-pw2) +[![Discord](https://img.shields.io/discord/1146473603450282004?label=Discord)](https://discord.gg/3PhtPmgHf8) [![codecov](https://codecov.io/gh/Johnserf-Seed/f2/graph/badge.svg?token=T9DH4QPZSS)](https://codecov.io/gh/Johnserf-Seed/f2) [![APACHE-2.0](https://img.shields.io/github/license/johnserf-seed/f2)](https://github.com/Johnserf-Seed/f2/blob/main/LICENSE) From ce55e3de75e76e79ecad0a6344f0bedc1ac24e32 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 23 May 2024 22:54:15 +0800 Subject: [PATCH 137/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0apps=E9=9B=86?= =?UTF-8?q?=E6=88=90=E6=B5=8B=E8=AF=95=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ..._apps_model.py => test_douyin_apps_model.py} | 0 ...test_aweme_id.py => test_douyin_aweme_id.py} | 0 .../{test_crawler.py => test_douyin_crawler.py} | 0 .../{test_handler.py => test_douyin_handler.py} | 0 .../test/{test_lrc.py => test_douyin_lrc.py} | 0 .../{test_room_id.py => test_douyin_room_id.py} | 0 ...ec_user_id.py => test_douyin_sec_user_id.py} | 0 f2/apps/douyin/test/test_douyin_token.py | 17 +++++++++++++++++ ..._webcast_id.py => test_douyin_webcast_id.py} | 0 .../{test_crawler.py => test_tiktok_crawler.py} | 0 .../{test_token.py => test_tiktok_token.py} | 0 11 files changed, 17 insertions(+) rename f2/apps/douyin/test/{test_apps_model.py => test_douyin_apps_model.py} (100%) rename f2/apps/douyin/test/{test_aweme_id.py => test_douyin_aweme_id.py} (100%) rename f2/apps/douyin/test/{test_crawler.py => test_douyin_crawler.py} (100%) rename f2/apps/douyin/test/{test_handler.py => test_douyin_handler.py} (100%) rename f2/apps/douyin/test/{test_lrc.py => test_douyin_lrc.py} (100%) rename f2/apps/douyin/test/{test_room_id.py => test_douyin_room_id.py} (100%) rename f2/apps/douyin/test/{test_sec_user_id.py => test_douyin_sec_user_id.py} (100%) create mode 100644 f2/apps/douyin/test/test_douyin_token.py rename f2/apps/douyin/test/{test_webcast_id.py => test_douyin_webcast_id.py} (100%) rename f2/apps/tiktok/test/{test_crawler.py => test_tiktok_crawler.py} (100%) rename f2/apps/tiktok/test/{test_token.py => test_tiktok_token.py} (100%) diff --git a/f2/apps/douyin/test/test_apps_model.py b/f2/apps/douyin/test/test_douyin_apps_model.py similarity index 100% rename from f2/apps/douyin/test/test_apps_model.py rename to f2/apps/douyin/test/test_douyin_apps_model.py diff --git a/f2/apps/douyin/test/test_aweme_id.py b/f2/apps/douyin/test/test_douyin_aweme_id.py similarity index 100% rename from f2/apps/douyin/test/test_aweme_id.py rename to f2/apps/douyin/test/test_douyin_aweme_id.py diff --git a/f2/apps/douyin/test/test_crawler.py b/f2/apps/douyin/test/test_douyin_crawler.py similarity index 100% rename from f2/apps/douyin/test/test_crawler.py rename to f2/apps/douyin/test/test_douyin_crawler.py diff --git a/f2/apps/douyin/test/test_handler.py b/f2/apps/douyin/test/test_douyin_handler.py similarity index 100% rename from f2/apps/douyin/test/test_handler.py rename to f2/apps/douyin/test/test_douyin_handler.py diff --git a/f2/apps/douyin/test/test_lrc.py b/f2/apps/douyin/test/test_douyin_lrc.py similarity index 100% rename from f2/apps/douyin/test/test_lrc.py rename to f2/apps/douyin/test/test_douyin_lrc.py diff --git a/f2/apps/douyin/test/test_room_id.py b/f2/apps/douyin/test/test_douyin_room_id.py similarity index 100% rename from f2/apps/douyin/test/test_room_id.py rename to f2/apps/douyin/test/test_douyin_room_id.py diff --git a/f2/apps/douyin/test/test_sec_user_id.py b/f2/apps/douyin/test/test_douyin_sec_user_id.py similarity index 100% rename from f2/apps/douyin/test/test_sec_user_id.py rename to f2/apps/douyin/test/test_douyin_sec_user_id.py diff --git a/f2/apps/douyin/test/test_douyin_token.py b/f2/apps/douyin/test/test_douyin_token.py new file mode 100644 index 00000000..96d11168 --- /dev/null +++ b/f2/apps/douyin/test/test_douyin_token.py @@ -0,0 +1,17 @@ +import pytest +from f2.apps.douyin.utils import TokenManager + +def test_gen_real_msToken(): + token = TokenManager.gen_real_msToken() + assert token is not None, "gen_real_msToken() should return a valid token" + assert isinstance(token, str), "gen_real_msToken() should return a string" + +def test_gen_false_msToken(): + token = TokenManager.gen_false_msToken() + assert token is not None, "gen_false_msToken() should return a valid token" + assert isinstance(token, str), "gen_false_msToken() should return a string" + +def test_gen_ttwid(): + ttwid = TokenManager.gen_ttwid() + assert ttwid is not None, "gen_ttwid() should return a valid ttwid" + assert isinstance(ttwid, str), "gen_ttwid() should return a string" diff --git a/f2/apps/douyin/test/test_webcast_id.py b/f2/apps/douyin/test/test_douyin_webcast_id.py similarity index 100% rename from f2/apps/douyin/test/test_webcast_id.py rename to f2/apps/douyin/test/test_douyin_webcast_id.py diff --git a/f2/apps/tiktok/test/test_crawler.py b/f2/apps/tiktok/test/test_tiktok_crawler.py similarity index 100% rename from f2/apps/tiktok/test/test_crawler.py rename to f2/apps/tiktok/test/test_tiktok_crawler.py diff --git a/f2/apps/tiktok/test/test_token.py b/f2/apps/tiktok/test/test_tiktok_token.py similarity index 100% rename from f2/apps/tiktok/test/test_token.py rename to f2/apps/tiktok/test/test_tiktok_token.py From 582ae7bb3b708b4354d392c266aa7b55a2bf27c7 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Fri, 24 May 2024 00:12:56 +0800 Subject: [PATCH 138/299] =?UTF-8?q?test:=20=E6=9B=B4=E6=96=B0tiktok?= =?UTF-8?q?=E9=9B=86=E6=88=90=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/test/test_tiktok_crawler.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/f2/apps/tiktok/test/test_tiktok_crawler.py b/f2/apps/tiktok/test/test_tiktok_crawler.py index f5ae266a..43144a57 100644 --- a/f2/apps/tiktok/test/test_tiktok_crawler.py +++ b/f2/apps/tiktok/test/test_tiktok_crawler.py @@ -11,13 +11,12 @@ def cookie_fixture(): @pytest.mark.asyncio -async def test_crawler_fetcher(cookie_fixture): +async def test_crawler_by_secUid(cookie_fixture): async with TiktokCrawler(cookie_fixture) as crawler: params = UserPost( - max_cursor=0, - count=1, - secUid="", - sec_user_id="MS4wLjABAAAAu8qwDm1-muGuMhZZ-tVzyPVWlUxIbQRNJN_9k83OhWU", + cursor=0, + count= 5, + secUid="MS4wLjABAAAAREbjjYuEFoUJN86G9f2byGC_LSOTz4N7BGdreT_8Cro-NkzZYf_nxpDpLp9R6ElJ", ) response = await crawler.fetch_user_post(params) assert response, "Failed to fetch user post" From b579443e2874d0bd5c359e7653d65bbdd40d1ca7 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Fri, 24 May 2024 00:13:36 +0800 Subject: [PATCH 139/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/conf/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/f2/conf/test.yaml b/f2/conf/test.yaml index ea5b0f09..506dfb15 100644 --- a/f2/conf/test.yaml +++ b/f2/conf/test.yaml @@ -9,9 +9,9 @@ douyin: tiktok: headers: - User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36 + User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36 Referer: https://www.tiktok.com/ - cookie: tt_csrf_token=OFxPH3PE-pSbFptiHW4iy-z4yo3u6gMDt3H0; tt_chain_token=mCH+/C/4flkJarNC1WciiQ==; ak_bmsc=91F3094B27728C66727FD8F413E3CFDA~000000000000000000000000000000~YAAQDfN0aMJLgrOOAQAAfOkFuBeR4cRsy06d9RdcxcQPWGV8lJwTK79/VYCCwvjeEtlU2mCQalUnDU1R2p6Put0FonN6gVhoG2cCdwocRl87ItHMeEQpQxAH0640eFwLYG7OBS5ydU9DUbYX3pCINlGp3AbB7wbAxQb75svv1eEALa0ba8YvA85s1ingqnpt4WmKuSeyR9LkCIg9oABnKJHbPaR2FAWA982tsSdQYIeKlsUc5nyotjtrmgDubgD+v624hs2ilwVQ61HKiCQ7P15mH0M9FL8ciGsDpTKotxZ8sG2phoylvmn0ajD8QV2YdDOegI9ss6RC79POVI5xaFnpoV8TQWLyPzdEl/E6S1TVqaqRHMJsF1De/tdQcLC9//aCKt3NZTqDGg==; tiktok_webapp_theme=light; ttwid=1%7C92fxGgEo0Z8ZDy0YLeqOnKTMHMCPieG0L8UVR1j1oI8%7C1712484381%7Ccb6cbac4d746f5a6acaf73301b34642d1358092dce19a9cb97a4adc978e9d383; odin_tt=d739e385ecc07c0682ee2c2824e464e42d6760e26ec3df8c5b4a0ed1b0bcf02fb36a3eed2a0012a70b3f8ac84a79d5278e23b2ead40ed7aaf85c8ca8b611a8f5819324df5b2ecc7e1d45725a1f5f3ed9; msToken=iA6SqoX-3ggC9aEGWcxqgX0GoRG_1z-3JA9jecj8NwngM3ivhpnl6113Xc72cEc1RhP5YXXeblbo5OOrjfH6tyqtVhD68pnoxVHFTwONHFKwxGkryp3AP2ipQ8Y4; msToken=-RWw93z8QG4ppPftuXXV0NXTs3KN74Jc-eZ7G8Yw0GOWvLoCXB4upq-lPpbKVhIOxp_wJ-hDkWHj364_BTIJUmFLhFLIOaTzgjD4tazEVOEQUBdyG3IbsEZnHxcR + cookie: tt_csrf_token=eGI3m1IO--7j58-ZpcYjYERFXQNmROAgzSyw; tt_chain_token=7y7/QdUWx4ZIgP4Ot3Z8Cg==; ak_bmsc=17A9D52C796C09A9A8D4F75D4BDE55AF~000000000000000000000000000000~YAAQZfrSF46xCp+PAQAAIPwWphfFN/P3SUUDi3jLw7CDHBCT3T8Q8Of1jaoVwyzSjJr9+Sk4zn4tZ1SwVRk2N4XwoZDZM/vcNU+shOv82y495Lq4fg3zFCL3qp8AHZbPpyYHhsAUQmKX72NFN2yNv9AUEoEuWZf/RixPCJq6uNMBXJlQHbi+Z+6fY3e9w4YlzDmVjeVAFdz6cEjAUn4CKsZXHtucZ7VjNwCOA5ntJbdSY9OGHoACbuyZxiyBPU9bw03kYokGKmqzRt/26mOineJJ/n5Vfxm8nw0wszxcl10tUatB2SRI/JNBKlOP+ya8bGF+MkLb3m2VJFV1+28ifA5NnzOxUzFPMeEyho4mVawh72riUI6D/e1gmTu257dShK/3zX3gRI0MgQ==; tiktok_webapp_theme=light; ttwid=1%7C3vmK-4AKcLrwW0dkt40unbPvMwaIT_nBpHAWirGPzgs%7C1716478481%7C7b955005200d35af3005e0879a4a344f8e47d429c77f95cc6f8220a648441e33; msToken=ToT05CKOzCiGWcIPDghKKSCqzItWry2tTyrl6qVroJlOtbNS1PPmOZlqiK695nQNXFVV6ZnEL3erWprT4JxPvDlWgpaP3JzCF4WwDYg99zGRa9sM6ieRIF6wbEuc; odin_tt=7ddd61572b181fd6f5f7910f10dc68db813d29c844f624956351979a5f5135fae06c482516e5fc90d55a742a690a96fad248b1cddcad1c116a89b806531403f75cd1e0dd1cbd1dd468fc8eed0af0dda8; msToken=If2HkAJWfx5rt-8S1b_YIMz7znwXO2taR1yKfwAW3MomvhEVDdv3FojHaRxazAWJK7UTwqwTQ3nA995PP_3jGkKQ9Gwy-k1E0ja_xkLY6vZaw5WDqIGNtvCfiQrr proxies: http://: https://: \ No newline at end of file From 5ee158b840033df3e730201ca91abd7f469524ce Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Fri, 24 May 2024 00:14:25 +0800 Subject: [PATCH 140/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0tiktok?= =?UTF-8?q?=E7=9A=84ttwid=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/conf/conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/f2/conf/conf.yaml b/f2/conf/conf.yaml index a15bf046..d67aaa10 100644 --- a/f2/conf/conf.yaml +++ b/f2/conf/conf.yaml @@ -40,7 +40,7 @@ f2: ttwid: url: https://www.tiktok.com/ttwid/check/ data: '{"aid":1988,"service":"www.tiktok.com","union":false,"unionHost":"","needFid":false,"fid":"","migrate_priority":0}' - cookie: ttwid=1%7CovVQu2St-HXSHAdEfZ7tljPe151SZ88AbrlTirlaC6w%7C1701072604%7C49b17849da69bafc3638e794f3f26b30fe9677c5253e65a2a5f615489846ce02 + cookie: ttwid=1%7C76h2rDsKzpmjqlO_ca2y9o_tmyKaoGNEwQqPevPtp_E%7C1715513873%7C932348e1f94fcca9ddca030483396dffde91d4f60d430f746c958b74dbb62add; tt_csrf_token=wFbdcvX9-kZblR4Wb8WwiGJww18VZLkhr_3g; odin_tt: url: https://www.tiktok.com/passport/web/account/info/?aid=1459&app_language=zh-Hans&app_name=tiktok_web&browser_language=zh-CN&browser_name=Mozilla&browser_online=true&browser_platform=Win32&browser_version=5.0%20%28Windows%20NT%2010.0%3B%20Win64%3B%20x64%29%20AppleWebKit%2F537.36%20%28KHTML%2C%20like%20Gecko%29%20Chrome%2F119.0.0.0%20Safari%2F537.36&channel=tiktok_web&cookie_enabled=true&device_id=7306060721837852167&root_referer=https%3A%2F%2Fwww.tiktok.com%2Flogin%2F From b0002d9169cedadec1a71174998a721133d73256 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Fri, 24 May 2024 00:18:50 +0800 Subject: [PATCH 141/299] =?UTF-8?q?build:=20=E6=9B=B4=E6=96=B0pytest=3D=3D?= =?UTF-8?q?8.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c1d4097c..76efd7cb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ dependencies = [ "jsonpath-ng==1.6.0", "importlib_resources==6.1.0", "m3u8==3.6.0", - "pytest==7.4.2", + "pytest==8.2.1", "pytest-asyncio==0.21.1", "browser_cookie3==0.19.1", "pydantic==2.6.4", From b16c2f3a6992e6654c8c1aff70c915fa2dc0766e Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Fri, 24 May 2024 00:57:13 +0800 Subject: [PATCH 142/299] =?UTF-8?q?style:=20=E4=BD=BF=E7=94=A8black?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/test/test_douyin_token.py | 3 +++ f2/apps/tiktok/test/test_tiktok_crawler.py | 2 +- f2/apps/tiktok/test/test_tiktok_token.py | 4 ++++ tests/test_xbogus.py | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/f2/apps/douyin/test/test_douyin_token.py b/f2/apps/douyin/test/test_douyin_token.py index 96d11168..e8195d57 100644 --- a/f2/apps/douyin/test/test_douyin_token.py +++ b/f2/apps/douyin/test/test_douyin_token.py @@ -1,16 +1,19 @@ import pytest from f2.apps.douyin.utils import TokenManager + def test_gen_real_msToken(): token = TokenManager.gen_real_msToken() assert token is not None, "gen_real_msToken() should return a valid token" assert isinstance(token, str), "gen_real_msToken() should return a string" + def test_gen_false_msToken(): token = TokenManager.gen_false_msToken() assert token is not None, "gen_false_msToken() should return a valid token" assert isinstance(token, str), "gen_false_msToken() should return a string" + def test_gen_ttwid(): ttwid = TokenManager.gen_ttwid() assert ttwid is not None, "gen_ttwid() should return a valid ttwid" diff --git a/f2/apps/tiktok/test/test_tiktok_crawler.py b/f2/apps/tiktok/test/test_tiktok_crawler.py index 43144a57..77e5660e 100644 --- a/f2/apps/tiktok/test/test_tiktok_crawler.py +++ b/f2/apps/tiktok/test/test_tiktok_crawler.py @@ -15,7 +15,7 @@ async def test_crawler_by_secUid(cookie_fixture): async with TiktokCrawler(cookie_fixture) as crawler: params = UserPost( cursor=0, - count= 5, + count=5, secUid="MS4wLjABAAAAREbjjYuEFoUJN86G9f2byGC_LSOTz4N7BGdreT_8Cro-NkzZYf_nxpDpLp9R6ElJ", ) response = await crawler.fetch_user_post(params) diff --git a/f2/apps/tiktok/test/test_tiktok_token.py b/f2/apps/tiktok/test/test_tiktok_token.py index c177487c..aa7d933e 100644 --- a/f2/apps/tiktok/test/test_tiktok_token.py +++ b/f2/apps/tiktok/test/test_tiktok_token.py @@ -1,21 +1,25 @@ import pytest from f2.apps.tiktok.utils import TokenManager + def test_gen_real_msToken(): token = TokenManager.gen_real_msToken() assert token is not None, "gen_real_msToken() should return a valid token" assert isinstance(token, str), "gen_real_msToken() should return a string" + def test_gen_false_msToken(): token = TokenManager.gen_false_msToken() assert token is not None, "gen_false_msToken() should return a valid token" assert isinstance(token, str), "gen_false_msToken() should return a string" + def test_gen_ttwid(): ttwid = TokenManager.gen_ttwid() assert ttwid is not None, "gen_ttwid() should return a valid ttwid" assert isinstance(ttwid, str), "gen_ttwid() should return a string" + def test_gen_odin_tt(): csrf_token = TokenManager.gen_odin_tt() assert csrf_token is not None, "gen_odin_tt() should return a valid csrf token" diff --git a/tests/test_xbogus.py b/tests/test_xbogus.py index 27484395..e1825e09 100644 --- a/tests/test_xbogus.py +++ b/tests/test_xbogus.py @@ -2,6 +2,7 @@ from f2.utils.xbogus import XBogus + def test_get_xbogus(): xb = XBogus().getXBogus( "aweme_id=7196239141472980280&aid=1128&version_name=23.5.0&device_platform=android&os_version=2333" From 972663e0295deaee3e171ac10e7d97b0b9a52981 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Fri, 24 May 2024 01:40:11 +0800 Subject: [PATCH 143/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0tiktok?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=9F=BA=E7=A1=80=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. device_id是风控重点参数 2. 只生成真实的mstoken，虚假的值会偶尔风控 --- f2/apps/tiktok/model.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/f2/apps/tiktok/model.py b/f2/apps/tiktok/model.py index 5c9c5547..ae7ed4e0 100644 --- a/f2/apps/tiktok/model.py +++ b/f2/apps/tiktok/model.py @@ -19,12 +19,12 @@ class BaseRequestModel(BaseModel): browser_online: str = "true" browser_platform: str = "Win32" browser_version: str = quote( - "5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36", + "5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36", safe="", ) channel: str = "tiktok_web" cookie_enabled: str = "true" - device_id: str = "7360698239018452498" + device_id: str = "7372218823115949569" # 风控参数 # 7368075886505051694 device_platform: str = "web_pc" focus_state: str = "true" from_page: str = "user" @@ -33,7 +33,7 @@ class BaseRequestModel(BaseModel): is_page_visible: str = "true" language: str = "zh-Hans" os: str = "windows" - priority_region: str = "" + priority_region: str = "US" referer: str = "" region: str = "SG" # SG JP KR... # root_referer: str = quote("https://www.tiktok.com/", safe="") @@ -44,8 +44,8 @@ class BaseRequestModel(BaseModel): try: msToken: str = TokenManager.gen_real_msToken() except: - # 返回虚假的msToken (Return a fake msToken) - msToken: str = TokenManager.gen_false_msToken() + # 发生异常时，重新生成msToken，不生成虚假msToken + msToken: str = TokenManager.gen_real_msToken() # router model From b27a9e2620833943aaa58a6d354bf3b2b05e55c2 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Fri, 24 May 2024 01:40:31 +0800 Subject: [PATCH 144/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0tiktok?= =?UTF-8?q?=E7=9A=84ttwid=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/conf/conf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/f2/conf/conf.yaml b/f2/conf/conf.yaml index d67aaa10..001fd6d3 100644 --- a/f2/conf/conf.yaml +++ b/f2/conf/conf.yaml @@ -39,8 +39,8 @@ f2: ttwid: url: https://www.tiktok.com/ttwid/check/ - data: '{"aid":1988,"service":"www.tiktok.com","union":false,"unionHost":"","needFid":false,"fid":"","migrate_priority":0}' - cookie: ttwid=1%7C76h2rDsKzpmjqlO_ca2y9o_tmyKaoGNEwQqPevPtp_E%7C1715513873%7C932348e1f94fcca9ddca030483396dffde91d4f60d430f746c958b74dbb62add; tt_csrf_token=wFbdcvX9-kZblR4Wb8WwiGJww18VZLkhr_3g; + data: '{"unionHost":"https://ttwid-sg.tiktok.com","aid":1459,"service":"www.tiktok.com","needFid":false,"union":true,"fid":"","migrate_priority":0}' + cookie: ttwid=1%7CrR_4t3jnUjjqfiQzZRmSkGKf7NjXm2v1U8gRHjPDZho%7C1715513773%7Cf339b15d826ae9a3b02cadf6ce6d453713af3e54a92df722f776626f5a8877df;odin_tt=8b0213106b8f93bfd7ad7fea3f3fa3f1f344e349a1d94d0758cc9ac3c76e394d3a419a98f5814ed65961c65f5441d63111e442eab06ac55b6853009b0e8f9ebd43e28bbd36351e12db4b4a42e4a9a004;msToken=bVb1Oatl-EoYxKLz9nRtAMohyPE1GdPjQf6YAaVpj6_0PaFIemUaxyuhyO9xAB4V9FSGlx1ps6HqsRBzl8-Ko_U85tWZQH7lkFOLTyEZLpH5lrrPvozDoaxy4w%3D%3D odin_tt: url: https://www.tiktok.com/passport/web/account/info/?aid=1459&app_language=zh-Hans&app_name=tiktok_web&browser_language=zh-CN&browser_name=Mozilla&browser_online=true&browser_platform=Win32&browser_version=5.0%20%28Windows%20NT%2010.0%3B%20Win64%3B%20x64%29%20AppleWebKit%2F537.36%20%28KHTML%2C%20like%20Gecko%29%20Chrome%2F119.0.0.0%20Safari%2F537.36&channel=tiktok_web&cookie_enabled=true&device_id=7306060721837852167&root_referer=https%3A%2F%2Fwww.tiktok.com%2Flogin%2F From 03232f64ddb974597c445872b6e50f7ae4a2c72d Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 25 May 2024 16:12:26 +0800 Subject: [PATCH 145/299] =?UTF-8?q?perf:=20=E4=B8=BAClientConfManager?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86version=E8=AF=BB=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/utils.py | 19 +++++++++++-------- f2/apps/tiktok/utils.py | 21 ++++++++++++--------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/f2/apps/douyin/utils.py b/f2/apps/douyin/utils.py index 5e903c59..5dd10f99 100644 --- a/f2/apps/douyin/utils.py +++ b/f2/apps/douyin/utils.py @@ -39,21 +39,24 @@ class ClientConfManager: 用于管理客户端配置 (Used to manage client configuration) """ - client_conf = ( - ConfigManager(f2.F2_CONFIG_FILE_PATH).get_config("f2").get("douyin", {}) - ) + client_conf = ConfigManager(f2.F2_CONFIG_FILE_PATH).get_config("f2") + douyin_conf = client_conf.get("douyin", {}) @classmethod def client(cls) -> dict: - return cls.client_conf + return cls.douyin_conf + + @classmethod + def version(cls) -> str: + return cls.client_conf.get("version", "unknown") @classmethod def proxies(cls) -> dict: - return cls.client_conf.get("proxies", {}) + return cls.douyin_conf.get("proxies", {}) @classmethod def headers(cls) -> dict: - return cls.client_conf.get("headers", {}) + return cls.douyin_conf.get("headers", {}) @classmethod def user_agent(cls) -> str: @@ -65,11 +68,11 @@ def referer(cls) -> str: @classmethod def msToken(cls) -> str: - return cls.client_conf.get("msToken", {}) + return cls.douyin_conf.get("msToken", {}) @classmethod def ttwid(cls) -> str: - return cls.client_conf.get("ttwid", {}) + return cls.douyin_conf.get("ttwid", {}) class TokenManager(BaseCrawler): diff --git a/f2/apps/tiktok/utils.py b/f2/apps/tiktok/utils.py index d9a7d58a..68106e59 100644 --- a/f2/apps/tiktok/utils.py +++ b/f2/apps/tiktok/utils.py @@ -35,21 +35,24 @@ class ClientConfManager: 用于管理客户端配置 (Used to manage client configuration) """ - client_conf = ( - ConfigManager(f2.F2_CONFIG_FILE_PATH).get_config("f2").get("tiktok", {}) - ) + client_conf = ConfigManager(f2.F2_CONFIG_FILE_PATH).get_config("f2") + tiktok_conf = client_conf.get("tiktok", {}) @classmethod def client(cls) -> dict: - return cls.client_conf + return cls.tiktok_conf + + @classmethod + def version(cls) -> str: + return cls.client_conf.get("version", "unknown") @classmethod def proxies(cls) -> dict: - return cls.client_conf.get("proxies", {}) + return cls.tiktok_conf.get("proxies", {}) @classmethod def headers(cls) -> dict: - return cls.client_conf.get("headers", {}) + return cls.tiktok_conf.get("headers", {}) @classmethod def user_agent(cls) -> str: @@ -61,15 +64,15 @@ def referer(cls) -> str: @classmethod def msToken(cls) -> str: - return cls.client_conf.get("msToken", {}) + return cls.tiktok_conf.get("msToken", {}) @classmethod def ttwid(cls) -> str: - return cls.client_conf.get("ttwid", {}) + return cls.tiktok_conf.get("ttwid", {}) @classmethod def odin_tt(cls) -> str: - return cls.client_conf.get("odin_tt", {}) + return cls.tiktok_conf.get("odin_tt", {}) class TokenManager(BaseCrawler): From c4b2f7433b0abfae4efba13fa1715ac2d8a36ac5 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 25 May 2024 17:41:18 +0800 Subject: [PATCH 146/299] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9Etiktok?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 为ClientConfManager添加模型配置读取 https://github.com/Johnserf-Seed/TikTokDownload/issues/711 --- f2/apps/tiktok/model.py | 32 +++++++++++++++++++------------- f2/apps/tiktok/utils.py | 32 ++++++++++++++++++++++++++++++++ f2/conf/conf.yaml | 18 ++++++++++++++++++ 3 files changed, 69 insertions(+), 13 deletions(-) diff --git a/f2/apps/tiktok/model.py b/f2/apps/tiktok/model.py index ae7ed4e0..33bfb607 100644 --- a/f2/apps/tiktok/model.py +++ b/f2/apps/tiktok/model.py @@ -4,7 +4,7 @@ from pydantic import BaseModel from urllib.parse import quote, unquote -from f2.apps.tiktok.utils import TokenManager +from f2.apps.tiktok.utils import TokenManager, ClientConfManager from f2.utils.utils import get_timestamp @@ -14,36 +14,42 @@ class BaseRequestModel(BaseModel): aid: str = "1988" app_language: str = "zh-Hans" app_name: str = "tiktok_web" - browser_language: str = "zh-CN" - browser_name: str = "Mozilla" + browser_language: str = ClientConfManager.browser().get("language", "zh-CN") + browser_name: str = ClientConfManager.browser().get("name", "Mozilla") browser_online: str = "true" - browser_platform: str = "Win32" + browser_platform: str = ClientConfManager.browser().get("platform", "Win32") browser_version: str = quote( - "5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36", + ClientConfManager.browser().get( + "version", + "5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36", + ), safe="", ) channel: str = "tiktok_web" cookie_enabled: str = "true" - device_id: str = "7372218823115949569" # 风控参数 # 7368075886505051694 - device_platform: str = "web_pc" + device_id: str = ClientConfManager.device().get( + "id", "7372218823115949569" + ) # 风控参数 + device_platform: str = ClientConfManager.device().get("platform", "web_pc") focus_state: str = "true" from_page: str = "user" history_len: int = 4 is_fullscreen: str = "false" is_page_visible: str = "true" language: str = "zh-Hans" - os: str = "windows" - priority_region: str = "US" + os: str = ClientConfManager.os() + priority_region: str = ClientConfManager.priority_region() referer: str = "" - region: str = "SG" # SG JP KR... + region: str = ClientConfManager.region() # SG JP KR... # root_referer: str = quote("https://www.tiktok.com/", safe="") screen_height: int = 1080 screen_width: int = 1920 - webcast_language: str = "zh-Hans" - tz_name: str = quote("Asia/Hong_Kong", safe="") + webcast_language: str = ClientConfManager.webcast_language() + tz_name: str = quote(ClientConfManager.tz_name(), safe="") try: msToken: str = TokenManager.gen_real_msToken() - except: + except Exception as e: + print(f"Error generating msToken: {e}") # 发生异常时，重新生成msToken，不生成虚假msToken msToken: str = TokenManager.gen_real_msToken() diff --git a/f2/apps/tiktok/utils.py b/f2/apps/tiktok/utils.py index 68106e59..d61063d4 100644 --- a/f2/apps/tiktok/utils.py +++ b/f2/apps/tiktok/utils.py @@ -46,6 +46,38 @@ def client(cls) -> dict: def version(cls) -> str: return cls.client_conf.get("version", "unknown") + @classmethod + def model(cls) -> dict: + return cls.client().get("model", {}) + + @classmethod + def browser(cls) -> dict: + return cls.model().get("browser", {}) + + @classmethod + def device(cls) -> dict: + return cls.model().get("device", {}) + + @classmethod + def region(cls) -> str: + return cls.model().get("region", "SG") + + @classmethod + def priority_region(cls) -> str: + return cls.model().get("priority_region", "US") + + @classmethod + def webcast_language(cls) -> str: + return cls.model().get("webcast_language", "zh-Hans") + + @classmethod + def tz_name(cls) -> str: + return cls.model().get("tz_name", "Asia/Hong_Kong") + + @classmethod + def os(cls) -> str: + return cls.model().get("os", "windows") + @classmethod def proxies(cls) -> dict: return cls.tiktok_conf.get("proxies", {}) diff --git a/f2/conf/conf.yaml b/f2/conf/conf.yaml index 001fd6d3..c333d907 100644 --- a/f2/conf/conf.yaml +++ b/f2/conf/conf.yaml @@ -22,6 +22,24 @@ f2: tiktok: + + model: + browser: + language: zh-CN + name: Mozilla + platform: Win32 + version: 5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36 + + device: + id: 7372218823115949569 + platform: web_pc + + os: windows + region: SG + priority_region: US + webcast_language: zh-Hans + tz_name: Asia/Hong_Kong + headers: User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 Edg/122.0.0.0 Referer: https://www.tiktok.com/ From 5319713cdf1c2bf1e88235b56772aa1b719ca1a3 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 25 May 2024 17:42:33 +0800 Subject: [PATCH 147/299] =?UTF-8?q?feat:=20=E4=B8=BAconf.yaml=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/conf/conf.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/f2/conf/conf.yaml b/f2/conf/conf.yaml index c333d907..6641bc63 100644 --- a/f2/conf/conf.yaml +++ b/f2/conf/conf.yaml @@ -1,4 +1,5 @@ f2: + version: 0.0.1.6 douyin: headers: From 5515cd4cbab7062ac50773267fb65e257cf4a5a2 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 25 May 2024 18:57:29 +0800 Subject: [PATCH 148/299] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9Edouyin?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 为ClientConfManager添加模型配置读取 https://github.com/Johnserf-Seed/TikTokDownload/issues/711 --- f2/apps/douyin/model.py | 32 ++++++++++++++++---------------- f2/apps/douyin/utils.py | 34 +++++++++++++++++++++++++++++++++- f2/conf/conf.yaml | 24 ++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 17 deletions(-) diff --git a/f2/apps/douyin/model.py b/f2/apps/douyin/model.py index 1583e424..34c73ac6 100644 --- a/f2/apps/douyin/model.py +++ b/f2/apps/douyin/model.py @@ -4,7 +4,7 @@ from pydantic import BaseModel from urllib.parse import quote, unquote -from f2.apps.douyin.utils import TokenManager, VerifyFpManager +from f2.apps.douyin.utils import TokenManager, VerifyFpManager, ClientConfManager # Base Model @@ -13,20 +13,20 @@ class BaseRequestModel(BaseModel): aid: str = "6383" channel: str = "channel_pc_web" pc_client_type: int = 1 - version_code: str = "190500" - version_name: str = "19.5.0" + version_code: str = ClientConfManager.brm_version().get("code", "190500") + version_name: str = ClientConfManager.brm_version().get("name", "19.5.0") cookie_enabled: str = "true" screen_width: int = 1920 screen_height: int = 1080 - browser_language: str = "zh-CN" - browser_platform: str = "Win32" - browser_name: str = "Edge" - browser_version: str = "122.0.0.0" + browser_language: str = ClientConfManager.brm_browser().get("language", "zh-CN") + browser_platform: str = ClientConfManager.brm_browser().get("platform", "Win32") + browser_name: str = ClientConfManager.brm_browser().get("name", "Edge") + browser_version: str = ClientConfManager.brm_browser().get("version", "122.0.0.0") browser_online: str = "true" - engine_name: str = "Blink" - engine_version: str = "122.0.0.0" - os_name: str = "Windows" - os_version: str = "10" + engine_name: str = ClientConfManager.brm_engine().get("name", "Blink") + engine_version: str = ClientConfManager.brm_engine().get("version", "122.0.0.0") + os_name: str = ClientConfManager.brm_os().get("name", "Windows") + os_version: str = ClientConfManager.brm_os().get("version", "10") cpu_core_num: int = 12 device_memory: int = 8 platform: str = "PC" @@ -45,14 +45,14 @@ class BaseLiveModel(BaseModel): app_name: str = "douyin_web" live_id: int = 1 device_platform: str = "web" - language: str = "zh-CN" + language: str = ClientConfManager.blm_language() cookie_enabled: str = "true" screen_width: int = 1920 screen_height: int = 1080 - browser_language: str = "zh-CN" - browser_platform: str = "Win32" - browser_name: str = "Edge" - browser_version: str = "119.0.0.0" + browser_language: str = ClientConfManager.blm_browser().get("language", "zh-CN") + browser_platform: str = ClientConfManager.blm_browser().get("platform", "Win32") + browser_name: str = ClientConfManager.blm_browser().get("name", "Edge") + browser_version: str = ClientConfManager.blm_browser().get("version", "119.0.0.0") enter_source: Any = "" is_need_double_stream: str = "false" # msToken: str = TokenManager.gen_real_msToken() diff --git a/f2/apps/douyin/utils.py b/f2/apps/douyin/utils.py index 5dd10f99..eab8a337 100644 --- a/f2/apps/douyin/utils.py +++ b/f2/apps/douyin/utils.py @@ -47,9 +47,41 @@ def client(cls) -> dict: return cls.douyin_conf @classmethod - def version(cls) -> str: + def conf_version(cls) -> str: return cls.client_conf.get("version", "unknown") + @classmethod + def base_request_model(cls) -> dict: + return cls.douyin_conf.get("BaseRequestModel", {}) + + @classmethod + def base_live_model(cls) -> dict: + return cls.douyin_conf.get("BaseLiveModel", {}) + + @classmethod + def brm_version(cls) -> dict: + return cls.base_request_model().get("version", {}) + + @classmethod + def brm_browser(cls) -> dict: + return cls.base_request_model().get("browser", {}) + + @classmethod + def brm_engine(cls) -> dict: + return cls.base_request_model().get("engine", {}) + + @classmethod + def brm_os(cls) -> str: + return cls.base_request_model().get("os", "") + + @classmethod + def blm_language(cls) -> str: + return cls.base_live_model().get("language", "") + + @classmethod + def blm_browser(cls) -> dict: + return cls.base_live_model().get("browser", {}) + @classmethod def proxies(cls) -> dict: return cls.douyin_conf.get("proxies", {}) diff --git a/f2/conf/conf.yaml b/f2/conf/conf.yaml index 6641bc63..9e219295 100644 --- a/f2/conf/conf.yaml +++ b/f2/conf/conf.yaml @@ -2,6 +2,30 @@ f2: version: 0.0.1.6 douyin: + BaseRequestModel: + version: + code: 190500 + name: 19.5.0 + browser: + language: zh-CN + platform: Win32 + name: Edge + version: 122.0.0.0 + engine: + name: Blink + version: 122.0.0.0 + os: + name: Windows + version: 10 + + BaseLiveModel: + language: zh-CN + browser: + language: zh-CN + platform: Win32 + name: Edge + version: 119.0.0.0 + headers: User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 Edg/122.0.0.0 Referer: https://www.douyin.com/ From f48bb272539e59a0609ecdfa9c40ada4d7444bdf Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 25 May 2024 18:57:54 +0800 Subject: [PATCH 149/299] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9tiktok?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E9=85=8D=E7=BD=AE=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/model.py | 30 +++++++++++++++++++----------- f2/apps/tiktok/utils.py | 28 ++++------------------------ f2/conf/conf.yaml | 2 +- 3 files changed, 24 insertions(+), 36 deletions(-) diff --git a/f2/apps/tiktok/model.py b/f2/apps/tiktok/model.py index 33bfb607..2ca423d8 100644 --- a/f2/apps/tiktok/model.py +++ b/f2/apps/tiktok/model.py @@ -14,12 +14,12 @@ class BaseRequestModel(BaseModel): aid: str = "1988" app_language: str = "zh-Hans" app_name: str = "tiktok_web" - browser_language: str = ClientConfManager.browser().get("language", "zh-CN") - browser_name: str = ClientConfManager.browser().get("name", "Mozilla") + browser_language: str = ClientConfManager.brm_browser().get("language", "zh-CN") + browser_name: str = ClientConfManager.brm_browser().get("name", "Mozilla") browser_online: str = "true" - browser_platform: str = ClientConfManager.browser().get("platform", "Win32") + browser_platform: str = ClientConfManager.brm_browser().get("platform", "Win32") browser_version: str = quote( - ClientConfManager.browser().get( + ClientConfManager.brm_browser().get( "version", "5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36", ), @@ -27,25 +27,33 @@ class BaseRequestModel(BaseModel): ) channel: str = "tiktok_web" cookie_enabled: str = "true" - device_id: str = ClientConfManager.device().get( + device_id: str = ClientConfManager.brm_device().get( "id", "7372218823115949569" ) # 风控参数 - device_platform: str = ClientConfManager.device().get("platform", "web_pc") + device_platform: str = ClientConfManager.brm_device().get("platform", "web_pc") focus_state: str = "true" from_page: str = "user" history_len: int = 4 is_fullscreen: str = "false" is_page_visible: str = "true" language: str = "zh-Hans" - os: str = ClientConfManager.os() - priority_region: str = ClientConfManager.priority_region() + os: str = ClientConfManager.base_request_model().get("os", "windows") + priority_region: str = ClientConfManager.base_request_model().get( + "priority_region", "US" + ) referer: str = "" - region: str = ClientConfManager.region() # SG JP KR... + region: str = ClientConfManager.base_request_model().get( + "region", "SG" + ) # SG JP KR... # root_referer: str = quote("https://www.tiktok.com/", safe="") screen_height: int = 1080 screen_width: int = 1920 - webcast_language: str = ClientConfManager.webcast_language() - tz_name: str = quote(ClientConfManager.tz_name(), safe="") + webcast_language: str = ClientConfManager.base_request_model().get( + "webcast_language", "zh-Hans" + ) + tz_name: str = quote( + ClientConfManager.base_request_model().get("tz_name", "Asia/Hong_Kong"), safe="" + ) try: msToken: str = TokenManager.gen_real_msToken() except Exception as e: diff --git a/f2/apps/tiktok/utils.py b/f2/apps/tiktok/utils.py index d61063d4..22da285a 100644 --- a/f2/apps/tiktok/utils.py +++ b/f2/apps/tiktok/utils.py @@ -47,37 +47,17 @@ def version(cls) -> str: return cls.client_conf.get("version", "unknown") @classmethod - def model(cls) -> dict: + def base_request_model(cls) -> dict: return cls.client().get("model", {}) @classmethod - def browser(cls) -> dict: - return cls.model().get("browser", {}) + def brm_browser(cls) -> dict: + return cls.base_request_model().get("browser", {}) @classmethod - def device(cls) -> dict: + def brm_device(cls) -> dict: return cls.model().get("device", {}) - @classmethod - def region(cls) -> str: - return cls.model().get("region", "SG") - - @classmethod - def priority_region(cls) -> str: - return cls.model().get("priority_region", "US") - - @classmethod - def webcast_language(cls) -> str: - return cls.model().get("webcast_language", "zh-Hans") - - @classmethod - def tz_name(cls) -> str: - return cls.model().get("tz_name", "Asia/Hong_Kong") - - @classmethod - def os(cls) -> str: - return cls.model().get("os", "windows") - @classmethod def proxies(cls) -> dict: return cls.tiktok_conf.get("proxies", {}) diff --git a/f2/conf/conf.yaml b/f2/conf/conf.yaml index 9e219295..fa53935b 100644 --- a/f2/conf/conf.yaml +++ b/f2/conf/conf.yaml @@ -48,7 +48,7 @@ f2: tiktok: - model: + BaseRequestModel: browser: language: zh-CN name: Mozilla From 0bc46f5970a3b9d4cf4aeb8b4aee59c9b28714fd Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 25 May 2024 18:58:07 +0800 Subject: [PATCH 150/299] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DClientConfMana?= =?UTF-8?q?ger=E9=83=A8=E5=88=86=E5=8F=82=E6=95=B0=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/utils.py | 4 ++-- f2/apps/tiktok/utils.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/f2/apps/douyin/utils.py b/f2/apps/douyin/utils.py index eab8a337..bb19ab37 100644 --- a/f2/apps/douyin/utils.py +++ b/f2/apps/douyin/utils.py @@ -99,11 +99,11 @@ def referer(cls) -> str: return cls.headers().get("Referer", "") @classmethod - def msToken(cls) -> str: + def msToken(cls) -> dict: return cls.douyin_conf.get("msToken", {}) @classmethod - def ttwid(cls) -> str: + def ttwid(cls) -> dict: return cls.douyin_conf.get("ttwid", {}) diff --git a/f2/apps/tiktok/utils.py b/f2/apps/tiktok/utils.py index 22da285a..065ea769 100644 --- a/f2/apps/tiktok/utils.py +++ b/f2/apps/tiktok/utils.py @@ -75,15 +75,15 @@ def referer(cls) -> str: return cls.headers().get("Referer", "") @classmethod - def msToken(cls) -> str: + def msToken(cls) -> dict: return cls.tiktok_conf.get("msToken", {}) @classmethod - def ttwid(cls) -> str: + def ttwid(cls) -> dict: return cls.tiktok_conf.get("ttwid", {}) @classmethod - def odin_tt(cls) -> str: + def odin_tt(cls) -> dict: return cls.tiktok_conf.get("odin_tt", {}) From ac2029517842951f6786ca7c34871ba3926c4ae3 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 25 May 2024 19:09:40 +0800 Subject: [PATCH 151/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0conf.yaml?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/conf/conf.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/f2/conf/conf.yaml b/f2/conf/conf.yaml index fa53935b..9e3a8a9f 100644 --- a/f2/conf/conf.yaml +++ b/f2/conf/conf.yaml @@ -1,22 +1,22 @@ f2: - version: 0.0.1.6 + version: "0.0.1.6" douyin: BaseRequestModel: version: - code: 190500 - name: 19.5.0 + code: "190500" + name: "19.5.0" browser: language: zh-CN platform: Win32 name: Edge - version: 122.0.0.0 + version: "122.0.0.0" engine: name: Blink - version: 122.0.0.0 + version: "122.0.0.0" os: name: Windows - version: 10 + version: "10" BaseLiveModel: language: zh-CN @@ -24,7 +24,7 @@ f2: language: zh-CN platform: Win32 name: Edge - version: 119.0.0.0 + version: "119.0.0.0" headers: User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 Edg/122.0.0.0 @@ -56,7 +56,7 @@ f2: version: 5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36 device: - id: 7372218823115949569 + id: "7372218823115949569" platform: web_pc os: windows From 118cf410a4be9521086e92dbd54583b584e9f622 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 25 May 2024 19:12:35 +0800 Subject: [PATCH 152/299] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DClientConfMana?= =?UTF-8?q?ger=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/f2/apps/tiktok/utils.py b/f2/apps/tiktok/utils.py index 065ea769..abcce4a6 100644 --- a/f2/apps/tiktok/utils.py +++ b/f2/apps/tiktok/utils.py @@ -56,7 +56,7 @@ def brm_browser(cls) -> dict: @classmethod def brm_device(cls) -> dict: - return cls.model().get("device", {}) + return cls.base_request_model().get("device", {}) @classmethod def proxies(cls) -> dict: From 78f4cd793f72788fe95ab715d30c4b2e221e5cc4 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 25 May 2024 19:28:03 +0800 Subject: [PATCH 153/299] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0tiktok?= =?UTF-8?q?=E7=9A=84msToken=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/conf/conf.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/f2/conf/conf.yaml b/f2/conf/conf.yaml index 9e3a8a9f..fe929bc9 100644 --- a/f2/conf/conf.yaml +++ b/f2/conf/conf.yaml @@ -74,11 +74,12 @@ f2: https://: msToken: - url: https://mssdk-sg.tiktok.com/web/common?msToken=1Ab-7YxR9lUHSem0PraI_XzdKmpHb6j50L8AaXLAd2aWTdoJCYLfX_67rVQFE4UwwHVHmyG_NfIipqrlLT3kCXps-5PYlNAqtdwEg7TrDyTAfCKyBrOLmhMUjB55oW8SPZ4_EkNxNFUdV7MquA== + url: https://mssdk-sg.tiktok.com/web/common?msToken=QnC7zMMh1cpaDTxHDHnabNOrqaWv49JwA1IAq3AIFvrdaqQi8Rs_YlXSya1vN-4b6C1MgpWpS2cL1oakaUEDe3pUDMLpCbdSc3b3V98Fux0AuwXn_9Ns3FyMTnFRmSOOOVeGg6bVXMSGoMG6dq3k + url2: https://mssdk-sg.tiktok.com/web/report?msToken=QnC7zMMh1cpaDTxHDHnabNOrqaWv49JwA1IAq3AIFvrdaqQi8Rs_YlXSya1vN-4b6C1MgpWpS2cL1oakaUEDe3pUDMLpCbdSc3b3V98Fux0AuwXn_9Ns3FyMTnFRmSOOOVeGg6bVXMSGoMG6dq3k magic: 538969122 version: 1 dataType: 8 - strData: 3BvqYbNXLLOcZehvxZVbjpAu7vq82RoWmFSJHLFwzDwJIZevE0AeilQfP55LridxmdGGjknoksqIsLqlMHMif0IFK/Br7JWqxOHnYuMwVCnttFc0Y4MFvdVWM5FECiEulJC0Dc+eeVsNSrFnAc9K7fazqdglyJgGLSfXIJmgyCvvQ4pg0u5HBVVugLSWs242X42fjoWymaUCLZJQo6vi6WLyuV7l5IC3Mg+lelr5xBQD6Q7hBIFEw8zzxJ1n2DyA4xLbOHTQdKvEtsK7XzyWwjpRnojPTbBl69Zosnuru+lOBIl+tFu/+hCQ1m0jYZwTP4rVE75L3Du6+KZ5v/9TyFYjq7y3y9bGLP4d7yQueJbF90G1yrZ6htElrZ2vqZKDrIqBVbmOZr/nph12k2JKrITtN0R/pMsp0sJ4gesQnXxcD/pLOFAINHk7umgbe6LzJ7+TLUdGuO4M7xiEg/jCqhjgJX1izZ4NPoBDp35zRxj6Y6OrcstlTN/cv5sz663+Nco/mEwhGq2VwrL4gAIAPycndIsb48dPdtngmLqNDNN0ZyVRjgqVIDXXrxigXCkR9CH89Dlrrb7QQqWVgRXz9/k5ihEM43BR3sd3mMU/XgFLN1Aoxf6GzzdxP2QPBI75/ZoHoAmu54v8gTmA3ntCGlEF0zgaFGTdpkGdb+oZgyQM4pw1aAyxmFINXkpD3IKKoGev9kD9gTFnhiQMGCMemhZS7ZYdbuGu0Cb+lQKaL/QTt80FMyGmW8kzVy9xW/ja9BcdEJYRoaufuFRkBFG5ay8x4WHLR6hEapXqQial/cREbLL4sQytpjtmnndFqvT7xN5DhgsLY2Z7451MJhD6NJXKNrMafGZSbItzQWY= + strData: 3g+ZrAO5JQgfqCRzb689RAbiueodAexjAjn2plyPVBdOArbRM66UOTnZPoVTDDw8GZ8TL/CO13bWedlvWSA8kCODHA6mjO1Af5hgak+1NHbb8EvfuahWFDL8x8hruWn4t6qb79DhOy64REx1nsO6ub4SX4cKdgs+ZXTjUItB2WKddXo7CKikuywT8SJ0TcwZ+z/9hSsawqJXawopS5H8bOF0o3qPn+CwkoWkXBUu4iwkI5UzL9/k18Gwq1BxAiCbyl2kCHJaox7md1H+KfQ0lU9fBhfVBuXa3jNkT5GfyASaBNeJXdhHwuPfEGI6a+4FOaO0MEGzOWDzhu6joo89ooEPo1XV+UJE2KLC5tStxSBibUvn+wZSfGmcpPfYl0jB0H2vLqyaveYraOx8WRE/G/Y9DkbBLJvz7E8sDZ/v1fCUVs1JDDewE/yn2aqOHr3NxUjOnylKl5WWSCPeSR4ZTXRR1ZJhvpGKP7XYc3tkOjBSQ70cXnl53dAQ6aouUVMcztSlkXh4goI46tgJDjTiJJILHBr03dM/1KwVzqoEEO8f7JBhfQo4OR6Y48PXomshJmZhDiEmtkqLndpZY2I/B8q0EShuPlDCFRW7iob6kFahyqDfpOmK15kzCX2n7eu7zqDGgpJuHEtULF9803lR5QBt104ET49RbnDJ+ipbz1bFvS2FJQ2rfktNlwjqdBT8UzfFPHyZk6z4cSxYIfPRj1lB8fDwTwv3PUSRxUZSwkuGoZbc6j/6hxwZaY0xxIEbb9DlOmQZY4qyiqSziZ8HGWsQ9uD95dO4lX6GlZaeh7mKsjLSKSdUt13YeGAciqjTvSPyO/pZ5xc3+i+5hY4A290/JiTmIyFBOrRrlmIhPEQe9OEJn0DPXYgliYUO1nljEi6q/4HMFdXFmlw6nC8/kL9EeinisX7g6PbdHuRcKONXZpXxBevL8xD5Z8SvFKH/uQmYHrJlybiKHjDIMq7vc59NBw2VDQBmRqa8NTh2XLwIryjoBIHuNSBngSZwJE== ttwid: url: https://www.tiktok.com/ttwid/check/ From 96660ce5b61c6b6cfc91e03bc1f1e27a5519a32f Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 25 May 2024 19:44:47 +0800 Subject: [PATCH 154/299] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DCI/CD=E6=B5=8B?= =?UTF-8?q?=E8=AF=95TokenManager=E6=97=A0=E6=B3=95=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/utils.py | 11 +++++++++-- f2/conf/conf.yaml | 7 ++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/f2/apps/tiktok/utils.py b/f2/apps/tiktok/utils.py index abcce4a6..b580cb89 100644 --- a/f2/apps/tiktok/utils.py +++ b/f2/apps/tiktok/utils.py @@ -120,6 +120,10 @@ class TokenManager(BaseCrawler): "Content-Type": "text/plain", "User-Agent": user_agent, } + odin_tt_headers = { + "Referer": ClientConfManager.referer(), + "User-Agent": user_agent, + } def __init__(self): super().__init__(proxies=self.proxies) @@ -160,7 +164,7 @@ def gen_real_msToken(cls) -> str: msToken = str(httpx.Cookies(response.cookies).get("msToken")) - if len(msToken) != 148: + if len(msToken) != 148 or msToken is None: raise APIResponseError(_("{0} 内容不符合要求").format("msToken")) logger.debug(_("生成真实的 msToken：{0}").format(msToken)) @@ -351,7 +355,10 @@ def gen_odin_tt(cls) -> str: instance = cls() try: - response = instance.client.get(instance.odin_tt_conf["url"]) + response = instance.client.get( + instance.odin_tt_conf["url"], + headers=instance.odin_tt_headers, + ) response.raise_for_status() odin_tt = httpx.Cookies(response.cookies).get("odin_tt") diff --git a/f2/conf/conf.yaml b/f2/conf/conf.yaml index fe929bc9..cbf357ad 100644 --- a/f2/conf/conf.yaml +++ b/f2/conf/conf.yaml @@ -83,8 +83,9 @@ f2: ttwid: url: https://www.tiktok.com/ttwid/check/ - data: '{"unionHost":"https://ttwid-sg.tiktok.com","aid":1459,"service":"www.tiktok.com","needFid":false,"union":true,"fid":"","migrate_priority":0}' - cookie: ttwid=1%7CrR_4t3jnUjjqfiQzZRmSkGKf7NjXm2v1U8gRHjPDZho%7C1715513773%7Cf339b15d826ae9a3b02cadf6ce6d453713af3e54a92df722f776626f5a8877df;odin_tt=8b0213106b8f93bfd7ad7fea3f3fa3f1f344e349a1d94d0758cc9ac3c76e394d3a419a98f5814ed65961c65f5441d63111e442eab06ac55b6853009b0e8f9ebd43e28bbd36351e12db4b4a42e4a9a004;msToken=bVb1Oatl-EoYxKLz9nRtAMohyPE1GdPjQf6YAaVpj6_0PaFIemUaxyuhyO9xAB4V9FSGlx1ps6HqsRBzl8-Ko_U85tWZQH7lkFOLTyEZLpH5lrrPvozDoaxy4w%3D%3D + data: '{"aid":1988,"service":"www.tiktok.com","union":false,"unionHost":"","needFid":false,"fid":"","migrate_priority":0}' + cookie: ttwid=1%7C3uOVjidbOFBmdS6Aci5oeBb8Ta-HWpeyp2dvhl2Ib2E%7C1716637053%7C462867ee452aecd60a854225b854ff4498e9b99c13d4826a3e2a4e58a4c55134; odin_tt: - url: https://www.tiktok.com/passport/web/account/info/?aid=1459&app_language=zh-Hans&app_name=tiktok_web&browser_language=zh-CN&browser_name=Mozilla&browser_online=true&browser_platform=Win32&browser_version=5.0%20%28Windows%20NT%2010.0%3B%20Win64%3B%20x64%29%20AppleWebKit%2F537.36%20%28KHTML%2C%20like%20Gecko%29%20Chrome%2F119.0.0.0%20Safari%2F537.36&channel=tiktok_web&cookie_enabled=true&device_id=7306060721837852167&root_referer=https%3A%2F%2Fwww.tiktok.com%2Flogin%2F + url: https://www.tiktok.com/passport/web/account/info/?WebIdLastTime=1716637053&aid=1459&app_language=zh-Hans&app_name=tiktok_web&browser_language=zh-CN&browser_name=Mozilla&browser_online=true&browser_platform=Win32&browser_version=5.0%20%28Windows%20NT%2010.0%3B%20Win64%3B%20x64%29%20AppleWebKit%2F537.36%20%28KHTML%2C%20like%20Gecko%29%20Chrome%2F124.0.0.0%20Safari%2F537.36&channel=tiktok_web&cookie_enabled=true&device_id=7372899909097571857&device_platform=web_pc&focus_state=true&from_page=fyp&history_len=2&is_fullscreen=false&is_page_visible=true&odinId=7372898697492972561&os=windows&priority_region=&referer=®ion=SG&screen_height=1080&screen_width=1920&tz_name=Asia%2FHong_Kong&webcast_language=zh-Hans + From 55b3dcb4bad547e2f0eb57d7c9cc0e50318350b4 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 25 May 2024 19:55:58 +0800 Subject: [PATCH 155/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0SKIP=5FIN=5FC?= =?UTF-8?q?I=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Codecov.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Codecov.yml b/.github/workflows/Codecov.yml index 28690aa4..8b4d4c6e 100644 --- a/.github/workflows/Codecov.yml +++ b/.github/workflows/Codecov.yml @@ -25,6 +25,7 @@ jobs: - name: Run ATS uses: codecov/codecov-ats@v0 env: + SKIP_IN_CI: ${{ secrets.SKIP_IN_CI }} CODECOV_STATIC_TOKEN: ${{ secrets.CODECOV_STATIC_TOKEN }} CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} From 20e01fa5cfa8fef452b0f900ed2d36c042f00a8a Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 25 May 2024 19:57:38 +0800 Subject: [PATCH 156/299] =?UTF-8?q?feat:=20=E8=B7=B3=E8=BF=87=E9=83=A8?= =?UTF-8?q?=E5=88=86CICD=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/test/test_tiktok_token.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/f2/apps/tiktok/test/test_tiktok_token.py b/f2/apps/tiktok/test/test_tiktok_token.py index aa7d933e..f2272816 100644 --- a/f2/apps/tiktok/test/test_tiktok_token.py +++ b/f2/apps/tiktok/test/test_tiktok_token.py @@ -1,7 +1,12 @@ +import os import pytest from f2.apps.tiktok.utils import TokenManager +# 检查环境变量是否设置为跳过测试 +skip_in_ci = os.getenv("SKIP_IN_CI", "false").lower() == "true" + +@pytest.mark.skipif(skip_in_ci, reason="Skipping test in CI environment") def test_gen_real_msToken(): token = TokenManager.gen_real_msToken() assert token is not None, "gen_real_msToken() should return a valid token" @@ -14,12 +19,14 @@ def test_gen_false_msToken(): assert isinstance(token, str), "gen_false_msToken() should return a string" +@pytest.mark.skipif(skip_in_ci, reason="Skipping test in CI environment") def test_gen_ttwid(): ttwid = TokenManager.gen_ttwid() assert ttwid is not None, "gen_ttwid() should return a valid ttwid" assert isinstance(ttwid, str), "gen_ttwid() should return a string" +@pytest.mark.skipif(skip_in_ci, reason="Skipping test in CI environment") def test_gen_odin_tt(): csrf_token = TokenManager.gen_odin_tt() assert csrf_token is not None, "gen_odin_tt() should return a valid csrf token" From 5df41a4023a576fda51a4f211b5d124d1150b8f7 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 25 May 2024 20:24:43 +0800 Subject: [PATCH 157/299] Update Codecov.yml --- .github/workflows/Codecov.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Codecov.yml b/.github/workflows/Codecov.yml index 8b4d4c6e..8b865445 100644 --- a/.github/workflows/Codecov.yml +++ b/.github/workflows/Codecov.yml @@ -3,6 +3,8 @@ on: [push, pull_request] jobs: run: runs-on: ubuntu-latest + env: + SKIP_IN_CI: true # 添加环境变量，允许在CI中跳过 steps: - name: Checkout uses: actions/checkout@v4 @@ -25,7 +27,6 @@ jobs: - name: Run ATS uses: codecov/codecov-ats@v0 env: - SKIP_IN_CI: ${{ secrets.SKIP_IN_CI }} CODECOV_STATIC_TOKEN: ${{ secrets.CODECOV_STATIC_TOKEN }} CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} From 2b352266897f2b89aa513baf2235d3ab1cf284ba Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 25 May 2024 20:28:37 +0800 Subject: [PATCH 158/299] Update Codecov.yml --- .github/workflows/Codecov.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Codecov.yml b/.github/workflows/Codecov.yml index 8b865445..ae433056 100644 --- a/.github/workflows/Codecov.yml +++ b/.github/workflows/Codecov.yml @@ -3,8 +3,6 @@ on: [push, pull_request] jobs: run: runs-on: ubuntu-latest - env: - SKIP_IN_CI: true # 添加环境变量，允许在CI中跳过 steps: - name: Checkout uses: actions/checkout@v4 @@ -21,12 +19,20 @@ jobs: pip install pytest-cov pip install -e . + - name: Print environment variable + run: echo $SKIP_IN_CI + env: + SKIP_IN_CI: ${{ secrets.SKIP_IN_CI }} + - name: Run tests and collect coverage + env: + SKIP_IN_CI: ${{ secrets.SKIP_IN_CI }} run: pytest --cov=./ --cov-report=xml - name: Run ATS uses: codecov/codecov-ats@v0 env: + SKIP_IN_CI: ${{ secrets.SKIP_IN_CI }} # 从GitHub Secrets中获取环境变量 CODECOV_STATIC_TOKEN: ${{ secrets.CODECOV_STATIC_TOKEN }} CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} From 08ba11bc008981e607252eca607734e698d0bedc Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 30 May 2024 19:23:07 +0800 Subject: [PATCH 159/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E5=85=B3=E6=B3=A8=E7=94=A8=E6=88=B7=E7=9B=B4=E6=92=AD=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=BF=87=E6=BB=A4=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/filter.py | 152 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 152 insertions(+) diff --git a/f2/apps/douyin/filter.py b/f2/apps/douyin/filter.py index 87cf903d..5bf01929 100644 --- a/f2/apps/douyin/filter.py +++ b/f2/apps/douyin/filter.py @@ -2145,3 +2145,155 @@ def _to_dict(self) -> dict: for prop_name in dir(self) if not prop_name.startswith("__") and not prop_name.startswith("_") } + + +class FollowUserLiveFilter(JSONModel): + @property + def status_code(self): + return self._get_attr_value("$.status_code") + + @property + def status_msg(self): + return self._get_attr_value("$.data.message") + + @property + def cover_type(self): + return self._get_list_attr_value("$.data.data.[*].cover_type") + + @property + def is_recommend(self): + return self._get_list_attr_value("$.data.data.[*].is_recommend") + + @property + def tag_name(self): + return self._get_list_attr_value("$.data.data.[*].tag_name") + + @property + def title_type(self): + return self._get_list_attr_value("$.data.data.[*].title_type") + + @property + def uniq_id(self): + return self._get_list_attr_value("$.data.data.[*].uniq_id") + + @property + def web_rid(self): + return self._get_list_attr_value("$.data.data.[*].web_rid") + + @property + def cover(self): + return self._get_list_attr_value("$.data.data.[*].room.cover.url_list[0]") + + @property + def has_commerce_goods(self): + return self._get_list_attr_value("$.data.data.[*].room.has_commerce_goods") + + @property + def room_id(self): + return self._get_list_attr_value("$.data.data.[*].room.id_str") + + @property + def live_title(self): + return replaceT(self._get_list_attr_value("$.data.data.[*].room.title")) + + @property + def live_title_raw(self): + return self._get_list_attr_value("$.data.data.[*].room.title") + + @property + def live_room_mode(self): + return self._get_list_attr_value("$.data.data.[*].room.live_room_mode") + + @property + def mosaic_status(self): + return self._get_list_attr_value("$.data.data.[*].room.mosaic_status") + + @property + def user_count(self): + return self._get_list_attr_value("$.data.data.[*].room.stats.user_count_str") + + @property + def like_count(self): + return self._get_list_attr_value("$.data.data.[*].room.stats.like_count") + + @property + def total_count(self): + return self._get_list_attr_value("$.data.data.[*].room.stats.total_user_str") + + # user + @property + def avatar_thumb(self): + return self._get_list_attr_value( + "$.data.data.[*].room.owner.avatar_thumb.url_list[0]" + ) + + @property + def user_id(self): + return self._get_list_attr_value("$.data.data.[*].room.owner.id_str") + + @property + def user_sec_uid(self): + return self._get_list_attr_value("$.data.data.[*].room.owner.sec_uid") + + @property + def nickname(self): + return replaceT( + self._get_list_attr_value("$.data.data.[*].room.owner.nickname") + ) + + @property + def nickname_raw(self): + return self._get_list_attr_value("$.data.data.[*].room.owner.nickname") + + # stream_url + @property + def flv_pull_url(self): + return self._get_list_attr_value("$.data.data.[*].room.stream_url.flv_pull_url") + + @property + def hls_pull_url(self): + return self._get_list_attr_value( + "$.data.data.[*].room.stream_url.hls_pull_url_map" + ) + + @property + def stream_orientation(self): + return self._get_list_attr_value( + "$.data.data.[*].room.stream_url.stream_orientation" + ) + + def _to_raw(self) -> dict: + return self._data + + def _to_dict(self) -> dict: + return { + prop_name: getattr(self, prop_name) + for prop_name in dir(self) + if not prop_name.startswith("__") and not prop_name.startswith("_") + } + + def _to_list(self): + exclude_list = [ + "status_code", + "status_msg", + ] + + keys = [ + prop_name + for prop_name in dir(self) + if not prop_name.startswith("__") + and not prop_name.startswith("_") + and prop_name not in exclude_list + ] + + friend_feed_entries = self._get_attr_value("$.data.data") or [] + + list_dicts = [] + for entry in friend_feed_entries: + d = {} + for key in keys: + attr_values = getattr(self, key) + index = friend_feed_entries.index(entry) + d[key] = attr_values[index] if index < len(attr_values) else None + list_dicts.append(d) + return list_dicts From cfcfa6a30b8fc1268501c93d1330f7f020ff4cbb Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 30 May 2024 19:37:11 +0800 Subject: [PATCH 160/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E5=85=B3=E6=B3=A8=E7=94=A8=E6=88=B7=E7=9B=B4=E6=92=AD=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 2 +- README.md | 2 +- f2/apps/douyin/handler.py | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/README.en.md b/README.en.md index 06275f77..4aa420b3 100644 --- a/README.en.md +++ b/README.en.md @@ -126,7 +126,7 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores | Similar Recommended Works | ⚫ | `fetch_related_videos` | 🟢 | | Live Room Information (Stream Download) | ⚫ | `fetch_user_live_videos`, `fetch_user_live_videos_by_room_id` | 🟢 | | Live Room Danmaku | ⚫ | `fetch_user_live_danmu` | 🔵 | - | Following Users' Live Broadcasts | 🟣⚫ | `fetch_user_following_lives` | 🔵 | + | Following Users' Live Broadcasts | 🟣⚫ | `fetch_user_following_lives` | 🟢 | | Following User Information | 🟣⚫ | `fetch_user_following` | 🟢 | | Fan User Information | 🟣⚫ | `fetch_user_follower` | 🟢 | | Following User Works | 🟣⚫ | `fetch_user_following_videos` | 🟤 | diff --git a/README.md b/README.md index e2635d9d..23a48e1a 100644 --- a/README.md +++ b/README.md @@ -127,7 +127,7 @@ |相似推荐作品|⚫|`fetch_related_videos`|🟢| |直播间信息（流下载）|⚫|`fetch_user_live_videos`、`fetch_user_live_videos_by_room_id`|🟢| |直播间弹幕|⚫|`fetch_user_live_danmu`|🔵| - |关注用户开播|🟣⚫|`fetch_user_following_lives`|🔵| + |关注用户开播|🟣⚫|`fetch_user_following_lives`|🟢| |关注用户信息|🟣⚫|`fetch_user_following`|🟢| |粉丝用户信息|🟣⚫|`fetch_user_follower`|🟢| |关注用户作品|🟣⚫|`fetch_user_following_videos`|🟤| diff --git a/f2/apps/douyin/handler.py b/f2/apps/douyin/handler.py index 2b88b848..b6aa69f0 100644 --- a/f2/apps/douyin/handler.py +++ b/f2/apps/douyin/handler.py @@ -31,6 +31,7 @@ FriendFeed, LiveImFetch, QueryUser, + FollowingUserLive, ) from f2.apps.douyin.filter import ( UserPostFilter, @@ -50,6 +51,7 @@ FriendFeedFilter, LiveImFetchFilter, QueryUserFilter, + FollowingUserLiveFilter, ) from f2.apps.douyin.utils import ( SecUserIdFetcher, @@ -1623,6 +1625,39 @@ async def fetch_live_im(self, room_id: str, unique_id: str) -> LiveImFetchFilter return live_im + async def fetch_user_following_lives(self) -> FollowingUserLiveFilter: + """ + 用于获取关注用户的直播间信息。 + + Return: + follow_live: FollowingUserLiveFilter: 关注用户直播间信息数据过滤器，包含关注用户直播间信息的_to_raw、_to_dict、_to_list方法 + """ + + logger.info(_("开始查询关注用户直播间信息")) + logger.debug("===================================") + + async with DouyinCrawler(self.kwargs) as crawler: + params = FollowingUserLive() + response = await crawler.fetch_following_live(params) + follow_live = FollowingUserLiveFilter(response) + + if follow_live.status_code == 0: + logger.debug( + _("直播间Room_ID：{0} 直播间标题：{1} 直播间人数：{2}").format( + follow_live.room_id, + follow_live.live_title_raw, + follow_live.user_count, + ) + ) + logger.debug("===================================") + logger.info(_("关注用户直播间信息查询结束")) + else: + logger.warning( + _("获取关注用户直播间信息失败：{0}").format(follow_live.status_msg) + ) + + return follow_live + # async def handle_sso_login(): # """ From a5608ecd6d43de67d0956faf07d4062f6f695b93 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 30 May 2024 19:46:30 +0800 Subject: [PATCH 161/299] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9douyin?= =?UTF-8?q?=E5=85=B3=E6=B3=A8=E7=94=A8=E6=88=B7=E7=9B=B4=E6=92=AD=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit FollowUserLive -> FollowingUserLive --- docs/guide/apps/douyin/index.md | 2 +- f2/apps/douyin/crawler.py | 4 ++-- f2/apps/douyin/filter.py | 2 +- f2/apps/douyin/model.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/guide/apps/douyin/index.md b/docs/guide/apps/douyin/index.md index a1bef088..1613dae1 100644 --- a/docs/guide/apps/douyin/index.md +++ b/docs/guide/apps/douyin/index.md @@ -84,7 +84,7 @@ outline: deep | 相关推荐作品接口地址 | DouyinCrawler | fetch_post_related | 🟡 | | 直播接口地址 | DouyinCrawler | fetch_live | 🟢 | | 直播接口地址（room_id） | DouyinCrawler | fetch_live_room_id | 🟢 | -| 关注用户直播接口地址 | DouyinCrawler | fetch_follow_live | 🟡 | +| 关注用户直播接口地址 | DouyinCrawler | fetch_following_live | 🟡 | | 定位上一次作品接口地址 | DouyinCrawler | fetch_locate_post | 🟡 | | SSO获取二维码接口地址 | DouyinCrawler | fetch_login_qrcode | 🟢 | | SSO检查扫码状态接口地址 | DouyinCrawler | fetch_check_qrcode | 🟢 | diff --git a/f2/apps/douyin/crawler.py b/f2/apps/douyin/crawler.py index c7fd848b..cdf81130 100644 --- a/f2/apps/douyin/crawler.py +++ b/f2/apps/douyin/crawler.py @@ -16,7 +16,7 @@ UserMix, UserLive, UserLive2, - FollowUserLive, + FollowingUserLive, LoginGetQr, LoginCheckQr, UserFollowing, @@ -187,7 +187,7 @@ async def fetch_live_room_id(self, params: UserLive2): finally: self.aclient.headers = original_headers - async def fetch_follow_live(self, params: FollowUserLive): + async def fetch_following_live(self, params: FollowingUserLive): endpoint = XBogusManager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.FOLLOW_USER_LIVE, diff --git a/f2/apps/douyin/filter.py b/f2/apps/douyin/filter.py index 5bf01929..cb436bd0 100644 --- a/f2/apps/douyin/filter.py +++ b/f2/apps/douyin/filter.py @@ -2147,7 +2147,7 @@ def _to_dict(self) -> dict: } -class FollowUserLiveFilter(JSONModel): +class FollowingUserLiveFilter(JSONModel): @property def status_code(self): return self._get_attr_value("$.status_code") diff --git a/f2/apps/douyin/model.py b/f2/apps/douyin/model.py index 34c73ac6..cdfaf11c 100644 --- a/f2/apps/douyin/model.py +++ b/f2/apps/douyin/model.py @@ -233,7 +233,7 @@ class UserLive2(BaseLiveModel2): room_id: str -class FollowUserLive(BaseRequestModel): +class FollowingUserLive(BaseRequestModel): scene: str = "aweme_pc_follow_top" From e7183244237c4a0c4359474efeee194b14db8686 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 30 May 2024 19:46:54 +0800 Subject: [PATCH 162/299] =?UTF-8?q?test:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E5=85=B3=E6=B3=A8=E7=94=A8=E6=88=B7=E7=9B=B4=E6=92=AD=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=89=87=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/snippets/douyin/user-follow-live.py | 26 ++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 docs/snippets/douyin/user-follow-live.py diff --git a/docs/snippets/douyin/user-follow-live.py b/docs/snippets/douyin/user-follow-live.py new file mode 100644 index 00000000..d42baedc --- /dev/null +++ b/docs/snippets/douyin/user-follow-live.py @@ -0,0 +1,26 @@ +import asyncio +from f2.apps.douyin.handler import DouyinHandler + + +kwargs = { + "headers": { + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "Referer": "https://www.douyin.com/", + }, + "proxies": {"http://": None, "https://": None}, + "cookie": "YOUR_COOKIE_HERE", +} + + +async def main(): + follow_live = await DouyinHandler(kwargs).fetch_following_live() + print("=================_to_raw================") + print(follow_live._to_raw()) + # print("=================_to_dict===============") + # print(follow_live._to_dict()) + # print("=================_to_list===============") + # print(follow_live._to_list()) + + +if __name__ == "__main__": + asyncio.run(main()) From 5388be07d41befbfcb18164dec7d9bd2422d0a3a Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 30 May 2024 22:13:25 +0800 Subject: [PATCH 163/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E7=94=9F=E6=88=90webid=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/conf/conf.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/f2/conf/conf.yaml b/f2/conf/conf.yaml index cbf357ad..857141fc 100644 --- a/f2/conf/conf.yaml +++ b/f2/conf/conf.yaml @@ -45,6 +45,14 @@ f2: url: https://ttwid.bytedance.com/ttwid/union/register/ data: '{"region":"cn","aid":1768,"needFid":false,"service":"www.ixigua.com","migrate_info":{"ticket":"","source":"node"},"cbUrlProtocol":"https","union":true}' + webid: + url: https://mcs.zijieapi.com/webid?aid=6383&sdk_version=5.1.18_zip&device_platform=web + body: + app_id: 6383 + referer: "https://www.douyin.com/" + url: "https://www.douyin.com/" + user_agent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36 Edg/125.0.0.0" + user_unique_id: "" tiktok: From a8cb43b1f7b97ad89f040a1fb15c6c58cc542e37 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 30 May 2024 22:14:12 +0800 Subject: [PATCH 164/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E7=94=9F=E6=88=90webid=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/utils.py | 119 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/f2/apps/douyin/utils.py b/f2/apps/douyin/utils.py index bb19ab37..91969a1e 100644 --- a/f2/apps/douyin/utils.py +++ b/f2/apps/douyin/utils.py @@ -106,6 +106,10 @@ def msToken(cls) -> dict: def ttwid(cls) -> dict: return cls.douyin_conf.get("ttwid", {}) + @classmethod + def webid(cls) -> dict: + return cls.douyin_conf.get("webid", {}) + class TokenManager(BaseCrawler): """ @@ -136,6 +140,7 @@ class TokenManager(BaseCrawler): token_conf = ClientConfManager.msToken() ttwid_conf = ClientConfManager.ttwid() + webid_conf = ClientConfManager.webid() proxies = ClientConfManager.proxies() user_agent = ClientConfManager.user_agent() mstoken_headers = { @@ -146,6 +151,11 @@ class TokenManager(BaseCrawler): "User-Agent": user_agent, "Content-Type": "application/json; charset=utf-8", } + webid_headers = { + "User-Agent": user_agent, + "Content-Type": "application/json; charset=UTF-8", + "Referer": "https://www.douyin.com/", + } def __init__(self): super().__init__(proxies=self.proxies) @@ -368,6 +378,115 @@ def gen_ttwid(cls) -> str: ) ) + @classmethod + def gen_webid(cls) -> str: + """ + 生成个性化追踪webid (Generate personalized tracking webid) + + Returns: + str: 生成的webid (Generated webid) + + Raises: + APITimeoutError: 请求超时错误 (Request timeout error) + APIConnectionError: 网络连接错误 (Network connection error) + APIUnauthorizedError: 请求协议错误 (Request protocol error) + APIResponseError: 状态码错误或响应内容不符合要求 (Status code error or response content does not meet the requirements) + """ + + instance = cls() + + body = json.dumps( + { + "app_id": instance.webid_conf["body"]["app_id"], + "referer": instance.webid_conf["body"]["referer"], + "url": instance.webid_conf["body"]["url"], + "user_agent": instance.webid_conf["body"]["user_agent"], + "user_unique_id": "", + } + ) + + try: + response = instance.client.post( + instance.webid_conf["url"], + content=body, + headers=instance.webid_headers, + ) + response.raise_for_status() + + webid = response.json().get("web_id") + if not webid: + raise APIResponseError(_("{0} 内容不符合要求").format("webid")) + + return webid + + except httpx.TimeoutException as exc: + logger.error(traceback.format_exc()) + raise APITimeoutError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求端点超时"), + instance.webid_conf["url"], + cls.proxies, + cls.__name__, + exc, + ) + ) + + except httpx.NetworkError as exc: + logger.error(traceback.format_exc()) + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("网络连接失败，请检查当前网络环境"), + instance.webid_conf["url"], + cls.proxies, + cls.__name__, + exc, + ) + ) + + except httpx.ProtocolError as exc: + logger.error(traceback.format_exc()) + raise APIUnauthorizedError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求协议错误"), + instance.webid_conf["url"], + cls.proxies, + cls.__name__, + exc, + ) + ) + + except httpx.ProxyError as exc: + logger.error(traceback.format_exc()) + raise APIConnectionError( + _( + "{0}。 链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}" + ).format( + _("请求代理错误"), + instance.webid_conf["url"], + cls.proxies, + cls.__name__, + exc, + ) + ) + + except httpx.HTTPStatusError as exc: + logger.error(traceback.format_exc()) + raise APIResponseError( + _("{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}").format( + _("状态码错误"), + instance.webid_conf["url"], + cls.proxies, + cls.__name__, + exc, + ) + ) + class VerifyFpManager: @classmethod From 8c8846ac2ba33e30136a5276c664eaef0a72fee8 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 30 May 2024 22:17:21 +0800 Subject: [PATCH 165/299] =?UTF-8?q?test:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E7=94=9F=E6=88=90webid=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/snippets/douyin/webid.py | 4 ++++ f2/apps/douyin/test/test_douyin_token.py | 6 ++++++ f2/apps/douyin/utils.py | 13 +++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 docs/snippets/douyin/webid.py diff --git a/docs/snippets/douyin/webid.py b/docs/snippets/douyin/webid.py new file mode 100644 index 00000000..056ae598 --- /dev/null +++ b/docs/snippets/douyin/webid.py @@ -0,0 +1,4 @@ +from f2.apps.douyin.utils import TokenManager + +if __name__ == "__main__": + print("douyin webid:", TokenManager.gen_webid()) diff --git a/f2/apps/douyin/test/test_douyin_token.py b/f2/apps/douyin/test/test_douyin_token.py index e8195d57..d1a7b6c8 100644 --- a/f2/apps/douyin/test/test_douyin_token.py +++ b/f2/apps/douyin/test/test_douyin_token.py @@ -18,3 +18,9 @@ def test_gen_ttwid(): ttwid = TokenManager.gen_ttwid() assert ttwid is not None, "gen_ttwid() should return a valid ttwid" assert isinstance(ttwid, str), "gen_ttwid() should return a string" + + +def test_gen_webid(): + webid = TokenManager.gen_webid() + assert webid is not None, "gen_webid() should return a valid webid" + assert isinstance(webid, str), "gen_webid() should return a string" diff --git a/f2/apps/douyin/utils.py b/f2/apps/douyin/utils.py index 91969a1e..8add8dd2 100644 --- a/f2/apps/douyin/utils.py +++ b/f2/apps/douyin/utils.py @@ -136,6 +136,19 @@ class TokenManager(BaseCrawler): 异常处理: - 在 HTTP 请求过程中，处理可能出现的 TimeoutException、NetworkError、ProtocolError、ProxyError 和 HTTPStatusError 异常，并记录相应的错误信息。 + + 使用示例: + # 生成真实的 msToken + msToken = TokenManager.gen_real_msToken() + + # 生成虚假的 msToken + false_msToken = TokenManager.gen_false_msToken() + + # 生成 ttwid + ttwid = TokenManager.gen_ttwid() + + # 生成 webid + webid = TokenManager.gen_webid() """ token_conf = ClientConfManager.msToken() From 70c73bc384b2a3a16df7cf406f19035f793fe218 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 30 May 2024 22:19:28 +0800 Subject: [PATCH 166/299] =?UTF-8?q?test:=20=E6=9B=B4=E6=96=B0=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/conf/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/f2/conf/test.yaml b/f2/conf/test.yaml index 506dfb15..4214d02f 100644 --- a/f2/conf/test.yaml +++ b/f2/conf/test.yaml @@ -2,7 +2,7 @@ douyin: headers: User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36 Referer: https://www.douyin.com/ - cookie: __ac_nonce=066126d7400831d6b5c4e; __ac_signature=_02B4Z6wo00f01Y.vKPwAAIDC-cD1sEsc6ZmPzyxAAAXq04; ttwid=1%7Crk-8HHHCVERrpnGqN5PSPeaEwNAo02w-MzX5peKwBnI%7C1712483701%7C16399ab279d221e1f50ef17c96b5215641887b7a739cec048347e0c45221a491; douyin.com; device_web_cpu_core=12; device_web_memory_size=8; architecture=amd64; IsDouyinActive=true; home_can_add_dy_2_desktop=%220%22; dy_swidth=1920; dy_sheight=1080; stream_recommend_feed_params=%22%7B%5C%22cookie_enabled%5C%22%3Atrue%2C%5C%22screen_width%5C%22%3A1920%2C%5C%22screen_height%5C%22%3A1080%2C%5C%22browser_online%5C%22%3Atrue%2C%5C%22cpu_core_num%5C%22%3A12%2C%5C%22device_memory%5C%22%3A8%2C%5C%22downlink%5C%22%3A10%2C%5C%22effective_type%5C%22%3A%5C%224g%5C%22%2C%5C%22round_trip_time%5C%22%3A150%7D%22; csrf_session_id=3d3dbde628fcd833106552c68320f88b; FORCE_LOGIN=%7B%22videoConsumedRemainSeconds%22%3A180%7D; strategyABtestKey=%221712483704.155%22; volume_info=%7B%22isUserMute%22%3Afalse%2C%22isMute%22%3Afalse%2C%22volume%22%3A0.7%7D; stream_player_status_params=%22%7B%5C%22is_auto_play%5C%22%3A0%2C%5C%22is_full_screen%5C%22%3A0%2C%5C%22is_full_webscreen%5C%22%3A0%2C%5C%22is_mute%5C%22%3A0%2C%5C%22is_speed%5C%22%3A1%2C%5C%22is_visible%5C%22%3A1%7D%22; passport_csrf_token=b2ef0d72ded3b759412fe41b62111cc9; passport_csrf_token_default=b2ef0d72ded3b759412fe41b62111cc9; bd_ticket_guard_client_data=eyJiZC10aWNrZXQtZ3VhcmQtdmVyc2lvbiI6MiwiYmQtdGlja2V0LWd1YXJkLWl0ZXJhdGlvbi12ZXJzaW9uIjoxLCJiZC10aWNrZXQtZ3VhcmQtcmVlLXB1YmxpYy1rZXkiOiJCRWFLenNuYW8vUHhnajB2L1NRYUU4U29QVGZhS1YxVnpnYnZEMnFlektXdVhqcDNXOTNjZXB6b1hoU0MxQ05YNVNRTUg1QWRlakd5UzBNNld1RjRBZVE9IiwiYmQtdGlja2V0LWd1YXJkLXdlYi12ZXJzaW9uIjoxfQ%3D%3D; bd_ticket_guard_client_web_domain=2; msToken=mnRmihU-xb0ZsLkb-itjzad_A7ZQyDmKNrcczdt6Jj_7IXz0gdwCT8uN8XYukG1Zj5-JFxDv4yeRKsiC_WxSeXrcbYJYC0Uwyuz0C-Oe; odin_tt=509a427e7fae6b0f4498c2bbed2ead86ae99d77284740ea0f1ab337321cb107858575a289f02b0d4e81f660aeec9405be135e8361c3726ca00857825c875944955ed204c58993e6c6e879dcd024a0733 + cookie: ttwid=1%7CmA00PxWh-zoEXR6YIC77BSmyQ96T7QextS6YFZ9Ocgg%7C1717076775%7C22722d2a9b78b258483ab482ed7d58c0cdd69c75a951b2bb67ec58d00c6b57d6; home_can_add_dy_2_desktop=%220%22; stream_recommend_feed_params=%22%7B%5C%22cookie_enabled%5C%22%3Atrue%2C%5C%22screen_width%5C%22%3A1920%2C%5C%22screen_height%5C%22%3A1080%2C%5C%22browser_online%5C%22%3Atrue%2C%5C%22cpu_core_num%5C%22%3A12%2C%5C%22device_memory%5C%22%3A8%2C%5C%22downlink%5C%22%3A10%2C%5C%22effective_type%5C%22%3A%5C%224g%5C%22%2C%5C%22round_trip_time%5C%22%3A200%7D%22; FORCE_LOGIN=%7B%22videoConsumedRemainSeconds%22%3A180%7D; strategyABtestKey=%221717076781.199%22; volume_info=%7B%22isUserMute%22%3Afalse%2C%22isMute%22%3Afalse%2C%22volume%22%3A0.5%7D; passport_csrf_token=28a44ba980807da79b895df1ac4e16ea; passport_csrf_token_default=28a44ba980807da79b895df1ac4e16ea; bd_ticket_guard_client_data=eyJiZC10aWNrZXQtZ3VhcmQtdmVyc2lvbiI6MiwiYmQtdGlja2V0LWd1YXJkLWl0ZXJhdGlvbi12ZXJzaW9uIjoxLCJiZC10aWNrZXQtZ3VhcmQtcmVlLXB1YmxpYy1rZXkiOiJCSFVoWGRMd0dkaVUvQmdOU2xXa2U3b2tmS0NlRkxOQ0o0Vk9ieGFMclNwNWhkTzdTK3RpazdZZU0xQmpCYWVhZmJFeVA2YjZndm1seDBxTktTVC9hWUU9IiwiYmQtdGlja2V0LWd1YXJkLXdlYi12ZXJzaW9uIjoxfQ%3D%3D; bd_ticket_guard_client_web_domain=2; download_guide=%221%2F20240530%2F0%22; IsDouyinActive=true; stream_player_status_params=%22%7B%5C%22is_auto_play%5C%22%3A0%2C%5C%22is_full_screen%5C%22%3A0%2C%5C%22is_full_webscreen%5C%22%3A0%2C%5C%22is_mute%5C%22%3A0%2C%5C%22is_speed%5C%22%3A1%2C%5C%22is_visible%5C%22%3A1%7D%22; odin_tt=9e666e08aa7c209164e2c3192087a9b9d9b72860dfa94785cd0d5d24d812e598b06848fa210bc71c3ed59f8ea381839a18a47c99dda8b3b6a28c95f9b3e52663336fec7ab8aeea181e5be0287392027f; msToken=fxUIQB8U7zUO7ec0ZI4OsvWRqHUExFN-bPUapHIvRDvL1s3F4Ywzz8fDj5MWoJnutglkgdxV2AZux90jpq1cBwELFWrQu9myVyylg94= proxies: http://: https://: @@ -11,7 +11,7 @@ tiktok: headers: User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36 Referer: https://www.tiktok.com/ - cookie: tt_csrf_token=eGI3m1IO--7j58-ZpcYjYERFXQNmROAgzSyw; tt_chain_token=7y7/QdUWx4ZIgP4Ot3Z8Cg==; ak_bmsc=17A9D52C796C09A9A8D4F75D4BDE55AF~000000000000000000000000000000~YAAQZfrSF46xCp+PAQAAIPwWphfFN/P3SUUDi3jLw7CDHBCT3T8Q8Of1jaoVwyzSjJr9+Sk4zn4tZ1SwVRk2N4XwoZDZM/vcNU+shOv82y495Lq4fg3zFCL3qp8AHZbPpyYHhsAUQmKX72NFN2yNv9AUEoEuWZf/RixPCJq6uNMBXJlQHbi+Z+6fY3e9w4YlzDmVjeVAFdz6cEjAUn4CKsZXHtucZ7VjNwCOA5ntJbdSY9OGHoACbuyZxiyBPU9bw03kYokGKmqzRt/26mOineJJ/n5Vfxm8nw0wszxcl10tUatB2SRI/JNBKlOP+ya8bGF+MkLb3m2VJFV1+28ifA5NnzOxUzFPMeEyho4mVawh72riUI6D/e1gmTu257dShK/3zX3gRI0MgQ==; tiktok_webapp_theme=light; ttwid=1%7C3vmK-4AKcLrwW0dkt40unbPvMwaIT_nBpHAWirGPzgs%7C1716478481%7C7b955005200d35af3005e0879a4a344f8e47d429c77f95cc6f8220a648441e33; msToken=ToT05CKOzCiGWcIPDghKKSCqzItWry2tTyrl6qVroJlOtbNS1PPmOZlqiK695nQNXFVV6ZnEL3erWprT4JxPvDlWgpaP3JzCF4WwDYg99zGRa9sM6ieRIF6wbEuc; odin_tt=7ddd61572b181fd6f5f7910f10dc68db813d29c844f624956351979a5f5135fae06c482516e5fc90d55a742a690a96fad248b1cddcad1c116a89b806531403f75cd1e0dd1cbd1dd468fc8eed0af0dda8; msToken=If2HkAJWfx5rt-8S1b_YIMz7znwXO2taR1yKfwAW3MomvhEVDdv3FojHaRxazAWJK7UTwqwTQ3nA995PP_3jGkKQ9Gwy-k1E0ja_xkLY6vZaw5WDqIGNtvCfiQrr + cookie: tt_csrf_token=NZdFHVu4-KtYghBEQDgHh_JKjgAdFhKIcgDU; ak_bmsc=165BFF3A4E2C445E031EEB9B347F3F99~000000000000000000000000000000~YAAQ3pPMF8pAiaiPAQAAWY/dyReR/C9ddS4mWedMGCN7W2a+ascE+7v5dTEEgGTrODWuBLEcqqPZyYRBBiVm99rjTDUSJi2P+0NziV9Ffe2olLI8uakawsAZkpKpZp0dsMpUlWCZ1lIlNgiLQ4OorRsxCrosSr6A56MOf6Q+X1cfFW5b4f3slHhUAgeUHJhNLZc2tN+zdBpIqRrK6Dc96MNa7IKVi6CNoYR/NRksJfINehDW3K3d2bDi//Et1nUcHFcKuw7L2hFhJQoILib/WjJmWOVomf3LSPfGEYZLHkm35SgskCTBlOMDX7oKaELbi98m5z00flHkvHwuyb0yltQjkvIZDA4DIvqBwqENAPesJQpIOULclJI5OIm69tYQGcE+sZ5u9ME=; tt_chain_token=zccwp7dvS61dC917u98Qdg==; bm_sv=2C218A189C99A8C0A7322DC4A6B52B2B~YAAQ3pPMF8tAiaiPAQAAz5HdyReH0vsS+BfXu7TAPBrd5wGaSHIGCvQj0n3LR/iub7ol4bhsXslOpYHY0pg/n6ZhD/yThWgU5wYI4InC/XCE85uuompY2T82hCGIC4zdMsyZ7JJpqerUagxgDTjTbxqPByQDNweuF7cLkzQisuCqfLNVoeId8LB7d2Jg+skOJoaUtDvY4r42wQH0pV/tZ0L7kRBfdJcbzbp2zGHKTNSrpgiPuPN550RtYLLv44QM~1; tiktok_webapp_theme_auto_dark_ab=1; tiktok_webapp_theme=system; ttwid=1%7C3skh2Vk1U1g6e8OS4OPTE7jZOHBW7MakDYrcBah14Ws%7C1717078699%7C449ad7f65ea5e1f1b014fbf3b4674e7bac68db6fd10201b6b3302c74274059ae; msToken=TxDdrpwkvfiXZJYTL4mrRxUhHJhSBKyd9cwgsI7zxYL4Cs9yyMXPRLGbw1nyaUI2iXjURwZaGT6fy3uztCVp6AIL8O9lqLxKerC6RxCdR9zh2umdd9JoAXSxK-EY; msToken=TxDdrpwkvfiXZJYTL4mrRxUhHJhSBKyd9cwgsI7zxYL4Cs9yyMXPRLGbw1nyaUI2iXjURwZaGT6fy3uztCVp6AIL8O9lqLxKerC6RxCdR9zh2umdd9JoAXSxK-EY proxies: http://: https://: \ No newline at end of file From be20274411cfc62762c937d48d2c7d2b05fd7e67 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 30 May 2024 23:45:04 +0800 Subject: [PATCH 167/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0=20BaseCrawle?= =?UTF-8?q?r=20=E7=B1=BB=E4=BB=A5=E5=A4=84=E7=90=86=20httpx=20=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=20mounts=20=E5=8F=82=E6=95=B0=E5=BC=83=E7=94=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加逻辑，在传递给 httpx 之前，从 proxies 字典中过滤掉 None 值。 - 确保仅在提供有效代理时才设置 mounts 参数。 --- f2/crawlers/base_crawler.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/f2/crawlers/base_crawler.py b/f2/crawlers/base_crawler.py index ad3f8dc6..eda244d9 100644 --- a/f2/crawlers/base_crawler.py +++ b/f2/crawlers/base_crawler.py @@ -36,10 +36,14 @@ def __init__( crawler_headers: dict = {}, ): if isinstance(proxies, dict): - self.proxies = proxies - # [f"{k}://{v}" for k, v in proxies.items()] + # 设置代理 (Set proxy) + self.mounts = { + scheme: httpx.Proxy(url) + for scheme, url in proxies.items() + if url is not None + } else: - self.proxies = None + self.mounts = {} # 爬虫请求头 / Crawler request header self.crawler_headers = crawler_headers or {} From ed517db1587ae7031c3c192f972a687875d30e2f Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 30 May 2024 23:47:15 +0800 Subject: [PATCH 168/299] =?UTF-8?q?perf:=20=E6=83=B0=E6=80=A7=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96BaseCrawler=20=E7=B1=BB=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 确保资源高效利用 --- f2/crawlers/base_crawler.py | 45 ++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/f2/crawlers/base_crawler.py b/f2/crawlers/base_crawler.py index eda244d9..f27d9686 100644 --- a/f2/crawlers/base_crawler.py +++ b/f2/crawlers/base_crawler.py @@ -65,24 +65,37 @@ def __init__( # 超时等待时间 / Timeout waiting time self._timeout = timeout self.timeout = httpx.Timeout(timeout) + # 异步客户端 / Asynchronous client - self.aclient = httpx.AsyncClient( - headers=self.crawler_headers, - verify=False, - proxies=self.proxies, - timeout=self.timeout, - limits=self.limits, - transport=self.atransport, - ) + self._aclient = None # 同步客户端 / Synchronous client - self.client = httpx.Client( - headers=self.crawler_headers, - verify=False, - proxies=self.proxies, - timeout=self.timeout, - limits=self.limits, - transport=self.transport, - ) + self._client = None + + @property + def aclient(self): + if self._aclient is None: + self._aclient = httpx.AsyncClient( + headers=self.crawler_headers, + verify=False, + mounts=self.mounts, + timeout=self.timeout, + limits=self.limits, + transport=self.atransport, + ) + return self._aclient + + @property + def client(self): + if self._client is None: + self._client = httpx.Client( + headers=self.crawler_headers, + verify=False, + mounts=self.mounts, + timeout=self.timeout, + limits=self.limits, + transport=self.transport, + ) + return self._client async def _fetch_response(self, endpoint: str) -> Response: """获取数据 (Get data) From 88b3450d4dce5fe5df79d9cf6581cfb80f7323c4 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Fri, 7 Jun 2024 15:02:15 +0800 Subject: [PATCH 169/299] =?UTF-8?q?fix:=20=E5=BC=83=E7=94=A8proxies?= =?UTF-8?q?=E6=94=B9=E7=94=A8mounts=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/dl/base_downloader.py | 4 ++-- f2/utils/_dl.py | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/f2/dl/base_downloader.py b/f2/dl/base_downloader.py index 1812a78e..aac0b1b1 100644 --- a/f2/dl/base_downloader.py +++ b/f2/dl/base_downloader.py @@ -121,7 +121,7 @@ async def download_file( for link in urls: # 获取文件内容大小 (Get the size of the file content) content_length = await get_content_length( - link, self.headers, self.proxies + link, self.headers, self.mounts ) logger.debug( @@ -302,7 +302,7 @@ async def download_m3u8_stream( if segment.absolute_uri not in downloaded_segments: ts_url = segment.absolute_uri ts_content_length = await get_content_length( - ts_url, self.headers, self.proxies + ts_url, self.headers, self.mounts ) if ts_content_length == 0: ts_content_length = default_chunks diff --git a/f2/utils/_dl.py b/f2/utils/_dl.py index cdf267dc..4f5d63b6 100644 --- a/f2/utils/_dl.py +++ b/f2/utils/_dl.py @@ -11,18 +11,20 @@ from f2.i18n.translator import _ -async def get_content_length(url: str, headers: dict = {}, proxies: dict = {}) -> int: +async def get_content_length(url: str, headers: dict = {}, mounts: dict = {}) -> int: """ 获取给定URL的Content-Length (Retrieve the Content-Length for a given URL) Args: url (str): 目标URL (Target URL) + headers (dict): 请求头 (Request headers) + mounts (dict): 代理 (Proxies) Returns: int: Content-Length的值，如果获取失败则返回0 (Value of Content-Length, or 0 if retrieval fails) """ async with httpx.AsyncClient( - timeout=10.0, transport=httpx.AsyncHTTPTransport(retries=5), proxies=proxies + timeout=10.0, transport=httpx.AsyncHTTPTransport(retries=5), mounts=mounts ) as client: try: response = await client.head(url, headers=headers, follow_redirects=True) @@ -42,7 +44,7 @@ async def get_content_length(url: str, headers: dict = {}, proxies: dict = {}) - logger.error(traceback.format_exc()) logger.error(_("连接超时错误: {0}".format(url))) logger.debug("===================================") - logger.debug(f"headers:{headers}, proxies:{proxies}") + logger.debug(f"headers:{headers}, proxies:{mounts}") logger.debug("===================================") return 0 # 对HTTP状态错误进行处理 (Handling HTTP status errors) From 027251e6292de7e2722afb031b7a80cc4dc0b467 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Fri, 7 Jun 2024 15:04:52 +0800 Subject: [PATCH 170/299] =?UTF-8?q?fix:=20=E8=BE=93=E5=87=BA=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=BC=83=E7=94=A8proxies=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/crawlers/base_crawler.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/f2/crawlers/base_crawler.py b/f2/crawlers/base_crawler.py index f27d9686..c966bba1 100644 --- a/f2/crawlers/base_crawler.py +++ b/f2/crawlers/base_crawler.py @@ -202,7 +202,7 @@ async def get_fetch_data(self, url: str): ).format( _("请求端点超时"), url, - self.proxies, + self.mounts, self.__class__.__name__, exc, ) @@ -215,7 +215,7 @@ async def get_fetch_data(self, url: str): ).format( _("网络连接失败，请检查当前网络环境"), url, - self.proxies, + self.mounts, self.__class__.__name__, exc, ) @@ -228,7 +228,7 @@ async def get_fetch_data(self, url: str): ).format( _("请求协议错误"), url, - self.proxies, + self.mounts, self.__class__.__name__, exc, ) @@ -241,7 +241,7 @@ async def get_fetch_data(self, url: str): ).format( _("请求代理错误"), url, - self.proxies, + self.mounts, self.__class__.__name__, exc, ) @@ -254,7 +254,7 @@ async def get_fetch_data(self, url: str): raise APIConnectionError( _( "连接端点失败，检查网络环境或代理：{0} 代理：{1} 类名：{2} 异常详细信息：{3}" - ).format(url, self.proxies, self.__class__.__name__, req_err) + ).format(url, self.mounts, self.__class__.__name__, req_err) ) except APIError as e: @@ -299,7 +299,7 @@ async def post_fetch_data(self, url: str, params: dict = {}): raise APIConnectionError( _( "连接端点失败，检查网络环境或代理：{0} 代理：{1} 类名：{2} 异常详细信息：{3}" - ).format(url, self.proxies, self.__class__.__name__, req_err) + ).format(url, self.mounts, self.__class__.__name__, req_err) ) except httpx.HTTPStatusError as http_error: @@ -328,7 +328,7 @@ async def head_fetch_data(self, url: str): raise APIConnectionError( _( "连接端点失败，检查网络环境或代理：{0} 代理：{1} 类名：{2} 异常详细信息：{3}" - ).format(url, self.proxies, self.__class__.__name__, req_err) + ).format(url, self.mounts, self.__class__.__name__, req_err) ) except httpx.HTTPStatusError as http_error: From 051691d68ec822ac5271319c1a1cc545fdfdb279 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 8 Jun 2024 03:38:39 +0800 Subject: [PATCH 171/299] =?UTF-8?q?fix:=20=E9=98=B2=E6=AD=A2douyin?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E7=BB=93=E6=9D=9F=E6=97=B6=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E5=B4=A9=E6=BA=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/dl/base_downloader.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/f2/dl/base_downloader.py b/f2/dl/base_downloader.py index aac0b1b1..e947e258 100644 --- a/f2/dl/base_downloader.py +++ b/f2/dl/base_downloader.py @@ -6,6 +6,7 @@ import aiofiles import traceback from pathlib import Path +from urllib.error import HTTPError as urllib_HTTPError from rich.progress import TaskID from typing import Union, Optional, Any, List @@ -381,6 +382,26 @@ async def download_m3u8_stream( ) return + except urllib_HTTPError as e: + if e.code == 404: + logger.warning(_("m3u8文件或ts文件未找到，直播已结束")) + await self.progress.update( + task_id, + description=_("[ 完成 ]:"), + filename=trim_filename(full_path.name, 45), + state="completed", + ) + return + logger.error(_("m3u8文件下载失败：{0}，但文件已保存").format(e)) + logger.error(traceback.format_exc()) + await self.progress.update( + task_id, + description=_("[ 失败 ]:"), + filename=trim_filename(full_path.name, 45), + state="completed", + ) + return + except Exception as e: logger.error(_("m3u8文件解析失败: {0}").format(e)) logger.error(traceback.format_exc()) From a9bb68d54dca26a9dc5c3fc5a4371dcd2f48d38a Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 8 Jun 2024 22:35:51 +0800 Subject: [PATCH 172/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0=E8=8E=B7?= =?UTF-8?q?=E5=8F=96Content-Length=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/dl/base_downloader.py | 8 ++++++-- f2/utils/_dl.py | 30 +++++++++++++++++++++--------- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/f2/dl/base_downloader.py b/f2/dl/base_downloader.py index e947e258..2c88f7a7 100644 --- a/f2/dl/base_downloader.py +++ b/f2/dl/base_downloader.py @@ -122,7 +122,9 @@ async def download_file( for link in urls: # 获取文件内容大小 (Get the size of the file content) content_length = await get_content_length( - link, self.headers, self.mounts + link, + self.headers, + self.proxies, ) logger.debug( @@ -303,7 +305,9 @@ async def download_m3u8_stream( if segment.absolute_uri not in downloaded_segments: ts_url = segment.absolute_uri ts_content_length = await get_content_length( - ts_url, self.headers, self.mounts + ts_url, + self.headers, + self.proxies, ) if ts_content_length == 0: ts_content_length = default_chunks diff --git a/f2/utils/_dl.py b/f2/utils/_dl.py index 4f5d63b6..11719f15 100644 --- a/f2/utils/_dl.py +++ b/f2/utils/_dl.py @@ -11,23 +11,33 @@ from f2.i18n.translator import _ -async def get_content_length(url: str, headers: dict = {}, mounts: dict = {}) -> int: +async def get_content_length(url: str, headers: dict = ..., proxies: dict = ...) -> int: """ 获取给定URL的Content-Length (Retrieve the Content-Length for a given URL) Args: url (str): 目标URL (Target URL) headers (dict): 请求头 (Request headers) - mounts (dict): 代理 (Proxies) + proxies (dict): 代理 (Proxies) Returns: int: Content-Length的值，如果获取失败则返回0 (Value of Content-Length, or 0 if retrieval fails) """ + + if proxies is ... or proxies is None: + proxies = {"all://": None} + + proxy_url = ( + proxies.get("http://") or proxies.get("https://") or proxies.get("all://") + ) + async with httpx.AsyncClient( - timeout=10.0, transport=httpx.AsyncHTTPTransport(retries=5), mounts=mounts - ) as client: + timeout=10.0, + transport=httpx.AsyncHTTPTransport(retries=5, proxy=proxy_url), + verify=False, + ) as aclient: try: - response = await client.head(url, headers=headers, follow_redirects=True) + response = await aclient.head(url, headers=headers, follow_redirects=True) # 当head请求被禁止时，释放status异常被捕获 (When head requests are forbidden, release status exceptions are caught) response.raise_for_status() @@ -36,7 +46,9 @@ async def get_content_length(url: str, headers: dict = {}, mounts: dict = {}) -> and int(response.headers.get("Content-Length")) == 0 ): # 如果head请求无法获取Content-Length, 则使用GET请求再次尝试获取 - response = await client.get(url, headers=headers, follow_redirects=True) + response = await aclient.get( + url, headers=headers, follow_redirects=True + ) response.raise_for_status() except httpx.ConnectTimeout: @@ -44,7 +56,7 @@ async def get_content_length(url: str, headers: dict = {}, mounts: dict = {}) -> logger.error(traceback.format_exc()) logger.error(_("连接超时错误: {0}".format(url))) logger.debug("===================================") - logger.debug(f"headers:{headers}, proxies:{mounts}") + logger.debug(f"headers:{headers}, proxies:{proxies}") logger.debug("===================================") return 0 # 对HTTP状态错误进行处理 (Handling HTTP status errors) @@ -54,10 +66,10 @@ async def get_content_length(url: str, headers: dict = {}, mounts: dict = {}) -> try: # 使用GET请求尝试再次获取Content-Length # (Trying to retrieve Content-Length using GET request) - request = client.build_request("GET", url, headers=headers) + request = aclient.build_request("GET", url, headers=headers) # 使用stream=True来避免下载整个内容 # (Using stream=True to avoid downloading the entire content) - response = await client.send(request, stream=True) + response = await aclient.send(request, stream=True) response.raise_for_status() except Exception as e: logger.error(traceback.format_exc()) From 9706f3d2860de74fcf512ae02fb58625d55e8349 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 8 Jun 2024 22:37:19 +0800 Subject: [PATCH 173/299] =?UTF-8?q?perf:=20=E5=B0=86=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=88=B0Transport=E5=AF=B9=E8=B1=A1=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/crawlers/base_crawler.py | 46 ++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/f2/crawlers/base_crawler.py b/f2/crawlers/base_crawler.py index c966bba1..cb4b4ee7 100644 --- a/f2/crawlers/base_crawler.py +++ b/f2/crawlers/base_crawler.py @@ -28,22 +28,28 @@ class BaseCrawler: def __init__( self, - proxies: dict = {}, + proxies: dict = ..., max_retries: int = 5, max_connections: int = 10, timeout: int = 10, max_tasks: int = 10, crawler_headers: dict = {}, ): + # 设置代理 (Set proxy) + self.proxies = proxies if isinstance(proxies, dict): - # 设置代理 (Set proxy) - self.mounts = { - scheme: httpx.Proxy(url) - for scheme, url in proxies.items() - if url is not None - } - else: - self.mounts = {} + # 底层连接重试次数 / Underlying connection retry count + self.sync_transport = httpx.HTTPTransport( + proxy=proxies.get("http://", None), + retries=max_retries, + local_address="0.0.0.0", + ) + # 底层连接重试次数 / Underlying connection retry count + self.async_transport = httpx.AsyncHTTPTransport( + proxy=proxies.get("http://", None), + retries=max_retries, + local_address="0.0.0.0", + ) # 爬虫请求头 / Crawler request header self.crawler_headers = crawler_headers or {} @@ -58,9 +64,6 @@ def __init__( # 业务逻辑重试次数 / Business logic retry count self._max_retries = max_retries - # 底层连接重试次数 / Underlying connection retry count - self.atransport = httpx.AsyncHTTPTransport(retries=max_retries) - self.transport = httpx.HTTPTransport(retries=max_retries) # 超时等待时间 / Timeout waiting time self._timeout = timeout @@ -68,6 +71,7 @@ def __init__( # 异步客户端 / Asynchronous client self._aclient = None + # 同步客户端 / Synchronous client self._client = None @@ -77,10 +81,8 @@ def aclient(self): self._aclient = httpx.AsyncClient( headers=self.crawler_headers, verify=False, - mounts=self.mounts, timeout=self.timeout, limits=self.limits, - transport=self.atransport, ) return self._aclient @@ -90,10 +92,8 @@ def client(self): self._client = httpx.Client( headers=self.crawler_headers, verify=False, - mounts=self.mounts, timeout=self.timeout, limits=self.limits, - transport=self.transport, ) return self._client @@ -202,7 +202,7 @@ async def get_fetch_data(self, url: str): ).format( _("请求端点超时"), url, - self.mounts, + self.proxies, self.__class__.__name__, exc, ) @@ -215,7 +215,7 @@ async def get_fetch_data(self, url: str): ).format( _("网络连接失败，请检查当前网络环境"), url, - self.mounts, + self.proxies, self.__class__.__name__, exc, ) @@ -228,7 +228,7 @@ async def get_fetch_data(self, url: str): ).format( _("请求协议错误"), url, - self.mounts, + self.proxies, self.__class__.__name__, exc, ) @@ -241,7 +241,7 @@ async def get_fetch_data(self, url: str): ).format( _("请求代理错误"), url, - self.mounts, + self.proxies, self.__class__.__name__, exc, ) @@ -254,7 +254,7 @@ async def get_fetch_data(self, url: str): raise APIConnectionError( _( "连接端点失败，检查网络环境或代理：{0} 代理：{1} 类名：{2} 异常详细信息：{3}" - ).format(url, self.mounts, self.__class__.__name__, req_err) + ).format(url, self.proxies, self.__class__.__name__, req_err) ) except APIError as e: @@ -299,7 +299,7 @@ async def post_fetch_data(self, url: str, params: dict = {}): raise APIConnectionError( _( "连接端点失败，检查网络环境或代理：{0} 代理：{1} 类名：{2} 异常详细信息：{3}" - ).format(url, self.mounts, self.__class__.__name__, req_err) + ).format(url, self.proxies, self.__class__.__name__, req_err) ) except httpx.HTTPStatusError as http_error: @@ -328,7 +328,7 @@ async def head_fetch_data(self, url: str): raise APIConnectionError( _( "连接端点失败，检查网络环境或代理：{0} 代理：{1} 类名：{2} 异常详细信息：{3}" - ).format(url, self.mounts, self.__class__.__name__, req_err) + ).format(url, self.proxies, self.__class__.__name__, req_err) ) except httpx.HTTPStatusError as http_error: From 79a862e726ee45c7551dafe1ebb2195172c4833d Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 8 Jun 2024 22:38:49 +0800 Subject: [PATCH 174/299] =?UTF-8?q?perf:=20=E9=80=80=E5=87=BA=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E6=97=B6=E6=B7=BB=E5=8A=A0=E6=8D=A2=E8=A1=8C=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/utils/_signal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/f2/utils/_signal.py b/f2/utils/_signal.py index 0f70e41a..80d6a800 100644 --- a/f2/utils/_signal.py +++ b/f2/utils/_signal.py @@ -22,7 +22,7 @@ def shutdown_event(self): def _handle_signal(self, received_signal, frame): """内部处理接收到的信号""" self._shutdown_event.set() - RichConsoleManager().rich_console.print("exiting f2...") + RichConsoleManager().rich_console.print("\nexiting f2...") # 取消所有运行中的asyncio任务 for task in asyncio.all_tasks(): task.cancel() From b0aacb00915c20186ef763b424124e9290fbcb26 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sat, 8 Jun 2024 22:39:27 +0800 Subject: [PATCH 175/299] =?UTF-8?q?workflow:=20=E6=B7=BB=E5=8A=A0black?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/launch.json | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..b6ba7005 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,31 @@ +{ + // 使用 IntelliSense 了解相关属性。 + // 悬停以查看现有属性的描述。 + // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "Black 格式化代码", + "type": "debugpy", + "request": "launch", + "module": "black", + "args": [ + "${input:pythonPath}", + "--exclude", + "venv/*", + ], + "env": { + "PYTHONDEVMODE": "1", + "PYDEVD_DISABLE_FILE_VALIDATION": "1" + } + } + ], + "inputs": [ + { + "id": "pythonPath", + "type": "promptString", + "description": "输入需要格式化的目录", + "default": "**/*.py" + } + ] +} From ae09eec2257f226eb84fa405920f236192922024 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Wed, 12 Jun 2024 23:52:12 +0800 Subject: [PATCH 176/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E8=AE=BE=E5=A4=87id=E4=B8=8Ecookie=E7=AE=A1=E7=90=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - gen_device_id: 异步类方法，用于生成设备 ID。 - gen_device_ids: 异步类方法，用于生成多个设备 ID。 --- f2/apps/tiktok/utils.py | 198 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 198 insertions(+) diff --git a/f2/apps/tiktok/utils.py b/f2/apps/tiktok/utils.py index b580cb89..91f64bd4 100644 --- a/f2/apps/tiktok/utils.py +++ b/f2/apps/tiktok/utils.py @@ -19,6 +19,7 @@ get_timestamp, extract_valid_urls, split_filename, + split_set_cookie, ) from f2.crawlers.base_crawler import BaseCrawler from f2.exceptions.api_exceptions import ( @@ -1021,6 +1022,203 @@ async def get_all_aweme_id(cls, urls: list) -> list: return await asyncio.gather(*aweme_ids) +class DeviceIdManager(BaseCrawler): + """ + DeviceIdManager 类用于生成设备 ID和 tt_chain_token。 + 设备 ID 和 tt_chain_token 是 TikTok API 请求的必要参数。 + + 该类继承自 BaseCrawler，利用其中的 aclient 进行 HTTP 请求。主要包含两个方法： + - gen_device_id: 异步类方法，用于生成设备 ID。 + - gen_device_ids: 异步类方法，用于生成多个设备 ID。 + + 类属性: + - _DEVICE_ID_PARTTERN: 编译后的正则表达式，用于匹配设备 ID。 + - _DEVICE_ID_URL: 设备 ID 生成器的 URL。 + - _DEVICE_ID_HEADERS: 设备 ID 生成器的请求头。 + - proxies: 从 ClientConfManager 获取的代理配置。 + + 方法: + - __init__: 初始化 DeviceIdManager 实例，并调用父类的初始化方法。 + - gen_device_id: 异步类方法，用于生成设备 ID。 + - gen_device_ids: 异步类方法，用于生成多个设备 ID。 + + 异常处理: + - 在 HTTP 请求过程中，处理可能出现的 TimeoutException、NetworkError、ProtocolError、ProxyError 和 HTTPStatusError 异常，并记录相应的错误信息。 + + 使用示例: + # 生成单个设备 ID + device = await DeviceIdManager.gen_device_id() + deviceId = device["deviceId"] + tt_chain_token = device["cookie"] + + # 生成单个设备 ID，返回完整的 cookie 信息 + device = await DeviceIdManager.gen_device_id(full_cookie=True) + deviceId = device["deviceId"] + cookie = device["cookie"] + + # 生成多个设备 ID + devices = await DeviceIdManager.gen_device_ids(3) + deviceIds = devices["deviceId"] + tt_chain_tokens = devices["cookies"] + + # 生成多个设备 ID，返回完整的 cookie 信息 + devices = await DeviceIdManager.gen_device_ids(3, full_cookie=True) + deviceIds = devices["deviceId"] + cookies = devices["cookie"] + """ + + # 预编译正则表达式 + _DEVICE_ID_PARTTERN = re.compile( + r'', + re.DOTALL, + ) + + _DEVICE_ID_URL = "https://www.tiktok.com/" + _DEVICE_ID_FULL_URL = "https://www.tiktok.com/explore" + + _DEVICE_ID_HEADERS = { + "User-Agent": ClientConfManager.user_agent(), + "Cookie": f"msToken={TokenManager.gen_real_msToken()}", + } + proxies = ClientConfManager.proxies() + + def __init__(self): + super().__init__(proxies=self.proxies) + + @classmethod + async def gen_device_id(cls, full_cookie: bool = False) -> dict: + """ + 生成设备 ID。 + + Args: + full_cookie(bool): 是否返回完整的 cookie 信息，默认为 False。 + + Returns: + dict: 生成的设备 ID 和 tt_chain_token + + Notes: + full_cookie为True时，返回完整的cookie信息，否则只返回tt_chain_token。默认即可。 + + Raises: + APITimeoutError: 如果请求超时。 + APIConnectionError: 如果网络连接失败。 + APIUnauthorizedError: 如果请求协议错误。 + APIResponseError: 如果响应不符合要求。 + """ + + instance = cls() + + try: + response = await instance.aclient.get( + ( + instance._DEVICE_ID_URL + if not full_cookie + else instance._DEVICE_ID_FULL_URL + ), + headers=instance._DEVICE_ID_HEADERS, + follow_redirects=True, + ) + response.raise_for_status() + data = instance._DEVICE_ID_PARTTERN.search(response.text).group(1).strip() + + cookie = split_set_cookie(response.headers["Set-Cookie"]) + deviceId = json.loads(data)["__DEFAULT_SCOPE__"]["webapp.app-context"][ + "wid" + ] + + if deviceId is None: + raise APIResponseError(_("{0}生成失败").format("deviceId")) + + if cookie is None: + raise APIResponseError(_("{0}生成失败").format("tt_chain_token")) + + return {"deviceId": deviceId, "cookie": cookie} + + except httpx.TimeoutException as exc: + logger.error(traceback.format_exc()) + raise APITimeoutError( + _("{0}。链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}").format( + _("请求端点超时"), + instance._DEVICE_ID_URL, + cls.proxies, + cls.__name__, + exc, + ) + ) + + except httpx.NetworkError as exc: + logger.error(traceback.format_exc()) + raise APIConnectionError( + _("{0}。链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}").format( + _("网络连接失败，请检查当前网络环境"), + instance._DEVICE_ID_URL, + cls.proxies, + cls.__name__, + exc, + ) + ) + + except httpx.ProtocolError as exc: + logger.error(traceback.format_exc()) + raise APIUnauthorizedError( + _("{0}。链接：{1}，代理：{2}，异常类名：{3}，异常详细信息：{4}").format( + _("请求协议错误"), + instance._DEVICE_ID_URL, + cls.proxies, + cls.__name__, + exc, + ) + ) + + except httpx.HTTPStatusError as exc: + logger.error(traceback.format_exc()) + raise APIResponseError( + _("{0}。链接：{1} 代理：{2}，异常类名：{3}，异常详细信息：{4}").format( + _("状态码错误"), + instance._DEVICE_ID_URL, + cls.proxies, + cls.__name__, + exc, + ) + ) + + @classmethod + async def gen_device_ids(cls, count: int, full_cookie: bool = False) -> dict: + """ + 生成多个设备 ID。 + + Args: + count: 生成的设备 ID 数量 + + Returns: + device_ids: 生成的设备 ID 字典 + + Raises: + TypeError: 如果输入的 count 不是整数。 + ValueError: 如果输入的 count 小于 1。 + """ + + if not isinstance(count, int): + raise TypeError(_("count 必须是整数")) + + if not isinstance(full_cookie, bool): + raise TypeError(_("full_cookie 必须是布尔值")) + + if count < 1: + raise ValueError(_("count 参数必须大于 0")) + + if count > 10: + logger.warning(_("生成设备 ID 数量过多，可能会导致请求失败。")) + + tasks = [cls.gen_device_id(full_cookie) for _ in range(count)] + results = await asyncio.gather(*tasks) + + device_ids = [result["deviceId"] for result in results] + cookies = [result["cookie"] for result in results] + + return {"deviceId": device_ids, "cookie": cookies} + + def format_file_name( naming_template: str, aweme_data: dict = ..., From 907621309945237860936e5f6aefc0a598a7a039 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Wed, 12 Jun 2024 23:52:23 +0800 Subject: [PATCH 177/299] =?UTF-8?q?test:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E8=AE=BE=E5=A4=87id=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/test/test_tiktok_device_id.py | 72 ++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 f2/apps/tiktok/test/test_tiktok_device_id.py diff --git a/f2/apps/tiktok/test/test_tiktok_device_id.py b/f2/apps/tiktok/test/test_tiktok_device_id.py new file mode 100644 index 00000000..8b3e01c6 --- /dev/null +++ b/f2/apps/tiktok/test/test_tiktok_device_id.py @@ -0,0 +1,72 @@ +import pytest +from f2.apps.tiktok.utils import DeviceIdManager + + +@pytest.mark.asyncio +async def test_gen_device_id(): + device = await DeviceIdManager.gen_device_id() + + deviceId = device["deviceId"] + assert deviceId is not None + assert len(deviceId) == 19 + + tt_chain_token = device["cookie"] + assert tt_chain_token is not None + assert len(tt_chain_token) == 39 + + +@pytest.mark.asyncio +async def test_gen_device_id_with_full_cookie(): + device = await DeviceIdManager.gen_device_id(full_cookie=True) + + deviceId = device["deviceId"] + assert deviceId is not None + assert len(deviceId) == 19 + + cookie = device["cookie"] + assert cookie is not None + assert len(cookie) == 224 + + +@pytest.mark.asyncio +async def test_gen_device_ids(): + devices = await DeviceIdManager.gen_device_ids(3) + + assert "deviceId" in devices + assert "cookie" in devices + + device_ids = devices["deviceId"] + tt_chain_tokens = devices["cookie"] + + assert len(device_ids) == 3 + assert len(tt_chain_tokens) == 3 + + for deviceId in device_ids: + assert deviceId is not None + assert len(deviceId) == 19 + + for tt_chain_token in tt_chain_tokens: + assert tt_chain_token is not None + assert len(tt_chain_token) == 39 + + +@pytest.mark.asyncio +async def test_gen_device_ids_with_full_cookie(): + devices = await DeviceIdManager.gen_device_ids(3, full_cookie=True) + + assert "deviceId" in devices + assert "cookie" in devices + + device_ids = devices["deviceId"] + cookies = devices["cookie"] + + assert len(device_ids) == 3 + assert len(cookies) == 3 + + for deviceId in device_ids: + assert deviceId is not None + assert len(deviceId) == 19 + + for tt_chain_token in cookies: + assert tt_chain_token is not None + assert len(tt_chain_token) == 224 From 518fa5676c75e7cb1120cd210c5237926fa1b064 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Wed, 12 Jun 2024 23:52:47 +0800 Subject: [PATCH 178/299] =?UTF-8?q?docs:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E8=AE=BE=E5=A4=87id=E4=BB=A3=E7=A0=81=E7=89=87=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/snippets/tiktok/device-id.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 docs/snippets/tiktok/device-id.py diff --git a/docs/snippets/tiktok/device-id.py b/docs/snippets/tiktok/device-id.py new file mode 100644 index 00000000..e31a7c17 --- /dev/null +++ b/docs/snippets/tiktok/device-id.py @@ -0,0 +1,17 @@ +import asyncio +from f2.apps.tiktok.utils import DeviceIdManager + + +async def main(): + devuce_id = await DeviceIdManager.gen_device_id() + print(devuce_id) + devuce_id = await DeviceIdManager.gen_device_id(full_cookie=True) + print(devuce_id) + device_ids = await DeviceIdManager.gen_device_ids(3) + print(device_ids) + device_ids = await DeviceIdManager.gen_device_ids(3, full_cookie=True) + print(device_ids) + + +if __name__ == "__main__": + asyncio.run(main()) From 3028bbd14792e9ed717d5188f28f756e72a8fd4b Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Wed, 12 Jun 2024 23:54:11 +0800 Subject: [PATCH 179/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E8=B7=AF=E5=BE=84=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/__init__.py | 2 ++ f2/__main__.py | 2 ++ f2/utils/_singleton.py | 2 ++ 3 files changed, 6 insertions(+) diff --git a/f2/__init__.py b/f2/__init__.py index 0c639ae2..d7bfb863 100644 --- a/f2/__init__.py +++ b/f2/__init__.py @@ -1,3 +1,5 @@ +# path: f2/__init__.py + __author__ = "JohnserfSeed " __version__ = "0.0.1.5" __description_cn__ = "基于[red]异步[/red]的[green]全平台下载工具." diff --git a/f2/__main__.py b/f2/__main__.py index c1dbeebb..cab518b0 100644 --- a/f2/__main__.py +++ b/f2/__main__.py @@ -1,3 +1,5 @@ +# path: f2/__main__.py + from f2.cli.cli_commands import main main() diff --git a/f2/utils/_singleton.py b/f2/utils/_singleton.py index af210fe4..f1bdb8b5 100644 --- a/f2/utils/_singleton.py +++ b/f2/utils/_singleton.py @@ -1,3 +1,5 @@ +# path: f2/utils/_singleton.py + import threading From 6d0f0e74681b1f2b6b96a559da5e948e2d70eb58 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 16 Jun 2024 21:59:51 +0800 Subject: [PATCH 180/299] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9tiktok?= =?UTF-8?q?=E8=AE=BE=E5=A4=87id=E4=BB=A3=E7=A0=81=E7=89=87=E6=AE=B5?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/snippets/tiktok/device-id.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/snippets/tiktok/device-id.py b/docs/snippets/tiktok/device-id.py index e31a7c17..e0cf7c3e 100644 --- a/docs/snippets/tiktok/device-id.py +++ b/docs/snippets/tiktok/device-id.py @@ -3,10 +3,10 @@ async def main(): - devuce_id = await DeviceIdManager.gen_device_id() - print(devuce_id) - devuce_id = await DeviceIdManager.gen_device_id(full_cookie=True) - print(devuce_id) + device_id = await DeviceIdManager.gen_device_id() + print(device_id) + device_id = await DeviceIdManager.gen_device_id(full_cookie=True) + print(device_id) device_ids = await DeviceIdManager.gen_device_ids(3) print(device_ids) device_ids = await DeviceIdManager.gen_device_ids(3, full_cookie=True) From 2612b439e7e5c6cdedff13292e3dfa167f763002 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 17 Jun 2024 01:08:22 +0800 Subject: [PATCH 181/299] =?UTF-8?q?refactor:=20=E4=B8=BA=E8=A3=85=E9=A5=B0?= =?UTF-8?q?=E5=99=A8=E6=96=87=E4=BB=B6=E9=87=8D=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/handler.py | 3 ++- f2/apps/tiktok/handler.py | 2 +- f2/utils/{mode_handler.py => decorators.py} | 0 3 files changed, 3 insertions(+), 2 deletions(-) rename f2/utils/{mode_handler.py => decorators.py} (100%) diff --git a/f2/apps/douyin/handler.py b/f2/apps/douyin/handler.py index b6aa69f0..6b5ead72 100644 --- a/f2/apps/douyin/handler.py +++ b/f2/apps/douyin/handler.py @@ -6,7 +6,8 @@ from f2.log.logger import logger from f2.i18n.translator import _ -from f2.utils.mode_handler import mode_handler, mode_function_map +from f2.utils.decorators import mode_handler, mode_function_map + # from f2.utils.utils import split_set_cookie from f2.apps.douyin.db import AsyncUserDB, AsyncVideoDB from f2.apps.douyin.crawler import DouyinCrawler diff --git a/f2/apps/tiktok/handler.py b/f2/apps/tiktok/handler.py index b20bd5dd..71f07570 100644 --- a/f2/apps/tiktok/handler.py +++ b/f2/apps/tiktok/handler.py @@ -8,7 +8,7 @@ from f2.i18n.translator import _ from f2.log.logger import logger -from f2.utils.mode_handler import mode_handler, mode_function_map +from f2.utils.decorators import mode_handler, mode_function_map from f2.apps.tiktok.db import AsyncUserDB, AsyncVideoDB from f2.apps.tiktok.crawler import TiktokCrawler from f2.apps.tiktok.dl import TiktokDownloader diff --git a/f2/utils/mode_handler.py b/f2/utils/decorators.py similarity index 100% rename from f2/utils/mode_handler.py rename to f2/utils/decorators.py From da461d4629e2030a55e6bfb81d7b2e460b7bfedd Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 17 Jun 2024 01:09:41 +0800 Subject: [PATCH 182/299] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0douyin?= =?UTF-8?q?=E7=9A=84xbogus=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/snippets/douyin/xbogus.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/snippets/douyin/xbogus.py b/docs/snippets/douyin/xbogus.py index f449df97..73b9275f 100644 --- a/docs/snippets/douyin/xbogus.py +++ b/docs/snippets/douyin/xbogus.py @@ -5,7 +5,7 @@ async def main(): test_endpoint = "aweme_id=7196239141472980280&aid=1128&version_name=23.5.0&device_platform=android&os_version=2333" - return XBogusManager.str_2_endpoint(test_endpoint) + return XBogusManager.str_2_endpoint(endpoint=test_endpoint) if __name__ == "__main__": print(asyncio.run(main())) @@ -22,7 +22,7 @@ async def main(): async def gen_user_profile(params: UserProfile): return XBogusManager.model_2_endpoint( - dyendpoint.USER_DETAIL, params.model_dump() + base_endpoint=dyendpoint.USER_DETAIL, params=params.model_dump() ) async def main(): From 2b4bbe43a1e35d34f71b54978cd9b2b3cced8b97 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 17 Jun 2024 16:49:48 +0800 Subject: [PATCH 183/299] =?UTF-8?q?perf:=20=E8=B0=83=E6=95=B4=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=A3=80=E6=9F=A5=E5=B9=B6=E6=B7=BB=E5=8A=A0=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 3 ++- f2/apps/douyin/crawler.py | 2 +- f2/apps/douyin/filter.py | 2 +- f2/utils/xbogus.py | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 98bd006b..13c7714d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,5 +4,6 @@ ], "python.testing.unittestEnabled": false, "python.testing.pytestEnabled": true, - "python.analysis.typeCheckingMode": "off" + "python.analysis.typeCheckingMode": "off", + "python.analysis.autoImportCompletions": true } \ No newline at end of file diff --git a/f2/apps/douyin/crawler.py b/f2/apps/douyin/crawler.py index cdf81130..4c63f957 100644 --- a/f2/apps/douyin/crawler.py +++ b/f2/apps/douyin/crawler.py @@ -34,7 +34,7 @@ def __init__( ): # 需要与cli同步 proxies = kwargs.get("proxies", {"http://": None, "https://": None}) - self.headers = kwargs.get("headers") | {"Cookie": kwargs["cookie"]} + self.headers = kwargs.get("headers", {}) | {"Cookie": kwargs["cookie"]} super().__init__(proxies=proxies, crawler_headers=self.headers) async def fetch_user_profile(self, params: UserProfile): diff --git a/f2/apps/douyin/filter.py b/f2/apps/douyin/filter.py index cb436bd0..29a6fa65 100644 --- a/f2/apps/douyin/filter.py +++ b/f2/apps/douyin/filter.py @@ -376,7 +376,7 @@ def status_code(self): return self._get_attr_value("$.status_code") @property - def total_number(self): + def collects_total_number(self): return self._get_attr_value("$.total_number") @property diff --git a/f2/utils/xbogus.py b/f2/utils/xbogus.py index 1350308e..ae59dd95 100644 --- a/f2/utils/xbogus.py +++ b/f2/utils/xbogus.py @@ -23,7 +23,7 @@ class XBogus: - def __init__(self, user_agent: str = None) -> None: + def __init__(self, user_agent: str = "") -> None: # fmt: off self.Array = [ None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, From 5629aff133a8fce4a8cd3d8184131e2c77e3a266 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 17 Jun 2024 16:51:34 +0800 Subject: [PATCH 184/299] =?UTF-8?q?perf:=20=E8=B0=83=E6=95=B4=E5=81=9C?= =?UTF-8?q?=E6=AD=A2=E5=BC=82=E6=AD=A5=E4=BB=BB=E5=8A=A1=E4=BF=A1=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/utils/_signal.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/f2/utils/_signal.py b/f2/utils/_signal.py index 80d6a800..fd69acb0 100644 --- a/f2/utils/_signal.py +++ b/f2/utils/_signal.py @@ -2,7 +2,6 @@ import signal import asyncio -# from f2.crawlers.base_crawler import BaseCrawler from f2.utils._singleton import Singleton from f2.cli.cli_console import RichConsoleManager @@ -16,19 +15,22 @@ def shutdown_event(self): """提供对shutdown_event的只读访问""" return self._shutdown_event - # async def _cleanup_resources(self): - # await BaseCrawler.close() - def _handle_signal(self, received_signal, frame): """内部处理接收到的信号""" self._shutdown_event.set() RichConsoleManager().rich_console.print("\nexiting f2...") + # 取消所有运行中的asyncio任务 - for task in asyncio.all_tasks(): - task.cancel() + loop = asyncio.get_event_loop() + if loop.is_running(): + try: + for task in asyncio.all_tasks(loop): + task.cancel() + loop.stop() + except Exception: + pass # 执行资源清理操作 - # asyncio.run(self._cleanup_resources()) sys.exit(0) def register_shutdown_signal(self): From 716ed2a9198c6ca1b60e0ec85138432adff14b2f Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 17 Jun 2024 17:52:45 +0800 Subject: [PATCH 185/299] =?UTF-8?q?build:=20=E6=B7=BB=E5=8A=A0websockets>?= =?UTF-8?q?=3D11.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 76efd7cb..e44b983a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -40,6 +40,7 @@ dependencies = [ "browser_cookie3==0.19.1", "pydantic==2.6.4", "qrcode==7.4.2", + "websockets>=11.0", ] [project.scripts] From a4ba64182f27b87fc11fcfc0406ccb72109f490b Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 17 Jun 2024 21:10:41 +0800 Subject: [PATCH 186/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=B8=8E=E6=A8=A1=E5=9E=8B=E7=9A=84ua=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/model.py | 2 +- f2/apps/tiktok/model.py | 2 +- f2/conf/conf.yaml | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/f2/apps/douyin/model.py b/f2/apps/douyin/model.py index cdfaf11c..afdca6c5 100644 --- a/f2/apps/douyin/model.py +++ b/f2/apps/douyin/model.py @@ -91,7 +91,7 @@ class BaseWebCastModel(BaseModel): browser_platform: str = "Win32" browser_name: str = "Mozilla" browser_version: str = quote( - "5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 Edg/122.0.0.0", + "5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", safe="", ) browser_online: str = "true" diff --git a/f2/apps/tiktok/model.py b/f2/apps/tiktok/model.py index 2ca423d8..ab044a2d 100644 --- a/f2/apps/tiktok/model.py +++ b/f2/apps/tiktok/model.py @@ -21,7 +21,7 @@ class BaseRequestModel(BaseModel): browser_version: str = quote( ClientConfManager.brm_browser().get( "version", - "5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36", + "5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36", ), safe="", ) diff --git a/f2/conf/conf.yaml b/f2/conf/conf.yaml index 857141fc..5a0e23d6 100644 --- a/f2/conf/conf.yaml +++ b/f2/conf/conf.yaml @@ -27,7 +27,7 @@ f2: version: "119.0.0.0" headers: - User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 Edg/122.0.0.0 + User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0 Referer: https://www.douyin.com/ proxies: @@ -49,9 +49,9 @@ f2: url: https://mcs.zijieapi.com/webid?aid=6383&sdk_version=5.1.18_zip&device_platform=web body: app_id: 6383 - referer: "https://www.douyin.com/" - url: "https://www.douyin.com/" - user_agent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36 Edg/125.0.0.0" + referer: https://www.douyin.com/ + url: https://www.douyin.com/ + user_agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0 user_unique_id: "" tiktok: @@ -61,7 +61,7 @@ f2: language: zh-CN name: Mozilla platform: Win32 - version: 5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36 + version: 5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 device: id: "7372218823115949569" @@ -74,7 +74,7 @@ f2: tz_name: Asia/Hong_Kong headers: - User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 Edg/122.0.0.0 + User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Referer: https://www.tiktok.com/ proxies: From c548de2f78d9f86a262d6d811bb05c841ea08418 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 17 Jun 2024 21:12:40 +0800 Subject: [PATCH 187/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0ClientConfMan?= =?UTF-8?q?ager=E5=AE=A2=E6=88=B7=E7=AB=AF=E9=85=8D=E7=BD=AE=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/utils.py | 14 +++++++------- f2/apps/tiktok/utils.py | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/f2/apps/douyin/utils.py b/f2/apps/douyin/utils.py index 8add8dd2..7952214b 100644 --- a/f2/apps/douyin/utils.py +++ b/f2/apps/douyin/utils.py @@ -52,11 +52,11 @@ def conf_version(cls) -> str: @classmethod def base_request_model(cls) -> dict: - return cls.douyin_conf.get("BaseRequestModel", {}) + return cls.client().get("BaseRequestModel", {}) @classmethod def base_live_model(cls) -> dict: - return cls.douyin_conf.get("BaseLiveModel", {}) + return cls.client().get("BaseLiveModel", {}) @classmethod def brm_version(cls) -> dict: @@ -84,11 +84,11 @@ def blm_browser(cls) -> dict: @classmethod def proxies(cls) -> dict: - return cls.douyin_conf.get("proxies", {}) + return cls.client().get("proxies", {}) @classmethod def headers(cls) -> dict: - return cls.douyin_conf.get("headers", {}) + return cls.client().get("headers", {}) @classmethod def user_agent(cls) -> str: @@ -100,15 +100,15 @@ def referer(cls) -> str: @classmethod def msToken(cls) -> dict: - return cls.douyin_conf.get("msToken", {}) + return cls.client().get("msToken", {}) @classmethod def ttwid(cls) -> dict: - return cls.douyin_conf.get("ttwid", {}) + return cls.client().get("ttwid", {}) @classmethod def webid(cls) -> dict: - return cls.douyin_conf.get("webid", {}) + return cls.client().get("webid", {}) class TokenManager(BaseCrawler): diff --git a/f2/apps/tiktok/utils.py b/f2/apps/tiktok/utils.py index 91f64bd4..f2635bfb 100644 --- a/f2/apps/tiktok/utils.py +++ b/f2/apps/tiktok/utils.py @@ -61,11 +61,11 @@ def brm_device(cls) -> dict: @classmethod def proxies(cls) -> dict: - return cls.tiktok_conf.get("proxies", {}) + return cls.client().get("proxies", {}) @classmethod def headers(cls) -> dict: - return cls.tiktok_conf.get("headers", {}) + return cls.client().get("headers", {}) @classmethod def user_agent(cls) -> str: @@ -77,15 +77,15 @@ def referer(cls) -> str: @classmethod def msToken(cls) -> dict: - return cls.tiktok_conf.get("msToken", {}) + return cls.client().get("msToken", {}) @classmethod def ttwid(cls) -> dict: - return cls.tiktok_conf.get("ttwid", {}) + return cls.client().get("ttwid", {}) @classmethod def odin_tt(cls) -> dict: - return cls.tiktok_conf.get("odin_tt", {}) + return cls.client().get("odin_tt", {}) class TokenManager(BaseCrawler): From 3eed3d5fe2c8a4ed26f55e9b2d1d077abfc074d1 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 17 Jun 2024 21:44:16 +0800 Subject: [PATCH 188/299] =?UTF-8?q?perf:=20=E5=8F=96=E6=B6=88tiktok?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE=E8=BF=87=E6=BB=A4=E5=99=A8?= =?UTF-8?q?=E5=AF=B9bool=E7=9A=84=E9=A2=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/filter.py | 60 ++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/f2/apps/tiktok/filter.py b/f2/apps/tiktok/filter.py index dfcecbd8..c323554d 100644 --- a/f2/apps/tiktok/filter.py +++ b/f2/apps/tiktok/filter.py @@ -61,28 +61,28 @@ def uniqueId(self): return self._get_attr_value("$.userInfo.user.uniqueId") @property - def commentSetting(self) -> bool: - return bool(self._get_attr_value("$.userInfo.user.commentSetting")) + def commentSetting(self): + return self._get_attr_value("$.userInfo.user.commentSetting") @property - def followingVisibility(self) -> bool: - return bool(self._get_attr_value("$.userInfo.user.followingVisibility")) + def followingVisibility(self): + return self._get_attr_value("$.userInfo.user.followingVisibility") @property - def openFavorite(self) -> bool: - return bool(self._get_attr_value("$.userInfo.user.openFavorite")) + def openFavorite(self): + return self._get_attr_value("$.userInfo.user.openFavorite") @property - def privateAccount(self) -> bool: - return bool(self._get_attr_value("$.userInfo.user.privateAccount")) + def privateAccount(self): + return self._get_attr_value("$.userInfo.user.privateAccount") @property - def showPlayListTab(self) -> bool: - return bool(self._get_attr_value("$.userInfo.user.profileTab.showPlayListTab")) + def showPlayListTab(self): + return self._get_attr_value("$.userInfo.user.profileTab.showPlayListTab") @property - def relation(self) -> bool: # follow 1, no follow 0 - return bool(self._get_attr_value("$.userInfo.user.relation")) + def relation(self): # follow 1, no follow 0 + return self._get_attr_value("$.userInfo.user.relation") @property def signature(self): @@ -93,12 +93,12 @@ def signature_raw(self): return self._get_attr_value("$.userInfo.user.signature") @property - def ttSeller(self) -> bool: - return bool(self._get_attr_value("$.userInfo.user.ttSeller")) + def ttSeller(self): + return self._get_attr_value("$.userInfo.user.ttSeller") @property - def verified(self) -> bool: - return bool(self._get_attr_value("$.userInfo.user.verified")) + def verified(self): + return self._get_attr_value("$.userInfo.user.verified") def _to_raw(self) -> dict: return self._data @@ -525,32 +525,32 @@ def aweme_id(self): # aweme stats @property - def collected(self) -> bool: - return bool(self._get_attr_value("$.itemInfo.itemStruct.collected")) + def collected(self): + return self._get_attr_value("$.itemInfo.itemStruct.collected") @property - def digged(self) -> bool: - return bool(self._get_attr_value("$.itemInfo.itemStruct.digged")) + def digged(self): + return self._get_attr_value("$.itemInfo.itemStruct.digged") @property - def forFriend(self) -> bool: - return bool(self._get_attr_value("$.itemInfo.itemStruct.forFriend")) + def forFriend(self): + return self._get_attr_value("$.itemInfo.itemStruct.forFriend") @property - def itemCommentStatus(self) -> bool: - return bool(self._get_attr_value("$.itemInfo.itemStruct.itemCommentStatus")) + def itemCommentStatus(self): + return self._get_attr_value("$.itemInfo.itemStruct.itemCommentStatus") @property - def privateItem(self) -> bool: - return bool(self._get_attr_value("$.itemInfo.itemStruct.privateItem")) + def privateItem(self): + return self._get_attr_value("$.itemInfo.itemStruct.privateItem") @property - def secret(self) -> bool: - return bool(self._get_attr_value("$.itemInfo.itemStruct.secret")) + def secret(self): + return self._get_attr_value("$.itemInfo.itemStruct.secret") @property - def shareEnabled(self) -> bool: - return bool(self._get_attr_value("$.itemInfo.itemStruct.shareEnabled")) + def shareEnabled(self): + return self._get_attr_value("$.itemInfo.itemStruct.shareEnabled") # stats @property From dca6cb9e253491134cab017b888400e392a67295 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 17 Jun 2024 21:46:07 +0800 Subject: [PATCH 189/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E5=BC=80=E6=92=AD=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/api.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/f2/apps/tiktok/api.py b/f2/apps/tiktok/api.py index 85c37e09..4e84906b 100644 --- a/f2/apps/tiktok/api.py +++ b/f2/apps/tiktok/api.py @@ -56,3 +56,6 @@ class TiktokAPIEndpoints: # 用户直播 (User Live) USER_LIVE = f"{TIKTOK_DOMAIN}/api-live/user/room/" + + # 检查开播状态 (Check Live Status) + CHECK_LIVE_ALIVE = f"{WEBCAST_DOMAIN}/webcast/room/check_alive/" From 6aa997142cf5986d0be0b244aa69d52a21afce14 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 17 Jun 2024 21:46:47 +0800 Subject: [PATCH 190/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E5=BC=80=E6=92=AD=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/model.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/f2/apps/tiktok/model.py b/f2/apps/tiktok/model.py index ab044a2d..af0693a5 100644 --- a/f2/apps/tiktok/model.py +++ b/f2/apps/tiktok/model.py @@ -139,3 +139,7 @@ class PostSearch(BaseRequestModel): class UserLive(BaseRequestModel): uniqueId: str sourceType: int = 54 + +class CheckLiveAlive(BaseRequestModel): + from_page: str = "live" + room_ids: str From 7f6ff89428724149bb60d244f08e8a469b86c80f Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 17 Jun 2024 21:47:14 +0800 Subject: [PATCH 191/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E5=BC=80=E6=92=AD=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=88=AC=E8=99=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/crawler.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/f2/apps/tiktok/crawler.py b/f2/apps/tiktok/crawler.py index f833d0f5..d4bc57e0 100644 --- a/f2/apps/tiktok/crawler.py +++ b/f2/apps/tiktok/crawler.py @@ -15,6 +15,7 @@ PostComment, PostSearch, UserLive, + CheckLiveAlive, ) from f2.apps.tiktok.utils import XBogusManager @@ -128,6 +129,15 @@ async def fetch_user_live(self, params: UserLive): logger.debug(_("用户直播接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) + async def fetch_check_live_alive(self, params: CheckLiveAlive): + endpoint = XBogusManager.model_2_endpoint( + self.headers.get("User-Agent"), + tkendpoint.CHECK_LIVE_ALIVE, + params.model_dump(), + ) + logger.debug(_("检查开播状态接口地址：{0}").format(endpoint)) + return await self._fetch_get_json(endpoint) + async def __aenter__(self): return self From 97ce3f6887f2b9a0829d7236c57fe86be0f1b480 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 17 Jun 2024 21:48:19 +0800 Subject: [PATCH 192/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E5=BC=80=E6=92=AD=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE=E8=BF=87=E6=BB=A4=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/filter.py | 44 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/f2/apps/tiktok/filter.py b/f2/apps/tiktok/filter.py index c323554d..f13fe0fe 100644 --- a/f2/apps/tiktok/filter.py +++ b/f2/apps/tiktok/filter.py @@ -1047,3 +1047,47 @@ def _to_dict(self) -> dict: for prop_name in dir(self) if not prop_name.startswith("__") and not prop_name.startswith("_") } + + +class CheckLiveAliveFilter(JSONModel): + @property + def api_status_code(self): + return self._get_attr_value("$.status_code") + + @property + def is_alive(self): + return self._get_list_attr_value("$.data[*].alive") + + @property + def room_id(self): + return self._get_list_attr_value("$.data[*].room_id") + + def _to_raw(self) -> dict: + return self._data + + def _to_dict(self) -> dict: + return { + prop_name: getattr(self, prop_name) + for prop_name in dir(self) + if not prop_name.startswith("__") and not prop_name.startswith("_") + } + + def _to_list(self): + exclude_list = ["api_status_code"] + keys = [ + prop_name + for prop_name in dir(self) + if not prop_name.startswith("__") + and not prop_name.startswith("_") + and prop_name not in exclude_list + ] + aweme_entries = self._get_attr_value("$.data") or [] + list_dicts = [] + for entry in aweme_entries: + d = {} + for key in keys: + attr_values = getattr(self, key) + index = aweme_entries.index(entry) + d[key] = attr_values[index] if index < len(attr_values) else None + list_dicts.append(d) + return list_dicts From c0245639771354bc2f508d4c132d3edc0c2cc4ee Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 17 Jun 2024 21:48:41 +0800 Subject: [PATCH 193/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E5=BC=80=E6=92=AD=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/handler.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/f2/apps/tiktok/handler.py b/f2/apps/tiktok/handler.py index 71f07570..53d69fa9 100644 --- a/f2/apps/tiktok/handler.py +++ b/f2/apps/tiktok/handler.py @@ -22,6 +22,7 @@ PostDetail, PostSearch, UserLive, + CheckLiveAlive, ) from f2.apps.tiktok.filter import ( UserProfileFilter, @@ -31,6 +32,7 @@ UserPlayListFilter, PostSearchFilter, UserLiveFilter, + CheckLiveAliveFilter, ) from f2.apps.tiktok.utils import ( SecUserIdFetcher, @@ -895,6 +897,29 @@ async def fetch_user_live_videos( return live + async def fetch_check_live_alive(self, room_ids: str) -> CheckLiveAliveFilter: + """ + 用于检查直播间是否在线 + (Used to check if the live room is online) + + Return: + check: CheckLiveAliveFilter: 检查直播间在线状态过滤器 (Check live status filter) + """ + logger.info(_("开始检查直播间在线状态")) + logger.debug("===================================") + async with TiktokCrawler(self.kwargs) as crawler: + response = await crawler.fetch_check_live_alive( + CheckLiveAlive(room_ids=room_ids) + ) + check = CheckLiveAliveFilter(response) + + logger.info( + _("直播间：{0}，在线状态：{1}").format(check.room_id, check.is_alive) + ) + logger.debug("===================================") + logger.info(_("直播间在线状态检查结束")) + return check + async def main(kwargs): mode = kwargs.get("mode") From b59746223731e809b625c6eca0cdb122426d266a Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 17 Jun 2024 21:51:13 +0800 Subject: [PATCH 194/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E5=BC=80=E6=92=AD=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=89=87=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/snippets/tiktok/check-live-alive.py | 33 ++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 docs/snippets/tiktok/check-live-alive.py diff --git a/docs/snippets/tiktok/check-live-alive.py b/docs/snippets/tiktok/check-live-alive.py new file mode 100644 index 00000000..54fd1abb --- /dev/null +++ b/docs/snippets/tiktok/check-live-alive.py @@ -0,0 +1,33 @@ +import asyncio +from f2.apps.tiktok.handler import TiktokHandler + + +kwargs = { + "headers": { + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36", + "Referer": "https://www.tiktok.com/", + }, + "proxies": { + "http://": None, + "https://": None, + }, + "timeout": 10, + "cookie": "YOUR_COOKIE_HERE", +} + + +async def main(): + rooms = await TiktokHandler(kwargs).fetch_check_live_alive( + room_ids="7381444193462078214,7381457815116466949,7381456855157721863,7381439549143026438" + ) + + print("=================_to_raw================") + print(rooms._to_raw()) + print("=================_to_dict===============") + print(rooms._to_dict()) + print("=================_to_list===============") + print(rooms._to_list()) + + +if __name__ == "__main__": + asyncio.run(main()) From 9b71aa95da905e3c912bc88b588f38bdc6d2c58d Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 17 Jun 2024 21:51:55 +0800 Subject: [PATCH 195/299] =?UTF-8?q?perf:=20=E5=AF=B9tiktok=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E7=9B=B4=E6=92=AD=E9=97=B4=E7=8A=B6=E6=80=81=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E7=9A=84=E8=AF=B4=E6=98=8E=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/handler.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/f2/apps/tiktok/handler.py b/f2/apps/tiktok/handler.py index 53d69fa9..15461bd0 100644 --- a/f2/apps/tiktok/handler.py +++ b/f2/apps/tiktok/handler.py @@ -902,8 +902,14 @@ async def fetch_check_live_alive(self, room_ids: str) -> CheckLiveAliveFilter: 用于检查直播间是否在线 (Used to check if the live room is online) + Args: + room_ids: str: 直播间ID (Live room ID) + Return: check: CheckLiveAliveFilter: 检查直播间在线状态过滤器 (Check live status filter) + + Note: + 房间号参数为字符串形式，多个房间号用逗号分隔，如：7381444193462078214,7381457815116466949, """ logger.info(_("开始检查直播间在线状态")) logger.debug("===================================") From fa3c5f5bdb72cb4485a55f5f6a2797ba5cf2d424 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 17 Jun 2024 21:55:33 +0800 Subject: [PATCH 196/299] =?UTF-8?q?feat:=20readme=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E5=BC=80=E6=92=AD=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 3 ++- README.md | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.en.md b/README.en.md index 4aa420b3..9eeb3d6c 100644 --- a/README.en.md +++ b/README.en.md @@ -157,7 +157,8 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores | Liked Works | 🟣⚫ | `fetch_user_like_videos` | 🟢 | | Favorite Works | 🟣⚫ | `fetch_user_collect_videos` | 🟢 | | Playlist Works | 🟣⚫ | `fetch_user_mix_videos` | 🟢 | - |Post Search|🟣⚫|`fetch_search_videos`|🟢| + | Post Search|🟣⚫|`fetch_search_videos`|🟢| + | Check If The webcast Is Alive|🟣⚫|`fetch_check_live_alive`|🟢| | ... | ... | ... | ... |
diff --git a/README.md b/README.md index 23a48e1a..11f64df4 100644 --- a/README.md +++ b/README.md @@ -159,6 +159,7 @@ |收藏作品|🟣⚫|`fetch_user_collect_videos`|🟢| |播放列表作品|🟣⚫|`fetch_user_mix_videos`|🟢| |作品搜索|🟣⚫|`fetch_search_videos`|🟢| + |检查开播|🟣⚫|`fetch_check_live_alive`|🟢| |...|...|...|...| From 5ec7f01e186713c3f85780f5edd52a1d61a02ec8 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 17 Jun 2024 22:05:24 +0800 Subject: [PATCH 197/299] =?UTF-8?q?perf:=20=E5=AE=8C=E5=96=84i18n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/cli.py | 2 +- f2/apps/tiktok/cli.py | 2 +- f2/cli/cli_commands.py | 2 +- f2/utils/_dl.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/f2/apps/douyin/cli.py b/f2/apps/douyin/cli.py index 084d3e65..867fb30c 100644 --- a/f2/apps/douyin/cli.py +++ b/f2/apps/douyin/cli.py @@ -432,7 +432,7 @@ def douyin( # 尝试从命令行参数或kwargs中获取URL if not kwargs.get("url"): - logger.error("缺乏URL参数，详情看命令帮助") + logger.error(_("缺乏URL参数，详情看命令帮助")) handler_help(ctx, None, True) # 添加app_name到kwargs diff --git a/f2/apps/tiktok/cli.py b/f2/apps/tiktok/cli.py index ffae0797..27291cfe 100644 --- a/f2/apps/tiktok/cli.py +++ b/f2/apps/tiktok/cli.py @@ -404,7 +404,7 @@ def tiktok( # 尝试从命令行参数或kwargs中获取URL if not kwargs.get("url"): - logger.error("缺乏URL参数，详情看命令帮助") + logger.error(_("缺乏URL参数，详情看命令帮助")) handler_help(ctx, None, True) # 添加app_name到kwargs diff --git a/f2/cli/cli_commands.py b/f2/cli/cli_commands.py index a1da310d..e8c7a841 100644 --- a/f2/cli/cli_commands.py +++ b/f2/cli/cli_commands.py @@ -79,7 +79,7 @@ def get_command(self, ctx, cmd_name): if app_name: # 动态导入app的cli模块 module = importlib.import_module(f"f2.apps.{app_name}.cli") - logger.info("App: %s" % app_name) + logger.info(_("应用：{0}").format(app_name)) command = getattr(module, app_name) return command except (ImportError, AttributeError) as e: diff --git a/f2/utils/_dl.py b/f2/utils/_dl.py index 11719f15..2b97e9ab 100644 --- a/f2/utils/_dl.py +++ b/f2/utils/_dl.py @@ -92,7 +92,7 @@ async def get_content_length(url: str, headers: dict = ..., proxies: dict = ...) return 0 except httpx.RequestError as e: logger.error(traceback.format_exc()) - logger.error("httpx 请求错误: {0}, 错误详情: {1}".format(url, e)) + logger.error(_("httpx 请求错误：{0}，错误详情：{1}".format(url, e))) return 0 except Exception as e: # 处理未知错误 (Handling unknown errors) From 543d198e1ea9dbebdc479408eca6fe6d76fe12c3 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 17 Jun 2024 23:24:01 +0800 Subject: [PATCH 198/299] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96command?= =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/cli/cli_commands.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/f2/cli/cli_commands.py b/f2/cli/cli_commands.py index e8c7a841..e2ee57d8 100644 --- a/f2/cli/cli_commands.py +++ b/f2/cli/cli_commands.py @@ -67,14 +67,14 @@ def handle_debug( class DynamicGroup(click.Group): - def get_command(self, ctx, cmd_name): + def get_command(self, ctx: click.Context, cmd_name: str): app_name = ( cmd_name if cmd_name in APP_MAPPINGS else REVERSE_APP_MAPPINGS.get(cmd_name, None) ) if not app_name: - return None + ctx.fail(_("没有找到 {0} 应用").format(cmd_name)) try: if app_name: # 动态导入app的cli模块 @@ -82,9 +82,9 @@ def get_command(self, ctx, cmd_name): logger.info(_("应用：{0}").format(app_name)) command = getattr(module, app_name) return command - except (ImportError, AttributeError) as e: - logger.error("Error: %s" % e) - return None + except (ImportError, AttributeError): + logger.error(traceback.format_exc()) + return @click.command(cls=DynamicGroup) From 75083a5e4b1369d4bfe352a34bf1efbe7d85a162 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 17 Jun 2024 23:30:37 +0800 Subject: [PATCH 199/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=8E=B7?= =?UTF-8?q?=E5=8F=96pypi=E5=8C=85=E7=89=88=E6=9C=AC=E5=8F=B7=E7=9A=84?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/utils/utils.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/f2/utils/utils.py b/f2/utils/utils.py index 81fb0d6e..696894a3 100644 --- a/f2/utils/utils.py +++ b/f2/utils/utils.py @@ -1,16 +1,21 @@ # path: f2/utils/utils.py +import f2 import re import sys +import httpx import random import secrets import datetime +import traceback import browser_cookie3 import importlib_resources from typing import Union, Any from pathlib import Path +from f2.log.logger import logger + # 生成一个 16 字节的随机字节串 (Generate a random byte string of 16 bytes) seed_bytes = secrets.token_bytes(16) @@ -392,3 +397,21 @@ def unescape_json(json_text: str) -> dict: json_obj = {} return json_obj + + +# 获取最新版本号 +async def get_latest_version(package_name): + async with httpx.AsyncClient( + timeout=10.0, + transport=httpx.AsyncHTTPTransport(retries=5), + verify=False, + ) as aclient: + try: + response = await aclient.get(f"{f2.PYPI_URL}/{package_name}/json") + response.raise_for_status() + package_data = response.json() + latest_version = package_data["info"]["version"] + return latest_version + except (httpx.HTTPStatusError, httpx.RequestError, KeyError) as e: + logger.error(traceback.format_exc()) + return None From e7086dc77e472922d9f7e46819f6940310351707 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 17 Jun 2024 23:31:51 +0800 Subject: [PATCH 200/299] =?UTF-8?q?feat:=20=E5=9C=A8=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E5=89=8D=E6=A3=80=E6=9F=A5F2=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/cli/cli_commands.py | 50 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/f2/cli/cli_commands.py b/f2/cli/cli_commands.py index e2ee57d8..c6a6933f 100644 --- a/f2/cli/cli_commands.py +++ b/f2/cli/cli_commands.py @@ -5,12 +5,14 @@ import typing import asyncio import importlib +import traceback from f2 import helps from f2.apps import __apps__ as apps_module from f2.exceptions import APIError from f2.cli.cli_console import RichConsoleManager from f2.utils._signal import SignalManager +from f2.utils.utils import get_latest_version from f2.i18n.translator import _ from f2.log.logger import logger @@ -48,12 +50,47 @@ def handle_debug( ) -> None: if not value or ctx.resilient_parsing: return + from rich.traceback import install install() logger.setLevel(value) - logger.debug("开启调试模式 (Debug mode on)") + logger.debug(_("调试模式：{0}").format(value)) + + +# 版本检测 +def handle_version( + ctx: click.Context, + param: typing.Union[click.Option, click.Parameter], + value: typing.Any, +) -> None: + if not value or ctx.resilient_parsing: + return + + asyncio.run(check_version()) + + ctx.exit() + + +async def check_version(): + """用于检查F2的版本是否最新""" + + latest_version = await get_latest_version("f2") + + if latest_version: + if f2.__version__ == latest_version: + logger.warning( + _( + "您当前使用的版本 {0} 可能已过时，请考虑及时升级到最新版本 {1}，请使用 pip install -U f2 更新" + ).format(f2.__version__, latest_version) + ) + elif f2.__version__ == latest_version: + logger.info(_("您当前使用的是最新版本：{0}").format(f2.__version__)) + else: + logger.error(_("无法获取最新版本信息")) + + return # 应用映射 @@ -77,6 +114,8 @@ def get_command(self, ctx: click.Context, cmd_name: str): ctx.fail(_("没有找到 {0} 应用").format(cmd_name)) try: if app_name: + # 检查版本 + asyncio.run(check_version()) # 动态导入app的cli模块 module = importlib.import_module(f"f2.apps.{app_name}.cli") logger.info(_("应用：{0}").format(app_name)) @@ -113,6 +152,14 @@ def get_command(self, ctx: click.Context, cmd_name: str): expose_value=False, callback=handle_debug, ) +@click.option( + "--check-version", + is_flag=True, + expose_value=False, + is_eager=True, + callback=handle_version, + help=_("检查F2版本"), +) def main(**kwargs): pass @@ -138,7 +185,6 @@ def set_cli_config(ctx, **kwargs): async def run_app(kwargs): - logger.info(f"Version {f2.__version__}") app_name = kwargs["app_name"] app_module = importlib.import_module(f"f2.apps.{app_name}.handler") await app_module.main(kwargs) From 4c4628f0b2dd04f0ecff855063900e8cab72ca82 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 17 Jun 2024 23:32:51 +0800 Subject: [PATCH 201/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0pypi=E5=8C=85?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/f2/__init__.py b/f2/__init__.py index d7bfb863..a0c0dcf9 100644 --- a/f2/__init__.py +++ b/f2/__init__.py @@ -47,3 +47,5 @@ "search", "live", ] + +PYPI_URL = "https://pypi.org/pypi" From 23bfa7297b27cd940881b2ed436f6222549c0946 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 17 Jun 2024 23:33:33 +0800 Subject: [PATCH 202/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0tiktok?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=85=B3=E9=94=AE=E8=AF=8D=E5=B8=AE=E5=8A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/help.py | 1 + 1 file changed, 1 insertion(+) diff --git a/f2/apps/tiktok/help.py b/f2/apps/tiktok/help.py index 4f60d0ba..b8ab5424 100644 --- a/f2/apps/tiktok/help.py +++ b/f2/apps/tiktok/help.py @@ -59,6 +59,7 @@ def help() -> None: "下载日期区间发布的作品，格式：2022-01-01|2023-01-01，'all' 为下载所有作品" ), ), + ("-w --keyword", "[dark_cyan]str", _("搜索关键词，用于搜索作品。")), ("-e --timeout", "[dark_cyan]int", _("网络请求超时时间。")), ("-r --max-retries", "[dark_cyan]int", _("网络请求超时重试数。")), ("-x --max-connections", "[dark_cyan]int", _("网络请求并发连接数。")), From 51e2283c45e7579a3fe7af7712de1b76388935f3 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 17 Jun 2024 23:34:47 +0800 Subject: [PATCH 203/299] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E5=B8=AE=E5=8A=A9=E4=BF=A1=E6=81=AF=E7=9A=84=E8=BE=93?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/cli.py | 4 ++-- f2/apps/douyin/help.py | 6 ++++-- f2/apps/tiktok/cli.py | 2 +- f2/apps/tiktok/help.py | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/f2/apps/douyin/cli.py b/f2/apps/douyin/cli.py index 867fb30c..cc62829a 100644 --- a/f2/apps/douyin/cli.py +++ b/f2/apps/douyin/cli.py @@ -304,7 +304,7 @@ def handler_naming( "-s", type=int, # default=20, - help=_("从接口每页可获取作品数，不建议超过20"), + help=_("从接口每页可获取作品数，不建议超过 20"), ) @click.option( "--languages", @@ -343,7 +343,7 @@ def handler_naming( # @click.option( # "--sso-login", # is_flag=True, -# help=_("使用SSO扫码登录获取cookie，保存低频主配置文件"), +# help=_("使用SSO扫码登录获取cookie，保存低频主配置文件（暂时弃用）"), # callback=handler_sso_login, # ) @click.option( diff --git a/f2/apps/douyin/help.py b/f2/apps/douyin/help.py index bb3106e4..23f7d401 100644 --- a/f2/apps/douyin/help.py +++ b/f2/apps/douyin/help.py @@ -67,7 +67,7 @@ def help() -> None: ( "-s --page-counts", "[dark_cyan]int", - _("从接口每页可获取作品数，不建议超过20"), + _("从接口每页可获取作品数，不建议超过 20"), ), ( "-l --languages", @@ -102,7 +102,9 @@ def help() -> None: ( "--sso-login", "[dark_cyan]Flag", - _("使用SSO扫码登录获取[yellow]cookie[/yellow]，保存低频主配置文件"), + _( + "使用SSO扫码登录获取[yellow]cookie[/yellow]，保存低频主配置文件[red]（暂时弃用）[/red]" + ), ), ("--help", "[dark_cyan]Flag", _("显示经典帮助信息")), ( diff --git a/f2/apps/tiktok/cli.py b/f2/apps/tiktok/cli.py index 27291cfe..16ee05e6 100644 --- a/f2/apps/tiktok/cli.py +++ b/f2/apps/tiktok/cli.py @@ -282,7 +282,7 @@ def handler_naming( "-s", type=int, # default=20, - help=_("从接口每页可获取作品数，不建议超过20。"), + help=_("从接口每页可获取作品数，不建议超过 20"), ) @click.option( "--languages", diff --git a/f2/apps/tiktok/help.py b/f2/apps/tiktok/help.py index b8ab5424..c668a969 100644 --- a/f2/apps/tiktok/help.py +++ b/f2/apps/tiktok/help.py @@ -72,7 +72,7 @@ def help() -> None: ( "-s --page-counts", "[dark_cyan]int", - _("从接口每页可获取作品数，不建议超过20。"), + _("从接口每页可获取作品数，不建议超过 20"), ), ( "-l --languages", From ce4cc42818cc6c590c0308eae7bf133e398eb3c7 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 17 Jun 2024 23:41:08 +0800 Subject: [PATCH 204/299] =?UTF-8?q?perf:=20=E5=AE=8C=E5=96=84get=5Flatest?= =?UTF-8?q?=5Fversion=E5=B7=A5=E5=85=B7=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/utils/utils.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/f2/utils/utils.py b/f2/utils/utils.py index 696894a3..64322aee 100644 --- a/f2/utils/utils.py +++ b/f2/utils/utils.py @@ -399,8 +399,16 @@ def unescape_json(json_text: str) -> dict: return json_obj -# 获取最新版本号 -async def get_latest_version(package_name): +async def get_latest_version(package_name: str) -> str: + """ + 获取 Python 包的最新版本号 + + Args: + package_name (str): Python 包名 + + Returns: + str: Python 包的最新版本号 + """ async with httpx.AsyncClient( timeout=10.0, transport=httpx.AsyncHTTPTransport(retries=5), @@ -414,4 +422,4 @@ async def get_latest_version(package_name): return latest_version except (httpx.HTTPStatusError, httpx.RequestError, KeyError) as e: logger.error(traceback.format_exc()) - return None + return "0.0.0.0" From 5cf2928314b11ae154585f36e5b5fa95669e17fd Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Tue, 18 Jun 2024 02:38:53 +0800 Subject: [PATCH 205/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E5=BC=B9=E5=B9=95wss=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/api.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/f2/apps/douyin/api.py b/f2/apps/douyin/api.py index 908b165a..eef2f4c5 100644 --- a/f2/apps/douyin/api.py +++ b/f2/apps/douyin/api.py @@ -24,6 +24,9 @@ class DouyinAPIEndpoints: # WSS域名 (WSS Domain) WEBCAST_WSS_DOMAIN = "wss://webcast5-ws-web-lf.douyin.com" + # 直播弹幕(WSS) (Live Danmaku WSS) + LIVE_IM_WSS = f"{WEBCAST_WSS_DOMAIN}/webcast/im/push/v2/" + # 首页Feed (Home Feed) TAB_FEED = f"{DOUYIN_DOMAIN}/aweme/v1/web/tab/feed/" From e2c492ef4d5a40eb474248d1502693458c18298b Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 15:45:00 +0800 Subject: [PATCH 206/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0douyin?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4wss=E6=8E=A5=E5=8F=A3=E5=9F=9F?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/f2/apps/douyin/api.py b/f2/apps/douyin/api.py index eef2f4c5..12df7313 100644 --- a/f2/apps/douyin/api.py +++ b/f2/apps/douyin/api.py @@ -22,7 +22,7 @@ class DouyinAPIEndpoints: SSO_DOMAIN = "https://sso.douyin.com" # WSS域名 (WSS Domain) - WEBCAST_WSS_DOMAIN = "wss://webcast5-ws-web-lf.douyin.com" + WEBCAST_WSS_DOMAIN = "wss://webcast5-ws-web-hl.douyin.com" # 直播弹幕(WSS) (Live Danmaku WSS) LIVE_IM_WSS = f"{WEBCAST_WSS_DOMAIN}/webcast/im/push/v2/" From 0d1f288f7a4d81e655b121d9118237945a60ac7b Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 16:12:43 +0800 Subject: [PATCH 207/299] =?UTF-8?q?workflow:=20=E5=85=B3=E9=97=AD=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=AF=BC=E5=85=A5=EF=BC=8C=E4=BC=9A=E5=8F=98=E5=82=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 13c7714d..2bdf719b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,5 +5,5 @@ "python.testing.unittestEnabled": false, "python.testing.pytestEnabled": true, "python.analysis.typeCheckingMode": "off", - "python.analysis.autoImportCompletions": true + "python.analysis.autoImportCompletions": false } \ No newline at end of file From 6a735ec20c207697da3d0a7464abe23da1f7eca3 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 16:17:43 +0800 Subject: [PATCH 208/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E5=B7=A5=E5=85=B7JS=E5=BA=93webmssdk.es5-1.0.0.53?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/algorithm/webcast_signature.js | 7102 +++++++++++++++++ 1 file changed, 7102 insertions(+) create mode 100644 f2/apps/douyin/algorithm/webcast_signature.js diff --git a/f2/apps/douyin/algorithm/webcast_signature.js b/f2/apps/douyin/algorithm/webcast_signature.js new file mode 100644 index 00000000..62d3600c --- /dev/null +++ b/f2/apps/douyin/algorithm/webcast_signature.js @@ -0,0 +1,7102 @@ +/*! + * File: webcast_signature.js + * Author: Johnserf-Seed + * Created: 2024-06-23 + * Update: 2024-06-23 + * Version: 1.0.0 + * Description: + * The source file is from douyin.com, with the necessary environment added and some of the obfuscation restored. + * Can be used to generate webcast_signature. + * + * Copyright (c) 2024 douyin.com + * Sdk Version: 1.0.0.53 + * Source: https://lf-c-flwb.bytetos.com/obj/rc-client-security/c-webmssdk/1.0.0.53/webmssdk.es5.js + * + * License: + * This file is part of the Douyin project. + * + * This software is released under the MIT License. + * https://opensource.org/licenses/MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + + +// const md5 = require('md5'); + +_window = global; +_document = {}; +// _navigator = { +// userAgent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0" +// } +_history = {}; +_screen = {}; +_location = {}; + +function handler(target_name, number) { + return { + get: function (target, prop) { + if (prop in target) { + console.log(`Getting ${prop} from ${target_name}`); + return target[prop]; + } else { + console.log(`${prop} not found on ${target_name}`); + return undefined; + } + }, + set: function (target, prop, value) { + console.log(`Setting ${prop} to ${value} on ${target_name}`); + target[prop] = value; + return true; + } + }; +} + +window = new Proxy(_window, handler("window", 10)); +document = new Proxy(_document, handler("document", 10)); +navigator = new Proxy(_navigator, handler("navigator", 10)); +history = new Proxy(_history, handler("history", 10)); + +if (!window.byted_acrawler) { + function w_0x25f3(e, r) { + var t = w_0x42f5(); + return w_0x25f3 = function (e, r) { + e -= 350; + var a = t[e]; + return a; + }, + w_0x25f3(e, r); + } + !function (e, r) { + var t = w_0x25f3; + var a = e(); + while (1) { + try { + var n = -parseInt(t(795)) / 1 * (-parseInt(t(618)) / 2) + parseInt(t(662)) / 3 + -parseInt(t(499)) / 4 * (parseInt(t(796)) / 5) + parseInt(t(839)) / 6 * (-parseInt(t(655)) / 7) + -parseInt(t(577)) / 8 * (-parseInt(t(697)) / 9) + -parseInt(t(661)) / 10 * (-parseInt(t(657)) / 11) + parseInt(t(775)) / 12 * (-parseInt(t(925)) / 13); + if (n === r) { + break; + } + a.push(a.shift()); + } catch (e) { + console.log(e); + a.push(a.shift()); + } + } + } + (w_0x42f5, 732770); + function w_0x42f5() { + var e = [" can't have a .", "484e4f4a403f5243001f3009ad9ffc90000000dc0b1204fb00000477110001033f2e17000135491102004a120000110001110001031a2747000503414500201100010334274700050347450012110001033e2747000603041d45000303111d184301421101021400020211000211000103182c43010211000211000103122c43011802110002110001030c2c4301180211000211000103062c43011802110002110001430118421100011401010211010311000103022c430142110101031c2b11000103042d2f1400021100011401010211010311000243014202110103110101031a2b11000103062d2f4301021101021100014301184205000000003b0114000205000000473b01140003050000008b3b01140004050000009e3b0114000505000000be3b0114000603001400010300140007030014000811010144004a12000143000403e81b03002d14000911010212000232330033021101030211010303001100090700031843021101041200044a12000511010412000612000703021843014302050000fff11c140008110009110008050000fff11a3103002d4a1200080302430114000a11000a14000b11000a12000703202947001811000a4a12000511000a120007032019430114000b45004511000a12000703202747003907000314000c030014000d11000d032011000a120007192747001411000c0700091817000c354917000d214945ffdc11000c11000b1814000b07000a11000b18140007021101051100070302430214000702110103030011000707000318430214000e02110106430014000f11011807000b25470004014500010011000f07000c1607000314001011011612000d3300131101074a12000e11011612000d430107000f2647006503001400111101161200104700290211010803001101074a12000e0211010911011612000d1101161200104302430143021400114500200211010803001101074a12000e0211010a11011612000d43014301430214001107001111001118070012181400100211010b110116120013430114001211011612001447001511010c4a12001511001211011612001443024500031100121400121100100211010d110012430118140010110010070016180211010e1101161200134301180700121814001011001007001718070018181400100211010f11000f4301140013110102120002323300060211011043001400141101021200023233001811011112001934000f021101120211011307001a430143011400150211000411000743010211000511000706001b1b03002d4301180211000611001411000731430118021100040211010311000e1101021200023233000611011412001c4a12000843004302050000fff11c03102b0211010311000e110010070003184302050000fff11c2f4301180211000511001303082b11010212001d03042b2f110007314301180211000311000843011814001602110006030043014911001547000a1100161100151814001607001e1100161814001702110108030011001743024a120008031043011400181100184a12001f1100181200070302191100181200074302140019110017110019181400171100174200200c6b7f62604e656c7f4e626968076a6879596460680b6962604362795b6c6164690004657f686b097e786f7e797f64636a087d7f6279626e6261066168636a79650879625e797f64636a013d0e3c3d3d3d3d3d3d3d3c3c3d3d3d3d076b627f7f686c610a69647f686e795e646a63046f626974097e797f64636a646b740276700b6f6269745b6c613f7e797f0a6f62697452656c7e6530012b03787f61057c78687f740a6c7e626169527e646a63097d6c7965636c606830097979527a686f646930062b78786469300e526f74796869527e686e52696469077979527e6e64690a393f3439343b3a3f343b09787e687f4c6a686379096b685b687f7e6462630e523d3f4f39573b7a623d3d3d3d3c057e61646e68", "484e4f4a403f5243003c01321067d4bc00000824ebfd74540000087f0211010311000111000243024a12000505000000213b0105000001533b014302421100011200064701251100011200073300191100011200074a12000811030112000912000a430103011d2634000c0211030211000112000743014700f111000112000b4a12000c07000d43011400021100024700d902110303110001120007430114000311000311030412000e2547005511000211030515000f1100031103051500100211030607000f110002430249021103071100024301491100031101032947001f1103051200111200120300294700100211030811030903020403e81a4302494500161101031103051200102a47000911000211030515000f1101031103041200132533000c110305120011120012030a274700361103051200114a120014110002430149110305120011120012030125470017021103071100024301490211030607000f110002430249110001421100014008421100023400010d14000211020a33000711000111020b3714000307001514000407001614000507001514000611020c33000711000111020d374701c411000112000a14000411000212001747000f1100021200174a12001843004500030700161400050211020e1100044301330011110005070016253400071100050700192547017d11020512001014000711020512001a1400081100080700152347000f07000f11020512000f0c000245001207000f11020512000f07001a1100080c00041400090211020f021102101100044301110009430214000a0211021111000a430114000b0211021211000b11000212001b430214000c0211020f11000a11010111000c0c0002430214000d07001514000e11021312001c47000911000d14000e4500b10d021102140211000d43020e000714000f110005070019254700710211021511000111000243024a12001d07001e43010300134a12001f430014000602110216110006430147003b0211021711000f11000611000212001b4303490211021811000f0807002043031400100211020f11000d1101021100100c0002430214000e45000611000d14000e4500250211021811000f0807002043031400110211020f11000d1101021100110c0002430214000e1102131200214700130211021a430011000212000b110219120022160211010411000e1100021100074303421100034701e91100011200071400041100011200174700091100011200174500030700161400050211020e1100044301330011110005070016253400071100050700192547019811020512001014001211020512001a1400131100130700152347000f07000f11020512000f0c000245001207000f11020512000f07001a1100130c00041400140211020f021102101100044301110014430214001502110211110015430114001611000112000b1400171102131200214700161100174a1200231102191200220211021a4300430249110005070019254700480211021511000111000243024a12001d07001e43010300134a12001f43001400061100014a12002443004a12002543004a12000505000007293b01050000081e3b014302424500bd021102121100160243021400180211020f1100151101011100180c000243021400190d021102140211001943020e000714001a0211021811001a08070020430314001b0211020f11001911010211001b0c0002430214001c11020b11001c0d1100170e000b080e001b1100011200260e00261100011200270e00271100011200280e00281100011200290e002911000112002a0e002a11000112002b0e002b11000112002c0e002c440214001d0211010411001d110002110012430342021101031100011100024302424501df11000212000b324700070d11000215000b11000114000411000212001747000f1100021200174a12001843004500030700161400050211020e1100044301330011110005070016253400071100050700192547017d11020512001014001e11020512001a14001f11001f0700152347000f07000f11020512000f0c000245001207000f11020512000f07001a11001f0c00041400200211020f02110210110004430111002043021400210211021111002143011400220211021211002211000212001b43021400230211020f1100211101011100230c0002430214002407001514002511021312001c4700091100241400254500b10d021102140211002443020e0007140026110005070019254700710211021511000111000243024a12001d07001e43010300134a12001f430014000602110216110006430147003b0211021711002611000611000212001b430349021102181100260807002043031400270211020f1100241101021100270c00024302140025450006110024140025450025021102181100260807002043031400280211020f1100241101021100280c000243021400251102131200214700130211021a430011000212000b110219120022160211010411002511000211001e4303420211010311000111000243024208420700151400020211031211011611000143021400030211030f1101151102011100030c000243021400040211031611010643014700490d021103140211000443020e000714000502110317110005110106110001430349021103181100050807002043031400060211030f1100041102021100060c0002430214000245000611000414000211030b1100020d1101011200170e00171101170e000b1100010e001b1101011200260e00261101011200270e00271101011200280e00281101011200290e002911010112002a0e002a11010112002b0e002b11010112002c0e002c44021400070211020411000711010211011243034211000140084205000000003b0314000405000001593b021400050700001400010700011400020211010043003247000208421101011200024700020842001101011500021101011200031400031100031101011500041100051101011500030842002d0754214e636b797f0a537f656b626d78797e691653536d6f53656278697e6f697c786968536a69786f64056a69786f6406536a69786f64047864696202636703797e60076562686974436a0860636f6d7865636204647e696a0764696d68697e7f036b69780a7421617f217863676962037f696f07617f586367696208617f5f786d78797f0e617f42697b586367696240657f78066069626b78640465626578047c797f6400034b4958066169786463680b7863597c7c697e4f6d7f69045c435f580b53536d6f5378697f786568046e636875017a057f7c60657801370b786340637b697e4f6d7f69076a637e7e696d60037f68650d7f696f45626a6344696d68697e037f6978056f606362690478697478087e696a697e7e697e0e7e696a697e7e697e5c6360656f7504616368690b6f7e6968696278656d607f056f6d6f6469087e6968657e696f7809656278696b7e657875", "own", "Super expression must either be null or a function", "getTimezoneOffset", "array", "toDataURL", "enumerable", "setPrototypeOf", "field", "WEBGL", "wID", "illegal catch attempt", "TouchEvent", "3160hBpQVk", "484e4f4a403f5243000d0a13c08652000000000f3be74070000003930211021611010111000143024908421101003300031101013300031101023247000208420d0700000e000103040e00021101181200000e00030d0700040e000103030e00021101030e00050d0700060e000103030e00021101040e00050d0700070e000103030e00021101050e00050d0700080e000103030e00021101030e00050d0700090e000103000e00020d07000a0e000103000e00020d07000b0e000103000e00020d07000c0e000103000e00020d07000d0e000103000e00020d07000e0e000103030e00021101060e00050d07000f0e000103030e00021101070e00050d0700100e000103010e00020d0700110e000103010e00020d0700120e000103010e00020d0700130e000103000e00020d0700140e000103030e00021101080e000503010e00150d0700160e000103030e00021101090e00050d0700170e000103030e000211010a0e00050d0700180e000103030e00021101030e00050d0700190e000103030e000211010b0e00050d07001a0e000103030e000211010c0e00050d07001b0e000103030e000211010d0e00050d07001c0e000103030e00021101030e00050d07001d0e000103000e00020d07001e0e000103030e000211010e0e000507001f0e00200d0700210e000103030e000211010f0e00050d0700220e000103030e00021101100e00050d0700230e000103030e00021101110e000503010e00150d0700240e000103010e00020d0700250e000103040e00021101121200260e00030d0700270e000103030e00021101130e00050d0700280e000103030e00021101030e00050d0700290e000103040e00020c00221400010c0000140002030014000311000311000112002a274700eb110001110003131200020300480013030148002f0302480045030348005b494500be0211011411010011000111000313120001134301110001110003131500034500a011010111000111000313120001131100011100031315000345008511010211000111000313120001131100011100031315000345006a110001110003131200154700321101153a07002b264700241100024a12002c110001110003131200054a12002d110001110003131200204301430149450025110001110003131200054a12002d0211000111000313120020430211000111000313150003450003450000170003214945ff081101153a07002b2647001d1101154a12002e11000243014a12002f05000000003b0143014945000a02110116110001430149084200300349414c0146014e015a095b5c495a5c7c41454d015c09494a4144415c414d5b064b49465e495b0a5c41454d5b5c49455819085844495c4e475a451340495a4c5f495a4d6b47464b5d5a5a4d464b510c4c4d5e414b4d654d45475a51084449464f5d494f4d094449464f5d494f4d5b0a5a4d5b47445d5c4147460f495e4941447a4d5b47445d5c414746095b4b5a4d4d467c47580a5b4b5a4d4d46644d4e5c104c4d5e414b4d7841504d447a495c41470a585a474c5d4b5c7b5d4a074a495c5c4d5a510158095c475d4b4061464e47085c41454d5247464d0a5c41454d5b5c4945581a074f585d61464e470b425b6e47465c5b64415b5c0b58445d4f41465b64415b5c0a5c41454d5b5c4945581b095d5b4d5a694f4d465c0a4d5e4d5a6b474743414d075c5c775b4b414c01450b5b51465c49506d5a5a475a0c46495c415e4d644d464f5c40055a5c4b61780844474b495c414746094e587e4d5a5b4147460b77775e4d5a5b4147467777084b44414d465c614c0a5c41454d5b5c4945581c0b4d505c4d464c6e414d444c06444d464f5c40095d464c4d4e41464d4c04585d5b40044b49444403494444045c404d46", "rewriteUrl ", "setTTWid", "height", "product", "Vrinda", "X-Mssdk-Info", "arrayBuffer", "vibrate", "sendBeacon", "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", "canvas", "Character outside valid Unicode range: 0x", "join", "throw", "iterator result is not an object", "DEPTH_BITS", "compatMode", "forEach", "Attempted to access private element on non-instance", "unsupport type", "attempted to call addInitializer after decoration was finished", "pageXOffset", "length", "method", "bytes", "charAt", "Sylfaen", "toElementDescriptor", "base64", "createElement", "private", "ttcid", "msStatus", "MAX_VARYING_VECTORS", "elements", "484e4f4a403f524300232a0d2ebaf9a00000000042410a740000019d110100002347000200421101011200004700020042070001110102364700351101024a12000111010143011400011100014a120002070000430103002a34000f1100014a120002070003430103002a470002004211010333000611010312000433000911010312000412000533000c1101031200041200051200064700213e000414000c413d00171101031200041200054a1200064300082547000200424107000707000807000907000a07000b07000c07000d07000e07000f0700100700110c000b1400020700120700130700140c000314000303001400041100041100031200152747001e11000311000413140005110103110005134700020042170004214945ffd503001400061100061100021200152747002111000211000613140007110103120016110007134700020042170006214945ffd21101024a1200171101031200164301140008030014000911000814000a11000911000a1200152747003911000a1100091314000b11000b4a1200181101050700194401430133000e11010312001611000b1307001a134700020042170009214945ffba0142001b096d7f787e68736c7f68137d7f6e556d744a68756a7f686e63547b777f690773747e7f62557c09767b747d6f7b7d7f690679726875777f07686f746e73777f07797574747f796e1445456d7f787e68736c7f68457f6c7b766f7b6e7f134545697f767f74736f77457f6c7b766f7b6e7f1b45456d7f787e68736c7f6845697968736a6e457c6f74796e7375741745456d7f787e68736c7f6845697968736a6e457c6f74791545456d7f787e68736c7f6845697968736a6e457c741345457c627e68736c7f68457f6c7b766f7b6e7f1245457e68736c7f68456f746d687b6a6a7f7e1545456d7f787e68736c7f68456f746d687b6a6a7f7e1145457e68736c7f68457f6c7b766f7b6e7f144545697f767f74736f77456f746d687b6a6a7f7e1445457c627e68736c7f68456f746d687b6a6a7f7e0945697f767f74736f770c797b7676497f767f74736f771645497f767f74736f7745535e5f45487f7975687e7f6806767f747d6e72087e75796f777f746e04717f636905777b6e79720a463e417b3760477e794506797b79727f45", "pop", "showOffsetX", "MAX_TEXTURE_IMAGE_UNITS", "2571598OPFKfY", "webgl", "appendChild", "outerHeight", "screenX", "kind", "navigator", "attempted to use private field on non-instance", "cookie", "AsyncIterator", "crypto", "buffer", "availHeight", "The property descriptor of a field descriptor", "resolve", "react.element", "close", "monospace", "stun:stun.l.google.com:19302", "acc", "BLUE_BITS", "Arguments", "style", "nextLoc", "pageYOffset", "72px", "webkitRequestAnimationFrame", "hidden", "MAX_FRAGMENT_UNIFORM_VECTORS", "node", "Parchment", "kWebsocket", "xmst", "number", "altKey", "A method descriptor", "Leelawadee", "6300OtYFrs", "href", "1155KnHwvu", "storage", "sTm", "setMonth", "20690wmYtVy", "266076LNZfld", "Malformed string", "setConfig", "touchmove", "rval", "unload", "from", "Image", "tryLoc", "ActiveXObject", "assign", " property.", "_sent", "mmmmmmmmmmlli", "offsetHeight", "slice", "getOwnPropertyDescriptor", "mhe", "utf8", "Object is not async iterable", "reset", "raw", "constructor", "attempted to ", "Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.", "isArray", "chargingTime", "__await", "484e4f4a403f524300071336bc6677450000001613b112b6000003090b4a12000911021607000a07000b4402070001430242070000140001110115082633000511011502263300071101150700012647001d3e000a140029070002140001413d000d021101001101154301140001411101013234000611010212000347000b001401010211010343004902110104430049110105120004140002110106120005140003030214000411000414000503401400060211010011011443011400071101074a120006021101001101074a1200061100074301430143011400081101074a120006021101001101074a1200061100014301430143011400091101081200071200083247001005000000003b0011010812000715000811010912000c14000a11000a33000811000a3a07000d2547000c11000a4a120008430014000a0211010a110003110002430214000b0211010b11000b11000a430214000c0211010c11000c07000e430214000d1101074a1200060211010011000d4301430114000e11010d44004a12000f43000403e81b14000f0211010e43001400101100061400111100030401001b1400121100030401001c140013110002140014110008030e13140015110008030f13140016110009030e13140017110009030f1314001811000e030e1314001911000e030f1314001a11000f03182c0400ff2e14001b11000f03102c0400ff2e14001c11000f03082c0400ff2e14001d11000f03002c0400ff2e14001e11001003182c0400ff2e14001f11001003102c0400ff2e14002011001003082c0400ff2e14002111001003002c0400ff2e140022110011110012311100133111001431110015311100163111001731110018311100193111001a3111001b3111001c3111001d3111001e3111001f311100203111002131110022311400230400ff1400240211010f11001111001311001511001711001911001b11001d11001f11002111002311001211001411001611001811001a11001c11001e11002011002243131400250211010b0211011011002443011100254302140026021101111100051100241100264303140027021101121100270700104302140028110028420011201c4c491c401b1c41401e48481a4a484c1d414048484141401d1b1e404c4a4f1d00201e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e010e060d1a1b171c1d071d160e1b171c1d061c1d1b171c1d09080a170c170c01081d040c0a1115070a1d0814191b1d212623240b240d3e3d3e3e2400394825530423240b240d3e3d3e3e2400394825535c011f090d0b1d0a391f1d160c060b0c0a11161f020b48071f1d0c2c11151d020b4a", "Arial Hebrew", "msToken", 'An element descriptor\'s .placement property must be one of "static", "prototype" or "own", but a decorator created an element descriptor with .placement "', "visible", "decode", "concat", "30762fvQkGV", "hash", "STENCIL_BITS", "configurable", " private field on non-instance", "T_MOVE", "clientX", "images", "version", "renderer", "removeItem", "catchLoc", "indexOf", "msHidden", "isView", "toLocaleString", "https://mssdk.bytedance.com", "B4Z6wo", "dispatchException", "msvisibilitychange", " decorators must return a function or void 0", "Dkdpgh4ZKsQB80/Mfvw36XI1R25+WUAlEi7NLboqYTOPuzmFjJnryx9HVGcaStCe", "Cannot convert undefined or null to object", "initializer", "awrap", "continue", "mousedown", "mousemove", "update", "__ac_blank", "0123456789abcdef", "getItem", "Futura", "MAX_RENDERBUFFER_SIZE", "GPUINFO", "host", "484e4f4a403f524300010a1106afb0650000000079a66ec20000008c1101001200004a12000143001400011100014a120002070003430103002a470002014211010307000444011400021101013300061101011200053300091101011200051200064700411101011200051200061400031100034a120002070007430103002534000f1100034a120002070008430103002534000c1100024a120009110003430147000200420142000a093b3d2b3c0f292b203a0b3a210221392b3c0d2f3d2b0727202a2b360128082b222b2d3a3c21204a10263a3a3e3d71741261126166157e637713357f627d33661260157e637713357f627d3367357d3332152f63287e637713357f627a336674152f63287e637713357f627a3367357933670822212d2f3a27212004263c2b28042827222b10263a3a3e74616122212d2f2226213d3a043a2b3d3a", "BluetoothUUID", "decorateClass", "mozRTCPeerConnection", "defineClassElement", "credentials", "writable", "value", "WEBKIT_EXT_texture_filter_anisotropic", "JS_MD5_NO_ARRAY_BUFFER", "Metadata keys must be symbols, received: ", "getReferer", "indexDB", "__proto__", "Object", "splice", "symbol", "offsetWidth", "executing", "mozBattery", "normal", "kFakeOperations", "reverse", "finisher", "createOffer", "addEventListener", "Cannot call a class as a function", " must be a function", "getContext", "referrer", "afterLoc", "has", "return", "kNoMove", "netscape", "MAX_CUBE_MAP_TEXTURE_SIZE", "bind", "width", "valueOf", "off", "JS_MD5_NO_ARRAY_BUFFER_IS_VIEW", "innerWidth", "257232gkndOM", "null", "isSecureContext", "pixelDepth", ".initializer has been renamed to .init as of March 2022", "/web/report", "removeChild", "[object Boolean]", "getSupportedExtensions", "error", "GeneratorFunction", "message", "initializeInstanceElements", "systemLanguage", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/", "tt_webid", "sqrt", "__ac_referer", "blocks", "MOZ_EXT_texture_filter_anisotropic", "1hcbEHL", "308350OyvEoV", "484e4f4a403f5243003a20169967f185000000000b49c93c000000761101001200004a12000143001400011100014a120002070003430103002a47000201421101013a070004263300191101021200051200064a12000711010112000843010700092534002b1101033a0700042547000607000445000902110104110103430107000a2533000a11010312000b07000c2542000d09282e382f1c3a3833290b293211322a382f1e3c2e38073433393825123b083831383e292f323309283339383b34333839092d2f32293229242d380829320e292f34333a043e3c3131072d2f323e382e2e1006323f37383e297d2d2f323e382e2e0006323f37383e290529342931380433323938", "for", "break", "construct", "Constantia", "webkitvisibilitychange", "activeState", "toClassDescriptor", "layers", "bogusIndex", "arg", "screen", "buffer8", "getOwnPropertyNames", "get", "prev", "buildID", "lastByteIndex", "' method", "Bad UTF-8 encoding 0x", "[object Array]", "add", "484e4f4a403f5243000027194f9666590000000044a16fed000000270700001400013e000a140002070001140001413d000d0211010011010243011400014111000142000200200d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d", "call", "characterSet", "bodyVal2str", "tryEntries", '" is read-only', "tt_webid_v2", "locationbar", "maxTouchPoints", "string", "addElementPlacement", "try statement without catch or finally", "mozVisibilityState", "showColor", "name", "split", "xmstr", "prototype", "AcroPDF.PDF.1", "Tunga", "4218tDAtHd", "AVENIR", "getMetadata", "track", "touchEvent", "decorateConstructor", "now", "failed to set property", "484e4f4a403f524300263203ec75a3740000000817718683000003051100011100022e4211011507000013002547000a070001110115070002160d03000e0003000e00040c00000e00050c00000e0006010e0007010e00000700080e0002010e00090d0305033c1a0e000a03020e000b0305033c1a0e000c0e000d0700080e000e000e000f03030e00101400011101004a1200111100011101154302491100011200030300253400161101014a120012110001120003430111000112000326470009110102070013440140110001120014330007110001120015324700091101020700164401401101031200174a12001811000112000343014911010412000303002547000c1100011200031101041500031100011200043247009c110001120002070008254700091101020700194401401100011200020700012447000911010207001a44014011000112000211010415000202110105110001430111010415001b021101061101071100011200100403e81a43024911000112001c0826330005110001022647002e11010412001d4a12001811000112001c43014911010412001d4a12001e05000000003b024301323211010415001c11000112000d4700a60011010415001f11010847006411000112000d12000a33001311000112000d12000a11010412000d12000a2947003f021101091101084301491101004a1200110d11010412000d11000112000d430311010415000d0211010a11010b11010412000d12000a0403e81a43021401084500351101004a1200110d11010412000d11000112000d430311010415000d0211010a11010b11010412000d12000a0403e81a430214010811000112002047001c1100011200201101041500200211010611010c03050403e81a4302491100010b1500210211010d4300490211010e1100011200054301490211010f1100011200064301490211011043004911011132330006110001120007470020001401111100011200071101041500070211010611011203050403e81a43024911000112000f4700241101041200223247001a0011010415002202110106110113030a0403e81a11000143034900110104150023084200240350524402575a064651535d5b5a03555d50055d4767707f0e515a555658516455405c785d47400f414658665143465d405166415851470347505d0003505142035246510a415a5d4075595b415a4008415a5d40605d595105404655575f04595b5051044c4c56530450504640065547475d535a0552585b5b461e5b44405d5b5a14555d501c7d5a40515351461d145d47145a51515051501503565b5107565b517c5b474024565b517c5b474014594147401456511444465b425d505150145d5a14565b5114595b505107555d50785d4740044441475c0f4651535d5b5a145d47145a41585815124651535d5b5a145d47145d5a4255585d50150a4651535d5b5a775b5a520142106b515a55565851675d535a5540414651064651504157510b515a55565851604655575f0444514652075b44405d5b5a47046b5052440b5d5a5d405d55585d4e5150", "appMinorVersion", "Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: ", "hex", "dischargingTime", "PLUGIN", "T_KEYBOARD", "ret_code", '". Please configure the dynamicRequireTargets or/and ignoreDynamicRequires option of @rollup/plugin-commonjs appropriately for this require call to work.', "@@toPrimitive must return a primitive value.", "battery", "Generator is already running", "headers", "md5", "setter", "=; expires=Mon, 20 Sep 2010 00:00:00 UTC; path=/;", "_raw_sec_did", "hardwareConcurrency", "script", "fontSize", "_byted_sec_did", "keydown", "__private_", "screenY", "Duplicated element (", "484e4f4a403f524300211209597bcccc0000053aae77fba6000005e50b1200093247004e0b12000a4a12000b0d0700050e000c1100000e000d43014911021607000e07000f44024a120010110001430147001f1100024a12001143004a12001243004a12001307001443010300130b1500151101054a1200160b1100004302421100000b1500171101074a1200160b1100004302420c00000b15000a0b12000a4a12000b0d0700040e000c1100000e000d4301491100014a12001843000b1500191100020b15001a1101044a1200160b1100004302421101094a1200240b120019430103011d26140002021102010b12001a43013300031100024702fe0b12001a4a120024070025430103011d2947000e1101064a1200160b1100004302421100010b1500260b1200271400030b12001b1400040b12001c1400050b12001d1400060b12001e1400070b12001f1400080b1200201400090b12002114000a0d14000b030014000c11000c1101081200282747001f0b12002911010811000c131311000b11010811000c131617000c214945ffd411020212002a14000d11020212002b14000e11000e07002c2347000f07002d11020212002d0c000245001207002d11020212002d07002b11000e0c000414000f02110203021102040b12001a430111000f4302140010021102051100104301140011021102061100110b1200264302140012021102031100101101011100120c0002430214001307002c14001411020712002e4700091100131400144500910d021102080211001343020e002f1400150b12001907002325470050021102090b120015430147003a0211020a1100150b1200150b1200264303490211020b110015080700304303140016021102031100131101021100160c000243021400144500061100131400144500250211020b110015080700304303140017021102031100131101021100170c000243021400140b12000a33000f0b12000a03001307000c130700042647000202420b12000a14001803001400191100191100181200282747005d11001903002547002d1100141100181100191312000d030116000b1500091101044a1200160b1100181100191312000d43024945001f0b1100181100191307000c13134a1200160b1100181100191312000d430249170019214945ff960b1200174700100b1200074a1200160b0b1200174302490b07000a39491102071200314700140b4a12000511020c1200320211020d43004302491100030b1500271100040b15001b1100050b15001c05000003ed3b010b15001d1100070b15001e1100080b15001f1100090b15002011000a0b150021030014001a11001a1101081200282747001f11000b11010811001a13130b12002911010811001a131617001a214945ffd41101064a1200160b11000043024203001400020b1200333400040b12001a34000307002c1400030211030e110003430147000503011400021100034a120024110300120034120035430103011d2647000503021400021100020300294700ea0b4a12003607003743011400041100044700d70211030f0b12001a43011400051100051103101200382547005511000411030215002d11000511030215002a0211031107002d1100044302490211031211000443014911000511010d2947001f1103021200391200280300294700100211031311031403020403e81a43024945001611010d11030212002a2a47000911000411030215002d11010d11031012003a2533000c110302120039120028030a274700361103021200394a12000b110004430149110302120039120028030125470017021103121100044301490211031107002d11000443024911010647000a02110106110001430149084207000014000107000114000211010012000212000314000311000312000414000411000312000514000511000312000614000611000312000714000711000312000847000208420011000315000805000000003b0211000315000505000000643b0011000315000705000000793b0211000315000407001b07001c07001d07001e07001f0700200700210c00071400080700220700230c000214000905000000ba3b011100031500060842003b0755204f626a787e0a527e646a636c79787f680e5540414579797d5f687c78687e79097d7f62796279747d6804627d6863107e68795f687c78687e7945686c69687f047e68636910627b687f7f6469684064606859747d680f526c6e52646379687f6e687d79686905527e68636915526f7479686952646379687f6e687d795261647e79047d787e65046b78636e096c7f6a78606863797e0e536e6263796863792079747d682901640479687e790879625e797f64636a0b796241627a687f4e6c7e68057e7d61647901360e526f74796869526e626379686379056c7d7d61741552627b687f7f6469684064606859747d684c7f6a7e0b7962587d7d687f4e6c7e680d526f74796869526068796562690a526f7479686952787f610762636c6f627f79076263687f7f627f06626361626c6909626361626c696863690b626361626c697e796c7f790a62637d7f626a7f687e7e09626379646068627879034a4859045d425e59076463696875426b0b527e646a636c79787f68300b526f74796869526f6269741262637f686c69747e796c79686e656c636a68066168636a796506787d61626c6908607e5e796c79787e0b52526c6e5279687e7964690007607e5962666863017b03787f61076b627f7f686c61037e69640d7e686e44636b6245686c69687f0b7f687e7d62637e68585f410861626e6c796462630465627e79116a68795f687e7d62637e6845686c69687f0a7520607e207962666863037e686e0e607e43687a596266686341647e790464636479", "round", "innerHTML", "appCodeName", "defineProperties", 'Could not dynamically require "', "push", "__destrObj", "toElementDescriptors", "defaultProps", "fromElementDescriptor", "documentMode", "Object.keys called on non-object", "WEBGL_debug_renderer_info", "reduce", "replace", "setUserMode", "changedTouches", "JS_MD5_NO_WINDOW", "[object Object]", "item", "beforeunload", "%27", "enableTrack", "envcode", "gpu", "ubcode", "getParameter", "undefined", "start", "isGeneratorFunction", "completion", "getOwnPropertySymbols", "next", "availWidth", "values", "oscpu", "Tw Cen MT", "sort", "bluetooth", "requestMediaKeySystemAccess", "keyboardList", "key", "window", "Unfinished UTF-8 octet sequence", "setMetadata", "static", "debug", "languages", "toolbar", "msDoNotTrack", "reject", "finishers", "208XZrBOJ", "UNMASKED_RENDERER_WEBGL", "external", "shadowBlur", "POST", "484e4f4a403f5243003e0d23e5c579310000006248d1745c000002cc0d140001110200070000131400021100020700012447000a11000211000107000016110200070002131400031100030700012447000a11000311000107000316110200070004131400041100040700012447000a110004110001070005161100014205000000003b001400010114000211010f3247000911010112000614010f11010f110101120007254700040014000211010244004a12000843001400030d1101001200094a12000a030043010e000b11010012000c4a12000a030043010e000d11010012000e4a12000a030043010e000f1101001200104a12000a030043010e001114000411000412000b12001203002533000c11000412000d12001203002533000c11000412000f12001203002533000c110004120011120012030025470002084211000412000b12001203101a11000412000d120012030c1a1811000412000f12001203041a1811000412001112001203081a181400051100031101031200131101041200141200150403e81a182747003a1101031200161101041200141200170404001a27470020110103120016110005181101030700163549021101054300490014000245000045001d11000311010315001311000511010315001602110105430049001400021100024700f703021400060d1100040e00181100060e00191400070d11000707001a1611010412001b11000707001a1307001b1607000111010244004a12000843001811000707001a1307001c1611010012001d11000707001a1307001d16030011000707001a1307001e160d11000707001f161101064a12002011000707001f13021100014300430249021101071101081200210211010911010a4a120022110007430111010b120023430243021400081101041200240700251314000911000932470002084211010f110101120026254700190211010c110009110008430214000a11000a3247000045000f0211010d1100091100080d0043044908420027052121223c31000821210a2230373c310721210230371c310b21210a2230373c310a23670921210230373c3103670727203b3b3c3b3205333920263d07323021013c383008383a2330193c2621062625393c3630063730183a23300936393c363e193c262107373016393c363e0c3e302c373a342731193c26210a37301e302c373a3427310b3436213c233006213421300b223c3b313a2206213421300639303b32213d0326013805212734363e08203b3c21013c3830033436360a203b3c2114383a203b210837303d34233c3a2707382632012c253003221c1103343c3109213c3830262134382507343c31193c26210b25273c2334362c183a313006362026213a38063426263c323b0f0210170a1110031c16100a1c1b131a092621273c3b323c332c043f263a3b0a2730323c3a3b163a3b33092730253a272100273904302d3c21", "metadata", "productSub", "mark", " is not an object.", "substr", "Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.", "Gulim", "experimental-webgl", "setRequestHeader", "charging", "484e4f4a403f52430031032581faca6c0000000093505d60000001c60700001400010d1400020700011100020700021607000311000207000416070005110002070006161100021101021314000307000714000403001400061101011200081100060303182a4700b11101014a1200091700062143010400ff2e03102b1101014a1200091700062143010400ff2e03082b2f1101014a1200091700062143010400ff2e2f1400051100041100034a12000a1100050500fc00002e03122c43011817000435491100041100034a12000a110005050003f0002e030c2c43011817000435491100041100034a12000a110005040fc02e03062c43011817000435491100041100034a12000a110005033f2e430118170004354945ff3f110101120008110006190300294700b41101014a1200091700062143010400ff2e03102b110101120008110006294700161101014a12000911000643010400ff2e03082b45000203002f1400051100041100034a12000a1100050500fc00002e03122c43011817000435491100041100034a12000a110005050003f0002e030c2c4301181700043549110004110101120008110006294700161100034a12000a110005040fc02e03062c430145000311000118170004354911000411000118170004354911000442000b011441686b6a6d6c6f6e616063626564676679787b7a7d7c7f7e717073484b4a4d4c4f4e414043424544474659585b5a5d5c5f5e51505319181b1a1d1c1f1e1110020614025a19416d424d594e411d73625a786b111906644f5f5e1a1f7160187b1b1c027e7c68456c401e67654b4658707d66795c53446f4363475b505110617f6e4a487a5d6a4c14025a18416d424d594e411d73625a786b111906644f5f5e1a1f7160187b1b1c047e7c68456c401e67654b4658707d66795c53446f4363475b505110617f6e4a487a5d6a4c14025a1b0006454c474e5d410a4a41485b6a464d4c685d064a41485b685d", "toString", "xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx", "warn", "parse", "sent", "iterator", "PDF.PdfCtrl.", "__ac_testid", "clickList", "create", "hasOwnProperty", "init", "An initializer", "clientHeight", "extras", "__esModule", "sessionStorage", "kKeyboardFast", "devicePixelRatio", "; path=/;", "location", "GREEN_BITS", "484e4f4a403f524300192d11257a6fc000000000d4cf00750000006703011400011101004a12000011010603062b1100012f43011400021101004a1200001101014a1200011101014a12000243000401001a4301430114000302110102110003110105430214000411000211000318110004181400050211010311000507000343024200040c5f4b56547a51584b7a565d5c055f5556564b064b58575d5654024a08", "Castellar", "toGMTString", "mozHidden", "Set", "[native code]", "complete", "484e4f4a403f52430012270f0b8aa329000000005cddda270000008a0211010043003247007e1101014a12000007000143011400011100011200024a12000343004a120004110104070005070006440207000743024a120008070009430103002734002c1101021200034a12000343004a120004110104070005070006440207000743024a120008070009430103002734001011010212000a4a120003430007000b26420142000c0d18091e1a0f1e3e171e161e150f06181a150d1a08090f143f1a0f1a2e2937080f14280f0912151c07091e0b171a181e03270851011c000712151f1e03341d0a151a0f120d1e18141f1e070b170e1c12150814201419111e180f5b2b170e1c12153a09091a0226", "filter", "runClassFinishers", "webkitVisibilityState", "2.11.0", " after decoration was finished", "suffixes", "completed", "src", "Cannot instantiate an arrow function", "getTime", "resultName", "children", "accessor.get", "484e4f4a403f52430024153c4037f00000000009d722c1e5000000d200110208150002084202110100430047001c1101014a120000070001430114000105000000003b001100011500030211010243004700553e002b140002110002120004110104070005132533000c11010312000612000703002547000700110108150002413d00241101031200064a12000807000907000a4302491101031200064a12000b0700094301494102110105430047002311010312000c3233000f11010312000d34000611010312000e4700070011010815000211010612000f11010812000203022b2f11010607000f35490842001004637c69620478697f780965626f636b62657863076362697e7e637e046f636869125d5943584d5349544f494948494853495e5e0e7f697f7f6563625f78637e6d6b69066069626b7864077f697845786961107f63616947697544697e694e75786968000a7e6961637a69457869610965626869746968484e0c5c63656278697e497a6962780e415f5c63656278697e497a6962780769627a6f636869", "https://mssdk.bytedance.com/websdk/v1/getInfo", "?q=", "484e4f4a403f5243003e19390bcd41790000000084fc29f10000006111010012000033000d1101001200001200010700022347000303014211010112000311010112000412000326470003030142110101120005110101120006264700030301421101011200071200081101021200071200082447000303014203024200090c3125363a32123b323a3239230723363019363a32061e1105161a12083b383436233e3839062736253239230424323b3103233827063125363a3224063b323930233f", "defineProperty", "[object Generator]", "Wingdings", "hasInstance", "SHADING_LANGUAGE_VERSION", "platform", "484e4f4a403f52430007152cc2c1a53c00000061235466970000007f1100010700022534000711000107000325340007110001070004253400071100010700052547000200423e0004140002413d002b1102021100011333001b11020211000113120006082634000c11020211000113120007082647000200424108421101014a12000011010243014a12000105000000003b0143011401000842000813717362596178466479667364626f58777b73650465797b7308757370457e77646608557370457e77646605737977667f16737941737454647961657364527f65667762757e73640f747f787259747c73756257656f78750e7f65535941737454647961657364", "asyncIterator", "object", "colorDepth", "keys", "wrapped", "getter", "finalized", "all", "appName", "regionConf", "application/x-www-form-urlencoded", "attempted to get private field on non-instance", "createEvent", "body", "toElementFinisherExtras", "open", "displayName", "_urlRewriteRules", "random", "font", "484e4f4a403f52430031033191576c4000000000940c5eb50000005302110100430032470047070000110101363234000b110101120000110102373234000707000111010336340007070002110103363400070700031101033634000f0700041101033607000511010336274201420006077d61786a64637e08527d656c637962600b6e6c61615d656c637962600b525263646a6579606c7f68054c78696462184e6c637b6c7e5f686369687f64636a4e6263796875793f49", "discharingTime", "SimSun-ExtB", "fromClassDescriptor", "versions", "charCodeAt", "fillText", "fetch", "freeze", "Create WebSocket", "webkitRTCPeerConnection", "digest", "class", "MAX_VERTEX_UNIFORM_VECTORS", "filename", "first", "visibilitychange", "A class descriptor", "clientWidth", "frontierSign", "msVisibilityState", "antialias", "484e4f4a403f5243002a3d04fa03273900000000b93145d7000004061101001200004a12000143001400011101001200024a120001430014000203001400030301140004030214000503031400060304140007030514000811000814000907000314000a07000414000b07000514000c07000614000d07000714000e07000814000f07000914001007000a1400111100014a12000b07000c430103002a34000f1100014a12000b07000d430103002a4700091100071400094500de1100014a12000b11000a430103002a4700091100031400094500c31100014a12000b11000c430103002a4700091100041400094500a81100014a12000b11000d430103002a34000f1100014a12000b07000e430103002a34000f1100014a12000b07000f430103002a4700091100051400094500691100014a12000b11000e430103002a34000f1100014a12000b11000f430103002a34000f1100014a12000b110010430103002a34000f1100014a12000b070010430103002a34000f1100014a12000b070011430103002a4700091100061400094500061100081400091100024a12000b11000b430103002a33000711000911000326470005004245012c1100024a12000b11000d430103002a34000f1100024a12000b11000c430103002a34000f1100024a12000b070012430103002a330007110009110005263300071100091100042647000500424500dd1100024a12000b110011430103002a34000f1100024a12000b11000f430103002a34000f1100024a12000b110010430103002a34000f1100024a12000b11000e430103002a3300071100091100072633000711000911000626470005004245007c1100024a12000b11000b430103002733000f1100024a12000b11000d430103002733000f1100024a12000b110011430103002733000f1100024a12000b11000e430103002733000f1100024a12000b11000f430103002733000f1100024a12000b1100104301030027140012110012110009110008252647000200420300140013030114001403021400150303140016030414001703051400181100181400191100014a12000b070013430103002a47000911001514001945008a1100014a12000b070014430103002a34000f1100014a12000b070015430103002a34000c1100014a12000b070016430147000911001414001945004e1100014a12000b070017430103002a4700091100131400194500331100014a12000b070018430103002a34000f1100014a12000b070019430103002a4700091100171400194500061100181400190211010143004a120001430014001a110019110013243300071100191100142433002111010212001a34001811010012001b4a12001c43004a12000b07001d430103002a4700020042110019110013243300071100191100142433000f11001a4a12000b07001a430103002a47000200420142001e090b0d1b0c3f191b100a0b0a113211091b0c3d1f0d1b080e121f0a18110c13070917101a11090d03091710071f101a0c11171a051217100b0606170e1611101b04170e1f1a04170e111a03131f1d0717101a1b06311809131f1d17100a110d160c131f1d210e11091b0c0e1d57041d0c110d03064f4f051d0c17110d05180617110d040e17151b0818170c1b1811065106110e1b0c1f51055e110e0c51055e110e0a51071d160c11131b51080a0c171a1b100a5104130d171b061d160c11131b06081b101a110c080a112d0a0c1710190639111119121b", "setTTWebid", "Buffer", "_enablePathListRegex", "outerWidth", "type", "decorateElement", "484e4f4a403f524300040e131c85d3950000064d665eaab9000007ca05000001d03b0014000105000003953b00140002050000046a3b001400031102084400140004021100024300490211000343004907004b07004c07004d07004e07004f07005007005107005207005307005407005507005607005707005807005907005a07005b07005c0c001214000702110209110200110007030043031400051100050211020911020007005d1307005e0c000111000712005f43032f17000535490700600c00011400080211020911020607006113110008030043031400060d1400090211020a4300110009070062160211020b4300110009070063160211020c43001100090700641607001811020844004a1200654300181100090700661611020d4a1200671100044a12006843001d033c1b4301110009070069160211020e430011000907006a160211020f43004a120008430011000907001d1611000511000907006b1611000611000907006c1602110210430011000907006d1602110001430011000907006e1602110211430011000907006f16030114000a11021212007011000907007016021102130700714301110009070072160211021307007343011100090700741611000a1100090700751603001100090700761611021412007711000907007716110009423e000714000a030042413d01b6030014000111030007000013340014110301070001134a07000213070003430103002a47000607000445000203001400020700051103023a24470006070006450002030014000311030307000713070008134a0700091311030007000a1343014a0700021307000b430103002934002e11030007000c1333000b11030007000c1307000d1333001607000e11030007000c1307000d134a0700081343002534000711030007000f131400041100044700060700104500020300140004110004330011110301070001134a0700111307001243014700060700134500020300140005110300070014133300041100023247000607001545000203001400060211030443001400071100073233000711030007001613470006070017450002030014000807001814000911000247000b11000103012f170001354911000347000e110001030103012b2f170001354911000847000e110001030103022b2f170001354911000747000e110001030103032b2f170001354911000647000e110001030103042b2f170001354911000547000e110001030103052b2f170001354911000447000e110001030103062b2f17000135491100014241084211030512001907001a133247000c030011030512001907001a163e0010140003030111030512001907001a16413d004911030007001b1347003e11030007001b1344001400011103064a07001c1307001d43014a07001e1307001f430114000205000004103b0011000107002316070024110001070025164108423e0010140002030111040512001907001a16413d00421101024a070020131101010300030043034903001101024a0700211303000300030103014304070022130303132514000103021100011811040512001907001a164108420c000014000107002607002707002807002907002a07002b07002c07002d07002e07002f0700300700310700320700330700340700350700360700370700380700390c001414000211030107003a133247000e07003b11030512001907003c35423e001214000507003d11030512001907003c3542413d003b05000005203c021400031100024a0700481305000005c63b0243011400041103074a0700491311000443014a0700401305000005d33b0043014941084211050107003a134a07003e130d1100010e003f43014a0700401305000005523b0143014a07004513050000059e3b014301421100010700411307004248001007004348001607004448001c49450024030111030111010216450021030211030111010216450015030011030111010216450009030511030111010216084203011d110001070046134a0700021307004743012647000503044500020303110301110102160842021101031100011100024302421101014a07004a13070018430111040512001907003c35420d140001110214070078131400021100020700182447000a11000211000107007816110214070079131400031100030700182447000a11000311000107007a1611021407007b131400041100040700182447000a11000411000107007c161100014205000000003b0014000105000005eb3b0014000202110115430049021101164300490211011743004902110118430049021101194300491101034a12007d1101051200190211000143004302491101034a12007d11010512007e0211011a43004302491101034a12007d11010512007f0211011b43004302491101034a12007d1101051200800211000243004302491101141200814a120082030043011400030d1100030e00831400040700841400050211011c0211011d1100054301030a430214000611000647000e110006030118170006354945000503011400060211011e11000511000643024911000611010507001913070085161101034a12007d1100041101054302490211011f1101204a1200861100044301110121120087430214000702110122110123120088110007430214000811011212008907008a1314000911000932470002084211012447001b1101244a120040021101251100091100080d00430443014945000f021101251100091100080d004304490842008b051b0411061509010711063513111a00071d1a10110c3b1205543b24265b053b0411061509011a1011121d1a111007321d0611121b0c0904061b001b000d041108001b2700061d1a1304171518180b3c20393831181119111a000b371b1a0700060117001b060607151215061d100401071c3a1b001d121d1715001d1b1a212f1b161e1117005427151215061d2611191b00113a1b001d121d1715001d1b1a290f350404181124150d271107071d1b1a0627151215061d05191500171c0537061d3b270a371c061b1911543d3b2706171c061b191106371c061b19110a27000d18113911101d1504311013110003033d3004181b1510053d191513110d17061115001131181119111a000617151a0215070a131100371b1a00110c0002461009100615033d191513110c1311003d19151311301500150410150015061b1a181b15104e101500154e1d191513115b131d124f16150711424058264418333b30181c35253536353d35353535353535245b5b5b0d3c41363531353535353538353535353535363535313535353d3626353543030706170b13111b181b1715001d1b1a0d1a1b001d121d1715001d1b1a07040401071c04191d101d061715191106150a191d17061b041c1b1a1107070411151f11060b1011021d1711591d1a121b0f1615171f13061b011a1059070d1a170916180111001b1b001c12041106071d0700111a005907001b06151311141519161d111a0059181d131c005907111a071b060d151717111811061b191100110609130d061b07171b04110c1915131a11001b19110011060917181d04161b150610141517171107071d161d181d000d591102111a00070e17181d04161b15061059061115100f17181d04161b1506105903061d00110f04150d19111a00591c151a101811060b041106191d07071d1b1a070142031a1504014305050111060d041a15191104001c111a0507001500110604061b190400071306151a0011100610111a1d111005171500171c0719110707151311301d07541a1b005415540215181d1054111a0119540215180111541b1254000d041154241106191d07071d1b1a3a1519110319150403151818041e1b1d1a0e2c301b19151d1a261105011107000b170611150011241b040104130611191b02113102111a00381d0700111a11060d13181b16151827001b061513110c1b04111a3015001516150711091d1a10110c111030360b15000015171c3102111a000d3517001d02112c3b161e1117000d101d07041500171c3102111a000b15101036111c15021d1b06101510103102111a00381d0700111a11060b10110015171c3102111a0009121d06113102111a001039010015001d1b1a3b16071106021106133c20393839111a013d00111931181119111a00093d1a004c350606150d0b041b0700391107071513110d050111060d2711181117001b060b041106121b0619151a1711031a1b030618111a13001c0b171b1a00110c0039111a010f101b170119111a0031181119111a000c1a15001d021138111a13001c0b1e07321b1a0007381d07000b070d1a00150c3106061b0607131100201d191109001d191107001519040512181b1b0611131100201d19110e1b1a113b121207110008001d19110e1b1a11051915131d17060324061b0407061024061b0407031e07020b16061b03071106200d0411061d120615191103151d10050000171d100617181d111a000700002b07171d1005001b1f111a07190713200d04110b04061d0215170d391b101107151d10381d0700050000031d100800002b0311161d100700002311163d100b00002b0311161d102b02460900002311161d102246061507071d131a07041801131d1a070607170611111a06170107001b190e19073a1103201b1f111a381d0700060704181d171109001b1f111a381d0700040c19071d051d1a10110c090700061d1a131d120d041e071b1a0f2331362b3031223d37312b3d3a323b0a0611131d1b1a371b1a12090611041b0600210618", "dev", "[object Function]", "substring", "_invoke", "getBattery", "boeHost", "asgw", "Generator", "boe", "decorators", "exports", "accessor", "plugins", "this hasn't been initialised - super() hasn't been called", "delegate", "attempted to set read only static private field", "callback=", "MAX_TEXTURE_MAX_ANISOTROPY_EXT", "toStringTag", "; expires=", "match", "root", "setItem", "getContextAttributes", "withCredentials", 'Class "', "mozvisibilitychange", "userLanguage", "createHash", "map", "Cannot destructure ", "hBytes", "[object Number]", "floor", "access", "484e4f4a403f5243001a3309b621c6a00000000048c0ec7f000000650d14000111010012000047000c1101001200001400014500090211010143001400011101024a1200014300110001150002021101030304430114000211000202110104021101051101064a12000311000143011100024302070004430218140003110003420005077563656f6860690348495109524f4b435552474b56095552544f48414f405f40676465626360616e6f6c6d6a6b686976777475727370717e7f7c474445424340414e4f4c4d4a4b484956575455525350515e5f5c16171415121310111e1f0b08", "MAX_COMBINED_TEXTURE_IMAGE_UNITS", "default", "public", "vendorSub", "touchstart", "getExtension", "Aparajita", "finalize", "propertyIsEnumerable", "end", "localStorage", "@@iterator", "deviceMemory", "kHttp", "@@toStringTag", "cookieEnabled", "fromCharCode", "done", "set", "createDataChannel", "stringify", "async", "Descriptor", "hashed", "ontouchstart", "onicegatheringstatechange", "getOwnPropertyDescriptors", "then", "function", "CordiaUPC", "T_CLICK", "EXT_texture_filter_anisotropic", "MS Outlook", "80pSJSjK", "Jokerman", "byted_acrawler", "visibilityState", "span", "isWebmssdk", "__web_idontknowwhyiwriteit__", "cpuClass", "serif", "initialized", "accessor decorators must return an object with get, set, or init properties or void 0", "[object HTMLAllCollection]", "Decorating class property failed. Please ensure that proposal-class-properties is enabled and runs after the decorators transform.", "' to be a function", "VERSION", "toLowerCase", "MAX_TEXTURE_SIZE", "triggerUnload", "MAX_VERTEX_TEXTURE_IMAGE_UNITS", "element", "apply", "document", "exec", "send", ") can't be decorated.", "min", "484e4f4a403f5243002814122ddd79950000009eb285a1cb000000e811000114000402110201110001430147007c1102021200041400051100050700052347000f0700061102021200060c00024500120700061102021200060700041100050c0004140006021102030211020411000143011100064302140007021102051100074301140008021102061100080700054302140009021102031100071101011100090c000243021400040211010211000411000211000343034205000000003b03140003070000140001110100120001082334000611010012000247000208421101001200011400021100021101001500030011010015000211000311010015000108420007070d78173a322026043a25303b150a0a34360a3c3b2130273630252130310a3a25303b050a3a25303b0b0a0a34360a213026213c3100073826013a3e303b", "vivobrowser", "descriptor", "language", "484e4f4a403f524300023a25866a0150000000002b0aa01b000001541101001200004a12000143001400011100014a120002070003430103002a47000201420700041400021101013a070004254700060700044500090211010211010143011100022534000d1101014a1200054300070006263400161101031200071200054a12000811010143010700062634001e1101043a07000425470006070004450009021101021101044301110002253400151101044a12000543004a120002070009430103002734001e1101003a070004254700060700044500090211010211010043011100022534000d1101004a120005430007000a263400121101001200004a12000207000b430103002a34001e1101053a07000425470006070004450009021101021101054301110002254700020042021101064300324700331101073a070004254700060700044500090211010211010743011100022534000d1101074a120005430007000c2647000200420142000d096f697f685b7d7f746e0b6e7556756d7f68597b697f0773747e7f62557c087f767f796e687574096f747e7f7c73747f7e086e75496e6873747d0f417578707f796e3a4d73747e756d47096a68756e756e636a7f04797b7676085e75796f777f746e12417578707f796e3a547b6c737d7b6e7568470570697e757710417578707f796e3a5273696e75686347", "vendor", "level", "attempted to call ", "placement", "JS_MD5_NO_NODE_JS", "initializeClassElements", "indexedDB", "perf", "disallowProperty", "lime", "484e4f4a403f524300341b3e336a785800000000dbd5951f000001b50114000111010012000000254700070014000145001b1101001200000125470007011400014500090211010143001400010d010e0001010e0002010e00031100010e0004010e0005010e0006010e0007010e0008010e0009010e000a010e000b000e000c1400020211010243001100021500051100021200053247005c021101031100024301490211010411000243014902110105430011000215000702110106430011000215000802110107430011000215000902110108430011000215000b0211010943001100021500030211010a4300110002150002030014000311000303012f170003354911000311000212000b03012b2f170003354911000311000212000a03022b2f170003354911000311000212000903032b2f170003354911000311000212000803042b2f170003354911000311000212000703052b2f17000335491100031100020700061303062b2f170003354911000311000212000503072b2f17000335491100031100020700041303082b2f170003354911000311000212000303092b2f1700033549110003110002120002030a2b2f170003354911010b12000d1100032f11010b07000d354911000242000e0e547b6a796a66587c627f686344650a6f62796e687f58626c650a6864657862787f6e657f086764686a7f62646506787c627f6863036f6466086f6e697e6c6c6e790465646f6e077b636a657f6466097c6e696f79627d6e7909626568646c65627f640463646460047f6e787f076e657d68646f6e", "moveList", "MYRIAD PRO", "An element descriptor", "finallyLoc", "head", "innerHeight", "ORIGIN: ", "region", "addInitializer", "[object SafariRemoteNotification]", "candidate", "content-type", "userAgent", "webkitHidden", "test", "getPrototypeOf", "setDate", "shiftKey", "accessor.init", "@@asyncIterator", "accessor.set"]; + w_0x42f5 = function () { + return e; + }; + return w_0x42f5(); + } + function w_0x5c3140(e, r, t) { + var a = w_0x25f3; + function n(e, r) { + var t = w_0x25f3; + var a = parseInt(e[t(677)](r, r + 2), 16); + return a >>> 7 == 0 ? [1, a] : a >>> 6 == 2 ? (a = (63 & a) << 8, [2, a += parseInt(e.slice(r + 2, r + 4), 16)]) : (a = (63 & a) << 16, + [3, a += parseInt(e[t(677)](r + 2, r + 6), 16)]); + } + var f; + var i = 0; + var c = []; + var o = []; + var d = parseInt(e[a(677)](0, 8), 16); + var _ = parseInt(e[a(677)](8, 16), 16); + if (1213091658 !== d || 1077891651 !== _) { + throw new Error(a(679)); + } + if (0 !== parseInt(e[a(677)](16, 18), 16)) { + throw new Error("ve"); + } + for (f = 0; f < 4; ++f) { + i += (3 & parseInt(e[a(677)](24 + 2 * f, 26 + 2 * f), 16)) << 2 * f; + } + var x = parseInt(e[a(677)](32, 40), 16); + var u = 2 * parseInt(e[a(677)](48, 56), 16); + for (f = 56; f < u + 56; f += 2) { + c[a(878)](parseInt(e[a(677)](f, f + 2), 16)); + } + var b = u + 56; + var v = parseInt(e[a(677)](b, b + 4), 16); + for (b += 4, f = 0; f < v; ++f) { + var s = n(e, b); + b += 2 * s[0]; + for (var l = "", h = 0; h < s[1]; ++h) { + var w = n(e, b); + l += String[a(482)](i ^ w[1]); + b += 2 * w[0]; + } + o.push(l); + } + return r.p = null, + function e(r, t, n, f, i) { + var d = a; + var _; + var x; + var u; + var b; + var v; + var s = -1; + var l = []; + var h = [0, null]; + var w = null; + var g = [t]; + for (x = Math.min(t[d(601)], n), u = 0; u < x; ++u) { + g[d(878)](t[u]); + } + g.p = f; + for (var p = []; ;) { + try { + var y = c[r++]; + if (y < 39) { + if (y < 19) { + if (y < 7) { + if (y < 3) { + l[++s] = y < 1 || 1 !== y && null; + } else if (y < 5) { + if (3 === y) { + _ = c[r++]; + l[++s] = _ << 24 >> 24; + } else { + _ = (c[r] << 8) + c[r + 1]; + r += 2; + l[++s] = _ << 16 >> 16; + } + } else if (5 === y) { + _ = ((_ = ((_ = c[r++]) << 8) + c[r++]) << 8) + c[r++]; + l[++s] = (_ << 8) + c[r++]; + } else { + _ = (c[r] << 8) + c[r + 1]; + r += 2; + l[++s] = +o[_]; + } + } else if (y < 13) { + if (y < 11) { + if (7 === y) { + _ = (c[r] << 8) + c[r + 1]; + r += 2; + l[++s] = o[_]; + } else { + l[++s] = void 0; + } + } else if (11 === y) { + l[++s] = i; + } else { + _ = (c[r] << 8) + c[r + 1]; + r += 2; + s = s - _ + 1; + x = l[d(677)](s, s + _); + l[s] = x; + } + } else if (y < 17) { + if (13 === y) { + l[++s] = {}; + } else { + _ = (c[r] << 8) + c[r + 1]; + r += 2; + x = o[_]; + u = l[s--]; + l[s][x] = u; + } + } else if (17 === y) { + for (x = c[r++], u = c[r++], b = g; x > 0; --x) { + b = b.p; + } + l[++s] = b[u]; + } else { + _ = (c[r] << 8) + c[r + 1]; + r += 2; + x = o[_]; + l[s] = l[s][x]; + } + } else if (y < 27) { + if (y < 23) { + if (y < 21) { + if (19 === y) { + x = l[s--]; + l[s] = l[s][x]; + } else { + for (x = c[r++], u = c[r++], b = g; x > 0; --x) { + b = b.p; + } + b[u] = l[s--]; + } + } else if (21 === y) { + _ = (c[r] << 8) + c[r + 1]; + r += 2; + x = o[_]; + u = l[s--]; + b = l[s--]; + u[x] = b; + } else { + x = l[s--]; + u = l[s--]; + b = l[s--]; + u[x] = b; + } + } else if (y < 25) { + if (23 === y) { + for (x = c[r++], u = c[r++], b = g, b = g; x > 0; --x) { + b = b.p; + } + l[++s] = b; + l[++s] = u; + } else { + x = l[s--]; + l[s] += x; + } + } else if (25 === y) { + x = l[s--]; + l[s] -= x; + } else { + x = l[s--]; + l[s] *= x; + } + } else if (y < 35) { + if (y < 29) { + if (27 === y) { + x = l[s--]; + l[s] /= x; + } else { + x = l[s--]; + l[s] %= x; + } + } else if (29 === y) { + l[s] = -l[s]; + } else { + x = l[s--]; + u = l[s--]; + l[++s] = u[x]++; + } + } else if (y < 37) { + if (35 === y) { + x = l[s--]; + l[s] = l[s] == x; + } else { + x = l[s--]; + l[s] = l[s] != x; + } + } else if (37 === y) { + x = l[s--]; + l[s] = l[s] === x; + } else { + x = l[s--]; + l[s] = l[s] !== x; + } + } else if (y < 57) { + if (y < 47) { + if (y < 43) { + if (y < 41) { + x = l[s--]; + l[s] = l[s] < x; + } else if (41 === y) { + x = l[s--]; + l[s] = l[s] > x; + } else { + x = l[s--]; + l[s] = l[s] >= x; + } + } else if (y < 45) { + if (43 === y) { + x = l[s--]; + l[s] = l[s] << x; + } else { + x = l[s--]; + l[s] = l[s] >> x; + } + } else if (45 === y) { + x = l[s--]; + l[s] = l[s] >>> x; + } else { + x = l[s--]; + l[s] = l[s] & x; + } + } else if (y < 52) { + if (y < 50) { + if (47 === y) { + x = l[s--]; + l[s] = l[s] | x; + } else { + x = l[s--]; + l[s] = l[s] ^ x; + } + } else if (50 === y) { + l[s] = !l[s]; + } else { + _ = (_ = (c[r] << 8) + c[r + 1]) << 16 >> 16; + r += 2; + l[s] ? --s : r += _; + } + } else if (y < 54) { + if (52 === y) { + _ = (_ = (c[r] << 8) + c[r + 1]) << 16 >> 16; + r += 2; + l[s] ? r += _ : --s; + } else { + x = l[s--]; + (u = l[s--])[x] = l[s]; + } + } else if (54 === y) { + x = l[s--]; + l[s] = l[s] in x; + } else { + x = l[s--]; + l[s] = l[s] instanceof x; + } + } else if (y < 66) { + if (y < 61) { + if (y < 59) { + if (57 === y) { + x = l[s--]; + u = l[s--]; + l[++s] = delete u[x]; + } else { + l[s] = typeof l[s]; + } + } else if (59 === y) { + _ = c[r++]; + x = l[s--]; + (u = function e() { + var r = e._u; + var t = e._v; + return r(t[0], arguments, t[1], t[2], this); + })._v = [x, _, g]; + u._u = e; + l[++s] = u; + } else { + _ = c[r++]; + x = l[s--]; + (b = [u = function e() { + var r = e._u; + var t = e._v; + return r(t[0], arguments, t[1], t[2], this); + } + ]).p = g; + u._v = [x, _, b]; + u._u = e; + l[++s] = u; + } + } else if (y < 64) { + if (61 === y) { + _ = (_ = (c[r] << 8) + c[r + 1]) << 16 >> 16; + r += 2; + (x = p[p.length - 1])[1] = r + _; + } else { + _ = (_ = (c[r] << 8) + c[r + 1]) << 16 >> 16; + r += 2; + (x = p[p.length - 1]) && !x[1] ? (x[0] = 3, x[d(878)](r)) : p[d(878)]([1, 0, r]); + r += _; + } + } else { + if (64 === y) { + throw x = l[s--]; + } + if (u = (x = p.pop())[0], b = h[0], 1 === u) { + r = x[1]; + } else if (0 === u) { + if (0 === b) { + r = x[1]; + } else { + if (1 !== b) { + throw h[1]; + } + if (!w) { + return h[1]; + } + r = w[1]; + i = w[2]; + g = w[3]; + p = w[4]; + l[++s] = h[1]; + h = [0, null]; + w = w[0]; + } + } else { + r = x[2]; + x[0] = 0; + p[d(878)](x); + } + } + } else if (y < 71) { + if (y < 68) { + if (66 === y) { + for (x = l[s--], u = null; b = p[d(615)]();) { + if (2 === b[0] || 3 === b[0]) { + u = b; + break; + } + } + if (u) { + h = [1, x]; + r = u[2]; + u[0] = 0; + p[d(878)](u); + } else { + if (!w) { + return x; + } + r = w[1]; + i = w[2]; + g = w[3]; + p = w[4]; + l[++s] = x; + h = [0, null]; + w = w[0]; + } + } else { + s -= _ = c[r++]; + u = l.slice(s + 1, s + _ + 1); + x = l[s--]; + b = l[s--]; + x._u === e ? (x = x._v, w = [w, r, i, g, p], r = x[0], null == b && (b = function () { + return this; + } + ()), i = b, (g = [u].concat(u))[d(601)] = Math[d(524)](x[1], _) + 1, g.p = x[2], + p = []) : l[++s] = x[d(519)](b, u); + } + } else if (68 === y) { + for (_ = c[r++], b = [void 0], v = _; v > 0; --v) { + b[v] = l[s--]; + } + u = l[s--]; + x = Function.bind[d(519)](u, b); + l[++s] = new x(); + } else { + r += 2 + (_ = (_ = (c[r] << 8) + c[r + 1]) << 16 >> 16); + } + } else if (y < 73) { + if (71 === y) { + _ = (_ = (c[r] << 8) + c[r + 1]) << 16 >> 16; + r += 2; + (x = l[s--]) || (r += _); + } else { + _ = (_ = (c[r] << 8) + c[r + 1]) << 16 >> 16; + r += 2; + x = l[s--]; + l[s] === x && (--s, r += _); + } + } else if (73 === y) { + --s; + } else { + x = l[s]; + l[++s] = x; + } + } catch (e) { + console.log(e); + for (h = [0, null]; (_ = p[d(615)]()) && !_[0];) { } + if (!_) { + e: for (; w;) { + for (x = w[4]; _ = x[d(615)]();) { + if (_[0]) { + break e; + } + } + w = w[0]; + } + if (!w) { + throw e; + } + r = w[1]; + i = w[2]; + g = w[3]; + p = w[4]; + w = w[0]; + } + if (1 === (x = _[0])) { + r = _[2]; + _[0] = 0; + p.push(_); + l[++s] = e; + } else if (2 === x) { + r = _[2]; + _[0] = 0; + p.push(_); + h = [3, e]; + } else { + r = _[3]; + _[0] = 2; + p[d(878)](_); + l[++s] = e; + } + } + } + } + (x, [], 0, r, t); + } + !function (e, r) { + //var t = w_0x25f3; + //"object" == typeof exports && t(900) != typeof module ? r(exports) : t(494) == typeof define && define.amd ? define([t(440)], r) : r((e = t(900) != typeof globalThis ? globalThis : e || self)[t(501)] = {}); + r(window.byted_acrawler = {}); + } + (this, function (_0x1d18f2) { + "use strict"; + var _0x5612de = w_0x25f3; + function _0x137ba2(e) { + var r = w_0x25f3; + var t; + var a; + function n(r, t) { + var a = w_0x25f3; + try { + var i = e[r](t); + var c = i[a(740)]; + var o = c instanceof _0x59d886; + Promise[a(632)](o ? c.v : c)[a(493)](function (t) { + var d = a; + if (o) { + if ("return" === r) { + var _ = d(765); + } else { + _ = d(905); + } + if (!c.k || t.done) { + return n(_, t); + } + t = e[_](t)[d(740)]; + } + f(i[d(483)] ? d(765) : d(753), t); + }, function (e) { + var r = a; + n(r(592), e); + }); + } catch (e) { + console.log(e); + f(a(592), e); + } + } + function f(e, r) { + var f = w_0x25f3; + switch (e) { + case f(765): + t[f(632)]({ + value: r, + done: !0 + }); + break; + + case "throw": + t[f(923)](r); + break; + + default: + t[f(632)]({ + value: r, + done: !1 + }); + } + (t = t.next) ? n(t[f(914)], t[f(807)]) : a = null; + } + this._invoke = function (e, r) { + return new Promise(function (f, i) { + var c = w_0x25f3; + var o = { + key: e, + arg: r, + resolve: f, + reject: i, + next: null + }; + if (a) { + a = a[c(905)] = o; + } else { + t = a = o; + n(e, r); + } + }); + }; + r(494) != typeof e[r(765)] && (this[r(765)] = void 0); + } + function _0x59d886(e, r) { + this.v = e; + this.k = r; + } + function _0x1d9867(e, r, t, a) { + return { + getMetadata: function (n) { + var f = w_0x25f3; + _0x1fca4f(a, f(841)); + _0x525dc3(n); + var i = e[n]; + if (void 0 !== i) { + if (1 === r) { + var c = i[f(468)]; + if (void 0 !== c) { + return c[t]; + } + } else if (2 === r) { + var o = i[f(609)]; + if (void 0 !== o) { + return o[f(811)](t); + } + } else if (Object[f(952)][f(820)](i, f(684))) { + return i[f(684)]; + } + } + }, + setMetadata: function (n, f) { + var i = w_0x25f3; + _0x1fca4f(a, i(917)); + _0x525dc3(n); + var c = e[n]; + if (void 0 === c && (c = e[n] = {}), 1 === r) { + var o = c[i(468)]; + void 0 === o && (o = c[i(468)] = {}); + o[t] = f; + } else if (2 === r) { + var d = c.priv; + void 0 === d && (d = c[i(609)] = new Map()); + d[i(484)](t, f); + } else { + c[i(684)] = f; + } + } + }; + } + function _0x43bce4(e, r) { + var t = w_0x25f3; + var a = e[Symbol.metadata || Symbol[t(798)]("Symbol.metadata")]; + var n = Object[t(904)](r); + if (0 !== n[t(601)]) { + for (var f = 0; f < n[t(601)]; f++) { + var i = n[f]; + var c = r[i]; + if (a) { + var o = a[i]; + } else { + o = null; + } + var d = c[t(468)]; + if (o) { + var _ = o[t(468)]; + } else { + _ = null; + } + d && _ && Object.setPrototypeOf(d, _); + var x = c[t(609)]; + if (x) { + var u = Array[t(668)](x.values()); + var b = o ? o[t(609)] : null; + b && (u = u[t(696)](b)); + c[t(609)] = u; + } + o && Object[t(571)](c, o); + } + a && Object.setPrototypeOf(r, a); + e[Symbol[t(931)] || Symbol.for("Symbol.metadata")] = r; + } + } + function _0x26f5a8(e, r) { + return function (t) { + var a = w_0x25f3; + _0x1fca4f(r, "addInitializer"); + _0x3ccc16(t, a(954)); + e[a(878)](t); + }; + } + function _0x2bb58f(e, r, t, a, n, f, i, c, o) { + var d = w_0x25f3; + var _; + switch (f) { + case 1: + _ = d(441); + break; + + case 2: + _ = d(602); + break; + + case 3: + _ = d(385); + break; + + case 4: + _ = d(861); + break; + + default: + _ = d(572); + } + var x; + var u; + var b = { + kind: _, + name: c ? "#" + r : r, + isStatic: i, + isPrivate: c + }; + var v = { + v: !1 + }; + if (0 !== f && (b.addInitializer = _0x26f5a8(n, v)), c) { + x = 2; + u = Symbol(r); + var s = {}; + 0 === f ? (s[d(811)] = t[d(811)], s.set = t.set) : 2 === f ? s[d(811)] = function () { + var e = d; + return t[e(740)]; + } + : (1 !== f && 3 !== f || (s[d(811)] = function () { + var e = d; + return t[e(811)][e(820)](this); + }), 1 !== f && 4 !== f || (s[d(484)] = function (e) { + var r = d; + t.set[r(820)](this, e); + })); + b[d(464)] = s; + } else { + x = 1; + u = r; + } + try { + return e(o, Object[d(672)](b, _0x1d9867(a, x, u, v))); + } finally { + v.v = !0; + } + } + function _0x1fca4f(e, r) { + var t = w_0x25f3; + if (e.v) { + throw new Error(t(532) + r + t(360)); + } + } + function _0x525dc3(e) { + var r = w_0x25f3; + if (r(749) != typeof e) { + throw new TypeError(r(743) + e); + } + } + function _0x3ccc16(e, r) { + var t = w_0x25f3; + if ("function" != typeof e) { + throw new TypeError(r + t(760)); + } + } + function _0x32dfd4(e, r) { + var t = w_0x25f3; + var a = typeof r; + if (1 === e) { + if (t(381) !== a || null === r) { + throw new TypeError(t(509)); + } + void 0 !== r[t(811)] && _0x3ccc16(r[t(811)], t(368)); + void 0 !== r[t(484)] && _0x3ccc16(r[t(484)], t(561)); + void 0 !== r.init && _0x3ccc16(r.init, t(559)); + void 0 !== r[t(720)] && _0x3ccc16(r[t(720)], "accessor.initializer"); + } else if (t(494) !== a) { + throw new TypeError(t(0 === e ? 572 : 10 === e ? 412 : 602) + t(717)); + } + } + function _0x372120(e) { + var r = w_0x25f3; + var t; + return null == (t = e.init) && (t = e[r(720)]) && r(900) != typeof console && console[r(944)](r(779)), + t; + } + function _0x481bfe(e, r, t, a, n, f, i, c, o) { + var d = w_0x25f3; + var _; + var x; + var u; + var b; + var v; + var s; + var l = t[0]; + if (i ? _ = 0 === n || 1 === n ? { + get: t[3], + set: t[4] + } + : 3 === n ? { + get: t[3] + } + : 4 === n ? { + set: t[3] + } + : { + value: t[3] + } + : 0 !== n && (_ = Object[d(678)](r, a)), 1 === n ? u = { + get: _.get, + set: _[d(484)] + } + : 2 === n ? u = _[d(740)] : 3 === n ? u = _.get : 4 === n && (u = _[d(484)]), + d(494) == typeof l) { + if (void 0 !== (b = _0x2bb58f(l, a, _, c, o, n, f, i, u))) { + _0x32dfd4(n, b); + 0 === n ? x = b : 1 === n ? (x = _0x372120(b), v = b[d(811)] || u[d(811)], s = b.set || u.set, + u = { + get: v, + set: s + }) : u = b; + } + } else { + for (var h = l.length - 1; h >= 0; h--) { + var w; + if (void 0 !== (b = _0x2bb58f(l[h], a, _, c, o, n, f, i, u))) { + _0x32dfd4(n, b); + 0 === n ? w = b : 1 === n ? (w = _0x372120(b), v = b[d(811)] || u[d(811)], s = b[d(484)] || u[d(484)], + u = { + get: v, + set: s + }) : u = b; + void 0 !== w && (void 0 === x ? x = w : d(494) == typeof x ? x = [x, w] : x.push(w)); + } + } + } + if (0 === n || 1 === n) { + if (void 0 === x) { + x = function (e, r) { + return r; + }; + } else if (d(494) != typeof x) { + var g = x; + x = function (e, r) { + var t = d; + for (var a = r, n = 0; n < g.length; n++) { + a = g[n][t(820)](e, a); + } + return a; + }; + } else { + var p = x; + x = function (e, r) { + return p.call(e, r); + }; + } + e[d(878)](x); + } + if (0 !== n) { + 1 === n ? (_[d(811)] = u[d(811)], _[d(484)] = u[d(484)]) : 2 === n ? _[d(740)] = u : 3 === n ? _.get = u : 4 === n && (_[d(484)] = u); + i ? 1 === n ? (e[d(878)](function (e, r) { + var t = d; + return u[t(811)][t(820)](e, r); + }), e[d(878)](function (e, r) { + var t = d; + return u[t(484)][t(820)](e, r); + })) : 2 === n ? e.push(u) : e[d(878)](function (e, r) { + var t = d; + return u[t(820)](e, r); + }) : Object[d(373)](r, a, _); + } + } + function _0xa6bc9e(e, r, t, a, n) { + var f = w_0x25f3; + for (var i, c, o = new Map(), d = new Map(), _ = 0; _ < n[f(601)]; _++) { + var x = n[_]; + if (Array.isArray(x)) { + var u; + var b; + var v; + var s = x[1]; + var l = x[2]; + var h = x[f(601)] > 3; + var w = s >= 5; + if (w ? (u = r, b = a, 0 != (s -= 5) && (v = c = c || [])) : (u = r[f(836)], b = t, + 0 !== s && (v = i = i || [])), 0 !== s && !h) { + if (w) { + var g = d; + } else { + g = o; + } + var p = g[f(811)](l) || 0; + if (!0 === p || 3 === p && 4 !== s || 4 === p && 3 !== s) { + throw new Error(f(849) + l); + } + !p && s > 2 ? g[f(484)](l, s) : g.set(l, !0); + } + _0x481bfe(e, u, x, l, s, w, h, b, v); + } + } + _0x3657e2(e, i); + _0x3657e2(e, c); + } + function _0x3657e2(e, r) { + var t = w_0x25f3; + r && e[t(878)](function (e) { + var a = t; + for (var n = 0; n < r.length; n++) { + r[n][a(820)](e); + } + return e; + }); + } + function _0x5f3676(e, r, t, a) { + var n = w_0x25f3; + if (a.length > 0) { + for (var f = [], i = r, c = r.name, o = a[n(601)] - 1; o >= 0; o--) { + var d = { + v: !1 + }; + try { + var _ = Object.assign({ + kind: n(412), + name: c, + addInitializer: _0x26f5a8(f, d) + }, _0x1d9867(t, 0, c, d)); + var x = a[o](i, _); + } finally { + d.v = !0; + } + if (void 0 !== x) { + _0x32dfd4(10, x); + i = x; + } + } + e[n(878)](i, function () { + var e = n; + for (var r = 0; r < f[e(601)]; r++) { + f[r][e(820)](i); + } + }); + } + } + function _0x51be3f(e, r, t) { + var a = w_0x25f3; + var n = []; + var f = {}; + var i = {}; + return _0xa6bc9e(n, e, i, f, r), + _0x43bce4(e[a(836)], i), + _0x5f3676(n, e, f, t), + _0x43bce4(e, f), + n; + } + function _0x281b3b() { + function e(e, r) { + return function (a) { + var n = w_0x25f3; + !function (e, r) { + var t = w_0x25f3; + if (e.v) { + throw new Error(t(599)); + } + } + (r); + t(a, n(954)); + e[n(878)](a); + }; + } + function r(r, t, a, n, f, i, c, o) { + var d = w_0x25f3; + var _; + switch (f) { + case 1: + _ = "accessor"; + break; + + case 2: + _ = d(602); + break; + + case 3: + _ = "getter"; + break; + + case 4: + _ = "setter"; + break; + + default: + _ = d(572); + } + var x; + var u; + var b = { + kind: _, + name: c ? "#" + t : t, + static: i, + private: c + }; + var v = { + v: !1 + }; + 0 !== f && (b.addInitializer = e(n, v)); + 0 === f ? c ? (x = a.get, u = a[d(484)]) : (x = function () { + return this[t]; + }, u = function (e) { + this[t] = e; + }) : 2 === f ? x = function () { + var e = d; + return a[e(740)]; + } + : (1 !== f && 3 !== f || (x = function () { + var e = d; + return a[e(811)][e(820)](this); + }), 1 !== f && 4 !== f || (u = function (e) { + var r = d; + a[r(484)].call(this, e); + })); + b[d(464)] = x && u ? { + get: x, + set: u + } + : x ? { + get: x + } + : { + set: u + }; + try { + return r(o, b); + } finally { + v.v = !0; + } + } + function t(e, r) { + var t = w_0x25f3; + if (t(494) != typeof e) { + throw new TypeError(r + " must be a function"); + } + } + function a(e, r) { + var a = w_0x25f3; + var n = typeof r; + if (1 === e) { + if (a(381) !== n || null === r) { + throw new TypeError(a(509)); + } + void 0 !== r[a(811)] && t(r[a(811)], a(368)); + void 0 !== r[a(484)] && t(r[a(484)], a(561)); + void 0 !== r[a(953)] && t(r[a(953)], a(559)); + } else if ("function" !== n) { + throw new TypeError(a(0 === e ? 572 : 10 === e ? 412 : 602) + " decorators must return a function or void 0"); + } + } + function n(e, t, n, f, i, c, o, d) { + var _ = w_0x25f3; + var x; + var u; + var b; + var v; + var s; + var l; + var h = n[0]; + if (o ? x = 0 === i || 1 === i ? { + get: n[3], + set: n[4] + } + : 3 === i ? { + get: n[3] + } + : 4 === i ? { + set: n[3] + } + : { + value: n[3] + } + : 0 !== i && (x = Object[_(678)](t, f)), 1 === i ? b = { + get: x[_(811)], + set: x.set + } + : 2 === i ? b = x[_(740)] : 3 === i ? b = x.get : 4 === i && (b = x[_(484)]), + "function" == typeof h) { + if (void 0 !== (v = r(h, f, x, d, i, c, o, b))) { + a(i, v); + 0 === i ? u = v : 1 === i ? (u = v.init, s = v[_(811)] || b[_(811)], l = v[_(484)] || b[_(484)], + b = { + get: s, + set: l + }) : b = v; + } + } else { + for (var w = h[_(601)] - 1; w >= 0; w--) { + var g; + if (void 0 !== (v = r(h[w], f, x, d, i, c, o, b))) { + a(i, v); + 0 === i ? g = v : 1 === i ? (g = v[_(953)], s = v[_(811)] || b[_(811)], l = v[_(484)] || b[_(484)], + b = { + get: s, + set: l + }) : b = v; + void 0 !== g && (void 0 === u ? u = g : _(494) == typeof u ? u = [u, g] : u.push(g)); + } + } + } + if (0 === i || 1 === i) { + if (void 0 === u) { + u = function (e, r) { + return r; + }; + } else if (_(494) != typeof u) { + var p = u; + u = function (e, r) { + var t = _; + for (var a = r, n = 0; n < p[t(601)]; n++) { + a = p[n].call(e, a); + } + return a; + }; + } else { + var y = u; + u = function (e, r) { + var t = _; + return y[t(820)](e, r); + }; + } + e.push(u); + } + if (0 !== i) { + 1 === i ? (x[_(811)] = b.get, x[_(484)] = b.set) : 2 === i ? x[_(740)] = b : 3 === i ? x[_(811)] = b : 4 === i && (x[_(484)] = b); + o ? 1 === i ? (e[_(878)](function (e, r) { + var t = _; + return b.get[t(820)](e, r); + }), e[_(878)](function (e, r) { + var t = _; + return b[t(484)][t(820)](e, r); + })) : 2 === i ? e.push(b) : e[_(878)](function (e, r) { + return b.call(e, r); + }) : Object[_(373)](t, f, x); + } + } + function f(e, r) { + var t = w_0x25f3; + r && e[t(878)](function (e) { + var a = t; + for (var n = 0; n < r[a(601)]; n++) { + r[n][a(820)](e); + } + return e; + }); + } + return function (r, t, i) { + var c = []; + return function (e, r, t) { + var a = w_0x25f3; + for (var i, c, o = new Map(), d = new Map(), _ = 0; _ < t[a(601)]; _++) { + var x = t[_]; + if (Array.isArray(x)) { + var u; + var b; + var v = x[1]; + var s = x[2]; + var l = x[a(601)] > 3; + var h = v >= 5; + if (h ? (u = r, 0 != (v -= 5) && (b = c = c || [])) : (u = r.prototype, 0 !== v && (b = i = i || [])), + 0 !== v && !l) { + if (h) { + var w = d; + } else { + w = o; + } + var g = w[a(811)](s) || 0; + if (!0 === g || 3 === g && 4 !== v || 4 === g && 3 !== v) { + throw new Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + s); + } + !g && v > 2 ? w[a(484)](s, v) : w[a(484)](s, !0); + } + n(e, u, x, s, v, h, l, b); + } + } + f(e, i); + f(e, c); + } + (c, r, t), + function (r, t, n) { + var f = w_0x25f3; + if (n[f(601)] > 0) { + for (var i = [], c = t, o = t[f(833)], d = n[f(601)] - 1; d >= 0; d--) { + var _ = { + v: !1 + }; + try { + var x = n[d](c, { + kind: f(412), + name: o, + addInitializer: e(i, _) + }); + } finally { + _.v = !0; + } + if (void 0 !== x) { + a(10, x); + c = x; + } + } + r.push(c, function () { + var e = f; + for (var r = 0; r < i[e(601)]; r++) { + i[r].call(c); + } + }); + } + } + (c, r, i), + c; + }; + } + var _0x15b960; + var _0x500e9f; + function _0x4ab133(e, r, t) { + return (_0x15b960 = _0x15b960 || _0x281b3b())(e, r, t); + } + function _0x4591cd() { + function e(e, r) { + return function (a) { + var n = w_0x25f3; + !function (e, r) { + var t = w_0x25f3; + if (e.v) { + throw new Error(t(599)); + } + } + (r); + t(a, n(954)); + e[n(878)](a); + }; + } + function r(r, t, a, n, f, i, c, o) { + var d = w_0x25f3; + var _; + switch (f) { + case 1: + _ = d(441); + break; + + case 2: + _ = d(602); + break; + + case 3: + _ = d(385); + break; + + case 4: + _ = d(861); + break; + + default: + _ = d(572); + } + var x; + var u; + var b = { + kind: _, + name: c ? "#" + t : t, + static: i, + private: c + }; + var v = { + v: !1 + }; + 0 !== f && (b[d(549)] = e(n, v)); + 0 === f ? c ? (x = a[d(811)], u = a.set) : (x = function () { + return this[t]; + }, u = function (e) { + this[t] = e; + }) : 2 === f ? x = function () { + var e = d; + return a[e(740)]; + } + : (1 !== f && 3 !== f || (x = function () { + var e = d; + return a.get[e(820)](this); + }), 1 !== f && 4 !== f || (u = function (e) { + a.set.call(this, e); + })); + b[d(464)] = x && u ? { + get: x, + set: u + } + : x ? { + get: x + } + : { + set: u + }; + try { + return r(o, b); + } finally { + v.v = !0; + } + } + function t(e, r) { + var t = w_0x25f3; + if (t(494) != typeof e) { + throw new TypeError(r + t(760)); + } + } + function a(e, r) { + var a = w_0x25f3; + var n = typeof r; + if (1 === e) { + if (a(381) !== n || null === r) { + throw new TypeError(a(509)); + } + void 0 !== r[a(811)] && t(r[a(811)], "accessor.get"); + void 0 !== r[a(484)] && t(r[a(484)], a(561)); + void 0 !== r[a(953)] && t(r.init, a(559)); + } else if (a(494) !== n) { + throw new TypeError(a(0 === e ? 572 : 10 === e ? 412 : 602) + a(717)); + } + } + function n(e, t, n, f, i, c, o, d) { + var _ = w_0x25f3; + var x; + var u; + var b; + var v; + var s; + var l; + var h = n[0]; + if (o ? x = 0 === i || 1 === i ? { + get: n[3], + set: n[4] + } + : 3 === i ? { + get: n[3] + } + : 4 === i ? { + set: n[3] + } + : { + value: n[3] + } + : 0 !== i && (x = Object[_(678)](t, f)), 1 === i ? b = { + get: x[_(811)], + set: x.set + } + : 2 === i ? b = x[_(740)] : 3 === i ? b = x[_(811)] : 4 === i && (b = x.set), + _(494) == typeof h) { + if (void 0 !== (v = r(h, f, x, d, i, c, o, b))) { + a(i, v); + 0 === i ? u = v : 1 === i ? (u = v[_(953)], s = v[_(811)] || b.get, l = v[_(484)] || b[_(484)], + b = { + get: s, + set: l + }) : b = v; + } + } else { + for (var w = h[_(601)] - 1; w >= 0; w--) { + var g; + if (void 0 !== (v = r(h[w], f, x, d, i, c, o, b))) { + a(i, v); + 0 === i ? g = v : 1 === i ? (g = v.init, s = v[_(811)] || b.get, l = v[_(484)] || b[_(484)], + b = { + get: s, + set: l + }) : b = v; + void 0 !== g && (void 0 === u ? u = g : _(494) == typeof u ? u = [u, g] : u[_(878)](g)); + } + } + } + if (0 === i || 1 === i) { + if (void 0 === u) { + u = function (e, r) { + return r; + }; + } else if ("function" != typeof u) { + var p = u; + u = function (e, r) { + var t = _; + for (var a = r, n = 0; n < p[t(601)]; n++) { + a = p[n].call(e, a); + } + return a; + }; + } else { + var y = u; + u = function (e, r) { + return y.call(e, r); + }; + } + e[_(878)](u); + } + if (0 !== i) { + 1 === i ? (x[_(811)] = b[_(811)], x[_(484)] = b[_(484)]) : 2 === i ? x[_(740)] = b : 3 === i ? x[_(811)] = b : 4 === i && (x[_(484)] = b); + o ? 1 === i ? (e[_(878)](function (e, r) { + var t = _; + return b[t(811)][t(820)](e, r); + }), e[_(878)](function (e, r) { + var t = _; + return b[t(484)][t(820)](e, r); + })) : 2 === i ? e.push(b) : e[_(878)](function (e, r) { + var t = _; + return b[t(820)](e, r); + }) : Object[_(373)](t, f, x); + } + } + function f(e, r) { + var t = w_0x25f3; + for (var a, f, c = [], o = new Map(), d = new Map(), _ = 0; _ < r[t(601)]; _++) { + var x = r[_]; + if (Array[t(687)](x)) { + var u; + var b; + var v = x[1]; + var s = x[2]; + var l = x.length > 3; + var h = v >= 5; + if (h ? (u = e, 0 != (v -= 5) && (b = f = f || [])) : (u = e[t(836)], 0 !== v && (b = a = a || [])), + 0 !== v && !l) { + if (h) { + var w = d; + } else { + w = o; + } + var g = w[t(811)](s) || 0; + if (!0 === g || 3 === g && 4 !== v || 4 === g && 3 !== v) { + throw new Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + s); + } + !g && v > 2 ? w[t(484)](s, v) : w.set(s, !0); + } + n(c, u, x, s, v, h, l, b); + } + } + return i(c, a), + i(c, f), + c; + } + function i(e, r) { + var t = w_0x25f3; + r && e[t(878)](function (e) { + var a = t; + for (var n = 0; n < r.length; n++) { + r[n][a(820)](e); + } + return e; + }); + } + return function (r, t, n) { + return { + e: f(r, t), + get c() { + return function (r, t) { + var n = w_0x25f3; + if (t.length > 0) { + for (var f = [], i = r, c = r[n(833)], o = t[n(601)] - 1; o >= 0; o--) { + var d = { + v: !1 + }; + try { + var _ = t[o](i, { + kind: n(412), + name: c, + addInitializer: e(f, d) + }); + } finally { + d.v = !0; + } + if (void 0 !== _) { + a(10, _); + i = _; + } + } + return [i, function () { + var e = n; + for (var r = 0; r < f.length; r++) { + f[r][e(820)](i); + } + } + ]; + } + } + (r, n); + } + }; + }; + } + function _0x49af1f(e, r, t) { + return (_0x49af1f = _0x4591cd())(e, r, t); + } + function _0x3e4ff5(e, r) { + return function (t) { + var a = w_0x25f3; + _0x15eb90(r, a(549)); + _0x45d8b1(t, a(954)); + e[a(878)](t); + }; + } + function _0x19207d(e, r) { + var t = w_0x25f3; + if (!e(r)) { + throw new TypeError(t(597)); + } + } + function _0x151762(e, r, t, a, n, f, i, c, o) { + var d = w_0x25f3; + var _; + switch (n) { + case 1: + _ = d(441); + break; + + case 2: + _ = d(602); + break; + + case 3: + _ = d(385); + break; + + case 4: + _ = d(861); + break; + + default: + _ = d(572); + } + var x; + var u; + var b = { + kind: _, + name: i ? "#" + r : r, + static: f, + private: i + }; + var v = { + v: !1 + }; + if (0 !== n && (b[d(549)] = _0x3e4ff5(a, v)), i || 0 !== n && 2 !== n) { + if (2 === n) { + x = function (e) { + var r = d; + return _0x19207d(o, e), + t[r(740)]; + }; + } else { + var s = 0 === n || 1 === n; + (s || 3 === n) && (x = i ? function (e) { + var r = d; + return _0x19207d(o, e), + t.get[r(820)](e); + } + : function (e) { + var r = d; + return t[r(811)][r(820)](e); + }); + (s || 4 === n) && (u = i ? function (e, r) { + var a = d; + _0x19207d(o, e); + t[a(484)][a(820)](e, r); + } + : function (e, r) { + var a = d; + t[a(484)][a(820)](e, r); + }); + } + } else { + x = function (e) { + return e[r]; + }; + 0 === n && (u = function (e, t) { + e[r] = t; + }); + } + if (i) { + var l = o[d(769)](); + } else { + l = function (e) { + return r in e; + }; + } + b[d(464)] = x && u ? { + get: x, + set: u, + has: l + } + : x ? { + get: x, + has: l + } + : { + set: u, + has: l + }; + try { + return e(c, b); + } finally { + v.v = !0; + } + } + function _0x15eb90(e, r) { + var t = w_0x25f3; + if (e.v) { + throw new Error("attempted to call " + r + t(360)); + } + } + function _0x45d8b1(e, r) { + var t = w_0x25f3; + if (t(494) != typeof e) { + throw new TypeError(r + t(760)); + } + } + function _0xed525b(e, r) { + var t = w_0x25f3; + var a = typeof r; + if (1 === e) { + if (t(381) !== a || null === r) { + throw new TypeError(t(509)); + } + void 0 !== r[t(811)] && _0x45d8b1(r[t(811)], t(368)); + void 0 !== r.set && _0x45d8b1(r[t(484)], t(561)); + void 0 !== r.init && _0x45d8b1(r[t(953)], t(559)); + } else if (t(494) !== a) { + throw new TypeError((0 === e ? t(572) : 10 === e ? "class" : "method") + " decorators must return a function or void 0"); + } + } + function _0x244c39(e) { + return function () { + return e(this); + }; + } + function _0x48532c(e) { + return function (r) { + e(this, r); + }; + } + function _0x23e6b(e, r, t, a, n, f, i, c, o) { + var d = w_0x25f3; + var _; + var x; + var u; + var b; + var v; + var s; + var l = t[0]; + if (i ? _ = 0 === n || 1 === n ? { + get: _0x244c39(t[3]), + set: _0x48532c(t[4]) + } + : 3 === n ? { + get: t[3] + } + : 4 === n ? { + set: t[3] + } + : { + value: t[3] + } + : 0 !== n && (_ = Object[d(678)](r, a)), 1 === n ? u = { + get: _[d(811)], + set: _[d(484)] + } + : 2 === n ? u = _.value : 3 === n ? u = _[d(811)] : 4 === n && (u = _.set), "function" == typeof l) { + if (void 0 !== (b = _0x151762(l, a, _, c, n, f, i, u, o))) { + _0xed525b(n, b); + 0 === n ? x = b : 1 === n ? (x = b[d(953)], v = b[d(811)] || u[d(811)], s = b.set || u[d(484)], + u = { + get: v, + set: s + }) : u = b; + } + } else { + for (var h = l.length - 1; h >= 0; h--) { + var w; + if (void 0 !== (b = _0x151762(l[h], a, _, c, n, f, i, u, o))) { + _0xed525b(n, b); + 0 === n ? w = b : 1 === n ? (w = b[d(953)], v = b[d(811)] || u[d(811)], s = b[d(484)] || u.set, + u = { + get: v, + set: s + }) : u = b; + void 0 !== w && (void 0 === x ? x = w : d(494) == typeof x ? x = [x, w] : x[d(878)](w)); + } + } + } + if (0 === n || 1 === n) { + if (void 0 === x) { + x = function (e, r) { + return r; + }; + } else if (d(494) != typeof x) { + var g = x; + x = function (e, r) { + var t = d; + for (var a = r, n = 0; n < g[t(601)]; n++) { + a = g[n][t(820)](e, a); + } + return a; + }; + } else { + var p = x; + x = function (e, r) { + var t = d; + return p[t(820)](e, r); + }; + } + e.push(x); + } + if (0 !== n) { + 1 === n ? (_[d(811)] = u[d(811)], _.set = u.set) : 2 === n ? _[d(740)] = u : 3 === n ? _[d(811)] = u : 4 === n && (_[d(484)] = u); + i ? 1 === n ? (e.push(function (e, r) { + var t = d; + return u.get[t(820)](e, r); + }), e[d(878)](function (e, r) { + var t = d; + return u.set[t(820)](e, r); + })) : 2 === n ? e[d(878)](u) : e[d(878)](function (e, r) { + var t = d; + return u[t(820)](e, r); + }) : Object.defineProperty(r, a, _); + } + } + function _0x754898(e, r, t) { + var a = w_0x25f3; + for (var n, f, i, c = [], o = new Map(), d = new Map(), _ = 0; _ < r[a(601)]; _++) { + var x = r[_]; + if (Array[a(687)](x)) { + var u; + var b; + var v = x[1]; + var s = x[2]; + var l = x[a(601)] > 3; + var h = v >= 5; + var w = t; + if (h ? (u = e, 0 != (v -= 5) && (b = f = f || []), l && !i && (i = function (r) { + return _0x37e1e2(r) === e; + }), w = i) : (u = e.prototype, 0 !== v && (b = n = n || [])), 0 !== v && !l) { + if (h) { + var g = d; + } else { + g = o; + } + var p = g[a(811)](s) || 0; + if (!0 === p || 3 === p && 4 !== v || 4 === p && 3 !== v) { + throw new Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + s); + } + !p && v > 2 ? g.set(s, v) : g.set(s, !0); + } + _0x23e6b(c, u, x, s, v, h, l, b, w); + } + } + return _0xdfc9aa(c, n), + _0xdfc9aa(c, f), + c; + } + function _0xdfc9aa(e, r) { + var t = w_0x25f3; + r && e[t(878)](function (e) { + var a = t; + for (var n = 0; n < r.length; n++) { + r[n][a(820)](e); + } + return e; + }); + } + function _0x2258b9(e, r) { + var t = w_0x25f3; + if (r[t(601)] > 0) { + for (var a = [], n = e, f = e.name, i = r[t(601)] - 1; i >= 0; i--) { + var c = { + v: !1 + }; + try { + var o = r[i](n, { + kind: t(412), + name: f, + addInitializer: _0x3e4ff5(a, c) + }); + } finally { + c.v = !0; + } + if (void 0 !== o) { + _0xed525b(10, o); + n = o; + } + } + return [n, function () { + var e = t; + for (var r = 0; r < a[e(601)]; r++) { + a[r][e(820)](n); + } + } + ]; + } + } + function _0x499d65(e, r, t, a) { + return { + e: _0x754898(e, r, a), + get c() { + return _0x2258b9(e, t); + } + }; + } + function _0x63f01f(e) { + var r = w_0x25f3; + var t = {}; + var a = !1; + function n(r, t) { + return a = !0, { + done: !1, + value: new _0x59d886(t = new Promise(function (a) { + a(e[r](t)); + }), 1) + }; + } + return t[r(900) != typeof Symbol && Symbol.iterator || r(477)] = function () { + return this; + }, + t[r(905)] = function (e) { + return a ? (a = !1, e) : n("next", e); + }, + r(494) == typeof e[r(592)] && (t[r(592)] = function (e) { + var t = r; + if (a) { + throw a = !1, + e; + } + return n(t(592), e); + }), + r(494) == typeof e[r(765)] && (t[r(765)] = function (e) { + return a ? (a = !1, e) : n("return", e); + }), + t; + } + function _0x278b9f(e) { + var r = w_0x25f3; + var t; + var a; + var n; + var f = 2; + for ("undefined" != typeof Symbol && (a = Symbol[r(380)], n = Symbol[r(947)]); f--;) { + if (a && null != (t = e[a])) { + return t[r(820)](e); + } + if (n && null != (t = e[n])) { + return new _0x3d6fc9(t[r(820)](e)); + } + a = r(560); + n = r(477); + } + throw new TypeError(r(681)); + } + function _0x3d6fc9(e) { + var r = w_0x25f3; + function t(e) { + var r = w_0x25f3; + if (Object(e) !== e) { + return Promise.reject(new TypeError(e + r(934))); + } + var t = e[r(483)]; + return Promise.resolve(e[r(740)]).then(function (e) { + return { + value: e, + done: t + }; + }); + } + return (_0x3d6fc9 = function (e) { + var r = w_0x25f3; + this.s = e; + this.n = e[r(905)]; + })[r(836)] = { + s: null, + n: null, + next: function () { + var e = r; + return t(this.n[e(519)](this.s, arguments)); + }, + return: function (e) { + var a = r; + var n = this.s[a(765)]; + return void 0 === n ? Promise[a(632)]({ + value: e, + done: !0 + }) : t(n[a(519)](this.s, arguments)); + }, + throw: function (e) { + var a = r; + var n = this.s[a(765)]; + return void 0 === n ? Promise[a(923)](e) : t(n.apply(this.s, arguments)); + } + }, + new _0x3d6fc9(e); + } + function _0x81c36b(e) { + return new _0x59d886(e, 0); + } + function _0x37e1e2(e) { + var r = w_0x25f3; + if (Object(e) !== e) { + throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? typeof e : r(776))); + } + return e; + } + function _0x564673(e, r, t, a) { + var n = w_0x25f3; + var f = { + configurable: !0, + enumerable: !0 + }; + return f[e] = a, + Object[n(373)](r, t, f); + } + function _0x19d66a(e, r) { + var t = w_0x25f3; + if (null == e) { + var a = null; + } else { + a = t(900) != typeof Symbol && e[Symbol[t(947)]] || e[t(477)]; + } + if (null != a) { + var n; + var f; + var i; + var c; + var o = []; + var d = !0; + var _ = !1; + try { + if (i = (a = a[t(820)](e)).next, 0 === r) { + if (Object(a) !== a) { + return; + } + d = !1; + } else { + for (; !(d = (n = i.call(a))[t(483)]) && (o[t(878)](n[t(740)]), o[t(601)] !== r); d = !0) { } + } + } catch (e) { + console.log(e); + _ = !0; + f = e; + } finally { + try { + if (!d && null != a[t(765)] && (c = a.return(), Object(c) !== c)) { + return; + } + } finally { + if (_) { + throw f; + } + } + } + return o; + } + } + function _0x376fd5(e, r) { + var t = w_0x25f3; + var a = e && (t(900) != typeof Symbol && e[Symbol[t(947)]] || e["@@iterator"]); + if (null != a) { + var n; + var f = []; + for (a = a.call(e); e[t(601)] < r && !(n = a.next())[t(483)];) { + f[t(878)](n.value); + } + return f; + } + } + function _0x2e4b86(e, r, t, a) { + var n = w_0x25f3; + _0x500e9f || (_0x500e9f = n(494) == typeof Symbol && Symbol[n(798)] && Symbol[n(798)](n(633)) || 60103); + var f = e && e[n(881)]; + var i = arguments[n(601)] - 3; + if (r || 0 === i || (r = { + children: void 0 + }), 1 === i) { + r[n(367)] = a; + } else if (i > 1) { + for (var c = new Array(i), o = 0; o < i; o++) { + c[o] = arguments[o + 3]; + } + r[n(367)] = c; + } + if (r && f) { + for (var d in f) { + void 0 === r[d] && (r[d] = f[d]); + } + } else { + r || (r = f || {}); + } + return { + $$typeof: _0x500e9f, + type: e, + key: void 0 === t ? null : "" + t, + ref: null, + props: r, + _owner: null + }; + } + function _0x3a3eb5(e, r) { + var t = w_0x25f3; + var a = Object[t(383)](e); + if (Object[t(904)]) { + var n = Object.getOwnPropertySymbols(e); + r && (n = n[t(356)](function (r) { + var a = t; + return Object[a(678)](e, r)[a(570)]; + })); + a.push[t(519)](a, n); + } + return a; + } + function _0x4ee2dd(e) { + var r = w_0x25f3; + for (var t = 1; t < arguments[r(601)]; t++) { + if (null != arguments[t]) { + var a = arguments[t]; + } else { + a = {}; + } + t % 2 ? _0x3a3eb5(Object(a), !0)[r(596)](function (r) { + _0x4a7824(e, r, a[r]); + }) : Object[r(492)] ? Object[r(876)](e, Object[r(492)](a)) : _0x3a3eb5(Object(a))[r(596)](function (t) { + var n = r; + Object[n(373)](e, t, Object[n(678)](a, t)); + }); + } + return e; + } + function _0x385d19() { + var e = w_0x25f3; + _0x385d19 = function () { + return r; + }; + var r = {}; + var t = Object[e(836)]; + var a = t[e(952)]; + var n = Object.defineProperty || function (r, t, a) { + var n = e; + r[t] = a[n(740)]; + }; + if (e(494) == typeof Symbol) { + var f = Symbol; + } else { + f = {}; + } + var i = f[e(947)] || e(477); + var c = f.asyncIterator || e(560); + var o = f[e(448)] || e(480); + function d(r, t, a) { + var n = e; + return Object[n(373)](r, t, { + value: a, + enumerable: !0, + configurable: !0, + writable: !0 + }), + r[t]; + } + try { + d({}, ""); + } catch (e) { + console.log(e); + d = function (e, r, t) { + return e[r] = t; + }; + } + function _(r, t, a, f) { + var i = e; + var c = t && t.prototype instanceof b ? t : b; + var o = Object[i(951)](c[i(836)]); + var d = new S(f || []); + return n(o, i(433), { + value: m(r, a, d) + }), + o; + } + function x(r, t, a) { + var n = e; + try { + return { + type: n(753), + arg: r[n(820)](t, a) + }; + } catch (e) { + console.log(e); + return { + type: "throw", + arg: e + }; + } + } + r.wrap = _; + var u = {}; + function b() { } + function v() { } + function s() { } + var l = {}; + d(l, i, function () { + return this; + }); + var h = Object[e(556)]; + var w = h && h(h(j([]))); + w && w !== t && a[e(820)](w, i) && (l = w); + var g = s[e(836)] = b.prototype = Object[e(951)](l); + function p(r) { + var t = e; + [t(905), t(592), t(765)][t(596)](function (e) { + d(r, e, function (r) { + var t = w_0x25f3; + return this[t(433)](e, r); + }); + }); + } + function y(e, r) { + var t; + n(this, "_invoke", { + value: function (n, f) { + var i = w_0x25f3; + function c() { + return new r(function (t, i) { + !function t(n, f, i, c) { + var o = w_0x25f3; + var d = x(e[n], e, f); + if (o(592) !== d[o(427)]) { + var _ = d[o(807)]; + var u = _[o(740)]; + return u && "object" == typeof u && a[o(820)](u, o(689)) ? r[o(632)](u[o(689)])[o(493)](function (e) { + var r = o; + t(r(905), e, i, c); + }, function (e) { + t("throw", e, i, c); + }) : r[o(632)](u)[o(493)](function (e) { + var r = o; + _[r(740)] = e; + i(_); + }, function (e) { + var r = o; + return t(r(592), e, i, c); + }); + } + c(d[o(807)]); + } + (n, f, t, i); + }); + } + return t = t ? t[i(493)](c, c) : c(); + } + }); + } + function m(e, r, t) { + var a = "suspendedStart"; + return function (n, f) { + var i = w_0x25f3; + if (i(751) === a) { + throw new Error(i(858)); + } + if ("completed" === a) { + if ("throw" === n) { + throw f; + } + return k(); + } + for (t[i(602)] = n, t[i(807)] = f; ;) { + var c = t[i(444)]; + if (c) { + var o = O(c, t); + if (o) { + if (o === u) { + continue; + } + return o; + } + } + if (i(905) === t[i(602)]) { + t[i(946)] = t[i(674)] = t[i(807)]; + } else if ("throw" === t[i(602)]) { + if ("suspendedStart" === a) { + throw a = i(362), + t.arg; + } + t[i(715)](t[i(807)]); + } else { + i(765) === t[i(602)] && t.abrupt(i(765), t.arg); + } + a = i(751); + var d = x(e, r, t); + if ("normal" === d.type) { + if (a = t[i(483)] ? i(362) : "suspendedYield", d[i(807)] === u) { + continue; + } + return { + value: d[i(807)], + done: t[i(483)] + }; + } + if (i(592) === d[i(427)]) { + a = i(362); + t[i(602)] = i(592); + t[i(807)] = d[i(807)]; + } + } + }; + } + function O(r, t) { + var a = e; + var n = t.method; + var f = r[a(947)][n]; + if (void 0 === f) { + return t[a(444)] = null, + a(592) === n && r[a(947)][a(765)] && (t.method = "return", + t[a(807)] = void 0, O(r, t), a(592) === t[a(602)]) || "return" !== n && (t[a(602)] = a(592), + t[a(807)] = new TypeError("The iterator does not provide a '" + n + a(815))), + u; + } + var i = x(f, r[a(947)], t[a(807)]); + if (a(592) === i[a(427)]) { + return t[a(602)] = a(592), + t.arg = i[a(807)], + t[a(444)] = null, + u; + } + var c = i[a(807)]; + return c ? c.done ? (t[r[a(366)]] = c[a(740)], t.next = r[a(641)], a(765) !== t[a(602)] && (t[a(602)] = a(905), + t.arg = void 0), t[a(444)] = null, u) : c : (t[a(602)] = a(592), t.arg = new TypeError(a(593)), + t[a(444)] = null, u); + } + function E(r) { + var t = e; + var a = { + tryLoc: r[0] + }; + 1 in r && (a.catchLoc = r[1]); + 2 in r && (a[t(544)] = r[2], a[t(763)] = r[3]); + this.tryEntries[t(878)](a); + } + function T(r) { + var t = e; + var a = r[t(903)] || {}; + a.type = t(753); + delete a[t(807)]; + r.completion = a; + } + function S(r) { + var t = e; + this[t(823)] = [{ + tryLoc: t(451) + } + ]; + r[t(596)](E, this); + this[t(682)](!0); + } + function j(r) { + var t = e; + if (r) { + var n = r[i]; + if (n) { + return n.call(r); + } + if (t(494) == typeof r[t(905)]) { + return r; + } + if (!isNaN(r.length)) { + var f = -1; + var c = function e() { + var n = t; + for (; ++f < r[n(601)];) { + if (a[n(820)](r, f)) { + return e[n(740)] = r[f], + e[n(483)] = !1, + e; + } + } + return e.value = void 0, + e[n(483)] = !0, + e; + }; + return c[t(905)] = c; + } + } + return { + next: k + }; + } + function k() { + return { + value: void 0, + done: !0 + }; + } + return v[e(836)] = s, + n(g, e(684), { + value: s, + configurable: !0 + }), + n(s, e(684), { + value: v, + configurable: !0 + }), + v[e(396)] = d(s, o, e(785)), + r[e(902)] = function (r) { + var t = e; + var a = t(494) == typeof r && r[t(684)]; + return !!a && (a === v || t(785) === (a.displayName || a.name)); + }, + r[e(933)] = function (r) { + var t = e; + return Object[t(571)] ? Object[t(571)](r, s) : (r[t(746)] = s, d(r, o, "GeneratorFunction")), + r[t(836)] = Object.create(g), + r; + }, + r[e(721)] = function (e) { + return { + __await: e + }; + }, + p(y[e(836)]), + d(y[e(836)], c, function () { + return this; + }), + r[e(627)] = y, + r[e(487)] = function (t, a, n, f, i) { + var c = e; + void 0 === i && (i = Promise); + var o = new y(_(t, a, n, f), i); + return r[c(902)](a) ? o : o[c(905)]()[c(493)](function (e) { + var r = c; + return e[r(483)] ? e[r(740)] : o[r(905)](); + }); + }, + p(g), + d(g, o, e(437)), + d(g, i, function () { + return this; + }), + d(g, e(942), function () { + var r = e; + return r(374); + }), + r.keys = function (r) { + var t = e; + var a = Object(r); + var n = []; + for (var f in a) { + n[t(878)](f); + } + return n[t(755)](), + function e() { + var r = t; + for (; n[r(601)];) { + var f = n[r(615)](); + if (f in a) { + return e[r(740)] = f, + e[r(483)] = !1, + e; + } + } + return e.done = !0, + e; + }; + }, + r[e(907)] = j, + S.prototype = { + constructor: S, + reset: function (r) { + var t = e; + if (this[t(812)] = 0, this[t(905)] = 0, this[t(946)] = this[t(674)] = void 0, this[t(483)] = !1, + this[t(444)] = null, this[t(602)] = t(905), this[t(807)] = void 0, this[t(823)][t(596)](T), + !r) { + for (var n in this) { + "t" === n.charAt(0) && a[t(820)](this, n) && !isNaN(+n.slice(1)) && (this[n] = void 0); + } + } + }, + stop: function () { + var r = e; + this[r(483)] = !0; + var t = this[r(823)][0][r(903)]; + if (r(592) === t[r(427)]) { + throw t.arg; + } + return this[r(666)]; + }, + dispatchException: function (r) { + var t = e; + if (this[t(483)]) { + throw r; + } + var n = this; + function f(e, a) { + var f = t; + return o[f(427)] = f(592), + o[f(807)] = r, + n[f(905)] = e, + a && (n[f(602)] = f(905), + n[f(807)] = void 0), + !!a; + } + for (var i = this[t(823)][t(601)] - 1; i >= 0; --i) { + var c = this[t(823)][i]; + var o = c[t(903)]; + if (t(451) === c.tryLoc) { + return f(t(475)); + } + if (c[t(670)] <= this[t(812)]) { + var d = a.call(c, "catchLoc"); + var _ = a[t(820)](c, t(544)); + if (d && _) { + if (this[t(812)] < c[t(708)]) { + return f(c.catchLoc, !0); + } + if (this.prev < c[t(544)]) { + return f(c[t(544)]); + } + } else if (d) { + if (this.prev < c[t(708)]) { + return f(c[t(708)], !0); + } + } else { + if (!_) { + throw new Error(t(830)); + } + if (this[t(812)] < c.finallyLoc) { + return f(c.finallyLoc); + } + } + } + } + }, + abrupt: function (r, t) { + var n = e; + for (var f = this[n(823)][n(601)] - 1; f >= 0; --f) { + var i = this[n(823)][f]; + if (i[n(670)] <= this[n(812)] && a[n(820)](i, n(544)) && this[n(812)] < i[n(544)]) { + var c = i; + break; + } + } + c && (n(799) === r || n(722) === r) && c[n(670)] <= t && t <= c[n(544)] && (c = null); + var o = c ? c[n(903)] : {}; + return o.type = r, + o[n(807)] = t, + c ? (this[n(602)] = n(905), this[n(905)] = c[n(544)], + u) : this[n(354)](o); + }, + complete: function (r, t) { + var a = e; + if (a(592) === r[a(427)]) { + throw r[a(807)]; + } + return a(799) === r[a(427)] || a(722) === r[a(427)] ? this[a(905)] = r[a(807)] : a(765) === r.type ? (this[a(666)] = this[a(807)] = r[a(807)], + this[a(602)] = a(765), this[a(905)] = "end") : a(753) === r[a(427)] && t && (this[a(905)] = t), + u; + }, + finish: function (r) { + var t = e; + for (var a = this[t(823)][t(601)] - 1; a >= 0; --a) { + var n = this[t(823)][a]; + if (n[t(544)] === r) { + return this.complete(n[t(903)], n[t(763)]), + T(n), + u; + } + } + }, + catch: function (r) { + var t = e; + for (var a = this.tryEntries[t(601)] - 1; a >= 0; --a) { + var n = this.tryEntries[a]; + if (n[t(670)] === r) { + var f = n[t(903)]; + if (t(592) === f[t(427)]) { + var i = f[t(807)]; + T(n); + } + return i; + } + } + throw new Error(t(575)); + }, + delegateYield: function (r, t, a) { + var n = e; + return this[n(444)] = { + iterator: j(r), + resultName: t, + nextLoc: a + }, + "next" === this.method && (this.arg = void 0), + u; + } + }, + r; + } + function _0x1db123(e) { + var r = w_0x25f3; + return (_0x1db123 = r(494) == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (e) { + return typeof e; + } + : function (e) { + var t = r; + return e && t(494) == typeof Symbol && e[t(684)] === Symbol && e !== Symbol.prototype ? t(749) : typeof e; + })(e); + } + function _0x34d29a() { + var e = w_0x25f3; + _0x34d29a = function (e, r) { + return new a(e, void 0, r); + }; + var r = RegExp[e(836)]; + var t = new WeakMap(); + function a(r, n, f) { + var i = e; + var c = new RegExp(r, n); + return t[i(484)](c, f || t[i(811)](r)), + _0x2e2f47(c, a[i(836)]); + } + function n(r, a) { + var n = e; + var f = t[n(811)](a); + return Object[n(383)](f)[n(886)](function (e, t) { + var a = n; + var i = f[t]; + if (a(651) == typeof i) { + e[t] = r[i]; + } else { + for (var c = 0; void 0 === r[i[c]] && c + 1 < i.length;) { + c++; + } + e[t] = r[i[c]]; + } + return e; + }, Object[n(951)](null)); + } + return _0x5dda7d(a, RegExp), + a.prototype.exec = function (t) { + var a = e; + var f = r[a(521)].call(this, t); + if (f) { + f.groups = n(f, this); + var i = f.indices; + i && (i.groups = n(i, this)); + } + return f; + }, + a[e(836)][Symbol[e(887)]] = function (a, f) { + var i = e; + if (i(828) == typeof f) { + var c = t[i(811)](this); + return r[Symbol[i(887)]].call(this, a, f[i(887)](/\$<([^>]+)>/g, function (e, r) { + var t = i; + var a = c[r]; + return "$" + (Array[t(687)](a) ? a[t(591)]("$") : a); + })); + } + if (i(494) == typeof f) { + var o = this; + return r[Symbol[i(887)]][i(820)](this, a, function () { + var e = i; + var r = arguments; + return e(381) != typeof r[r[e(601)] - 1] && (r = [].slice[e(820)](r))[e(878)](n(r, o)), + f[e(519)](this, r); + }); + } + return r[Symbol[i(887)]].call(this, a, f); + }, + _0x34d29a[e(519)](this, arguments); + } + function _0x2772ab(e) { + var r = w_0x25f3; + this[r(384)] = e; + } + function _0x125e01(e) { + return function () { + var r = w_0x25f3; + return new _0x137ba2(e[r(519)](this, arguments)); + }; + } + function _0x8a0370(e, r, t, a, n, f, i) { + var c = w_0x25f3; + try { + var o = e[f](i); + var d = o[c(740)]; + } catch (e) { + console.log(e); + return void t(e); + } + o[c(483)] ? r(d) : Promise[c(632)](d)[c(493)](a, n); + } + function _0x50daaa(e) { + return function () { + var r = this; + var t = arguments; + return new Promise(function (a, n) { + var f = e.apply(r, t); + function i(e) { + var r = w_0x25f3; + _0x8a0370(f, a, n, i, c, r(905), e); + } + function c(e) { + var r = w_0x25f3; + _0x8a0370(f, a, n, i, c, r(592), e); + } + i(void 0); + }); + }; + } + function _0x297d3d(e, r) { + var t = w_0x25f3; + if (!(e instanceof r)) { + throw new TypeError(t(759)); + } + } + function _0x96f358(e, r) { + var t = w_0x25f3; + for (var a = 0; a < r[t(601)]; a++) { + var n = r[a]; + n[t(570)] = n[t(570)] || !1; + n[t(700)] = !0; + t(740) in n && (n.writable = !0); + Object[t(373)](e, _0x32e885(n[t(914)]), n); + } + } + function _0x55cd8a(e, r, t) { + var a = w_0x25f3; + return r && _0x96f358(e[a(836)], r), + t && _0x96f358(e, t), + Object[a(373)](e, a(836), { + writable: !1 + }), + e; + } + function _0x58d8c2(e, r) { + var t = w_0x25f3; + for (var a in r) { + (i = r[a])[t(700)] = i[t(570)] = !0; + "value" in i && (i[t(739)] = !0); + Object[t(373)](e, a, i); + } + if (Object[t(904)]) { + for (var n = Object[t(904)](r), f = 0; f < n[t(601)]; f++) { + var i; + var c = n[f]; + (i = r[c]).configurable = i[t(570)] = !0; + t(740) in i && (i[t(739)] = !0); + Object[t(373)](e, c, i); + } + } + return e; + } + function _0x40ff51(e, r) { + var t = w_0x25f3; + for (var a = Object[t(810)](r), n = 0; n < a[t(601)]; n++) { + var f = a[n]; + var i = Object[t(678)](r, f); + i && i[t(700)] && void 0 === e[f] && Object.defineProperty(e, f, i); + } + return e; + } + function _0x4a7824(e, r, t) { + var a = w_0x25f3; + return (r = _0x32e885(r)) in e ? Object[a(373)](e, r, { + value: t, + enumerable: !0, + configurable: !0, + writable: !0 + }) : e[r] = t, + e; + } + function _0x36f54f() { + var e = w_0x25f3; + return (_0x36f54f = Object.assign ? Object[e(672)].bind() : function (r) { + var t = e; + for (var a = 1; a < arguments[t(601)]; a++) { + var n = arguments[a]; + for (var f in n) { + Object[t(836)][t(952)][t(820)](n, f) && (r[f] = n[f]); + } + } + return r; + }).apply(this, arguments); + } + function _0x5f346f(e) { + var r = w_0x25f3; + for (var t = 1; t < arguments[r(601)]; t++) { + if (null != arguments[t]) { + var a = Object(arguments[t]); + } else { + a = {}; + } + var n = Object[r(383)](a); + r(494) == typeof Object[r(904)] && n[r(878)][r(519)](n, Object[r(904)](a)[r(356)](function (e) { + var t = r; + return Object[t(678)](a, e)[t(570)]; + })); + n.forEach(function (r) { + _0x4a7824(e, r, a[r]); + }); + } + return e; + } + function _0x5dda7d(e, r) { + var t = w_0x25f3; + if ("function" != typeof r && null !== r) { + throw new TypeError(t(566)); + } + e[t(836)] = Object.create(r && r[t(836)], { + constructor: { + value: e, + writable: !0, + configurable: !0 + } + }); + Object[t(373)](e, t(836), { + writable: !1 + }); + r && _0x2e2f47(e, r); + } + function _0x3879ac(e, r) { + var t = w_0x25f3; + e[t(836)] = Object.create(r[t(836)]); + e[t(836)][t(684)] = e; + _0x2e2f47(e, r); + } + function _0x22af63(e) { + var r = w_0x25f3; + return (_0x22af63 = Object[r(571)] ? Object.getPrototypeOf[r(769)]() : function (e) { + var t = r; + return e.__proto__ || Object[t(556)](e); + })(e); + } + function _0x2e2f47(e, r) { + var t = w_0x25f3; + return (_0x2e2f47 = Object.setPrototypeOf ? Object[t(571)][t(769)]() : function (e, r) { + var a = t; + return e[a(746)] = r, + e; + })(e, r); + } + function _0x3390dc() { + var e = w_0x25f3; + if (e(900) == typeof Reflect || !Reflect[e(800)]) { + return !1; + } + if (Reflect[e(800)].sham) { + return !1; + } + if (e(494) == typeof Proxy) { + return !0; + } + try { + return Boolean[e(836)][e(771)][e(820)](Reflect[e(800)](Boolean, [], function () { })), + !0; + } catch (e) { + console.log(e); + return !1; + } + } + function _0x920a3d(e, r, t) { + var a = w_0x25f3; + return (_0x920a3d = _0x3390dc() ? Reflect.construct[a(769)]() : function (e, r, t) { + var n = a; + var f = [null]; + f.push[n(519)](f, r); + var i = new (Function[n(769)].apply(e, f))(); + return t && _0x2e2f47(i, t[n(836)]), + i; + }).apply(null, arguments); + } + function _0x5cb0d7(e) { + var r = w_0x25f3; + return -1 !== Function[r(942)].call(e)[r(709)](r(353)); + } + function _0x16f283(e) { + var r = w_0x25f3; + if (r(494) == typeof Map) { + var t = new Map(); + } else { + t = void 0; + } + return (_0x16f283 = function (e) { + var a = r; + if (null === e || !_0x5cb0d7(e)) { + return e; + } + if (a(494) != typeof e) { + throw new TypeError(a(566)); + } + if (void 0 !== t) { + if (t[a(764)](e)) { + return t[a(811)](e); + } + t[a(484)](e, n); + } + function n() { + var r = a; + return _0x920a3d(e, arguments, _0x22af63(this)[r(684)]); + } + return n.prototype = Object[a(951)](e[a(836)], { + constructor: { + value: n, + enumerable: !1, + writable: !0, + configurable: !0 + } + }), + _0x2e2f47(n, e); + })(e); + } + function _0x8f6e33(e, r) { + var t = w_0x25f3; + return null != r && t(900) != typeof Symbol && r[Symbol[t(376)]] ? !!r[Symbol[t(376)]](e) : e instanceof r; + } + function _0x2ea366(e) { + var r = w_0x25f3; + return e && e[r(957)] ? e : { + default: + e + }; + } + function _0x1629e6(e) { + var r = w_0x25f3; + if (r(494) != typeof WeakMap) { + return null; + } + var t = new WeakMap(); + var a = new WeakMap(); + return (_0x1629e6 = function (e) { + return e ? a : t; + })(e); + } + function _0x2c9158(e, r) { + var t = w_0x25f3; + if (!r && e && e.__esModule) { + return e; + } + if (null === e || t(381) != typeof e && "function" != typeof e) { + return { + default: + e + }; + } + var a = _0x1629e6(r); + if (a && a[t(764)](e)) { + return a[t(811)](e); + } + var n = {}; + var f = Object[t(373)] && Object[t(678)]; + for (var i in e) { + if (t(467) !== i && Object[t(836)].hasOwnProperty[t(820)](e, i)) { + if (f) { + var c = Object[t(678)](e, i); + } else { + c = null; + } + c && (c[t(811)] || c[t(484)]) ? Object.defineProperty(n, i, c) : n[i] = e[i]; + } + } + return n.default = e, + a && a[t(484)](e, n), + n; + } + function _0x374736(e, r) { + var t = w_0x25f3; + if (e !== r) { + throw new TypeError(t(364)); + } + } + function _0x206199(e) { + var r = w_0x25f3; + if (null == e) { + throw new TypeError(r(460) + e); + } + } + function _0x2bfa3e(e, r) { + var t = w_0x25f3; + if (null == e) { + return {}; + } + var a; + var n; + var f = {}; + var i = Object.keys(e); + for (n = 0; n < i[t(601)]; n++) { + a = i[n]; + r[t(709)](a) >= 0 || (f[a] = e[a]); + } + return f; + } + function _0x2a28e9(e, r) { + var t = w_0x25f3; + if (null == e) { + return {}; + } + var a; + var n; + var f = _0x2bfa3e(e, r); + if (Object.getOwnPropertySymbols) { + var i = Object[t(904)](e); + for (n = 0; n < i[t(601)]; n++) { + a = i[n]; + r[t(709)](a) >= 0 || Object[t(836)][t(474)][t(820)](e, a) && (f[a] = e[a]); + } + } + return f; + } + function _0x58f550(e) { + var r = w_0x25f3; + if (void 0 === e) { + throw new ReferenceError(r(443)); + } + return e; + } + function _0xf3b17(e, r) { + var t = w_0x25f3; + if (r && (t(381) == typeof r || t(494) == typeof r)) { + return r; + } + if (void 0 !== r) { + throw new TypeError("Derived constructors may only return object or undefined"); + } + return _0x58f550(e); + } + function _0x17b234(e) { + var r = _0x3390dc(); + return function () { + var t = w_0x25f3; + var a; + var n = _0x22af63(e); + if (r) { + var f = _0x22af63(this)[t(684)]; + a = Reflect[t(800)](n, arguments, f); + } else { + a = n[t(519)](this, arguments); + } + return _0xf3b17(this, a); + }; + } + function _0x2b3a8b(e, r) { + for (; !Object.prototype.hasOwnProperty.call(e, r) && null !== (e = _0x22af63(e));) { } + return e; + } + function _0x33bfa4() { + var e = w_0x25f3; + return (_0x33bfa4 = e(900) != typeof Reflect && Reflect[e(811)] ? Reflect[e(811)][e(769)]() : function (r, t, a) { + var n = e; + var f = _0x2b3a8b(r, t); + if (f) { + var i = Object[n(678)](f, t); + return i[n(811)] ? i[n(811)][n(820)](arguments[n(601)] < 3 ? r : a) : i[n(740)]; + } + }).apply(this, arguments); + } + function _0x5b010c(e, r, t, a) { + var n = w_0x25f3; + return (_0x5b010c = "undefined" != typeof Reflect && Reflect[n(484)] ? Reflect[n(484)] : function (e, r, t, a) { + var f = n; + var i; + var c = _0x2b3a8b(e, r); + if (c) { + if ((i = Object[f(678)](c, r))[f(484)]) { + return i.set[f(820)](a, t), + !0; + } + if (!i[f(739)]) { + return !1; + } + } + if (i = Object.getOwnPropertyDescriptor(a, r)) { + if (!i[f(739)]) { + return !1; + } + i[f(740)] = t; + Object[f(373)](a, r, i); + } else { + _0x4a7824(a, r, t); + } + return !0; + })(e, r, t, a); + } + function _0x2732a4(e, r, t, a, n) { + var f = w_0x25f3; + if (!_0x5b010c(e, r, t, a || e) && n) { + throw new TypeError(f(846)); + } + return t; + } + function _0x281bf3(e, r) { + var t = w_0x25f3; + return r || (r = e[t(677)](0)), + Object[t(408)](Object[t(876)](e, { + raw: { + value: Object[t(408)](r) + } + })); + } + function _0x2d5f0c(e, r) { + var t = w_0x25f3; + return r || (r = e.slice(0)), + e[t(683)] = r, + e; + } + function _0x246229(e) { + var r = w_0x25f3; + throw new TypeError('"' + e + r(824)); + } + function _0x5db7bf(e) { + throw new TypeError('"' + e + '" is write-only'); + } + function _0x2275f4(e) { + var r = w_0x25f3; + throw new ReferenceError(r(455) + e + '" cannot be referenced in computed property keys.'); + } + function _0x516c2b() { } + function _0xab4ac9(e) { + throw new ReferenceError(e + " is not defined - temporal dead zone"); + } + function _0x5b377b(e, r) { + return e === _0x516c2b ? _0xab4ac9(r) : e; + } + function _0x5096de(e, r) { + return _0x1ae312(e) || _0x19d66a(e, r) || _0x525331(e, r) || _0x25b697(); + } + function _0x1dff6c(e, r) { + return _0x1ae312(e) || _0x376fd5(e, r) || _0x525331(e, r) || _0x25b697(); + } + function _0x5c885(e) { + return _0x1ae312(e) || _0x1853c6(e) || _0x525331(e) || _0x25b697(); + } + function _0x534083(e) { + return _0x1ccd19(e) || _0x1853c6(e) || _0x525331(e) || _0x542337(); + } + function _0x1ccd19(e) { + var r = w_0x25f3; + if (Array[r(687)](e)) { + return _0x537c83(e); + } + } + function _0x1ae312(e) { + var r = w_0x25f3; + if (Array[r(687)](e)) { + return e; + } + } + function _0x4bbf4b(e, r, t) { + var a = w_0x25f3; + if (r && !Array[a(687)](r) && a(651) == typeof r[a(601)]) { + var n = r[a(601)]; + return _0x537c83(r, void 0 !== t && t < n ? t : n); + } + return e(r, t); + } + function _0x1853c6(e) { + var r = w_0x25f3; + if (r(900) != typeof Symbol && null != e[Symbol[r(947)]] || null != e[r(477)]) { + return Array.from(e); + } + } + function _0x525331(e, r) { + var t = w_0x25f3; + if (e) { + if (t(828) == typeof e) { + return _0x537c83(e, r); + } + var a = Object[t(836)][t(942)][t(820)](e).slice(8, -1); + return t(747) === a && e[t(684)] && (a = e[t(684)].name), + "Map" === a || t(352) === a ? Array[t(668)](e) : t(639) === a || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/[t(555)](a) ? _0x537c83(e, r) : void 0; + } + } + function _0x537c83(e, r) { + var t = w_0x25f3; + (null == r || r > e[t(601)]) && (r = e[t(601)]); + for (var a = 0, n = new Array(r); a < r; a++) { + n[a] = e[a]; + } + return n; + } + function _0x542337() { + var e = w_0x25f3; + throw new TypeError(e(936)); + } + function _0x25b697() { + throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); + } + function _0x350075(e, r) { + var t = w_0x25f3; + var a = t(900) != typeof Symbol && e[Symbol[t(947)]] || e[t(477)]; + if (!a) { + if (Array.isArray(e) || (a = _0x525331(e)) || r && e && t(651) == typeof e[t(601)]) { + a && (e = a); + var n = 0; + var f = function () { }; + return { + s: f, + n: function () { + var r = t; + return n >= e[r(601)] ? { + done: !0 + } + : { + done: !1, + value: e[n++] + }; + }, + e: function (e) { + throw e; + }, + f: f + }; + } + throw new TypeError(t(686)); + } + var i; + var c = !0; + var o = !1; + return { + s: function () { + a = a.call(e); + }, + n: function () { + var e = t; + var r = a.next(); + return c = r[e(483)], + r; + }, + e: function (e) { + o = !0; + i = e; + }, + f: function () { + var e = t; + try { + c || null == a[e(765)] || a[e(765)](); + } finally { + if (o) { + throw i; + } + } + } + }; + } + function _0x37af30(e, r) { + var t = w_0x25f3; + var a = "undefined" != typeof Symbol && e[Symbol[t(947)]] || e["@@iterator"]; + if (a) { + return (a = a.call(e))[t(905)][t(769)](a); + } + if (Array[t(687)](e) || (a = _0x525331(e)) || r && e && "number" == typeof e[t(601)]) { + a && (e = a); + var n = 0; + return function () { + var r = t; + return n >= e[r(601)] ? { + done: !0 + } + : { + done: !1, + value: e[n++] + }; + }; + } + throw new TypeError(t(686)); + } + function _0x5362e1(e) { + return function () { + var r = w_0x25f3; + var t = e.apply(this, arguments); + return t[r(905)](), + t; + }; + } + function _0x4ad3b0(e, r) { + var t = w_0x25f3; + if (t(381) != typeof e || null === e) { + return e; + } + var a = e[Symbol.toPrimitive]; + if (void 0 !== a) { + var n = a.call(e, r || t(467)); + if ("object" != typeof n) { + return n; + } + throw new TypeError(t(856)); + } + return ("string" === r ? String : Number)(e); + } + function _0x32e885(e) { + var r = w_0x25f3; + var t = _0x4ad3b0(e, r(828)); + return r(749) == typeof t ? t : String(t); + } + function _0xf47dc3(e, r) { + var t = w_0x25f3; + throw new Error(t(511)); + } + function _0x9d8dd5(e, r, t, a) { + var n = w_0x25f3; + t && Object[n(373)](e, r, { + enumerable: t.enumerable, + configurable: t[n(700)], + writable: t[n(739)], + value: t[n(720)] ? t.initializer[n(820)](a) : void 0 + }); + } + function _0x271739(e, r, t, a, n) { + var f = w_0x25f3; + var i = {}; + return Object.keys(a)[f(596)](function (e) { + i[e] = a[e]; + }), + i[f(570)] = !!i[f(570)], + i[f(700)] = !!i[f(700)], + (f(740) in i || i.initializer) && (i[f(739)] = !0), + i = t[f(677)]()[f(755)]()[f(886)](function (t, a) { + return a(e, r, t) || t; + }, i), + n && void 0 !== i[f(720)] && (i[f(720)] ? i[f(740)] = i[f(720)][f(820)](n) : i[f(740)] = void 0, + i[f(720)] = void 0), + void 0 === i[f(720)] && (Object[f(373)](e, r, i), i = null), + i; + } + _0x137ba2.prototype[_0x5612de(494) == typeof Symbol && Symbol[_0x5612de(380)] || _0x5612de(560)] = function () { + return this; + }; + _0x137ba2[_0x5612de(836)].next = function (e) { + var r = _0x5612de; + return this[r(433)](r(905), e); + }; + _0x137ba2[_0x5612de(836)].throw = function (e) { + var r = _0x5612de; + return this[r(433)]("throw", e); + }; + _0x137ba2[_0x5612de(836)][_0x5612de(765)] = function (e) { + var r = _0x5612de; + return this[r(433)](r(765), e); + }; + var _0x371360 = 0; + var _0x4d6c78; + var _0x312e19; + var _0x2a32a1; + var _0x371ac2; + function _0x2ca065(e) { + var r = _0x5612de; + return r(869) + _0x371360++ + "_" + e; + } + function _0x33f649(e, r) { + var t = _0x5612de; + if (!Object.prototype[t(952)][t(820)](e, r)) { + throw new TypeError(t(625)); + } + return e; + } + function _0x4c53b8(e, r) { + var t = _0x5612de; + return _0x1de0ff(e, _0x3feef3(e, r, t(811))); + } + function _0xf01d58(e, r, t) { + var a = _0x5612de; + return _0x30760d(e, _0x3feef3(e, r, a(484)), t), + t; + } + function _0x3ff428(e, r) { + var t = _0x5612de; + return _0x1af7ca(e, _0x3feef3(e, r, t(484))); + } + function _0x3feef3(e, r, t) { + var a = _0x5612de; + if (!r[a(764)](e)) { + throw new TypeError(a(685) + t + a(701)); + } + return r[a(811)](e); + } + function _0x46f318(e, r, t) { + var a = _0x5612de; + return _0x3fbf28(e, r), + _0x234ff5(t, a(811)), + _0x1de0ff(e, t); + } + function _0x3d490a(e, r, t, a) { + return _0x3fbf28(e, r), + _0x234ff5(t, "set"), + _0x30760d(e, t, a), + a; + } + function _0x1f2159(e, r, t) { + return _0x3fbf28(e, r), + t; + } + function _0x2fcc7b() { + var e = _0x5612de; + throw new TypeError(e(445)); + } + function _0x1de0ff(e, r) { + var t = _0x5612de; + return r[t(811)] ? r[t(811)][t(820)](e) : r[t(740)]; + } + function _0x30760d(e, r, t) { + var a = _0x5612de; + if (r.set) { + r.set[a(820)](e, t); + } else { + if (!r.writable) { + throw new TypeError("attempted to set read only private field"); + } + r.value = t; + } + } + function _0x1af7ca(e, r) { + var t = _0x5612de; + if (r[t(484)]) { + return t(879) in r || (r.__destrObj = { + set value(a) { + var n = t; + r[n(484)][n(820)](e, a); + } + }), + r.__destrObj; + } + if (!r[t(739)]) { + throw new TypeError("attempted to set read only private field"); + } + return r; + } + function _0x153ad5(e, r, t) { + var a = _0x5612de; + return _0x3fbf28(e, r), + _0x234ff5(t, a(484)), + _0x1af7ca(e, t); + } + function _0x3fbf28(e, r) { + if (e !== r) { + throw new TypeError("Private static access of wrong provenance"); + } + } + function _0x234ff5(e, r) { + var t = _0x5612de; + if (void 0 === e) { + throw new TypeError(t(685) + r + " private static field before its declaration"); + } + } + function _0x3cd893(e, r, t, a) { + var n = _0x5612de; + var f = _0xdaf8f6(); + if (a) { + for (var i = 0; i < a[n(601)]; i++) { + f = a[i](f); + } + } + var c = r(function (e) { + var r = n; + f[r(787)](e, o[r(613)]); + }, t); + var o = f[n(735)](_0x872852(c.d[n(459)](_0x210308)), e); + return f[n(535)](c.F, o[n(613)]), + f[n(357)](c.F, o[n(924)]); + } + function _0xdaf8f6() { + var e = _0x5612de; + _0xdaf8f6 = function () { + return r; + }; + var r = { + elementsDefinitionOrder: [[e(602)], [e(572)]], + initializeInstanceElements: function (r, t) { + var a = e; + [a(602), a(572)][a(596)](function (e) { + var n = a; + t[n(596)](function (t) { + var a = n; + t.kind === e && a(565) === t[a(533)] && this[a(737)](r, t); + }, this); + }, this); + }, + initializeClassElements: function (r, t) { + var a = e; + var n = r[a(836)]; + [a(602), a(572)].forEach(function (e) { + t.forEach(function (t) { + var a = w_0x25f3; + var f = t[a(533)]; + if (t[a(623)] === e && (a(918) === f || a(836) === f)) { + if (a(918) === f) { + var i = r; + } else { + i = n; + } + this[a(737)](i, t); + } + }, this); + }, this); + }, + defineClassElement: function (r, t) { + var a = e; + var n = t.descriptor; + if (a(572) === t[a(623)]) { + var f = t[a(720)]; + n = { + enumerable: n[a(570)], + writable: n[a(739)], + configurable: n[a(700)], + value: void 0 === f ? void 0 : f[a(820)](r) + }; + } + Object[a(373)](r, t.key, n); + }, + decorateClass: function (r, t) { + var a = e; + var n = []; + var f = []; + var i = { + static: [], + prototype: [], + own: [] + }; + if (r[a(596)](function (e) { + var r = a; + this[r(829)](e, i); + }, this), r[a(596)](function (e) { + var r = a; + if (!_0x51f3b5(e)) { + return n[r(878)](e); + } + var t = this[r(428)](e, i); + n[r(878)](t[r(518)]); + n[r(878)].apply(n, t[r(956)]); + f[r(878)].apply(f, t[r(924)]); + }, this), !t) { + return { + elements: n, + finishers: f + }; + } + var c = this[a(844)](n, t); + return f.push[a(519)](f, c[a(924)]), + c[a(924)] = f, + c; + }, + addElementPlacement: function (r, t, a) { + var n = e; + var f = t[r[n(533)]]; + if (!a && -1 !== f.indexOf(r.key)) { + throw new TypeError("Duplicated element (" + r[n(914)] + ")"); + } + f[n(878)](r[n(914)]); + }, + decorateElement: function (r, t) { + var a = e; + for (var n = [], f = [], i = r.decorators, c = i[a(601)] - 1; c >= 0; c--) { + var o = t[r[a(533)]]; + o[a(748)](o[a(709)](r[a(914)]), 1); + var d = this[a(882)](r); + var _ = this[a(394)]((0, i[c])(d) || d); + r = _.element; + this.addElementPlacement(r, t); + _[a(756)] && f[a(878)](_[a(756)]); + var x = _[a(956)]; + if (x) { + for (var u = 0; u < x[a(601)]; u++) { + this[a(829)](x[u], t); + } + n[a(878)].apply(n, x); + } + } + return { + element: r, + finishers: f, + extras: n + }; + }, + decorateConstructor: function (r, t) { + var a = e; + for (var n = [], f = t[a(601)] - 1; f >= 0; f--) { + var i = this[a(403)](r); + var c = this[a(804)]((0, t[f])(i) || i); + if (void 0 !== c[a(756)] && n[a(878)](c[a(756)]), void 0 !== c.elements) { + r = c[a(613)]; + for (var o = 0; o < r[a(601)] - 1; o++) { + for (var d = o + 1; d < r.length; d++) { + if (r[o][a(914)] === r[d][a(914)] && r[o][a(533)] === r[d][a(533)]) { + throw new TypeError(a(871) + r[o][a(914)] + ")"); + } + } + } + } + } + return { + elements: r, + finishers: n + }; + }, + fromElementDescriptor: function (r) { + var t = e; + var a = { + kind: r[t(623)], + key: r.key, + placement: r.placement, + descriptor: r[t(527)] + }; + return Object[t(373)](a, Symbol[t(448)], { + value: t(488), + configurable: !0 + }), + t(572) === r.kind && (a[t(720)] = r.initializer), + a; + }, + toElementDescriptors: function (e) { + if (void 0 !== e) { + return _0x5c885(e).map(function (e) { + var r = w_0x25f3; + var t = this[r(606)](e); + return this.disallowProperty(e, r(756), r(543)), + this[r(538)](e, r(956), r(543)), + t; + }, this); + } + }, + toElementDescriptor: function (r) { + var t = e; + var a = String(r[t(623)]); + if (t(602) !== a && t(572) !== a) { + throw new TypeError('An element descriptor\'s .kind property must be either "method" or "field", but a decorator created an element descriptor with .kind "' + a + '"'); + } + var n = _0x32e885(r[t(914)]); + var f = String(r[t(533)]); + if (t(918) !== f && t(836) !== f && t(565) !== f) { + throw new TypeError(t(693) + f + '"'); + } + var i = r[t(527)]; + this[t(538)](r, "elements", t(543)); + var c = { + kind: a, + key: n, + placement: f, + descriptor: Object[t(672)]({}, i) + }; + return t(572) !== a ? this[t(538)](r, t(720), t(653)) : (this.disallowProperty(i, t(811), t(631)), + this.disallowProperty(i, "set", t(631)), this.disallowProperty(i, t(740), t(631)), + c.initializer = r[t(720)]), + c; + }, + toElementFinisherExtras: function (r) { + var t = e; + return { + element: this[t(606)](r), + finisher: _0x22df7b(r, t(756)), + extras: this[t(880)](r.extras) + }; + }, + fromClassDescriptor: function (r) { + var t = e; + var a = { + kind: t(412), + elements: r.map(this[t(882)], this) + }; + return Object[t(373)](a, Symbol[t(448)], { + value: t(488), + configurable: !0 + }), + a; + }, + toClassDescriptor: function (r) { + var t = e; + var a = String(r[t(623)]); + if ("class" !== a) { + throw new TypeError('A class descriptor\'s .kind property must be "class", but a decorator created a class descriptor with .kind "' + a + '"'); + } + this.disallowProperty(r, t(914), "A class descriptor"); + this[t(538)](r, t(533), "A class descriptor"); + this[t(538)](r, t(527), t(417)); + this.disallowProperty(r, "initializer", t(417)); + this[t(538)](r, t(956), "A class descriptor"); + var n = _0x22df7b(r, t(756)); + return { + elements: this.toElementDescriptors(r.elements), + finisher: n + }; + }, + runClassFinishers: function (r, t) { + var a = e; + for (var n = 0; n < t[a(601)]; n++) { + var f = (0, t[n])(r); + if (void 0 !== f) { + if (a(494) != typeof f) { + throw new TypeError("Finishers must return a constructor."); + } + r = f; + } + } + return r; + }, + disallowProperty: function (r, t, a) { + var n = e; + if (void 0 !== r[t]) { + throw new TypeError(a + n(562) + t + n(673)); + } + } + }; + return r; + } + function _0x210308(e) { + var r = _0x5612de; + var t; + var a = _0x32e885(e.key); + r(602) === e[r(623)] ? t = { + value: e[r(740)], + writable: !0, + configurable: !0, + enumerable: !1 + } + : r(811) === e[r(623)] ? t = { + get: e.value, + configurable: !0, + enumerable: !1 + } + : "set" === e[r(623)] ? t = { + set: e[r(740)], + configurable: !0, + enumerable: !1 + } + : r(572) === e.kind && (t = { + configurable: !0, + writable: !0, + enumerable: !0 + }); + var n = { + kind: r(572) === e[r(623)] ? r(572) : "method", + key: a, + placement: e[r(918)] ? r(918) : "field" === e[r(623)] ? "own" : r(836), + descriptor: t + }; + return e.decorators && (n[r(439)] = e[r(439)]), + r(572) === e.kind && (n.initializer = e[r(740)]), + n; + } + function _0x3b2c5d(e, r) { + var t = _0x5612de; + void 0 !== e[t(527)][t(811)] ? r.descriptor[t(811)] = e.descriptor[t(811)] : r.descriptor.set = e[t(527)][t(484)]; + } + function _0x872852(e) { + var r = _0x5612de; + for (var t = [], a = function (e) { + var r = w_0x25f3; + return r(602) === e[r(623)] && e[r(914)] === i.key && e[r(533)] === i[r(533)]; + }, n = 0; n < e[r(601)]; n++) { + var f; + var i = e[n]; + if (r(602) === i[r(623)] && (f = t.find(a))) { + if (_0x3f9244(i[r(527)]) || _0x3f9244(f[r(527)])) { + if (_0x51f3b5(i) || _0x51f3b5(f)) { + throw new ReferenceError("Duplicated methods (" + i[r(914)] + r(523)); + } + f[r(527)] = i[r(527)]; + } else { + if (_0x51f3b5(i)) { + if (_0x51f3b5(f)) { + throw new ReferenceError("Decorators can't be placed on different accessors with for the same property (" + i.key + ")."); + } + f[r(439)] = i[r(439)]; + } + _0x3b2c5d(i, f); + } + } else { + t[r(878)](i); + } + } + return t; + } + function _0x51f3b5(e) { + var r = _0x5612de; + return e[r(439)] && e.decorators.length; + } + function _0x3f9244(e) { + var r = _0x5612de; + return void 0 !== e && !(void 0 === e[r(740)] && void 0 === e[r(739)]); + } + function _0x22df7b(e, r) { + var t = _0x5612de; + var a = e[r]; + if (void 0 !== a && t(494) != typeof a) { + throw new TypeError("Expected '" + r + t(512)); + } + return a; + } + function _0x44a779(e, r, t) { + var a = _0x5612de; + if (!r[a(764)](e)) { + throw new TypeError(a(391)); + } + return t; + } + function _0x227cd9(e, r) { + var t = _0x5612de; + if (r[t(764)](e)) { + throw new TypeError("Cannot initialize the same private elements twice on an object"); + } + } + function _0x41d2eb(e, r, t) { + _0x227cd9(e, r); + r.set(e, t); + } + function _0x4fd04a(e, r) { + var t = _0x5612de; + _0x227cd9(e, r); + r[t(818)](e); + } + function _0x4fb313() { + throw new TypeError("attempted to reassign private method"); + } + function _0x4e4f66(e) { + return e; + } + _0x5612de(494) != typeof Object[_0x5612de(672)] && Object.defineProperty(Object, _0x5612de(672), { + value: function (e, r) { + var t = _0x5612de; + if (null == e) { + throw new TypeError(t(719)); + } + for (var a = Object(e), n = 1; n < arguments[t(601)]; n++) { + var f = arguments[n]; + if (null != f) { + for (var i in f) { + Object[t(836)][t(952)][t(820)](f, i) && (a[i] = f[i]); + } + } + } + return a; + }, + writable: !0, + configurable: !0 + }); + Object[_0x5612de(383)] || (Object.keys = (_0x4d6c78 = Object[_0x5612de(836)][_0x5612de(952)], + _0x312e19 = !{ + toString: null + } + [_0x5612de(474)]("toString"), _0x2a32a1 = [_0x5612de(942), _0x5612de(712), _0x5612de(771), _0x5612de(952), "isPrototypeOf", _0x5612de(474), "constructor"], + _0x371ac2 = _0x2a32a1[_0x5612de(601)], function (e) { + var r = _0x5612de; + if (r(494) != typeof e && (r(381) !== _0x1db123(e) || null === e)) { + throw new TypeError(r(884)); + } + var t; + var a; + var n = []; + for (t in e) { + _0x4d6c78[r(820)](e, t) && n[r(878)](t); + } + if (_0x312e19) { + for (a = 0; a < _0x371ac2; a++) { + _0x4d6c78.call(e, _0x2a32a1[a]) && n[r(878)](_0x2a32a1[a]); + } + } + return n; + })); + var _0x45b94b = { + __version__: _0x5612de(359), + feVersion: 2, + domNotValid: !1, + refererKey: _0x5612de(792), + pushVersion: _0x5612de(714), + secInfoHeader: _0x5612de(584) + }; + function _0x598972(e, r) { + var t = _0x5612de; + if (t(828) == typeof r) { + for (var a, n = e + "=", f = r[t(834)](/[;&]/), i = 0; i < f[t(601)]; i++) { + for (a = f[i]; " " === a.charAt(0);) { + a = a[t(432)](1, a.length); + } + if (0 === a[t(709)](n)) { + return a[t(432)](n[t(601)], a[t(601)]); + } + } + } + } + function _0x24dc34(e) { + var r = _0x5612de; + try { + var t = ""; + return window.sessionStorage && (t = window.sessionStorage[r(728)](e)) || window[r(476)] && (t = window[r(476)][r(728)](e)) ? t : t = _0x598972(e, document.cookie); + } catch (e) { + console.log(e); + return ""; + } + } + function _0x1f42cb(e, r) { + var t = _0x5612de; + try { + window[t(958)] && window.sessionStorage.setItem(e, r); + window[t(476)] && window[t(476)][t(452)](e, r); + document[t(626)] = e + t(862); + document[t(626)] = e + "=" + r + t(449) + new Date(new Date().getTime() + 6048e5)[t(350)]() + t(961); + } catch (e) { + console.log(e); + } + } + function _0x2ecc5a(e) { + var r = _0x5612de; + try { + window[r(958)] && window.sessionStorage.removeItem(e); + window[r(476)] && window[r(476)][r(707)](e); + document[r(626)] = e + r(862); + } catch (e) { + console.log(e); + } + } + for (var _0x462335 = { + boe: !1, + aid: 0, + dfp: !1, + sdi: !1, + enablePathList: [], + _enablePathListRegex: [], + urlRewriteRules: [], + _urlRewriteRules: [], + initialized: !1, + enableTrack: !1, + track: { + unitTime: 0, + unitAmount: 0, + fre: 0 + }, + triggerUnload: !1, + region: "", + regionConf: {}, + umode: 0, + v: !1, + _enableSignature: [], + perf: !1, + xxbg: !0 + }, _0x3d40ff = { + debug: function (e, r) { + var t = _0x5612de; + _0x462335[t(438)]; + } + }, _0x100715 = _0x5612de(727)[_0x5612de(834)](""), _0x1f510e = [], _0x37750d = [], _0x1cb307 = 0; _0x1cb307 < 256; _0x1cb307++) { + _0x1f510e[_0x1cb307] = _0x100715[_0x1cb307 >> 4 & 15] + _0x100715[15 & _0x1cb307]; + _0x1cb307 < 16 && (_0x1cb307 < 10 ? _0x37750d[48 + _0x1cb307] = _0x1cb307 : _0x37750d[87 + _0x1cb307] = _0x1cb307); + } + var _0x55de18 = function (e) { + var r = _0x5612de; + for (var t = e[r(601)], a = "", n = 0; n < t;) { + a += _0x1f510e[e[n++]]; + } + return a; + }; + var _0x655940 = function (e) { + for (var r = e.length >> 1, t = r << 1, a = new Uint8Array(r), n = 0, f = 0; f < t;) { + a[n++] = _0x37750d[e.charCodeAt(f++)] << 4 | _0x37750d[e.charCodeAt(f++)]; + } + return a; + }; + var _0x42e709 = { + encode: _0x55de18, + decode: _0x655940 + }; + if (_0x5612de(900) != typeof globalThis) { + var _0x1e7721 = globalThis; + } else { + var _0x1e7721 = _0x5612de(900) != typeof window ? window : _0x5612de(900) != typeof global ? global : "undefined" != typeof self ? self : {}; + } + function _0x3bc8d3(e) { + var r = _0x5612de; + return e && e[r(957)] && Object[r(836)][r(952)][r(820)](e, r(467)) ? e[r(467)] : e; + } + function _0x3abc0b(e) { + var r = _0x5612de; + return e && Object[r(836)].hasOwnProperty[r(820)](e, r(467)) ? e[r(467)] : e; + } + function _0x41ace1(e) { + var r = _0x5612de; + return e && Object[r(836)][r(952)].call(e, r(467)) && 1 === Object[r(383)](e)[r(601)] ? e[r(467)] : e; + } + function _0x3e9554(e) { + var r = _0x5612de; + if (e[r(957)]) { + return e; + } + var t = Object[r(373)]({}, r(957), { + value: !0 + }); + return Object[r(383)](e).forEach(function (a) { + var n = r; + var f = Object[n(678)](e, a); + Object.defineProperty(t, a, f[n(811)] ? f : { + enumerable: !0, + get: function () { + return e[a]; + } + }); + }), + t; + } + function _0x56409e(e) { + var r = _0x5612de; + var t = { + exports: {} + }; + return e(t, t[r(440)]), + t.exports; + } + function _0x171dc9(e) { + var r = _0x5612de; + throw new Error(r(877) + e + r(855)); + } + var _0x90795 = _0x56409e(function (_0xb9c7d1) { + !function () { + var _0x2db296 = w_0x25f3; + var _0x1f977a = "input is invalid type"; + var _0x5a87b4 = _0x2db296(381) == typeof window; + var _0x11d177 = _0x5a87b4 ? window : {}; + _0x11d177[_0x2db296(890)] && (_0x5a87b4 = !1); + var _0x387fd8 = !_0x5a87b4 && _0x2db296(381) == typeof self; + var _0x2e1226 = !_0x11d177[_0x2db296(534)] && _0x2db296(381) == typeof process && process[_0x2db296(404)] && process[_0x2db296(404)][_0x2db296(647)]; + _0x2e1226 ? _0x11d177 = _0x1e7721 : _0x387fd8 && (_0x11d177 = self); + var _0x299a21 = !_0x11d177.JS_MD5_NO_COMMON_JS && _0xb9c7d1[_0x2db296(440)]; + var _0x5efc8f = !1; + var _0x1edc95 = !_0x11d177[_0x2db296(742)] && "undefined" != typeof ArrayBuffer; + var _0x142491 = _0x2db296(727)[_0x2db296(834)](""); + var _0x146907 = [128, 32768, 8388608, -2147483648]; + var _0x4d13bd = [0, 8, 16, 24]; + var _0x3f581b = [_0x2db296(850), _0x2db296(568), _0x2db296(411), _0x2db296(629), "arrayBuffer", _0x2db296(607)]; + var _0xcb4d61 = _0x2db296(789)[_0x2db296(834)](""); + var _0x5c5e45 = []; + var _0x54b265; + if (_0x1edc95) { + var _0x171107 = new ArrayBuffer(68); + _0x54b265 = new Uint8Array(_0x171107); + _0x5c5e45 = new Uint32Array(_0x171107); + } + !_0x11d177[_0x2db296(534)] && Array[_0x2db296(687)] || (Array.isArray = function (e) { + var r = _0x2db296; + return r(817) === Object.prototype.toString.call(e); + }); + !_0x1edc95 || !_0x11d177[_0x2db296(773)] && ArrayBuffer.isView || (ArrayBuffer.isView = function (e) { + var r = _0x2db296; + return r(381) == typeof e && e[r(629)] && e.buffer[r(684)] === ArrayBuffer; + }); + var _0x2e393f = function (e) { + return function (r) { + var t = w_0x25f3; + return new _0x22f902(!0)[t(725)](r)[e](); + }; + }; + var _0x1edabb = function () { + var e = _0x2db296; + var r = _0x2e393f(e(850)); + _0x2e1226 && (r = _0x4d7e2d(r)); + r[e(951)] = function () { + return new _0x22f902(); + }; + r.update = function (e) { + return r.create().update(e); + }; + for (var t = 0; t < _0x3f581b[e(601)]; ++t) { + var a = _0x3f581b[t]; + r[a] = _0x2e393f(a); + } + return r; + }; + var _0x4d7e2d = function (_0x1afe1b) { + var _0x3e0a6e = eval("var _0x13db80 = w_0x25f3;require(_0x13db80(628));"); + var _0x5bfe7e = eval("var _0x20dc8b = w_0x25f3;require('buffer')[_0x20dc8b(424)];"); + var _0x3d7396 = function (e) { + var r = w_0x25f3; + if (r(828) == typeof e) { + return _0x3e0a6e[r(458)](r(860))[r(725)](e, r(680))[r(411)](r(850)); + } + if (null == e) { + throw _0x1f977a; + } + return e[r(684)] === ArrayBuffer && (e = new Uint8Array(e)), + Array[r(687)](e) || ArrayBuffer[r(711)](e) || e[r(684)] === _0x5bfe7e ? _0x3e0a6e[r(458)](r(860)).update(new _0x5bfe7e(e))[r(411)](r(850)) : _0x1afe1b(e); + }; + return _0x3d7396; + }; + function _0x22f902(e) { + var r = _0x2db296; + if (e) { + _0x5c5e45[0] = _0x5c5e45[16] = _0x5c5e45[1] = _0x5c5e45[2] = _0x5c5e45[3] = _0x5c5e45[4] = _0x5c5e45[5] = _0x5c5e45[6] = _0x5c5e45[7] = _0x5c5e45[8] = _0x5c5e45[9] = _0x5c5e45[10] = _0x5c5e45[11] = _0x5c5e45[12] = _0x5c5e45[13] = _0x5c5e45[14] = _0x5c5e45[15] = 0; + this.blocks = _0x5c5e45; + this[r(809)] = _0x54b265; + } else if (_0x1edc95) { + var t = new ArrayBuffer(68); + this[r(809)] = new Uint8Array(t); + this[r(793)] = new Uint32Array(t); + } else { + this[r(793)] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; + } + this.h0 = this.h1 = this.h2 = this.h3 = this[r(901)] = this[r(603)] = this[r(461)] = 0; + this[r(386)] = this[r(489)] = !1; + this[r(415)] = !0; + } + _0x22f902[_0x2db296(836)][_0x2db296(725)] = function (e) { + var r = _0x2db296; + if (!this.finalized) { + var t; + var a = typeof e; + if (r(828) !== a) { + if ("object" !== a) { + throw _0x1f977a; + } + if (null === e) { + throw _0x1f977a; + } + if (_0x1edc95 && e.constructor === ArrayBuffer) { + e = new Uint8Array(e); + } else if (!(Array[r(687)](e) || _0x1edc95 && ArrayBuffer.isView(e))) { + throw _0x1f977a; + } + t = !0; + } + for (var n, f, i = 0, c = e[r(601)], o = this[r(793)], d = this[r(809)]; i < c;) { + if (this[r(489)] && (this[r(489)] = !1, o[0] = o[16], o[16] = o[1] = o[2] = o[3] = o[4] = o[5] = o[6] = o[7] = o[8] = o[9] = o[10] = o[11] = o[12] = o[13] = o[14] = o[15] = 0), + t) { + if (_0x1edc95) { + for (f = this[r(901)]; i < c && f < 64; ++i) { + d[f++] = e[i]; + } + } else { + for (f = this[r(901)]; i < c && f < 64; ++i) { + o[f >> 2] |= e[i] << _0x4d13bd[3 & f++]; + } + } + } else if (_0x1edc95) { + for (f = this[r(901)]; i < c && f < 64; ++i) { + if ((n = e[r(405)](i)) < 128) { + d[f++] = n; + } else if (n < 2048) { + d[f++] = 192 | n >> 6; + d[f++] = 128 | 63 & n; + } else if (n < 55296 || n >= 57344) { + d[f++] = 224 | n >> 12; + d[f++] = 128 | n >> 6 & 63; + d[f++] = 128 | 63 & n; + } else { + n = 65536 + ((1023 & n) << 10 | 1023 & e[r(405)](++i)); + d[f++] = 240 | n >> 18; + d[f++] = 128 | n >> 12 & 63; + d[f++] = 128 | n >> 6 & 63; + d[f++] = 128 | 63 & n; + } + } + } else { + for (f = this[r(901)]; i < c && f < 64; ++i) { + if ((n = e[r(405)](i)) < 128) { + o[f >> 2] |= n << _0x4d13bd[3 & f++]; + } else if (n < 2048) { + o[f >> 2] |= (192 | n >> 6) << _0x4d13bd[3 & f++]; + o[f >> 2] |= (128 | 63 & n) << _0x4d13bd[3 & f++]; + } else if (n < 55296 || n >= 57344) { + o[f >> 2] |= (224 | n >> 12) << _0x4d13bd[3 & f++]; + o[f >> 2] |= (128 | n >> 6 & 63) << _0x4d13bd[3 & f++]; + o[f >> 2] |= (128 | 63 & n) << _0x4d13bd[3 & f++]; + } else { + n = 65536 + ((1023 & n) << 10 | 1023 & e[r(405)](++i)); + o[f >> 2] |= (240 | n >> 18) << _0x4d13bd[3 & f++]; + o[f >> 2] |= (128 | n >> 12 & 63) << _0x4d13bd[3 & f++]; + o[f >> 2] |= (128 | n >> 6 & 63) << _0x4d13bd[3 & f++]; + o[f >> 2] |= (128 | 63 & n) << _0x4d13bd[3 & f++]; + } + } + } + this.lastByteIndex = f; + this[r(603)] += f - this.start; + f >= 64 ? (this[r(901)] = f - 64, this[r(698)](), this[r(489)] = !0) : this[r(901)] = f; + } + return this[r(603)] > 4294967295 && (this.hBytes += this.bytes / 4294967296 << 0, + this[r(603)] = this[r(603)] % 4294967296), + this; + } + }; + _0x22f902[_0x2db296(836)][_0x2db296(473)] = function () { + var e = _0x2db296; + if (!this[e(386)]) { + this[e(386)] = !0; + var r = this[e(793)]; + var t = this[e(814)]; + r[t >> 2] |= _0x146907[3 & t]; + t >= 56 && (this.hashed || this.hash(), r[0] = r[16], r[16] = r[1] = r[2] = r[3] = r[4] = r[5] = r[6] = r[7] = r[8] = r[9] = r[10] = r[11] = r[12] = r[13] = r[14] = r[15] = 0); + r[14] = this[e(603)] << 3; + r[15] = this[e(461)] << 3 | this[e(603)] >>> 29; + this.hash(); + } + }; + _0x22f902[_0x2db296(836)][_0x2db296(698)] = function () { + var e = _0x2db296; + var r; + var t; + var a; + var n; + var f; + var i; + var c = this[e(793)]; + this.first ? t = ((t = ((r = ((r = c[0] - 680876937) << 7 | r >>> 25) - 271733879 << 0) ^ (a = ((a = (-271733879 ^ (n = ((n = (-1732584194 ^ 2004318071 & r) + c[1] - 117830708) << 12 | n >>> 20) + r << 0) & (-271733879 ^ r)) + c[2] - 1126478375) << 17 | a >>> 15) + n << 0) & (n ^ r)) + c[3] - 1316259209) << 22 | t >>> 10) + a << 0 : (r = this.h0, + t = this.h1, a = this.h2, t = ((t += ((r = ((r += ((n = this.h3) ^ t & (a ^ n)) + c[0] - 680876936) << 7 | r >>> 25) + t << 0) ^ (a = ((a += (t ^ (n = ((n += (a ^ r & (t ^ a)) + c[1] - 389564586) << 12 | n >>> 20) + r << 0) & (r ^ t)) + c[2] + 606105819) << 17 | a >>> 15) + n << 0) & (n ^ r)) + c[3] - 1044525330) << 22 | t >>> 10) + a << 0); + t = ((t += ((r = ((r += (n ^ t & (a ^ n)) + c[4] - 176418897) << 7 | r >>> 25) + t << 0) ^ (a = ((a += (t ^ (n = ((n += (a ^ r & (t ^ a)) + c[5] + 1200080426) << 12 | n >>> 20) + r << 0) & (r ^ t)) + c[6] - 1473231341) << 17 | a >>> 15) + n << 0) & (n ^ r)) + c[7] - 45705983) << 22 | t >>> 10) + a << 0; + t = ((t += ((r = ((r += (n ^ t & (a ^ n)) + c[8] + 1770035416) << 7 | r >>> 25) + t << 0) ^ (a = ((a += (t ^ (n = ((n += (a ^ r & (t ^ a)) + c[9] - 1958414417) << 12 | n >>> 20) + r << 0) & (r ^ t)) + c[10] - 42063) << 17 | a >>> 15) + n << 0) & (n ^ r)) + c[11] - 1990404162) << 22 | t >>> 10) + a << 0; + t = ((t += ((r = ((r += (n ^ t & (a ^ n)) + c[12] + 1804603682) << 7 | r >>> 25) + t << 0) ^ (a = ((a += (t ^ (n = ((n += (a ^ r & (t ^ a)) + c[13] - 40341101) << 12 | n >>> 20) + r << 0) & (r ^ t)) + c[14] - 1502002290) << 17 | a >>> 15) + n << 0) & (n ^ r)) + c[15] + 1236535329) << 22 | t >>> 10) + a << 0; + t = ((t += ((n = ((n += (t ^ a & ((r = ((r += (a ^ n & (t ^ a)) + c[1] - 165796510) << 5 | r >>> 27) + t << 0) ^ t)) + c[6] - 1069501632) << 9 | n >>> 23) + r << 0) ^ r & ((a = ((a += (r ^ t & (n ^ r)) + c[11] + 643717713) << 14 | a >>> 18) + n << 0) ^ n)) + c[0] - 373897302) << 20 | t >>> 12) + a << 0; + t = ((t += ((n = ((n += (t ^ a & ((r = ((r += (a ^ n & (t ^ a)) + c[5] - 701558691) << 5 | r >>> 27) + t << 0) ^ t)) + c[10] + 38016083) << 9 | n >>> 23) + r << 0) ^ r & ((a = ((a += (r ^ t & (n ^ r)) + c[15] - 660478335) << 14 | a >>> 18) + n << 0) ^ n)) + c[4] - 405537848) << 20 | t >>> 12) + a << 0; + t = ((t += ((n = ((n += (t ^ a & ((r = ((r += (a ^ n & (t ^ a)) + c[9] + 568446438) << 5 | r >>> 27) + t << 0) ^ t)) + c[14] - 1019803690) << 9 | n >>> 23) + r << 0) ^ r & ((a = ((a += (r ^ t & (n ^ r)) + c[3] - 187363961) << 14 | a >>> 18) + n << 0) ^ n)) + c[8] + 1163531501) << 20 | t >>> 12) + a << 0; + t = ((t += ((n = ((n += (t ^ a & ((r = ((r += (a ^ n & (t ^ a)) + c[13] - 1444681467) << 5 | r >>> 27) + t << 0) ^ t)) + c[2] - 51403784) << 9 | n >>> 23) + r << 0) ^ r & ((a = ((a += (r ^ t & (n ^ r)) + c[7] + 1735328473) << 14 | a >>> 18) + n << 0) ^ n)) + c[12] - 1926607734) << 20 | t >>> 12) + a << 0; + t = ((t += ((i = (n = ((n += ((f = t ^ a) ^ (r = ((r += (f ^ n) + c[5] - 378558) << 4 | r >>> 28) + t << 0)) + c[8] - 2022574463) << 11 | n >>> 21) + r << 0) ^ r) ^ (a = ((a += (i ^ t) + c[11] + 1839030562) << 16 | a >>> 16) + n << 0)) + c[14] - 35309556) << 23 | t >>> 9) + a << 0; + t = ((t += ((i = (n = ((n += ((f = t ^ a) ^ (r = ((r += (f ^ n) + c[1] - 1530992060) << 4 | r >>> 28) + t << 0)) + c[4] + 1272893353) << 11 | n >>> 21) + r << 0) ^ r) ^ (a = ((a += (i ^ t) + c[7] - 155497632) << 16 | a >>> 16) + n << 0)) + c[10] - 1094730640) << 23 | t >>> 9) + a << 0; + t = ((t += ((i = (n = ((n += ((f = t ^ a) ^ (r = ((r += (f ^ n) + c[13] + 681279174) << 4 | r >>> 28) + t << 0)) + c[0] - 358537222) << 11 | n >>> 21) + r << 0) ^ r) ^ (a = ((a += (i ^ t) + c[3] - 722521979) << 16 | a >>> 16) + n << 0)) + c[6] + 76029189) << 23 | t >>> 9) + a << 0; + t = ((t += ((i = (n = ((n += ((f = t ^ a) ^ (r = ((r += (f ^ n) + c[9] - 640364487) << 4 | r >>> 28) + t << 0)) + c[12] - 421815835) << 11 | n >>> 21) + r << 0) ^ r) ^ (a = ((a += (i ^ t) + c[15] + 530742520) << 16 | a >>> 16) + n << 0)) + c[2] - 995338651) << 23 | t >>> 9) + a << 0; + t = ((t += ((n = ((n += (t ^ ((r = ((r += (a ^ (t | ~n)) + c[0] - 198630844) << 6 | r >>> 26) + t << 0) | ~a)) + c[7] + 1126891415) << 10 | n >>> 22) + r << 0) ^ ((a = ((a += (r ^ (n | ~t)) + c[14] - 1416354905) << 15 | a >>> 17) + n << 0) | ~r)) + c[5] - 57434055) << 21 | t >>> 11) + a << 0; + t = ((t += ((n = ((n += (t ^ ((r = ((r += (a ^ (t | ~n)) + c[12] + 1700485571) << 6 | r >>> 26) + t << 0) | ~a)) + c[3] - 1894986606) << 10 | n >>> 22) + r << 0) ^ ((a = ((a += (r ^ (n | ~t)) + c[10] - 1051523) << 15 | a >>> 17) + n << 0) | ~r)) + c[1] - 2054922799) << 21 | t >>> 11) + a << 0; + t = ((t += ((n = ((n += (t ^ ((r = ((r += (a ^ (t | ~n)) + c[8] + 1873313359) << 6 | r >>> 26) + t << 0) | ~a)) + c[15] - 30611744) << 10 | n >>> 22) + r << 0) ^ ((a = ((a += (r ^ (n | ~t)) + c[6] - 1560198380) << 15 | a >>> 17) + n << 0) | ~r)) + c[13] + 1309151649) << 21 | t >>> 11) + a << 0; + t = ((t += ((n = ((n += (t ^ ((r = ((r += (a ^ (t | ~n)) + c[4] - 145523070) << 6 | r >>> 26) + t << 0) | ~a)) + c[11] - 1120210379) << 10 | n >>> 22) + r << 0) ^ ((a = ((a += (r ^ (n | ~t)) + c[2] + 718787259) << 15 | a >>> 17) + n << 0) | ~r)) + c[9] - 343485551) << 21 | t >>> 11) + a << 0; + this.first ? (this.h0 = r + 1732584193 << 0, this.h1 = t - 271733879 << 0, this.h2 = a - 1732584194 << 0, + this.h3 = n + 271733878 << 0, this[e(415)] = !1) : (this.h0 = this.h0 + r << 0, + this.h1 = this.h1 + t << 0, this.h2 = this.h2 + a << 0, this.h3 = this.h3 + n << 0); + }; + _0x22f902[_0x2db296(836)].hex = function () { + this.finalize(); + var e = this.h0; + var r = this.h1; + var t = this.h2; + var a = this.h3; + return _0x142491[e >> 4 & 15] + _0x142491[15 & e] + _0x142491[e >> 12 & 15] + _0x142491[e >> 8 & 15] + _0x142491[e >> 20 & 15] + _0x142491[e >> 16 & 15] + _0x142491[e >> 28 & 15] + _0x142491[e >> 24 & 15] + _0x142491[r >> 4 & 15] + _0x142491[15 & r] + _0x142491[r >> 12 & 15] + _0x142491[r >> 8 & 15] + _0x142491[r >> 20 & 15] + _0x142491[r >> 16 & 15] + _0x142491[r >> 28 & 15] + _0x142491[r >> 24 & 15] + _0x142491[t >> 4 & 15] + _0x142491[15 & t] + _0x142491[t >> 12 & 15] + _0x142491[t >> 8 & 15] + _0x142491[t >> 20 & 15] + _0x142491[t >> 16 & 15] + _0x142491[t >> 28 & 15] + _0x142491[t >> 24 & 15] + _0x142491[a >> 4 & 15] + _0x142491[15 & a] + _0x142491[a >> 12 & 15] + _0x142491[a >> 8 & 15] + _0x142491[a >> 20 & 15] + _0x142491[a >> 16 & 15] + _0x142491[a >> 28 & 15] + _0x142491[a >> 24 & 15]; + }; + _0x22f902.prototype[_0x2db296(942)] = _0x22f902[_0x2db296(836)].hex; + _0x22f902[_0x2db296(836)].digest = function () { + var e = _0x2db296; + this[e(473)](); + var r = this.h0; + var t = this.h1; + var a = this.h2; + var n = this.h3; + return [255 & r, r >> 8 & 255, r >> 16 & 255, r >> 24 & 255, 255 & t, t >> 8 & 255, t >> 16 & 255, t >> 24 & 255, 255 & a, a >> 8 & 255, a >> 16 & 255, a >> 24 & 255, 255 & n, n >> 8 & 255, n >> 16 & 255, n >> 24 & 255]; + }; + _0x22f902[_0x2db296(836)][_0x2db296(568)] = _0x22f902.prototype[_0x2db296(411)]; + _0x22f902.prototype[_0x2db296(585)] = function () { + var e = _0x2db296; + this[e(473)](); + var r = new ArrayBuffer(16); + var t = new Uint32Array(r); + return t[0] = this.h0, + t[1] = this.h1, + t[2] = this.h2, + t[3] = this.h3, + r; + }; + _0x22f902.prototype.buffer = _0x22f902[_0x2db296(836)][_0x2db296(585)]; + _0x22f902[_0x2db296(836)][_0x2db296(607)] = function () { + var e = _0x2db296; + for (var r, t, a, n = "", f = this[e(568)](), i = 0; i < 15;) { + r = f[i++]; + t = f[i++]; + a = f[i++]; + n += _0xcb4d61[r >>> 2] + _0xcb4d61[63 & (r << 4 | t >>> 4)] + _0xcb4d61[63 & (t << 2 | a >>> 6)] + _0xcb4d61[63 & a]; + } + return r = f[i], + n + (_0xcb4d61[r >>> 2] + _0xcb4d61[r << 4 & 63] + "=="); + }; + var _0x336469 = _0x1edabb(); + if (_0x299a21) { + _0xb9c7d1[_0x2db296(440)] = _0x336469; + } else { + _0x11d177[_0x2db296(860)] = _0x336469; + _0x5efc8f && (void 0)(function () { + return _0x336469; + }); + } + } + (); + }); + function _0x5dd467(e) { + var r = _0x5612de; + return w_0x5c3140(r(819), { + get 0() { + return _0x90795; + }, + 1: arguments, + 2: e + }, this); + } + function _0x176a57() { + var e = _0x5612de; + return !!document[e(883)]; + } + function _0x1230e7() { + return "undefined" != typeof InstallTrigger; + } + function _0xf8ccf1() { + var e = _0x5612de; + return /constructor/i[e(555)](window.HTMLElement) || e(550) === (!window.safari || e(900) != typeof safari && safari.pushNotification)[e(942)](); + } + function _0x30c916() { + var e = _0x5612de; + return new Date()[e(365)](); + } + function _0x5af46a(e) { + return null == e ? "" : "boolean" == typeof e ? e ? "1" : "0" : e; + } + function _0x325f58(e, r) { + var t = _0x5612de; + r || (r = t(588)); + for (var a = "", n = e; n > 0; --n) { + a += r[Math[t(463)](Math.random() * r[t(601)])]; + } + return a; + } + var _0x39693d = { + sec: 9, + asgw: 5, + init: 0 + }; + var _0x6caf = { + bogusIndex: 0, + msNewTokenList: [], + moveList: [], + clickList: [], + keyboardList: [], + activeState: [], + aidList: [] + }; + function _0x53b77d(e) { + return w_0x5c3140("484e4f4a403f5243001714366d6da13c00000025f8c25369000000ee00110307070002161103021200031103070700021303062b2f11030207000335490700044211010044001400011101014a1200001100010700010d05000000003c000e00054303491101034a12000607000711000143024911010433000611010412000833000911010412000812000947002100110107070002161101021200031101070700021303062b2f110102070003354902110105430047004f11010433002511010412000a11010412000b190400962934001111010412000c11010412000d190400962947002100110107070002161101021200031101070700021303062b2f11010207000335490842000e0e7170737c7b7045677a657067616c027c7108717077607272706707707b63767a71700003727061047c7b737a02307607767a7b667a797007737c67707760720a7a60617067427c71617d0a7c7b7b7067427c71617d0b7a606170675d707c727d610b7c7b7b70675d707c727d61", { + get 0() { + return Image; + }, + 1: Object, + get 2() { + return _0x6caf; + }, + get 3() { + return console; + }, + get 4() { + return window; + }, + get 5() { + return _0x1230e7; + }, + 6: arguments, + 7: e + }, this); + } + function _0x3ed707() { + var e = _0x5612de; + return w_0x5c3140(e(797), { + get 0() { + return navigator; + }, + get 1() { + var r = e; + return r(900) != typeof global ? global : void 0; + }, + 2: Object, + get 3() { + var r = e; + return r(900) != typeof process ? process : void 0; + }, + get 4() { + return _0x1db123; + }, + 5: arguments + }, this); + } + function _0x328bde(e, r, t) { + var a = _0x5612de; + var n = a(718); + var f = "="; + t && (f = ""); + r && (n = r); + for (var i, c = "", o = 0; e[a(601)] >= o + 3;) { + i = (255 & e[a(405)](o++)) << 16 | (255 & e[a(405)](o++)) << 8 | 255 & e[a(405)](o++); + c += n[a(604)]((16515072 & i) >> 18); + c += n.charAt((258048 & i) >> 12); + c += n.charAt((4032 & i) >> 6); + c += n[a(604)](63 & i); + } + return e[a(601)] - o > 0 && (i = (255 & e.charCodeAt(o++)) << 16 | (e.length > o ? (255 & e[a(405)](o)) << 8 : 0), + c += n[a(604)]((16515072 & i) >> 18), c += n.charAt((258048 & i) >> 12), c += e.length > o ? n[a(604)]((4032 & i) >> 6) : f, + c += f), + c; + } + function _0x389396(e, r) { + var t = _0x5612de; + return w_0x5c3140(t(941), { + 0: arguments, + 1: e, + 2: r + }, this); + } + function _0x3262d3(e) { + var r = _0x5612de; + return r(789)[r(709)](e); + } + function _0xb5350b(e) { + var r = _0x5612de; + var t; + var a; + var n; + var f; + var i; + var c = ""; + for (t = 0; t < e[r(601)] - 3; t += 4) { + a = _0x3262d3(e[r(604)](t)); + n = _0x3262d3(e[r(604)](t + 1)); + f = _0x3262d3(e[r(604)](t + 2)); + i = _0x3262d3(e.charAt(t + 3)); + c += String[r(482)](a << 2 | n >>> 4); + "=" !== e[r(604)](t + 2) && (c += String.fromCharCode(n << 4 & 240 | f >>> 2 & 15)); + "=" !== e[r(604)](t + 3) && (c += String[r(482)](f << 6 & 192 | i)); + } + return c; + } + _0x6caf[_0x5612de(896)] = 0; + _0x6caf.msToken = ""; + _0x6caf[_0x5612de(611)] = _0x39693d[_0x5612de(953)]; + _0x6caf[_0x5612de(949)] = ""; + _0x6caf.ttwid = ""; + _0x6caf[_0x5612de(790)] = ""; + _0x6caf[_0x5612de(825)] = ""; + var _0x28d239 = 0; + var _0x2d6b72; + var _0x1e9bba; + var _0xdc7355; + var _0xf08186; + function _0x33f406(e) { + var r = _0x5612de; + return e &= 63, + String[r(482)](e + (e < 26 ? 65 : e < 52 ? 71 : e < 62 ? -4 : -17)); + } + function _0x4da136(e) { + var r = _0x33f406; + return r(e >> 24) + r(e >> 18) + r(e >> 12) + r(e >> 6) + r(e); + } + _0x2d6b72 = _0x1e9bba = function (e) { + return _0x2d6b72 = _0xdc7355, + _0x28d239 = e, + _0x4da136(e >> 2); + }; + _0xdc7355 = function (e) { + _0x2d6b72 = _0xf08186; + var r = _0x28d239 << 28 | e >>> 4; + return _0x28d239 = e, + _0x4da136(r); + }; + _0xf08186 = function (e) { + return _0x2d6b72 = _0x1e9bba, + _0x4da136(_0x28d239 << 26 | e >>> 6) + _0x33f406(e); + }; + var _0x539097 = 2654435769; + var _0x12ada0; + function _0x75d5b3(e, r) { + var t = _0x5612de; + var a = e.length; + var n = a << 2; + if (r) { + var f = e[a - 1]; + if (f < (n -= 4) - 3 || f > n) { + return null; + } + n = f; + } + for (var i = 0; i < a; i++) { + e[i] = String.fromCharCode(255 & e[i], e[i] >>> 8 & 255, e[i] >>> 16 & 255, e[i] >>> 24 & 255); + } + var c = e[t(591)](""); + return r ? c.substring(0, n) : c; + } + function _0x183951(e, r) { + var t = _0x5612de; + var a; + var n = e[t(601)]; + var f = n >> 2; + 0 != (3 & n) && ++f; + r ? (a = new Array(f + 1))[f] = n : a = new Array(f); + for (var i = 0; i < n; ++i) { + a[i >> 2] |= e.charCodeAt(i) << ((3 & i) << 3); + } + return a; + } + function _0x25c901(e) { + return 4294967295 & e; + } + function _0x38d33e(e, r, t, a, n, f) { + return (t >>> 5 ^ r << 2) + (r >>> 3 ^ t << 4) ^ (e ^ r) + (f[3 & a ^ n] ^ t); + } + function _0x231484(e) { + var r = _0x5612de; + return e[r(601)] < 4 && (e[r(601)] = 4), + e; + } + function _0x3d58e7(e, r) { + var t = _0x5612de; + var a; + var n; + var f; + var i; + var c; + var o; + var d = e[t(601)]; + var _ = d - 1; + for (n = e[_], f = 0, o = 0 | Math[t(463)](6 + 52 / d); o > 0; --o) { + for (i = (f = _0x25c901(f + _0x539097)) >>> 2 & 3, c = 0; c < _; ++c) { + a = e[c + 1]; + n = e[c] = _0x25c901(e[c] + _0x38d33e(f, a, n, c, i, r)); + } + a = e[0]; + n = e[_] = _0x25c901(e[_] + _0x38d33e(f, a, n, _, i, r)); + } + return e; + } + function _0x4aaf04(e, r) { + var t = _0x5612de; + var a; + var n; + var f; + var i; + var c; + var o = e[t(601)]; + var d = o - 1; + for (a = e[0], f = _0x25c901(Math[t(463)](6 + 52 / o) * _0x539097); 0 !== f; f = _0x25c901(f - _0x539097)) { + for (i = f >>> 2 & 3, c = d; c > 0; --c) { + n = e[c - 1]; + a = e[c] = _0x25c901(e[c] - _0x38d33e(f, a, n, c, i, r)); + } + n = e[d]; + a = e[0] = _0x25c901(e[0] - _0x38d33e(f, a, n, 0, i, r)); + } + return e; + } + function _0x532596(e) { + var r = _0x5612de; + if (/^[\x00-\x7f]*$/[r(555)](e)) { + return e; + } + for (var t = [], a = e[r(601)], n = 0, f = 0; n < a; ++n, ++f) { + var i = e[r(405)](n); + if (i < 128) { + t[f] = e[r(604)](n); + } else if (i < 2048) { + t[f] = String.fromCharCode(192 | i >> 6, 128 | 63 & i); + } else { + if (!(i < 55296 || i > 57343)) { + if (n + 1 < a) { + var c = e[r(405)](n + 1); + if (i < 56320 && 56320 <= c && c <= 57343) { + var o = 65536 + ((1023 & i) << 10 | 1023 & c); + t[f] = String[r(482)](240 | o >> 18 & 63, 128 | o >> 12 & 63, 128 | o >> 6 & 63, 128 | 63 & o); + ++n; + continue; + } + } + throw new Error(r(663)); + } + t[f] = String[r(482)](224 | i >> 12, 128 | i >> 6 & 63, 128 | 63 & i); + } + } + return t[r(591)](""); + } + function _0x45fbef(e, r) { + var t = _0x5612de; + for (var a = new Array(r), n = 0, f = 0, i = e[t(601)]; n < r && f < i; n++) { + var c = e[t(405)](f++); + switch (c >> 4) { + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + a[n] = c; + break; + + case 12: + case 13: + if (!(f < i)) { + throw new Error("Unfinished UTF-8 octet sequence"); + } + a[n] = (31 & c) << 6 | 63 & e[t(405)](f++); + break; + + case 14: + if (!(f + 1 < i)) { + throw new Error(t(916)); + } + a[n] = (15 & c) << 12 | (63 & e[t(405)](f++)) << 6 | 63 & e[t(405)](f++); + break; + + case 15: + if (!(f + 2 < i)) { + throw new Error(t(916)); + } + var o = ((7 & c) << 18 | (63 & e[t(405)](f++)) << 12 | (63 & e[t(405)](f++)) << 6 | 63 & e[t(405)](f++)) - 65536; + if (!(0 <= o && o <= 1048575)) { + throw new Error(t(590) + o.toString(16)); + } + a[n++] = o >> 10 & 1023 | 55296; + a[n] = 1023 & o | 56320; + break; + + default: + throw new Error(t(816) + c[t(942)](16)); + } + } + return n < r && (a[t(601)] = n), + String[t(482)].apply(String, a); + } + function _0x25bfe1(e, r) { + var t = _0x5612de; + for (var a = [], n = new Array(32768), f = 0, i = 0, c = e[t(601)]; f < r && i < c; f++) { + var o = e.charCodeAt(i++); + switch (o >> 4) { + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + n[f] = o; + break; + + case 12: + case 13: + if (!(i < c)) { + throw new Error(t(916)); + } + n[f] = (31 & o) << 6 | 63 & e.charCodeAt(i++); + break; + + case 14: + if (!(i + 1 < c)) { + throw new Error(t(916)); + } + n[f] = (15 & o) << 12 | (63 & e[t(405)](i++)) << 6 | 63 & e.charCodeAt(i++); + break; + + case 15: + if (!(i + 2 < c)) { + throw new Error(t(916)); + } + var d = ((7 & o) << 18 | (63 & e[t(405)](i++)) << 12 | (63 & e[t(405)](i++)) << 6 | 63 & e[t(405)](i++)) - 65536; + if (!(0 <= d && d <= 1048575)) { + throw new Error("Character outside valid Unicode range: 0x" + d.toString(16)); + } + n[f++] = d >> 10 & 1023 | 55296; + n[f] = 1023 & d | 56320; + break; + + default: + throw new Error("Bad UTF-8 encoding 0x" + o[t(942)](16)); + } + if (f >= 32766) { + var _ = f + 1; + n[t(601)] = _; + a[a[t(601)]] = String[t(482)][t(519)](String, n); + r -= _; + f = -1; + } + } + return f > 0 && (n.length = f, a[a[t(601)]] = String.fromCharCode[t(519)](String, n)), + a.join(""); + } + function _0x31dfb5(e, r) { + var t = _0x5612de; + return (null == r || r < 0) && (r = e[t(601)]), + 0 === r ? "" : /^[\x00-\x7f]*$/[t(555)](e) || !/^[\x00-\xff]*$/[t(555)](e) ? r === e[t(601)] ? e : e[t(935)](0, r) : r < 65535 ? _0x45fbef(e, r) : _0x25bfe1(e, r); + } + function _0xdda738(e, r) { + var t = _0x5612de; + return null == e || 0 === e[t(601)] ? e : (e = _0x532596(e), r = _0x532596(r), _0x75d5b3(_0x3d58e7(_0x183951(e, !0), _0x231484(_0x183951(r, !1))), !1)); + } + function _0x4bb829(e, r) { + var t = _0x5612de; + return null == e || 0 === e[t(601)] ? e : (r = _0x532596(r), _0x31dfb5(_0x75d5b3(_0x4aaf04(_0x183951(e, !1), _0x231484(_0x183951(r, !1))), !0))); + } + function _0x39dfe4() { + var e = _0x5612de; + var r = ""; + try { + window[e(958)] && (r = window[e(958)].getItem("_byted_param_sw")); + r && !window[e(476)] || (r = window.localStorage[e(728)]("_byted_param_sw")); + } catch (e) { + console.log(e); + } + if (r) { + try { + var t = _0x4bb829(_0xb5350b(r[e(677)](8)), r[e(677)](0, 8)); + if ("on" === t) { + return !0; + } + if (e(772) === t) { + return !1; + } + } catch (e) { + console.log(e); + } + } + return !1; + } + function _0x1b4bf1() { + var e = _0x5612de; + return w_0x5c3140(e(529), { + get 0() { + var r = e; + return r(900) != typeof navigator ? navigator : void 0; + }, + get 1() { + var r = e; + return r(900) != typeof window ? window : void 0; + }, + get 2() { + return _0x1db123; + }, + 3: Object, + get 4() { + return "undefined" != typeof document ? document : void 0; + }, + get 5() { + var r = e; + return r(900) != typeof location ? location : void 0; + }, + get 6() { + return _0x176a57; + }, + get 7() { + return "undefined" != typeof history ? history : void 0; + }, + 8: arguments + }, this); + } + function _0x532cd9() { + var e = _0x5612de; + return w_0x5c3140(e(400), { + get 0() { + return _0x176a57; + }, + get 1() { + return navigator; + }, + get 2() { + return PluginArray; + }, + get 3() { + return window; + }, + 4: arguments + }, this); + } + function _0x3391fc() { + var e = _0x5612de; + return w_0x5c3140(e(614), { + get 0() { + return _0x12ada0; + }, + get 1() { + return navigator; + }, + 2: Object, + get 3() { + return window; + }, + 4: arguments, + 5: RegExp + }, this); + } + function _0x21fa28() { + var e = _0x5612de; + return w_0x5c3140(e(379), { + set 0(e) { + _0x12ada0 = e; + }, + 1: Object, + get 2() { + return window; + }, + 3: arguments + }, this); + } + function _0x49b1d7(e) { + var r = _0x5612de; + return w_0x5c3140(r(369), { + get 0() { + return _0x1230e7; + }, + get 1() { + return indexedDB; + }, + get 2() { + return _0xf8ccf1; + }, + get 3() { + return window; + }, + get 4() { + return DOMException; + }, + get 5() { + return _0x176a57; + }, + get 6() { + return _0x6caf; + }, + 7: arguments, + 8: e + }, this); + } + function _0x462256() { + var e = _0x5612de; + return w_0x5c3140(e(355), { + get 0() { + return _0x176a57; + }, + get 1() { + return document; + }, + get 2() { + return navigator; + }, + 3: arguments, + 4: RegExp + }, this); + } + function _0x3cee0e() { + var e = _0x5612de; + return w_0x5c3140(e(733), { + get 0() { + return navigator; + }, + get 1() { + return window; + }, + 2: arguments, + 3: RegExp + }, this); + } + function _0x1f9824() { + var e = _0x5612de; + var r = ""; + if (_0x6caf.PLUGIN) { + r = _0x6caf[e(852)]; + } else { + for (var t = [], a = navigator[e(442)] || [], n = 0; n < 5; n++) { + try { + for (var f = a[n], i = [], c = 0; c < f[e(601)]; c++) { + f[e(892)](c) && i[e(878)](f.item(c)[e(427)]); + } + var o = f[e(833)] + ""; + f.version && (o += f[e(705)] + ""); + o += f.filename + ""; + o += i[e(591)](""); + t.push(o); + } catch (e) { + console.log(e); + } + } + r = t[e(591)]("##"); + _0x6caf[e(852)] = r; + } + return r[e(677)](0, 1024); + } + function _0x30412e() { + var e = _0x5612de; + var r = []; + try { + var t = navigator[e(442)]; + if (t) { + for (var a = 0; a < t[e(601)]; a++) { + for (var n = 0; n < t[a][e(601)]; n++) { + var f = [t[a][e(414)], t[a][n][e(427)], t[a][n][e(361)]][e(591)]("|"); + r.push(f); + } + } + } + } catch (e) { + console.log(e); + } + return r; + } + function _0x28e2ec() { + var e = _0x5612de; + return w_0x5c3140(e(422), { + get 0() { + return navigator; + }, + get 1() { + return _0x1f9824; + }, + get 2() { + return window; + }, + 3: arguments + }, this); + } + function _0x5863d1() { + var e = _0x5612de; + var e540 = e(540); + return w_0x5c3140(e540, { + get 0() { + return _0x462335; + }, + get 1() { + return _0x39dfe4; + }, + get 2() { + return _0x1b4bf1; + }, + get 3() { + return _0x53b77d; + }, + get 4() { + return _0x49b1d7; + }, + get 5() { + return _0x3ed707; + }, + get 6() { + return _0x532cd9; + }, + get 7() { + return _0x3391fc; + }, + get 8() { + return _0x462256; + }, + get 9() { + return _0x3cee0e; + }, + get 10() { + return _0x28e2ec; + }, + get 11() { + return _0x6caf; + }, + 12: arguments + }, this); + } + function _0x2a900b(e) { + var r = _0x5612de; + for (var t = Object[r(383)](e), a = 0, n = t[r(601)] - 1; n >= 0; n--) { + a = (e[t[n]] ? 1 : 0) << t[r(601)] - n - 1 | a; + } + return a; + } + function _0x246aeb(e, r) { + var t = _0x5612de; + for (var a = 0; a < r[t(601)]; a++) { + e = 65599 * e + r[t(405)](a) >>> 0; + } + return e; + } + function _0x184783(e, r) { + var t = _0x5612de; + for (var a = 0; a < r[t(601)]; a++) { + e = 65599 * (e ^ r.charCodeAt(a)) >>> 0; + } + return e; + } + function _0xf119da(e, r) { + var t = _0x5612de; + for (var a = 0; a < r[t(601)]; a++) { + var n = r[t(405)](a); + if (n >= 55296 && n <= 56319 && a < r[t(601)]) { + var f = r.charCodeAt(a + 1); + if (56320 == (64512 & f)) { + n = ((1023 & n) << 10) + (1023 & f) + 65536; + a += 1; + } + } + e = 65599 * e + n >>> 0; + } + return e; + } + function _0x53f850(e) { + var r = _0x5612de; + var t = e || ""; + return (t = -1 !== (t = t[r(887)](/(http:\/\/|https:\/\/|\/\/)?[^\/]*/, "")).indexOf("?") ? t[r(935)](0, t[r(709)]("?")) : t) || "/"; + } + function _0x446110(e) { + var r = _0x5612de; + var t = e || ""; + var a = t[r(450)](/[?](\w+=.*&?)*/); + var n = (t = a ? a[0][r(935)](1) : "") ? t[r(834)]("&") : null; + var f = {}; + if (n) { + for (var i = 0; i < n[r(601)]; i++) { + f[n[i].split("=")[0]] = n[i][r(834)]("=")[1]; + } + } + return f; + } + function _0x3a1cf3(e, r) { + var t = _0x5612de; + if (!e || "{}" === JSON[t(486)](e)) { + return {}; + } + for (var a = Object[t(383)](e).sort(), n = {}, f = 0; f < a[t(601)]; f++) { + n[a[f]] = r ? e[a[f]] + "" : e[a[f]]; + } + return n; + } + function _0x20b77a(e) { + var r = _0x5612de; + return Array[r(687)](e) ? e.map(_0x20b77a) : e instanceof Object ? Object[r(383)](e)[r(910)]()[r(886)](function (r, t) { + return r[t] = _0x20b77a(e[t]), + r; + }, {}) : e; + } + function _0x483e03(e) { + var r = _0x5612de; + if (!e || "{}" === JSON[r(486)](e)) { + return ""; + } + for (var t = Object.keys(e).sort(), a = "", n = 0; n < t[r(601)]; n++) { + a += [t[n]] + "=" + e[t[n]] + "&"; + } + return a; + } + function _0x4bae98() { + var e = _0x5612de; + try { + return !!window[e(958)]; + } catch (e) { + console.log(e); + return !0; + } + } + function _0x275e5a() { + try { + return !!window.localStorage; + } catch (e) { + console.log(e); + return !0; + } + } + function _0x4fdb47() { + var e = _0x5612de; + try { + return !!window[e(536)]; + } catch (e) { + console.log(e); + return !0; + } + } + function _0x1afbc2() { + return _0x5af46a(_0x4fdb47()) + _0x5af46a(_0x275e5a()) + _0x5af46a(_0x4bae98()); + } + function _0xc6f828(e) { + var r = _0x5612de; + var t; + var a = document[r(608)](r(589)); + a[r(770)] = 48; + a[r(581)] = 16; + var n = a.getContext("2d"); + n[r(399)] = "14px serif"; + n[r(406)]("龘ฑภ경", 2, 12); + n[r(928)] = 2; + n[r(616)] = 1; + n[r(832)] = r(539); + n.arc(8, 8, 8, 0, 2); + n.stroke(); + t = a[r(569)](); + for (var f = 0; f < 32; f++) { + e = 65599 * e + t.charCodeAt(e % t[r(601)]) >>> 0; + } + return e; + } + var _0x37a93a = 0; + function _0x18b4be() { + var e = _0x5612de; + try { + return _0x37a93a || (_0x462335[e(537)] ? -1 : _0x37a93a = _0xc6f828(3735928559)); + } catch (e) { + console.log(e); + return -1; + } + } + function _0x1a39c4() { + if (_0x37a93a) { + return _0x37a93a; + } + _0x37a93a = _0xc6f828(3735928559); + } + var _0x45ece5 = { + fpProfileUrl: _0x5612de(370) + }; + function _0x130155() { + var e = _0x5612de; + var r = window[e(808)]; + return r[e(770)] + "_" + r[e(581)] + "_" + r[e(382)]; + } + function _0x2a76f8() { + var e = _0x5612de; + var r = window.screen; + return r[e(906)] + "_" + r[e(630)]; + } + function _0x3da279() { + return new Promise(function (e) { + var r = w_0x25f3; + if (r(434) in navigator) { + try { + navigator.getBattery()[r(493)](function (t) { + var a = r; + e(t[a(940)] + "_" + t[a(688)] + "_" + t[a(851)] + "_" + t[a(531)]); + }); + } catch (r) { + console.log(r); + e(""); + } + } else { + e(""); + } + }); + } + var _0x47ec2a = {}; + function _0x299f3a() { + var e = _0x5612de; + var r; + var t = e(827); + var a = 0; + void 0 !== navigator[t] && (a = navigator[t]); + try { + document[e(392)](e(576)); + r = !0; + } catch (e) { + console.log(e); + r = !1; + } + var n = e(490) in window; + return Object[e(672)](_0x47ec2a, { + maxTouchPoints: a, + touchEvent: r, + touchStart: n + }), + a + "_" + r + "_" + n; + } + function _0xbe842b() { + return _0x47ec2a; + } + function _0x4649a1() { + var e = _0x5612de; + var r = new Date(); + r[e(557)](1); + r[e(660)](5); + var t = -r[e(567)](); + r[e(660)](11); + var a = -r[e(567)](); + return Math.min(t, a); + } + function _0x487576() { + var e = _0x5612de; + if (_0x6caf[e(731)]) { + return _0x6caf[e(731)]; + } + try { + var r = document[e(608)](e(589))[e(761)]("webgl"); + var t = r.getExtension(e(885)); + var a = r[e(899)](t.UNMASKED_VENDOR_WEBGL) + "/" + r.getParameter(t[e(926)]); + return _0x6caf[e(731)] = a, + a; + } catch (e) { + console.log(e); + return ""; + } + } + function _0x4f323e() { + var e = _0x5612de; + var r = [e(635), "sans-serif", e(507)]; + var t = {}; + var a = {}; + if (!document[e(393)]) { + return "0"; + } + for (var n = 0, f = r; n < f.length; n++) { + var i = f[n]; + var c = document[e(608)](e(503)); + c.innerHTML = e(675); + c.style[e(866)] = "72px"; + c.style.fontFamily = i; + document[e(393)][e(620)](c); + t[i] = c[e(750)]; + a[i] = c.offsetHeight; + document[e(393)][e(781)](c); + } + var o; + var d = ["Trebuchet MS", e(375), e(605), "Segoe UI", e(801), e(402), "MT Extra", e(937), e(654), e(838), "Meiryo", e(583), e(495), e(472), "IrisUPC", "Palatino", "Colonna MT", "Playbill", e(500), e(648), e(498), e(909), "OPTIMA", e(729), e(840), e(691), "Savoye LET", e(965), e(542)]; + o = 0; + for (var _ = 0; _ < d[e(601)]; _++) { + var x; + var u = _0x350075(r); + try { + for (u.s(); !(x = u.n())[e(483)];) { + var b = x.value; + var v = document[e(608)]("span"); + v[e(874)] = e(675); + v.style[e(866)] = e(643); + v[e(640)].fontFamily = d[_] + "," + b; + document.body[e(620)](v); + var s = v[e(750)] !== t[b] || v[e(676)] !== a[b]; + if (document[e(393)][e(781)](v), s) { + _ < 30 && (o |= 1 << _); + break; + } + } + } catch (e) { + console.log(e); + u.e(e); + } finally { + u.f(); + } + } + return o[e(942)](16); + } + function _0x5090f5() { + var e = _0x5612de; + try { + new WebSocket(e(409)); + } catch (r) { + console.log(r); + return r[e(786)]; + } + } + function _0x468d57() { + var e = _0x5612de; + return eval[e(942)]()[e(601)]; + } + function _0x5bbaf0() { + var e = _0x5612de; + var r = window.RTCPeerConnection || window[e(736)] || window[e(410)]; + var t = []; + return new Promise(function (a) { + var n = e; + (_0x176a57() || navigator[n(553)][n(514)]()[n(709)](n(526)) > 0) && a(""); + try { + if (r && "function" == typeof r) { + var f = new r({ + iceServers: [{ + urls: n(636) + } + ] + }); + var i = function () { }; + var c = /([0-9]{1,3}(\.[0-9]{1,3}){3}|[a-f0-9]{1,4}(:[a-f0-9]{1,4}){7})/; + f[n(491)] = function () { + var e = n; + if (e(354) === f.iceGatheringState) { + f[e(634)](); + f = null; + } + }; + f.onicecandidate = function (e) { + var r = n; + if (e && e[r(551)] && e[r(551)][r(551)]) { + if ("" === e.candidate[r(551)]) { + return; + } + var f = c.exec(e[r(551)][r(551)]); + if (null !== f && f[r(601)] > 1) { + var i = f[1]; + -1 === t[r(709)](i) && t[r(878)](i); + } + } else { + a(t[r(591)]()); + } + }; + f[n(485)](""); + setTimeout(function () { + var e = n; + a(t[e(591)]()); + }, 500); + var o = f[n(757)](); + o instanceof Promise ? o[n(493)](function (e) { + return f.setLocalDescription(e); + })[n(493)](i) : f.createOffer(function (e) { + f.setLocalDescription(e, i, i); + }, i); + } else { + a(""); + } + } catch (e) { + console.log(e); + a(""); + } + }); + } + function _0x2e02ca() { + var e = _0x5612de; + return e(943)[e(887)](/[xy]/g, function (r) { + var t = e; + var a = 16 * Math[t(398)]() | 0; + return ("x" == r ? a : 3 & a | 8)[t(942)](16); + }); + } + function _0x2e2fa0(e) { + var r = _0x5612de; + return 34 === e[r(601)] && _0x246aeb(0, e[r(432)](0, 32))[r(942)]().substring(0, 2) === e[r(432)](32, 34); + } + function _0x178d7c() { + var e = _0x5612de; + var r = _0x24dc34(e(610)); + return r && _0x2e2fa0(r) || _0x1f42cb(e(610), r = ((r = _0x2e02ca()) + _0x246aeb(0, r))[e(432)](0, 34)), + r; + } + function _0x3c0a68(e, r) { + var t = _0x5612de; + var a = null; + try { + a = document.getElementsByTagName(t(545))[0]; + } catch (e) { + console.log(e); + a = document.body; + } + if (null !== a) { + var n = document[t(608)](t(865)); + var f = "_" + parseInt(1e4 * Math.random(), 10) + "_" + new Date()[t(365)](); + e += t(446) + f; + n[t(363)] = e; + window[f] = function (e) { + var i = t; + try { + r(e); + a[i(781)](n); + delete window[f]; + } catch (e) { + console.log(e); + } + }; + a[t(620)](n); + } + } + function _0x4072ad(e) { + return w_0x5c3140("484e4f4a403f524300022c395eafc0a4000000004a04440d00000030110104324700040700004202110100030443011400011100010211010102110102110104110001430207000143021842000200404f4c4d4a4b484946474445424340415e5f5c5d5a5b58595657546f6c6d6a6b686966676465626360617e7f7c7d7a7b78797677743e3f3c3d3a3b383936372320", { + get 0() { + return _0x325f58; + }, + get 1() { + return _0x328bde; + }, + get 2() { + return _0xdda738; + }, + 3: arguments, + 4: e + }, this); + } + function _0x5c0cdd(e, r) { + var t = _0x5612de; + if (r) { + for (var a = 0, n = 0; n < e[t(601)]; n++) { + e[n].p && (e[n].r = r[a++]); + } + } + var f = ""; + e[t(596)](function (e) { + f += _0x5af46a(e.r) + "^^"; + }); + f += _0x30c916(); + var i = _0x2e02ca(); + var c = Math[t(463)](i[t(405)](3) / 8) + i[t(405)](3) % 8; + var o = i.substring(4, 4 + c); + f = _0x328bde(_0xdda738(f, o) + i); + var d = _0x45ece5.fpProfileUrl; + _0x3c0a68(d += t(371) + encodeURIComponent(f) + "&", function (e) { + var r = t; + if (0 == e[r(854)] && e.fp) { + _0x462335[r(863)] = e.fp; + _0x462335[r(867)] = _0x4072ad(e.fp); + _0x1f42cb("tt_scid", e.fp); + } + }); + } + function _0x1c3b6d(e) { + var r = _0x5612de; + return w_0x5c3140(r(578), { + get 0() { + return navigator; + }, + get 1() { + return window; + }, + get 2() { + return document; + }, + get 3() { + return _0x30c916; + }, + get 4() { + return _0x1afbc2; + }, + get 5() { + return _0x18b4be; + }, + get 6() { + return _0x130155; + }, + get 7() { + return _0x2a76f8; + }, + get 8() { + return _0x3da279; + }, + get 9() { + return _0x299f3a; + }, + get 10() { + return _0x4649a1; + }, + get 11() { + return _0x487576; + }, + get 12() { + return _0x4f323e; + }, + get 13() { + return _0x1f9824; + }, + get 14() { + return _0x24dc34; + }, + get 15() { + return _0x5090f5; + }, + get 16() { + return _0x468d57; + }, + get 17() { + return _0x5bbaf0; + }, + get 18() { + return _0x45b94b; + }, + get 19() { + return _0x178d7c; + }, + get 20() { + return _0x5af46a; + }, + 21: Promise, + get 22() { + return _0x5c0cdd; + }, + 23: arguments, + 24: e + }, this); + } + function _0x20cbf3(e, r, t) { + var a = _0x5612de; + return w_0x5c3140(a(563), { + 0: String, + 1: Date, + get 2() { + return _0x45b94b; + }, + get 3() { + return _0x184783; + }, + get 4() { + return location; + }, + 5: parseInt, + get 6() { + return _0x5863d1; + }, + 7: JSON, + get 8() { + return _0xf119da; + }, + get 9() { + return _0x3a1cf3; + }, + get 10() { + return _0x20b77a; + }, + get 11() { + return _0x446110; + }, + 12: Object, + get 13() { + return _0x483e03; + }, + get 14() { + return _0x53f850; + }, + get 15() { + return _0x2a900b; + }, + get 16() { + return _0x18b4be; + }, + get 17() { + return _0x462335; + }, + get 18() { + return _0x4072ad; + }, + get 19() { + return _0x24dc34; + }, + get 20() { + return navigator; + }, + 21: arguments, + 22: e, + 23: r, + 24: t + }, this); + } + function _0x5e5a64(e, r) { + var t = _0x5612de; + for (var a = {}, n = 0; n < r.length; n++) { + var f = r[n]; + var i = e[f]; + null == i && (i = !1); + null === i || "function" != typeof i && t(381) !== _0x1db123(i) || (i = !0); + a[f] = i; + } + return a; + } + function _0x2a6ac2() { + var e = _0x5612de; + return _0x5e5a64(navigator, [e(875), "appName", e(378), e(582), e(932), e(864), e(506), e(827), e(908), e(530), "vendorSub", "doNotTrack", e(586), e(738), e(658), e(912), e(911)]); + } + function _0x226933() { + var e = _0x5612de; + return _0x5e5a64(window, [e(669), e(546), e(774), e(622), e(870), "isSecureContext", e(960), e(921), "locationbar", e(671), e(927), e(736), "postMessage", "webkitRequestAnimationFrame", e(734), "netscape"]); + } + function _0x1e5a7f() { + var e = _0x5612de; + return _0x5e5a64(document, [e(821), e(595), e(883), "layers", e(704)]); + } + function _0x11a1d6() { + var e = _0x5612de; + var r = document[e(608)](e(589)); + var t = null; + try { + t = r[e(761)](e(619)) || r.getContext(e(938)); + } catch (e) { + console.log(e); + } + return t || (t = null), + t; + } + function _0x39c3d8(e) { + var r = _0x5612de; + var t = e[r(471)](r(497)) || e[r(471)](r(741)) || e[r(471)](r(794)); + if (t) { + var a = e[r(899)](t[r(447)]); + return 0 === a && (a = 2), + a; + } + return null; + } + function _0x425568() { + var e = _0x5612de; + if (_0x6caf[e(573)]) { + return _0x6caf[e(573)]; + } + var r = _0x11a1d6(); + if (!r) { + return {}; + } + var t = { + supportedExtensions: r[e(783)]() || [], + antialias: r[e(453)]()[e(421)], + blueBits: r[e(899)](r[e(638)]), + depthBits: r.getParameter(r[e(594)]), + greenBits: r[e(899)](r[e(963)]), + maxAnisotropy: _0x39c3d8(r), + maxCombinedTextureImageUnits: r.getParameter(r[e(466)]), + maxCubeMapTextureSize: r[e(899)](r[e(768)]), + maxFragmentUniformVectors: r.getParameter(r.MAX_FRAGMENT_UNIFORM_VECTORS), + maxRenderbufferSize: r[e(899)](r[e(730)]), + maxTextureImageUnits: r[e(899)](r[e(617)]), + maxTextureSize: r[e(899)](r[e(515)]), + maxVaryingVectors: r[e(899)](r[e(612)]), + maxVertexAttribs: r[e(899)](r.MAX_VERTEX_ATTRIBS), + maxVertexTextureImageUnits: r[e(899)](r[e(517)]), + maxVertexUniformVectors: r[e(899)](r[e(413)]), + shadingLanguageVersion: r.getParameter(r.SHADING_LANGUAGE_VERSION), + stencilBits: r.getParameter(r.STENCIL_BITS), + version: r[e(899)](r.VERSION) + }; + return _0x6caf[e(573)] = t, + t; + } + function _0x18707d() { + var e = _0x5612de; + var r = {}; + return r[e(624)] = _0x2a6ac2(), + r[e(915)] = _0x226933(), + r[e(520)] = _0x1e5a7f(), + r[e(619)] = _0x425568(), + r[e(897)] = _0x487576(), + r.plugins = _0x1f9824(), + _0x6caf.SECINFO = r, + r; + } + function _0x572e48() { + var e = _0x5612de; + return w_0x5c3140(e(465), { + get 0() { + return _0x6caf; + }, + get 1() { + return _0x18707d; + }, + 2: Date, + get 3() { + return _0x325f58; + }, + get 4() { + return _0x328bde; + }, + get 5() { + return _0xdda738; + }, + 6: JSON, + 7: arguments + }, this); + } + var _0x522d20 = { + kCallTypeDirect: 0, + kCallTypeInterceptor: 1 + }; + var _0x2e10da = { + kHttp: 0, + kWebsocket: 1 + }; + var _0x3f742e = _0x45b94b; + function _0x5646fa(e) { + var r = _0x5612de; + for (var t, a, n = [], f = 0; f < e[r(601)]; f++) { + t = e[r(405)](f); + a = []; + do { + a[r(878)](255 & t); + t >>= 8; + } while (t); + n = n[r(696)](a.reverse()); + } + return n; + } + function _0x6bc4ae(e) { } + function _0x5b890d(e) { } + function _0x16f345(e) { } + function _0x361214(e) { } + function _0xc35122(e, r, t) { } + var _0x5dde58 = { + WEB_DEVICE_INFO: 8 + }; + function _0x4df596(e, r) { + var t = _0x5612de; + return JSON[t(486)]({ + magic: 538969122, + version: 1, + dataType: e, + strData: r, + tspFromClient: new Date()[t(365)]() + }); + } + function _0x29a5ac(e, r, t, a) { + var n = _0x5612de; + return _0x32af0e(n(929), e, r, t, a); + } + function _0x32af0e(e, r, t, a, n) { + var f = _0x5612de; + var i = new XMLHttpRequest(); + if (i[f(395)](e, r, !0), n && (i[f(454)] = !0), a) { + for (var c = 0, o = Object.keys(a); c < o[f(601)]; c++) { + var d = o[c]; + var _ = a[d]; + i[f(939)](d, _); + } + } + i[f(522)](t); + } + function _0x2cd488(e, r) { + var t = _0x5612de; + return r || (r = null), + !!navigator.sendBeacon && (navigator[t(587)](e, r), !0); + } + function _0x4a2daf(e, r) { + var t = _0x5612de; + try { + window[t(476)] && window[t(476)][t(452)](e, r); + } catch (e) { + console.log(e); + } + } + function _0x34f60a(e) { + var r = _0x5612de; + try { + window[r(476)] && window[r(476)][r(707)](e); + } catch (e) { + console.log(e); + } + } + function _0x3d13cf(e) { + var r = _0x5612de; + try { + return window[r(476)] ? window.localStorage.getItem(e) : null; + } catch (e) { + console.log(e); + return null; + } + } + function _0x21db29(e, r) { + var t = _0x5612de; + for (var a, n = [], f = 0, i = "", c = 0; c < 256; c++) { + n[c] = c; + } + for (var o = 0; o < 256; o++) { + f = (f + n[o] + e[t(405)](o % e[t(601)])) % 256; + a = n[o]; + n[o] = n[f]; + n[f] = a; + } + var d = 0; + f = 0; + for (var _ = 0; _ < r[t(601)]; _++) { + f = (f + n[d = (d + 1) % 256]) % 256; + a = n[d]; + n[d] = n[f]; + n[f] = a; + i += String[t(482)](r[t(405)](_) ^ n[(n[d] + n[f]) % 256]); + } + return i; + } + var _0x45bf15 = _0x21db29; + var _0x48a082 = {}; + function _0x641e3d(e, r) { + var t = _0x5612de; + return w_0x5c3140(t(964), { + 0: String, + 1: Math, + get 2() { + return _0x45bf15; + }, + get 3() { + return _0x389396; + }, + 4: arguments, + 5: e, + 6: r + }, this); + } + _0x48a082.pb = 2; + _0x48a082.json = 1; + var _0x216650 = { + kNoMove: 2, + kNoClickTouch: 4, + kNoKeyboardEvent: 8, + kMoveFast: 16, + kKeyboardFast: 32, + kFakeOperations: 64 + }; + var _0x5dc9cc = { + sTm: 0, + acc: 0 + }; + function _0x18a9f7() { + var e = _0x5612de; + try { + var r = _0x3d13cf(e(835)); + if (r) { + Object[e(672)](_0x5dc9cc, JSON[e(945)](r)); + } else { + _0x5dc9cc[e(659)] = new Date()[e(365)](); + _0x5dc9cc[e(637)] = 0; + } + } catch (r) { + console.log(r); + _0x5dc9cc[e(659)] = new Date()[e(365)](); + _0x5dc9cc[e(637)] = 0; + _0x26e186(); + } + } + function _0x26e186() { + var e = _0x5612de; + _0x4a2daf(e(835), JSON.stringify(_0x5dc9cc)); + } + var _0xf63a81 = { + T_MOVE: 1, + T_CLICK: 2, + T_KEYBOARD: 3 + }; + var _0x2786f5 = !1; + var _0x9fb121 = []; + var _0x207cc5 = []; + var _0x191fa5 = []; + var _0xe06992 = { + ubcode: 0 + }; + var _0x388856 = function (e, r) { + return e + r; + }; + var _0x20a3d9 = function (e) { + return e * e; + }; + function _0x9c0be2(e, r) { + var t = _0x5612de; + if (e[t(601)] > 200 && e.splice(0, 100), e[t(601)] > 0) { + var a = e[e.length - 1]; + if (r.d - a.d <= 0 || "y" in r && r.x === a.x && r.y === a.y) { + return; + } + } + e[t(878)](r); + } + function _0x1d26db(e, r, t) { + var a = _0x5612de; + if (_0x462335.enableTrack) { + if (t !== _0xf63a81.T_MOVE) { + return t === _0xf63a81[a(496)] ? (e[a(601)] >= 500 && _0x450b73(), void e[a(878)](r)) : t === _0xf63a81[a(853)] ? (e[a(601)] > 500 && _0x450b73(), + void e.push(r)) : void 0; + } + if (e.length >= 500 && _0x450b73(), e[a(601)] > 0) { + var n = e[e[a(601)] - 1]; + var f = n.x; + var i = n.y; + var c = n.ts; + if (f === r.x && i === r.y) { + return; + } + if (r.ts - c < 500) { + return; + } + } + e.push(r); + } + } + var _0x19ffaf = { + init: 0, + running: 1, + exit: 2, + flush: 3 + }; + function _0x450b73(e) { + var r = _0x5612de; + return w_0x5c3140(r(930), { + get 0() { + return _0x6caf; + }, + get 1() { + return _0x19ffaf; + }, + 2: Date, + get 3() { + return _0x5dc9cc; + }, + get 4() { + return _0x462335; + }, + get 5() { + return _0x26e186; + }, + 6: Object, + get 7() { + return _0x4df596; + }, + get 8() { + return _0x5dde58; + }, + get 9() { + return _0x641e3d; + }, + 10: JSON, + get 11() { + return _0x48a082; + }, + get 12() { + return _0x2cd488; + }, + get 13() { + return _0x29a5ac; + }, + 14: arguments, + 15: e + }, this); + } + function _0x58c311() { + var e = _0x5612de; + _0x462335[e(895)] && _0x450b73(_0x19ffaf.exit); + } + var _0x1a755e = {}; + _0x1a755e[_0x5612de(724)] = _0x3dcfd5; + _0x1a755e.touchmove = _0x3dcfd5; + _0x1a755e[_0x5612de(868)] = _0x56114b; + _0x1a755e[_0x5612de(470)] = _0x19d89b; + _0x1a755e[_0x5612de(723)] = _0x19d89b; + var _0x18582a = !1; + function _0x1dbe74() { + var e = _0x5612de; + if (document && document[e(758)] && !_0x18582a) { + for (var r = 0, t = Object[e(383)](_0x1a755e); r < t[e(601)]; r++) { + var a = t[r]; + document[e(758)](a, _0x1a755e[a]); + } + _0x18582a = !0; + } + } + function _0x3dcfd5(e) { + var r = _0x5612de; + var t = e; + var a = e.type; + if (e[r(889)] && r(665) === a) { + t = e.touches[0]; + _0x2786f5 = !0; + } + var n = { + x: Math[r(463)](t.clientX), + y: Math[r(463)](t.clientY), + d: Date[r(845)]() + }; + _0x9c0be2(_0x9fb121, n); + _0x1d26db(_0x6caf[r(541)], { + ts: n.d, + x: n.x, + y: n.y + }, _0xf63a81[r(702)]); + } + function _0x56114b(e) { + var r = _0x5612de; + var t = 0; + (e[r(652)] || e.ctrlKey || e.metaKey || e[r(558)]) && (t = 1); + var a = { + x: t, + d: Date.now() + }; + _0x9c0be2(_0x191fa5, a); + _0x1d26db(_0x6caf[r(913)], { + ts: a.d + }, _0xf63a81[r(853)]); + } + function _0x19d89b(e) { + var r = _0x5612de; + var t = e; + var a = e.type; + if (e[r(889)] && "touchstart" === a) { + t = e.touches[0]; + _0x2786f5 = !0; + } + var n = { + x: Math.floor(t[r(703)]), + y: Math[r(463)](t.clientY), + d: Date.now() + }; + _0x9c0be2(_0x207cc5, n); + _0x1d26db(_0x6caf[r(950)], { + ts: n.d, + x: n.x, + y: n.y + }, _0xf63a81[r(496)]); + } + function _0x42fe9b(e) { + var r = _0x5612de; + return e.reduce(_0x388856) / e[r(601)]; + } + function _0x3ea7d6(e) { + var r = _0x5612de; + if (e[r(601)] <= 1) { + return 0; + } + var t = _0x42fe9b(e); + var a = e.map(function (e) { + return e - t; + }); + return Math[r(791)](a.map(_0x20a3d9)[r(886)](_0x388856) / (e[r(601)] - 1)); + } + function _0x52f064(e, r, t) { + var a = _0x5612de; + var n = 0; + var f = 0; + if (e[a(601)] > r) { + for (var i = [], c = 0; c < e[a(601)] - 1; c++) { + var o = e[c + 1]; + var d = e[c]; + var _ = o.d - d.d; + _ && (t ? i[a(878)](1 / _) : i[a(878)](Math[a(791)](_0x20a3d9(o.x - d.x) + _0x20a3d9(o.y - d.y)) / _)); + } + n = _0x42fe9b(i); + 0 === (f = _0x3ea7d6(i)) && (f = .01); + } + return [n, f]; + } + function _0x26d461() { + var e = _0x5612de; + var r = !1; + var t = 0; + try { + if (document && document.createEvent) { + document[e(392)](e(576)); + r = !0; + } + } catch (e) { + console.log(e); + } + var a = _0x52f064(_0x9fb121, 1); + var n = _0x52f064(_0x191fa5, 5, !0); + var f = 1; + !r && _0x2786f5 && (f |= 64, t |= _0x216650[e(754)]); + 0 === _0x9fb121.length ? (f |= 2, t |= _0x216650[e(766)]) : a[0] > 50 && (f |= 16, + t |= _0x216650.kMoveFast); + 0 === _0x207cc5.length && (f |= 4, t |= _0x216650.kNoClickTouch); + 0 === _0x191fa5[e(601)] ? (f |= 8, t |= _0x216650.kNoKeyboardEvent) : n[0] > .5 && (f |= 32, + t |= _0x216650[e(959)]); + _0xe06992.ubcode = t; + var i = f[e(942)](32); + return 1 === i.length ? i = "00" + i : 2 === i[e(601)] && (i = "0" + i), + i; + } + function _0x5047d8() { + _0x450b73(3); + } + function _0x4145f8(e, r) { + var t = _0x5612de; + for (var a = r[t(601)], n = new ArrayBuffer(a + 1), f = new Uint8Array(n), i = 0, c = 0; c < a; c++) { + f[c] = r[c]; + i ^= r[c]; + } + f[a] = i; + var o = 255 & Math[t(463)](255 * Math[t(398)]()); + var d = String[t(482)][t(519)](null, f); + var _ = _0x21db29(String[t(482)](o), d); + var x = ""; + return x += String[t(482)](e), + x += String[t(482)](o), + _0x389396(x += _, "s1"); + } + function _0x1633f2(e, r, t, a, n) { + var f = _0x5612de; + console.log(e, r, t, a, n); + // _0x5863d1(); + // _0x26d461(); + void 0 !== a && "" !== a && (a = ""); + var i = _0x5dd467(a); + n || (n = "00000000000000000000000000000000"); + var c = new ArrayBuffer(9); + var o = new Uint8Array(c); + var f398 = f(398); + var f463 = f(463); + var f806 = f(806); + var ra = Math[f463](100 * Math[f398]()); + var ra2 = Math.floor(100 * Math.random()); + var d = 0 | e << 6 | r << 5 | (1 & ra) << 4 | 0; + _0x6caf[f806]++; + var _ = 63 & _0x6caf[f806]; + o[0] = t << 6 | _; + o[1] = 0// _0x6caf.envcode >> 8 & 255; // 1 o[1]=0 + o[2] = 255 & _0x6caf[f(896)]; + o[3] = _0xe06992[f(898)]; + var x = _0x42e709[f(695)](_0x5dd467(_0x42e709[f(695)](i))); + o[4] = x[14]; + o[5] = x[15]; + var ttt = _0x42e709.decode(n); + console.log(ttt); + var tttt = _0x5dd467(ttt); + console.log(tttt); + var u = _0x42e709.decode(tttt); + return o[6] = u[14], + o[7] = u[15], + o[8] = 255 & Math[f(463)](255 * Math[f(398)]()), + _0x4145f8(d, o); + } + function _0x34c70a(e, r, t) { + var a = _0x5612de; + var a1 = _0x2e10da[a(649)]; + var a2 = _0x462335.initialized; + var a3 = e; + var a4 = null; + var a5 = t; + var xb = _0x1633f2(a1, a2, a3, a4, a5); + return { + "X-Bogus": xb + }; + } + // function _0x11233a(e, r, t) { + // var a = _0x5612de; + // return { + // "X-Bogus": _0x1633f2(_0x2e10da[a(479)], _0x462335[a(508)], e, r, t) + // }; + // } + function _0x5c2014(e) { + return w_0x5c3140("484e4f4a403f524300362d0a5f00233c0000000029b6a730000000630214000103001400020700001400030700011400041101031100031347000d11010311000313140001450023110103110004134700130211010011010311000413430114000145000607000214000102110101110002021100014303140005110005420003096b1e7e601e606766710c6b1e7e601e63726a7f7c7277200303030303030303030303030303030303030303030303030303030303030303", { + get 0() { + return _0x5dd467; + }, + get 1() { + return _0x34c70a; + }, + 2: arguments, + 3: e + }, this); + } + function _0x3c875d(e, r) { + var t = _0x5612de; + var a = new Uint8Array(3); + return a[0] = e / 256, + a[1] = e % 256, + a[2] = r % 256, + String[t(482)][t(519)](null, a); + } + function _0x4b49f3(e) { + var r = _0x5612de; + return String[r(482)](e); + } + function _0x26151b(e, r, t) { + return _0x4b49f3(e) + _0x4b49f3(r) + t; + } + function _0xc38697(e, r) { + return _0x389396(e, r); + } + function _0x538c80(e, r, t, a, n, f, i, c, o, d, _, x, u, b, v, s, l, h, w) { + var g = _0x5612de; + var p = new Uint8Array(19); + return p[0] = e, + p[1] = _, + p[2] = r, + p[3] = x, + p[4] = t, + p[5] = u, + p[6] = a, + p[7] = b, + p[8] = n, + p[9] = v, + p[10] = f, + p[11] = s, + p[12] = i, + p[13] = l, + p[14] = c, + p[15] = h, + p[16] = o, + p[17] = w, + p[18] = d, + String.fromCharCode[g(519)](null, p); + } + var _0x3c4305 = !1; + function _0x8edc3d(e, r) { + var t = _0x5612de; + return w_0x5c3140(t(690), { + get 0() { + return _0x5dd467; + }, + get 1() { + return _0x3c4305; + }, + set 1(e) { + _0x3c4305 = e; + }, + get 2() { + return _0x462335; + }, + get 3() { + return _0x5863d1; + }, + get 4() { + return _0x26d461; + }, + get 5() { + return _0xe06992; + }, + get 6() { + return _0x6caf; + }, + get 7() { + return _0x42e709; + }, + 8: String, + get 9() { + return navigator; + }, + get 10() { + return _0x3c875d; + }, + get 11() { + return _0x21db29; + }, + get 12() { + return _0xc38697; + }, + 13: Date, + get 14() { + return _0x18b4be; + }, + get 15() { + return _0x538c80; + }, + get 16() { + return _0x4b49f3; + }, + get 17() { + return _0x26151b; + }, + get 18() { + return _0x389396; + }, + 19: arguments, + 20: e, + 21: r, + 22: RegExp + }, this); + } + function _0x556182(e) { + var r = _0x5612de; + _0x4a2daf(r(650), e); + } + function _0x5141ac() { + var e = _0x3d13cf("xmst"); + return e || ""; + } + function _0x50686a(e) { + var r = _0x5612de; + return r(817) === Object[r(836)][r(942)][r(820)](e); + } + function _0x2195cd(e, r) { + var t = _0x5612de; + if (e) { + var a = e[r]; + if (a) { + var n = _0x1db123(a); + return t(381) === n || t(494) === n ? 1 : "string" === n ? n[t(601)] > 0 ? 1 : 2 : _0x50686a(a) ? 1 : 2; + } + } + return 2; + } + function _0xdc4d4c(e) { + var r = _0x5612de; + try { + var t = Object[r(836)][r(942)][r(820)](e); + return r(782) === t ? !0 === e ? 1 : 2 : r(431) === t ? 3 : "[object Undefined]" === t ? 4 : r(462) === t ? 5 : "[object String]" === t ? "" === e ? 7 : 8 : r(817) === t ? 0 === e.length ? 9 : 10 : r(891) === t ? 11 : r(510) === t ? 12 : r(381) === _0x1db123(e) ? 99 : -1; + } catch (e) { + console.log(e); + return -2; + } + } + var _0x2d8bb4 = {}; + function _0x241339() { + var e = _0x5612de; + return document[e(883)] ? "IE" : 0; + } + function _0x5011f8() { + var e = _0x5612de; + return eval.toString()[e(601)]; + } + function _0x58210c(e, r, t) { + var a = _0x5612de; + for (var n = {}, f = 0; f < r[a(601)]; f++) { + var i = void 0; + var c = void 0; + var o = r[f]; + try { + e && (i = e[o]); + } catch (e) { + console.log(e); + } + if ("string" === t) { + c = "" + i; + } else if (a(651) === t) { + c = i ? Math[a(463)](i) : -1; + } else { + if (a(427) !== t) { + throw Error(a(598)); + } + c = _0xdc4d4c(i); + } + n[o] = c; + } + return n; + } + function _0x3a2b92() { + var e = _0x5612de; + var r; + Object[e(672)](_0x2d8bb4[e(624)], _0x58210c(navigator, [e(875), e(848), e(388), "appVersion", e(813), "doNotTrack", e(922), e(908), e(378), e(582), "productSub", "cpuClass", e(530), e(469), e(478), e(528), e(788), e(457), "webdriver"], "string")); + Object.assign(_0x2d8bb4[e(624)], _0x58210c(navigator, [e(481), "vibrate", e(738), e(658), e(912), e(911)], e(427))); + Object[e(672)](_0x2d8bb4[e(624)], _0x58210c(navigator, [e(864), e(827)], e(651))); + _0x2d8bb4.navigator[e(920)] = "" + navigator[e(920)]; + try { + document[e(392)](e(576)); + r = 1; + } catch (e) { + console.log(e); + r = 2; + } + _0x2d8bb4.navigator[e(843)] = r; + var t = e(490) in window ? 1 : 2; + _0x2d8bb4[e(624)][e(470)] = t; + } + function _0x5abc93() { + var e = _0x5612de; + Object.assign(_0x2d8bb4.window, _0x58210c(window, ["Image", e(777), e(671), e(921), e(826), "external", "mozRTCPeerConnection", "postMessage", e(644), e(734), e(767), e(476), e(958), e(745)], e(427))); + Object[e(672)](_0x2d8bb4[e(915)], _0x58210c(window, [e(960)], e(651))); + _0x2d8bb4[e(915)][e(962)] = window[e(962)][e(656)]; + } + function _0x5d3845() { + var e = _0x5612de; + try { + var r = document; + var t = window[e(808)]; + var a = window[e(774)] >>> 0; + var n = window[e(546)] >>> 0; + var f = window[e(426)] >>> 0; + var i = window[e(621)] >>> 0; + var c = Math[e(463)](window.screenX); + var o = Math.floor(window[e(870)]); + var d = window[e(600)] >>> 0; + var _ = window[e(642)] >>> 0; + var x = t.availWidth >>> 0; + var u = t[e(630)] >>> 0; + var b = t.width >>> 0; + var v = t[e(581)] >>> 0; + return { + innerWidth: void 0 !== a ? a : -1, + innerHeight: void 0 !== n ? n : -1, + outerWidth: void 0 !== f ? f : -1, + outerHeight: void 0 !== i ? i : -1, + screenX: void 0 !== c ? c : -1, + screenY: void 0 !== o ? o : -1, + pageXOffset: void 0 !== d ? d : -1, + pageYOffset: void 0 !== _ ? _ : -1, + availWidth: void 0 !== x ? x : -1, + availHeight: void 0 !== u ? u : -1, + sizeWidth: void 0 !== b ? b : -1, + sizeHeight: void 0 !== v ? v : -1, + clientWidth: r.body ? r[e(393)][e(418)] >>> 0 : -1, + clientHeight: r[e(393)] ? r[e(393)][e(955)] >>> 0 : -1, + colorDepth: t[e(382)] >>> 0, + pixelDepth: t[e(778)] >>> 0 + }; + } catch (e) { + console.log(e); + return {}; + } + } + function _0x573065() { + var e = _0x5612de; + Object[e(672)](_0x2d8bb4[e(520)], _0x58210c(document, [e(821), e(595), "documentMode"], e(828))); + Object.assign(_0x2d8bb4[e(520)], _0x58210c(document, [e(805), e(387), "images"], e(427))); + } + function _0x47f354() { + var e = _0x5612de; + var r = {}; + try { + var t = document[e(608)](e(589))[e(761)](e(619)); + var a = t[e(471)](e(885)); + var n = t.getParameter(a.UNMASKED_VENDOR_WEBGL); + var f = t[e(899)](a[e(926)]); + r.vendor = n; + r[e(706)] = f; + } catch (e) { + console.log(e); + } + return r; + } + function _0x58bcf8() { + var e = _0x5612de; + var r = _0x11a1d6(); + if (r) { + var t = { + antialias: r[e(453)]()[e(421)] ? 1 : 2, + blueBits: r[e(899)](r[e(638)]), + depthBits: r.getParameter(r[e(594)]), + greenBits: r[e(899)](r.GREEN_BITS), + maxAnisotropy: _0x39c3d8(r), + maxCombinedTextureImageUnits: r[e(899)](r.MAX_COMBINED_TEXTURE_IMAGE_UNITS), + maxCubeMapTextureSize: r[e(899)](r[e(768)]), + maxFragmentUniformVectors: r[e(899)](r[e(646)]), + maxRenderbufferSize: r[e(899)](r[e(730)]), + maxTextureImageUnits: r[e(899)](r.MAX_TEXTURE_IMAGE_UNITS), + maxTextureSize: r[e(899)](r[e(515)]), + maxVaryingVectors: r.getParameter(r[e(612)]), + maxVertexAttribs: r[e(899)](r.MAX_VERTEX_ATTRIBS), + maxVertexTextureImageUnits: r.getParameter(r[e(517)]), + maxVertexUniformVectors: r.getParameter(r[e(413)]), + shadingLanguageVersion: r[e(899)](r[e(377)]), + stencilBits: r.getParameter(r[e(699)]), + version: r[e(899)](r[e(513)]) + }; + Object.assign(_0x2d8bb4.webgl, t); + } + Object[e(672)](_0x2d8bb4[e(619)], _0x47f354()); + } + function _0x75957() { + var e = _0x5612de; + if (window[e(671)]) { + for (var r = 2; r < 10; r++) { + try { + return !!new (window[e(671)])(e(948) + r) && r[e(942)](); + } catch (e) { + console.log(e); + } + } + try { + return !!new (window[e(671)])("PDF.PdfCtrl.1") && "4"; + } catch (e) { + console.log(e); + } + try { + return !!new (window[e(671)])(e(837)) && "7"; + } catch (e) { + console.log(e); + } + } + return "0"; + } + function _0x1555d9() { + return { + plugin: _0x30412e(), + pv: _0x75957() + }; + } + function _0x1f01ce(e) { + var r = _0x5612de; + try { + var t = window[e]; + var a = r(505); + return t[r(452)](a, a), + t[r(707)](a), + !0; + } catch (e) { + console.log(e); + return !1; + } + } + function _0x3ffe15() { + return w_0x5c3140("484e4f4a403f5243003c20117d3adeac000000004e770f390000003a030014000102110100070000430147000b11000103012f170001354902110100070001430147000e110001030103012b2f17000135491100014200020c45464a48457a5d465b484e4c0e5a4c5a5a4046477a5d465b484e4c", { + get 0() { + return _0x1f01ce; + }, + 1: arguments + }, this); + } + function _0x252788(e, r, t) { + var a = _0x5612de; + for (var n = 0, f = 0; f < r.length; f++) { + var i = _0x2195cd(e, r[f]); + if (i && (n |= i << t + f, t + f >= 32)) { + console[a(784)]("abort 32"); + break; + } + } + return n; + } + function _0x484054() { + return w_0x5c3140("484e4f4a403f5243002c3b0a6f4f88290000000044c410000000011f1101001400010700000700010700020700030700040700050700060700070700080700090c000a14000207000a14000307000b14000407000a110101110004163e000414000a413d00d11100014a07000c1307000d43010300131400050c0000140006030014000711000711000207000e13274700691100014a07000f130700104301140008110002110007131400091100084a0700111307001207001311000918430249110004070014181100091807001518110008070016161100054a070017131100084301491100064a07001813110008430149170007214945ff891101011100041317000335490300170007354911000711000207000e132747001a1100054a0700191311000611000713430149170007214945ffd84111000342001a037e617e037e617d037e617c037e617b037e617a037e6179037e6178037e6177037e6176037d617f0014262b20213b242120382138272e3b263c3b27263c14282a3b0a232a222a213b3c0d361b2e28012e222a04272a2e2b06232a21283b270d2c3d2a2e3b2a0a232a222a213b063c2c3d263f3b0c3c2a3b0e3b3b3d262d3a3b2a08232e21283a2e282a0a052e392e1c2c3d263f3b02726d016d043b2a373b0b2e3f3f2a212b0c2726232b043f3a3c270b3d2a2220392a0c2726232b", { + get 0() { + return document; + }, + get 1() { + return window; + }, + 2: arguments + }, this); + } + _0x2d8bb4[_0x5612de(624)] = {}; + _0x2d8bb4[_0x5612de(574)] = {}; + _0x2d8bb4[_0x5612de(915)] = {}; + _0x2d8bb4[_0x5612de(619)] = {}; + _0x2d8bb4.document = {}; + _0x2d8bb4[_0x5612de(808)] = {}; + _0x2d8bb4[_0x5612de(442)] = {}; + _0x2d8bb4.custom = {}; + var _0x548676 = null; + function _0x491716() { + var e = _0x5612de; + return w_0x5c3140(e(372), { + get 0() { + return self; + }, + get 1() { + return window; + }, + get 2() { + return parent; + }, + 3: arguments + }, this); + } + function _0x2d2578() { + !function () { + var e = w_0x25f3; + var r = {}; + var t = navigator[e(857)] || navigator[e(752)]; + if (t) { + try { + t[e(940)] ? r[e(940)] = 1 : r[e(940)] = 2; + r[e(531)] = Math[e(873)](100 * t[e(531)]); + r[e(688)] = "" + t[e(688)]; + r[e(401)] = "" + t.dischargingTime; + } catch (e) { + console.log(e); + } + _0x2d8bb4[e(857)] = {}; + Object[e(672)](_0x2d8bb4[e(857)], r); + } else if (e(900) != typeof navigator && navigator[e(434)]) { + try { + navigator[e(434)]()[e(493)](function (t) { + var a = e; + try { + t[a(940)] ? r[a(940)] = 1 : r[a(940)] = 2; + r[a(531)] = Math[a(873)](100 * t[a(531)]); + r[a(688)] = "" + t[a(688)]; + r[a(401)] = "" + t.dischargingTime; + } catch (e) { + console.log(e); + } + _0x2d8bb4.battery = {}; + Object[a(672)](_0x2d8bb4[a(857)], r); + }); + } catch (e) { + console.log(e); + } + } + } + (); + "undefined" != typeof Promise && (_0x548676 = new Promise(function (e) { + try { + _0x5bbaf0().then(function (e) { + var r = w_0x25f3; + Object[r(672)](_0x2d8bb4.wID, { + rtcIP: e + }); + }); + } catch (e) { + console.log(e); + } + e(""); + })); + } + function _0x5c328e() { + var e = _0x5612de; + return w_0x5c3140(e(429), { + get 0() { + return window; + }, + get 1() { + return navigator; + }, + get 2() { + var r = e; + return r(900) != typeof InstallTrigger ? InstallTrigger : void 0; + }, + 3: Object, + get 4() { + return _0x241339; + }, + get 5() { + return _0x2d8bb4; + }, + get 6() { + return document; + }, + 7: Promise, + 8: Date, + get 9() { + return _0x252788; + }, + get 10() { + return _0x5011f8; + }, + get 11() { + return _0x4f323e; + }, + get 12() { + return _0x5090f5; + }, + 13: Math, + get 14() { + return _0x3ffe15; + }, + get 15() { + return _0x18b4be; + }, + get 16() { + return _0x484054; + }, + get 17() { + return _0x491716; + }, + get 18() { + return _0x462335; + }, + get 19() { + return _0x24dc34; + }, + get 20() { + return _0x6caf; + }, + get 21() { + return _0x2d2578; + }, + get 22() { + return _0x3a2b92; + }, + get 23() { + return _0x5abc93; + }, + get 24() { + return _0x573065; + }, + get 25() { + return _0x58bcf8; + }, + get 26() { + return _0x1555d9; + }, + get 27() { + return _0x5d3845; + }, + 28: parseInt, + get 29() { + return _0x3d13cf; + }, + get 30() { + return _0x4a2daf; + }, + get 31() { + return _0x641e3d; + }, + 32: JSON, + get 33() { + return _0x48a082; + }, + get 34() { + return _0x4df596; + }, + get 35() { + return _0x5dde58; + }, + get 36() { + return _0x548676; + }, + get 37() { + return _0x29a5ac; + }, + 38: arguments + }, this); + } + function _0x25a792(e) { + var r = _0x5612de; + return _0x462335[r(389)] && _0x462335[r(389)][r(732)] && -1 !== e[r(709)](_0x462335[r(389)][r(732)]) ? _0x39693d.sec : _0x39693d[r(436)]; + } + function _0xd287a1(e) { + var r = _0x5612de; + var t = _0x462335[r(389)][r(732)]; + return !(!t || !e || -1 === e[r(709)](t)); + } + function _0x2b13af(e) { + var r = _0x5612de; + var t = e; + decodeURIComponent(e) === e && (t = encodeURI(e)); + var a = t[r(709)]("?"); + if (a > 0) { + var n = t[r(935)](0, a + 1); + var f = t[r(935)](a + 1); + t = n + f[r(834)]("'").join(r(894)); + } + return t; + } + function _0x1958a5(e, r) { + var t = _0x5612de; + for (var a = "", n = "", f = 0; f < r[t(601)]; f++) { + f % 2 == 0 ? n = r[f] : a += "&" + n + "=" + r[f]; + } + var i = e; + if (a[t(601)] > 0) { + var c = -1 === e.indexOf("?") ? "?" : "&"; + i = e + c + a[t(935)](1); + } + return i; + } + function _0x288415(e) { + var r = _0x5612de; + var t = e.indexOf("?"); + return -1 !== t ? e[r(935)](t + 1) : ""; + } + function _0x6a7375(e) { + var r = _0x5612de; + for (var t = 0; t < _0x462335._enablePathListRegex.length; t++) { + if (_0x462335[r(425)][t].test(e)) { + return !0; + } + } + return !1; + } + function _0x7d8404(e) { + var r = _0x5612de; + return r(390) === e || "application/json" === e; + } + function _0x3af1be() { + var e = _0x5612de; + return w_0x5c3140(e(872), { + get 0() { + return window; + }, + get 1() { + return _0x6a7375; + }, + get 2() { + return _0x6caf; + }, + get 3() { + return _0x1958a5; + }, + get 4() { + return _0x2b13af; + }, + get 5() { + return _0x288415; + }, + get 6() { + return _0x8edc3d; + }, + get 7() { + return _0x462335; + }, + get 8() { + return _0x45e0e9; + }, + get 9() { + return _0x7d8404; + }, + get 10() { + return _0x1294ff; + }, + get 11() { + return _0x20cbf3; + }, + get 12() { + return _0x45b94b; + }, + get 13() { + return _0x572e48; + }, + get 14() { + return _0xd287a1; + }, + get 15() { + return _0x25a792; + }, + get 16() { + return _0x39693d; + }, + get 17() { + return _0x1f42cb; + }, + get 18() { + return _0x556182; + }, + get 19() { + return setTimeout; + }, + get 20() { + return _0x5c328e; + }, + 21: arguments, + 22: RegExp + }, this); + } + var _0x3c4266 = _0x5612de(900) != typeof URL && URL instanceof Object; + var _0x3311d7 = "undefined" != typeof Request && Request instanceof Object; + var _0x4f1fa4 = "undefined" != typeof Headers && Headers instanceof Object; + function _0x415adb() { + var e = _0x5612de; + return window[e(407)]; + } + function _0x1d82ac() { + var e = _0x5612de; + return w_0x5c3140(e(564), { + get 0() { + return _0x415adb; + }, + get 1() { + return window; + }, + get 2() { + return _0xd287a1; + }, + get 3() { + return _0x25a792; + }, + get 4() { + return _0x39693d; + }, + get 5() { + return _0x6caf; + }, + get 6() { + return _0x1f42cb; + }, + get 7() { + return _0x556182; + }, + get 8() { + return setTimeout; + }, + get 9() { + return _0x5c328e; + }, + get 10() { + return _0x3311d7; + }, + get 11() { + return Request; + }, + get 12() { + return _0x3c4266; + }, + get 13() { + return URL; + }, + get 14() { + return _0x6a7375; + }, + get 15() { + return _0x1958a5; + }, + get 16() { + return _0x2b13af; + }, + get 17() { + return _0x288415; + }, + get 18() { + return _0x8edc3d; + }, + get 19() { + return _0x462335; + }, + get 20() { + return _0x45e0e9; + }, + get 21() { + return _0xb48e77; + }, + get 22() { + return _0x7d8404; + }, + get 23() { + return _0x1294ff; + }, + get 24() { + return _0x20cbf3; + }, + get 25() { + return _0x45b94b; + }, + get 26() { + return _0x572e48; + }, + 27: arguments + }, this); + } + function _0xb48e77(e, r) { + var t = _0x5612de; + var a = ""; + if (_0x3311d7 && e instanceof Request) { + var n = e[t(859)][t(811)](t(552)); + return n && (a = n), + a; + } + if (r && r[t(859)]) { + if (_0x4f1fa4 && r[t(859)] instanceof Headers) { + var f = r[t(859)][t(811)](t(552)); + return f && (a = f), + a; + } + if (r.headers instanceof Array) { + for (var i = 0; i < r.headers[t(601)]; i++) { + if (t(552) == r[t(859)][i][0].toLowerCase()) { + return r[t(859)][i][1]; + } + } + } + if (r[t(859)] instanceof Object) { + for (var c = 0, o = Object.keys(r.headers); c < o[t(601)]; c++) { + var d = o[c]; + if ("content-type" === d.toLowerCase()) { + return r[t(859)][d]; + } + } + return a; + } + } + } + function _0x1294ff(e, r, t) { + var a = _0x5612de; + if (null == t || "" === t) { + return e; + } + if (t = t[a(942)](), a(390) === r) { + e[a(822)] = !0; + var n = t[a(834)]("&"); + var f = {}; + if (n) { + for (var i = 0; i < n.length; i++) { + f[n[i][a(834)]("=")[0]] = decodeURIComponent(n[i][a(834)]("=")[1]); + } + } + e[a(393)] = f; + } else { + e[a(393)] = JSON.parse(t); + } + return e; + } + function _0x45e0e9(e, r) { + var t = _0x5612de; + var a = r; + if (_0x462335[t(397)][t(601)] > 0) { + for (var n = 0; n < _0x462335[t(397)][t(601)]; n++) { + var f = _0x462335[t(397)][n][0]; + if (f[t(555)](r)) { + a = r[t(887)](f, _0x462335[t(397)][n][1]); + e && _0x3d40ff[t(919)].call(e, t(579), t(547) + r + "\nREWRITED: " + a); + break; + } + } + } + return _0x2b13af(a); + } + function _0x344a4d() { + var e = _0x5612de; + return w_0x5c3140(e(525), { + get 0() { + return window; + }, + get 1() { + return _0x6a7375; + }, + get 2() { + return _0x6caf; + }, + get 3() { + return _0x1958a5; + }, + get 4() { + return _0x2b13af; + }, + get 5() { + return _0x288415; + }, + get 6() { + return _0x8edc3d; + }, + 7: arguments + }, this); + } + function _0x3f720d() { + _0x3af1be(); + _0x1d82ac(); + _0x344a4d(); + } + function _0x3bfecb(e) { + var r = _0x5612de; + this[r(833)] = "ConfigException"; + this[r(786)] = e; + } + var _0x589057 = { + cn: { + host: _0x5612de(713) + } + }; + var _0x2bbf08 = [_0x5612de(780)]; + var _0x3d70a4; + function _0x43f5a3(e) { + var r = _0x5612de; + var t = ""; + return { + host: t = e[r(438)] || e[r(430)] ? e[r(435)] : _0x589057[e[r(548)]][r(732)], + pathList: _0x2bbf08, + reportUrl: t + _0x2bbf08[0] + }; + } + var _0x383bd7 = !1; + var _0xd39ee2; + var _0x9e520d; + function _0x53ee31(e) { + var r = _0x5612de; + return w_0x5c3140(r(847), { + 0: Object, + 1: Math, + get 2() { + return _0x3bfecb; + }, + get 3() { + return _0x6caf; + }, + get 4() { + return _0x462335; + }, + get 5() { + return _0x43f5a3; + }, + get 6() { + return setTimeout; + }, + get 7() { + return _0x5c328e; + }, + get 8() { + return _0x3d70a4; + }, + set 8(e) { + _0x3d70a4 = e; + }, + get 9() { + return clearInterval; + }, + get 10() { + return setInterval; + }, + get 11() { + return _0x450b73; + }, + get 12() { + return _0x1a39c4; + }, + get 13() { + return _0x3f720d; + }, + get 14() { + return _0x59992f; + }, + get 15() { + return _0x39d569; + }, + get 16() { + return _0x1dbe74; + }, + get 17() { + return _0x383bd7; + }, + set 17(e) { + _0x383bd7 = e; + }, + get 18() { + return _0x18707d; + }, + get 19() { + return _0x1c3b6d; + }, + 20: arguments, + 21: e + }, this); + } + function _0x3498af(e) { } + function _0x59992f(e) { + var r = _0x5612de; + for (var t = 0; t < e[r(601)]; t++) { + e[t] && _0x462335._enablePathListRegex.push(new RegExp(e[t])); + } + } + function _0x39d569(e) { + var r = _0x5612de; + if (void 0 !== e) { + for (var t = 0; t < e[r(601)]; t++) { + _0x462335[r(397)][r(878)]([new RegExp(e[t][0]), e[t][1]]); + } + } + } + function _0x32e4a6() { + var e = _0x5612de; + return window[e(792)] || ""; + } + function _0x1be1e1(e) { + var r = _0x5612de; + var t = _0x6caf[r(803)]; + var a = 9; + r(694) === e && (a = 1); + r(645) === e && (a = 2); + var n = { + ts: new Date()[r(365)](), + v: a + }; + t[r(878)](n); + } + function _0x4de7ef() { + var e = _0x5612de; + var r; + var t; + void 0 !== document[e(645)] ? (e(645), t = e(416), r = e(502)) : void 0 !== document[e(351)] ? (e(351), + t = e(456), r = e(831)) : void 0 !== document[e(710)] ? (e(710), t = e(716), r = e(420)) : void 0 !== document[e(554)] && (e(554), + t = e(802), r = e(358)); + document[e(758)](t, function () { + _0x1be1e1(document[r]); + }, !1); + _0x1be1e1(document[r]); + } + function _0x3ff3f1() { + _0x58c311(); + } + function _0x4c727e() { + var e = _0x5612de; + function r(e) { + var r = w_0x25f3; + _0x462335.triggerUnload || (_0x462335[r(516)] = !0, _0x3ff3f1()); + } + if (window && window[e(758)]) { + window[e(758)](e(893), r); + window[e(758)](e(667), r); + } + } + function _0x5b850b() { + var e = _0x5612de; + for (var r = document[e(626)][e(834)](";"), t = [], a = 0; a < r[e(601)]; a++) { + if (e(949) == (t = r[a][e(834)]("="))[0].trim()) { + _0x6caf[e(949)] = t[1]; + break; + } + } + } + function _0x498349(e) { + return new _0x53ee31(e); + } + function _0x475194(e) { + 0 === e ? setTimeout(_0x5047d8, 100) : 1 === e && setTimeout(_0x5c328e, 100); + } + function _0x4a4111(e, r) { + var t = _0x5612de; + 1 === e && (_0x462335[t(842)] = Object.assign({}, _0x462335[t(842)], r)); + } + function _0x271dea(e) { + void 0 !== e && "" != e && (_0x6caf.ttwid = e); + } + function _0x3a4a1a(e) { + var r = _0x5612de; + void 0 !== e && "" != e && (_0x6caf[r(790)] = e); + } + function _0x3f0a66(e) { + var r = _0x5612de; + void 0 !== e && "" != e && (_0x6caf[r(825)] = e); + } + _0x53ee31[_0x5612de(836)][_0x5612de(419)] = _0x5c2014; + _0x53ee31[_0x5612de(836)].getReferer = _0x32e4a6; + _0x53ee31[_0x5612de(836)].setUserMode = _0x3498af; + _0xd39ee2 = _0x24dc34(_0x45b94b.refererKey) || ""; + _0x2ecc5a(_0x45b94b.refererKey); + _0x5612de(726) === _0xd39ee2 ? _0xd39ee2 = "" : "" === _0xd39ee2 && (_0xd39ee2 = document[_0x5612de(762)]); + _0xd39ee2 && (window[_0x5612de(792)] = _0xd39ee2); + _0x9e520d = _0x5141ac(); + _0x9e520d && (_0x6caf[_0x5612de(692)] = _0x9e520d, _0x6caf.msStatus = _0x39693d.asgw); + // setTimeout(function () { + // _0x18a9f7(); + // _0x1dbe74(); + // _0x4de7ef(); + // _0x4c727e(); + // _0x21fa28(); + // }, 3e3); + _0x5b850b(); + _0x59992f([_0x5612de(780)]); + var _0x1649bc = !0; + _0x1d18f2.frontierSign = _0x5c2014; + _0x1d18f2[_0x5612de(744)] = _0x32e4a6; + _0x1d18f2[_0x5612de(953)] = _0x498349; + _0x1d18f2[_0x5612de(504)] = _0x1649bc; + _0x1d18f2.report = _0x475194; + _0x1d18f2[_0x5612de(664)] = _0x4a4111; + _0x1d18f2[_0x5612de(423)] = _0x3a4a1a; + _0x1d18f2.setTTWebidV2 = _0x3f0a66; + _0x1d18f2[_0x5612de(580)] = _0x271dea; + _0x1d18f2[_0x5612de(888)] = _0x3498af; + Object.defineProperty(_0x1d18f2, _0x5612de(957), { + value: !0 + }); + }); +} + +// function get_signature(room_id, user_unique_id) { +// return window.byted_acrawler.frontierSign({ +// "X-MS-STUB": md5(`live_id=1,aid=6383,version_code=180800,webcast_sdk_version=1.0.14-beta.0,room_id=${room_id},sub_room_id=,sub_channel_id=,did_rule=3,user_unique_id=${user_unique_id},device_platform=web,device_type=,ac=,identity=audience`) +// }) +// } +// console.log(get_signature("7382517534467115826","7382524529011246630")) + +function get_signature(x_ms_stub) { + return window.byted_acrawler.frontierSign(x_ms_stub) +} From b41a12e70381e66954da252a4e64804acd50ba16 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 16:21:50 +0800 Subject: [PATCH 209/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=94=9F?= =?UTF-8?q?=E6=88=90douyin=E7=9B=B4=E6=92=AD=E9=97=B4wss=E7=AD=BE=E5=90=8D?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/algorithm/webcast_signature.py | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 f2/apps/douyin/algorithm/webcast_signature.py diff --git a/f2/apps/douyin/algorithm/webcast_signature.py b/f2/apps/douyin/algorithm/webcast_signature.py new file mode 100644 index 00000000..8156c59b --- /dev/null +++ b/f2/apps/douyin/algorithm/webcast_signature.py @@ -0,0 +1,64 @@ +# path: f2/apps/douyin/algorithm/webcast_signature.py + +import execjs +import hashlib +from pathlib import Path +from f2.utils.utils import get_resource_path + + +class DouyinWebcastSignature: + def __init__(self, user_agent: str = None): + self.user_agent = ( + user_agent + if user_agent is not None and user_agent != "" + else "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0" + ) # 自定义 ua，为空则设置一个默认 ua + + def get_signature(self, room_id: str, user_unique_id: str): + """ + 获取直播间签名 + + Args: + room_id: (str) 直播间 ID + user_unique_id: (str) 用户唯一 ID + + Returns: + signature: (str) 签名 + """ + # 使用 importlib_resources 读取库中的 js 文件 + js_path = get_resource_path("apps/douyin/algorithm/webcast_signature.js") + # 读取 js 文件，确保使用 utf-8 编码 + js_code = Path(js_path).read_text() + + # 在 js_code 中动态设置 user_agent + js_code = f""" + _navigator = {{ + userAgent: "{self.user_agent}" + }}; + {js_code} + """ + + # 创建 execjs 运行环境 + ctx = execjs.compile(js_code) + + # 构造待 signature 的字符串 + raw_string = f"live_id=1,aid=6383,version_code=180800,webcast_sdk_version=1.0.12,room_id={room_id},sub_room_id=,sub_channel_id=,did_rule=3,user_unique_id={user_unique_id},device_platform=web,device_type=,ac=,identity=audience" + + # md5 计算 X-MS-STUB + x_ms_stub = {"X-MS-STUB": hashlib.md5(raw_string.encode("utf-8")).hexdigest()} + + # 调用 js 函数计算 signature + result = ctx.call("get_signature", x_ms_stub) + + # 加密参数的 key 为 X-Bogus + return result.get("X-Bogus") + + +if __name__ == "__main__": + signature_handler = DouyinWebcastSignature( + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0" + ) + signature = signature_handler.get_signature( + "7382517534467115826", "7382524529011246630" + ) + print(signature) From a021467cbdc7de8a7ed7c3d1498e4081c4b666dc Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 19:13:05 +0800 Subject: [PATCH 210/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0WebSocket?= =?UTF-8?q?=E7=88=AC=E8=99=AB=E5=AE=A2=E6=88=B7=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/crawlers/base_crawler.py | 146 ++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) diff --git a/f2/crawlers/base_crawler.py b/f2/crawlers/base_crawler.py index cb4b4ee7..e0b58aaa 100644 --- a/f2/crawlers/base_crawler.py +++ b/f2/crawlers/base_crawler.py @@ -3,8 +3,11 @@ import httpx import json import asyncio +import traceback +import websockets from httpx import Response +from websockets.exceptions import ConnectionClosedError, ConnectionClosedOK from f2.i18n.translator import _ from f2.log.logger import logger @@ -396,3 +399,146 @@ async def __aenter__(self): async def __aexit__(self, exc_type, exc_val, exc_tb): await self.aclient.aclose() + +class WebSocketCrawler: + """ + WebSocket爬虫客户端 (WebSocket crawler client) + """ + + def __init__(self, wss_headers: dict, callbacks: dict = None, timeout: int = 10): + """ + 初始化 WebSocketCrawler 实例 + + Args: + wss_headers: WebSocket 连接头信息 + callbacks: WebSocket 回调函数 + timeout: WebSocket 超时时间 + """ + self.websocket = None + self.wss_headers = wss_headers + self.callbacks = callbacks or {} # 存储回调函数 + self.timeout = timeout + + async def connect_websocket( + self, + websocket_uri: str, + ): + """ + 连接 WebSocket + + Args: + websocket_uri: WebSocket URI (ws:// or wss://) + """ + try: + # https://websockets.readthedocs.io/en/stable/reference/features.html#client 暂不支持代理 + self.websocket = await websockets.connect( + websocket_uri, extra_headers=self.wss_headers + ) + logger.info(_("已连接 WebSocket")) + except ConnectionRefusedError as exc: + logger.error(traceback.format_exc()) + logger.error(_("WebSocket 连接被拒绝：{0}").format(exc)) + raise APIConnectionError(_("连接 WebSocket 失败：{0}").format(exc)) + + except websockets.InvalidStatusCode as exc: + logger.error(traceback.format_exc()) + logger.error(_("WebSocket 连接状态码无效：{0}").format(exc)) + await asyncio.sleep(2) + await self.connect_websocket(websocket_uri) + + async def receive_messages(self): + """ + 接收 WebSocket 消息并处理 + """ + timeout_count = 0 + try: + while True: + try: + # 为wss连接设置10秒超时机制 + logger.info( + _("等待接收消息，超时时间：{0} 秒").format(self.timeout) + ) + message = await asyncio.wait_for( + self.websocket.recv(), timeout=self.timeout + ) + timeout_count = 0 # 重置超时计数 + await self.on_message(message) + except asyncio.TimeoutError: + logger.warning(_("接收消息超时")) + timeout_count += 1 + if timeout_count >= 3: + await self.on_close(_("即将关闭 WebSocket 连接")) + return "closed" + if self.websocket.closed: + await self.on_close(_("即将关闭 WebSocket 连接")) + return "closed" + except ConnectionClosedError as exc: + logger.error(traceback.format_exc()) + await self.on_close(_("WebSocket 连接被关闭：{0}").format(exc)) + return "closed" + except ConnectionClosedOK: + await self.on_close(_("WebSocket 连接正常关闭")) + return "closed" + except Exception as exc: + logger.error(traceback.format_exc()) + logger.error(_("处理消息时出错：{0}").format(exc)) + await self.on_error(exc) + return "error" + + except Exception as e: + logger.error(traceback.format_exc()) + logger.error(_("接收消息过程中出错：{0}").format(e)) + return "error" + + async def close_websocket(self): + """ + 关闭 WebSocket 连接 + """ + if self.websocket: + await self.websocket.close() + logger.info(_("已关闭 WebSocket 连接")) + + async def on_message(self, message): + """ + 处理 WebSocket 消息 + + Args: + message: WebSocket 消息 + """ + logger.debug(_("收到消息：{0}").format(message)) + + async def on_error(self, message): + """ + 处理 WebSocket 错误 + + Args: + message: WebSocket 错误 + """ + logger.error(_("WebSocket 错误：{0}").format(message)) + + async def on_close(self, message): + """ + 处理 WebSocket 关闭 + + Args: + message: WebSocket 关闭消息 + """ + logger.warning(message) + + async def on_open(self): + """ + 处理 WebSocket 打开 + """ + logger.info(_("WebSocket 连接已打开")) + + async def __aenter__(self): + """ + 进入异步上下文：连接WebSocket + """ + return self + + async def __aexit__(self, exc_type, exc_val, exc_tb): + """ + 退出异步上下文：关闭WebSocket连接 + """ + await self.close_websocket() From 652ce50655d50dc0863b6b6d71215636a823bd09 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 19:13:42 +0800 Subject: [PATCH 211/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0=5F=5Faexit?= =?UTF-8?q?=5F=5F=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/crawlers/base_crawler.py | 9 +++++++-- f2/dl/base_downloader.py | 7 +++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/f2/crawlers/base_crawler.py b/f2/crawlers/base_crawler.py index e0b58aaa..007423f6 100644 --- a/f2/crawlers/base_crawler.py +++ b/f2/crawlers/base_crawler.py @@ -392,13 +392,18 @@ def handle_http_status_error(self, http_error, url: str, attempt): raise APIResponseError(_("HTTP状态码错误："), status_code) async def close(self): - await self.aclient.aclose() + # 如果没有初始化客户端，则不关闭 (If the client is not initialized, do not close) + if self._client: + await self.client.aclose() + if self._aclient: + await self.aclient.aclose() async def __aenter__(self): return self async def __aexit__(self, exc_type, exc_val, exc_tb): - await self.aclient.aclose() + await self.close() + class WebSocketCrawler: """ diff --git a/f2/dl/base_downloader.py b/f2/dl/base_downloader.py index 2c88f7a7..9658e67e 100644 --- a/f2/dl/base_downloader.py +++ b/f2/dl/base_downloader.py @@ -572,7 +572,10 @@ async def execute_tasks(self): async def close(self) -> None: """关闭下载器 (Close the downloader)""" - await self.aclient.aclose() + if self.client: + await self.client.close() + if self.aclient: + await self.aclient.aclose() async def __aenter__(self) -> "BaseDownloader": """进入上下文管理器 (Enter the context manager)""" @@ -582,4 +585,4 @@ async def __aenter__(self) -> "BaseDownloader": async def __aexit__(self, exc_type, exc_val, exc_tb) -> None: """退出上下文管理器 (Exit the context manager)""" self.progress.__exit__(exc_type, exc_val, exc_tb) - await self.aclient.aclose() + await self.close() From 54ae89390c8f912cd3a8e4f8e2b6fd97a6952a4f Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 19:18:22 +0800 Subject: [PATCH 212/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=8E=A5=E5=8F=A3=E6=A8=A1=E5=9E=8B=E8=BD=ACurl?= =?UTF-8?q?=E7=B1=BB=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/utils/utils.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/f2/utils/utils.py b/f2/utils/utils.py index 64322aee..0cb2ffd8 100644 --- a/f2/utils/utils.py +++ b/f2/utils/utils.py @@ -423,3 +423,11 @@ async def get_latest_version(package_name: str) -> str: except (httpx.HTTPStatusError, httpx.RequestError, KeyError) as e: logger.error(traceback.format_exc()) return "0.0.0.0" + + +class BaseEndpointManager: + @classmethod + def model_2_endpoint(cls, base_endpoint: str, params: dict) -> str: + param_str = "&".join([f"{k}={v}" for k, v in params.items()]) + separator = "&" if "?" in base_endpoint else "?" + return f"{base_endpoint}{separator}{param_str}" From 0e907f14b8c582f62ab2f824e52260d2cf7a299a Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 19:19:42 +0800 Subject: [PATCH 213/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4wss=E7=AD=BE=E5=90=8D=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/utils.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/f2/apps/douyin/utils.py b/f2/apps/douyin/utils.py index 7952214b..3fe97906 100644 --- a/f2/apps/douyin/utils.py +++ b/f2/apps/douyin/utils.py @@ -13,6 +13,7 @@ from typing import Union from pathlib import Path +from f2.apps.douyin.algorithm import webcast_signature from f2.i18n.translator import _ from f2.log.logger import logger from f2.utils.xbogus import XBogus as XB @@ -537,6 +538,30 @@ def gen_s_v_web_id(cls) -> str: return cls.gen_verify_fp() +class WebcastSignatureManager: + @classmethod + def model_2_endpoint( + cls, + base_endpoint: str, + params: dict, + request_type: str = "", + ) -> str: + if not isinstance(params, dict): + raise TypeError(_("参数必须是字典类型")) + + param_str = ",".join([f"{k}={v}" for k, v in params.items()]) + + try: + signature = webcast_signature.get_sign(param_str) + except Exception as e: + logger.error(traceback.format_exc()) + raise RuntimeError(_("生成signature失败: {0})").format(e)) + + separator = "&" if "?" in base_endpoint else "?" + + return f"{base_endpoint}{separator}{param_str}&signature={signature}" + + class XBogusManager: @classmethod def str_2_endpoint( From 636e0516706716f2b8c8c7644e5f6e070b3a9f3d Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 19:20:12 +0800 Subject: [PATCH 214/299] =?UTF-8?q?test:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4wss=E7=AD=BE=E5=90=8D=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../douyin/test/test_douyin_webcast_signature.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 f2/apps/douyin/test/test_douyin_webcast_signature.py diff --git a/f2/apps/douyin/test/test_douyin_webcast_signature.py b/f2/apps/douyin/test/test_douyin_webcast_signature.py new file mode 100644 index 00000000..f5c060af --- /dev/null +++ b/f2/apps/douyin/test/test_douyin_webcast_signature.py @@ -0,0 +1,13 @@ +import pytest +from f2.apps.douyin.algorithm.webcast_signature import DouyinWebcastSignature +from f2.apps.douyin.utils import ClientConfManager + + +def test_DouyinWebcastSignature(): + room_id = "7383573503129258802" + user_unique_id = "7383588170770138661" + signature = DouyinWebcastSignature(ClientConfManager.user_agent()).get_signature( + room_id, user_unique_id + ) + assert signature is not None + assert len(signature) == 16 From 3671d072fc128106dee35515978293e1be20d542 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 19:20:51 +0800 Subject: [PATCH 215/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E5=BC=B9=E5=B9=95protobuf=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/proto/douyin_webcast.proto | 998 ++++++++++++++++++++++ 1 file changed, 998 insertions(+) create mode 100644 f2/apps/douyin/proto/douyin_webcast.proto diff --git a/f2/apps/douyin/proto/douyin_webcast.proto b/f2/apps/douyin/proto/douyin_webcast.proto new file mode 100644 index 00000000..a0765919 --- /dev/null +++ b/f2/apps/douyin/proto/douyin_webcast.proto @@ -0,0 +1,998 @@ +syntax = "proto3"; + +package douyin; + + +message Response { + repeated Message messagesList = 1; + string cursor = 2; + uint64 fetchInterval = 3; + uint64 now = 4; + string internalExt = 5; + uint32 fetchType = 6; + map routeParams = 7; + uint64 heartbeatDuration = 8; + bool needAck = 9; + string pushServer = 10; + string liveCursor = 11; + bool historyNoMore = 12; +} + +message Message{ + string method = 1; + bytes payload = 2; + int64 msgId = 3; + int32 msgType = 4; + int64 offset = 5; + bool needWrdsStore = 6; + int64 wrdsVersion = 7; + string wrdsSubKey = 8; +} + +message ChatMessage { + Common common = 1; + User user = 2; + string content = 3; + bool visibleToSender = 4; + Image backgroundImage = 5; + string fullScreenTextColor = 6; + Image backgroundImageV2 = 7; + PublicAreaCommon publicAreaCommon = 8; + Image giftImage = 9; + uint64 agreeMsgId = 11; + uint32 priorityLevel = 12; + LandscapeAreaCommon landscapeAreaCommon = 13; + uint64 eventTime = 15; + bool sendReview = 16; + bool fromIntercom = 17; + bool intercomHideUserCard = 18; + // repeated chatTagsList = 19; + string chatBy = 20; + uint32 individualChatPriority = 21; + Text rtfContent = 22; +} + + +message LandscapeAreaCommon { + bool showHead = 1; + bool showNickname = 2; + bool showFontColor = 3; + repeated string colorValueList = 4; + repeated CommentTypeTag commentTypeTagsList = 5; +} + +message RoomUserSeqMessage { + Common common = 1; + repeated RoomUserSeqMessageContributor ranksList = 2; + int64 total = 3; + string popStr = 4; + repeated RoomUserSeqMessageContributor seatsList = 5; + int64 popularity = 6; + int64 totalUser = 7; + string totalUserStr = 8; + string totalStr = 9; + string onlineUserForAnchor = 10; + string totalPvForAnchor = 11; + string upRightStatsStr = 12; + string upRightStatsStrComplete = 13; +} + +message RoomMessage{ + Common common = 1; + string content = 2; + bool support_landscape = 3; +} + +message CommonTextMessage { + Common common = 1; + User user = 2; + string scene = 3; +} + +// 粉丝团更新 +message UpdateFanTicketMessage { + Common common = 1; + string roomFanTicketCountText = 2; + uint64 roomFanTicketCount = 3; + bool forceUpdate = 4; +} + + +message RoomUserSeqMessageContributor { + uint64 score = 1; + User user = 2; + uint64 rank = 3; + uint64 delta = 4; + bool isHidden = 5; + string scoreDescription = 6; + string exactlyScore = 7; +} + +// 礼物消息 +message GiftMessage { + Common common = 1; + uint64 giftId = 2; + uint64 fanTicketCount = 3; + uint64 groupCount = 4; + uint64 repeatCount = 5; + uint64 comboCount = 6; + User user = 7; + User toUser = 8; + uint32 repeatEnd = 9; + TextEffect textEffect = 10; + uint64 groupId = 11; + uint64 incomeTaskgifts = 12; + uint64 roomFanTicketCount = 13; + GiftIMPriority priority = 14; + GiftStruct gift = 15; + string logId = 16; + uint64 sendType = 17; + PublicAreaCommon publicAreaCommon = 18; + Text trayDisplayText = 19; + uint64 bannedDisplayEffects = 20; + GiftTrayInfo trayInfo = 21; + AssetEffectMixInfo assetEffectMixInfo = 22; + bool displayForSelf = 25; + string interactGiftInfo = 26; + string diyItemInfo = 27; + repeated uint64 minAssetSetList = 28; + uint64 totalCount = 29; + uint32 clientGiftSource = 30; + // AnchorGiftData anchorGift = 31; + repeated uint64 toUserIdsList = 32; + uint64 sendTime = 33; + uint64 forceDisplayEffects = 34; + string traceId = 35; + uint64 effectDisplayTs = 36; +} + +message AssetEffectMixInfo{ + +} + +message FansClubMessage { + Common commonInfo = 1; + int32 type = 2; + string content = 3; + User user = 4; +} + +message GiftTrayInfo{ + Text trayDisplayText = 1; + Image trayBaseImg = 2; + Image trayHeadImg = 3; + Image trayRightImg = 4; + int64 trayLevel = 5; + Image trayDynamicImg = 6; +} + +message GiftStruct { + Image image = 1; + string describe = 2; + bool notify = 3; + int64 duration = 4; + int64 id = 5; + GiftStructFansClubInfo fansclubInfo = 6; + bool forLinkmic = 7; + bool doodle = 8; + bool forFansclub = 9; + bool combo = 10; + int32 type = 11; + int32 diamondCount = 12; + int32 isDisplayedOnPanel = 13; + int64 primaryEffectId = 14; + Image giftLabelIcon = 15; + string name = 16; + string region = 17; + string manual = 18; + bool forCustom = 19; + map specialEffects = 20; + Image icon = 21; + int32 actionType = 22; + int32 watermelonSeeds = 23; + string goldEffect = 24; + repeated LuckyMoneyGiftMeta subs = 25; + int64 goldenBeans = 26; + int64 honorLevel = 27; + int32 itemType = 28; + string schemeUrl = 29; + GiftPanelOperation giftOperation = 30; + string eventName = 31; + int64 nobleLevel = 32; + string guideUrl = 33; + bool punishMedicine = 34; + bool forPortal = 35; + string businessText = 36; + bool cnyGift = 37; + int64 appId = 38; + int64 vipLevel = 39; + bool isGray = 40; + string graySchemeUrl = 41; + int64 giftScene = 42; + GiftBanner giftBanner = 43; + repeated string triggerWords = 44; + repeated GiftBuffInfo giftBuffInfos = 45; + bool forFirstRecharge = 46; + Image dynamicImgForSelected = 47; + int32 afterSendAction = 48; + int64 giftOfflineTime = 49; + string topBarText = 50; + Image topRightAvatar = 51; + string bannerSchemeUrl = 52; + bool isLocked = 53; + int64 reqExtraType = 54; + repeated int64 assetIds = 55; + GiftPreviewInfo giftPreviewInfo = 56; + GiftTip giftTip = 57; + int32 needSweepLightCount = 58; + repeated GiftGroupInfo groupInfo = 59; + + message GiftStructFansClubInfo { + int32 minLevel = 1; + int32 insertPos = 2; + } +} + +message LuckyMoneyGiftMeta { + +} + +message GiftPanelOperation { + +} + +message GiftBanner { + +} + +message GiftBuffInfo{ + +} + +message GiftPreviewInfo{ + +} + +message GiftTip { + +} + +message GiftGroupInfo { + +} + +message GiftIMPriority { + repeated uint64 queueSizesList = 1; + uint64 selfQueuePriority = 2; + uint64 priority = 3; +} + +message TextEffect { + TextEffectDetail portrait = 1; + TextEffectDetail landscape = 2; +} + +message TextEffectDetail { + Text text = 1; + uint32 textFontSize = 2; + Image background = 3; + uint32 start = 4; + uint32 duration = 5; + uint32 x = 6; + uint32 y = 7; + uint32 width = 8; + uint32 height = 9; + uint32 shadowDx = 10; + uint32 shadowDy = 11; + uint32 shadowRadius = 12; + string shadowColor = 13; + string strokeColor = 14; + uint32 strokeWidth = 15; +} + +// 成员消息 +message MemberMessage { + Common common = 1; + User user = 2; + uint64 memberCount = 3; + User operator = 4; + bool isSetToAdmin = 5; + bool isTopUser = 6; + uint64 rankScore = 7; + uint64 topUserNo = 8; + uint64 enterType = 9; + uint64 action = 10; + string actionDescription = 11; + uint64 userId = 12; + EffectConfig effectConfig = 13; + string popStr = 14; + EffectConfig enterEffectConfig = 15; + Image backgroundImage = 16; + Image backgroundImageV2 = 17; + Text anchorDisplayText = 18; + PublicAreaCommon publicAreaCommon = 19; + uint64 userEnterTipType = 20; + uint64 anchorEnterTipType = 21; + map buriedPointMap = 22; +} + + +message PublicAreaCommon { + Image userLabel = 1; + uint64 userConsumeInRoom = 2; + uint64 userSendGiftCntInRoom = 3; +} + +message EffectConfig { + uint64 type = 1; + Image icon = 2; + uint64 avatarPos = 3; + Text text = 4; + Image textIcon = 5; + uint32 stayTime = 6; + uint64 animAssetId = 7; + Image badge = 8; + repeated uint64 flexSettingArrayList = 9; + Image textIconOverlay = 10; + Image animatedBadge = 11; + bool hasSweepLight = 12; + repeated uint64 textFlexSettingArrayList = 13; + uint64 centerAnimAssetId = 14; + Image dynamicImage = 15; + map extraMap = 16; + uint64 mp4AnimAssetId = 17; + uint64 priority = 18; + uint64 maxWaitTime = 19; + string dressId = 20; + uint64 alignment = 21; + uint64 alignmentOffset = 22; + string effectScene = 23; + map pieceValuesMap = 24; +} + +message Text { + string key = 1; + string defaultPatter = 2; + TextFormat defaultFormat = 3; + repeated TextPiece piecesList = 4; +} + +message TextPiece { + bool type = 1; + TextFormat format = 2; + string stringValue = 3; + TextPieceUser userValue = 4; + TextPieceGift giftValue = 5; + TextPieceHeart heartValue = 6; + TextPiecePatternRef patternRefValue = 7; + TextPieceImage imageValue = 8; +} + + +message TextPieceImage { + Image image = 1; + float scalingRate = 2; +} + +message TextPiecePatternRef { + string key = 1; + string defaultPattern = 2; +} + +message TextPieceHeart { + string color = 1; +} + +message TextPieceGift { + uint64 giftId = 1; + PatternRef nameRef = 2; +} + +message PatternRef { + string key = 1; + string defaultPattern = 2; +} + +message TextPieceUser { + User user = 1; + bool withColon = 2; +} + +message TextFormat { + string color = 1; + bool bold = 2; + bool italic = 3; + uint32 weight = 4; + uint32 italicAngle = 5; + uint32 fontSize = 6; + bool useHeighLightColor = 7; + bool useRemoteClor = 8; +} + +// 点赞 +message LikeMessage { + Common common = 1; + uint64 count = 2; + uint64 total = 3; + uint64 color = 4; + User user = 5; + string icon = 6; + DoubleLikeDetail doubleLikeDetail = 7; + DisplayControlInfo displayControlInfo = 8; + uint64 linkmicGuestUid = 9; + string scene = 10; + PicoDisplayInfo picoDisplayInfo = 11; +} + +message SocialMessage { + Common common = 1; + User user = 2; + uint64 shareType = 3; + uint64 action = 4; + string shareTarget = 5; + uint64 followCount = 6; + PublicAreaCommon publicAreaCommon = 7; +} + +message PicoDisplayInfo { + uint64 comboSumCount = 1; + string emoji = 2; + Image emojiIcon = 3; + string emojiText = 4; +} + +message DoubleLikeDetail { + bool doubleFlag = 1; + uint32 seqId = 2; + uint32 renewalsNum = 3; + uint32 triggersNum = 4; +} + +message DisplayControlInfo { + bool showText = 1; + bool showIcons = 2; +} + +message EpisodeChatMessage { + Message common = 1; + User user = 2; + string content = 3; + bool visibleToSende = 4; +// BackgroundImage backgroundImage = 5; +// PublicAreaCommon publicAreaCommon = 6; + Image giftImage = 7; + uint64 agreeMsgId = 8; + repeated string colorValueList = 9; +} + + +message MatchAgainstScoreMessage { + Common common = 1; + Against against = 2; + uint32 matchStatus = 3; + uint32 displayStatus = 4; +} + +message Against { + string leftName = 1; + Image leftLogo = 2; + string leftGoal = 3; +// LeftPlayersList leftPlayersList = 4; +// LeftGoalStageDetail leftGoalStageDetail = 5; + string rightName = 6; + Image rightLogo = 7; + string rightGoal = 8; +// RightPlayersList rightPlayersList = 9; +// RightGoalStageDetail rightGoalStageDetail = 10; + uint64 timestamp = 11; + uint64 version = 12; + uint64 leftTeamId = 13; + uint64 rightTeamId = 14; + uint64 diffSei2absSecond = 15; + uint32 finalGoalStage = 16; + uint32 currentGoalStage =17; + uint32 leftScoreAddition =18; + uint32 rightScoreAddition =19; + uint64 leftGoalInt = 20; + uint64 rightGoalInt = 21; +} + +message Common { + string method = 1; + uint64 msgId = 2; + uint64 roomId = 3; + uint64 createTime = 4; + uint32 monitor = 5; + bool isShowMsg = 6; + string describe = 7; + Text displayText = 8; + uint64 foldType = 9; + uint64 anchorFoldType = 10; + uint64 priorityScore = 11; + string logId = 12; + string msgProcessFilterK = 13; + string msgProcessFilterV = 14; + User user = 15; + Room room = 16; + uint64 anchorFoldTypeV2 = 17; + uint64 processAtSeiTimeMs = 18; + uint64 randomDispatchMs = 19; + bool isDispatch = 20; + uint64 channelId = 21; + uint64 diffSei2absSecond = 22; + uint64 anchorFoldDuration = 23; +} + +message Room { + int64 id = 1; + string idStr = 2; + int64 status = 3; + int64 ownerUserId = 4; + string title = 5; + int64 userCount = 6; + int64 createTime = 7; + int64 linkmicLayout = 8; + int64 finishTime = 9; + RoomExtra extra = 10; + string dynamicCoverUri = 11; + map dynamicCoverDict = 12; + int64 lastPingTime = 13; + int64 liveId = 14; + int64 streamProvider = 15; + int64 osType = 16; + int64 clientVersion = 17; + bool withLinkmic = 18; + bool enableRoomPerspective = 19; + Image cover = 20; + Image dynamicCover = 21; + Image dynamicCoverLow = 22; + string shareUrl = 23; + string anchorShareText = 24; + string userShareText = 25; + int64 streamId = 26; + string streamIdStr = 27; + StreamUrl streamUrl = 28; + int64 mosaicStatus = 29; + string mosaicTip = 30; + int64 cellStyle = 31; + LinkMic linkMic = 32; + int64 luckymoneyNum = 33; + repeated Decoration decoList = 34; + repeated TopFan topFans = 35; + RoomStats stats = 36; + string sunDailyIconContent = 37; + string distance = 38; + string distanceCity = 39; + string location = 40; + string realDistance = 41; + Image feedRoomLabel = 42; + string commonLabelList = 43; + RoomUserAttr livingRoomAttrs = 44; + repeated int64 adminUserIds = 45; + User owner = 46; + string privateInfo = 47; +} + +message RoomExtra{ + +} + +message RoomStats{ + +} + +message RoomUserAttr{ + +} + +message StreamUrl{ + +} + +message LinkMic { + +} + +message Decoration{ + +} + +message TopFan { + +} + +message GradeBuffInfo { + int64 buffLevel = 1; + int32 status = 2; + int64 endTime = 3; + map statsInfoMap = 4; + Image buffBadge = 5; +} + +message UserVIPInfo{ + +} + +message IndustryCertification{ + +} + +// User +message User { + int64 id = 1; + int64 shortId = 2; + string nickname = 3; + int32 gender = 4; + string signature = 5; + int32 level = 6; + int64 birthday = 7; + string telephone = 8; + Image avatarThumb = 9; + Image avatarMedium = 10; + Image avatarLarge = 11; + bool verified = 12; + int32 experience = 13; + string city = 14; + int32 status = 15; + int64 createTime = 16; + int64 modifyTime = 17; + int32 secret = 18; + string shareQrcodeUri = 19; + int32 incomeSharePercent = 20; + Image badgeImageListList = 21; + FollowInfo followInfo = 22; + PayGrade payGrade = 23; + FansClub fansClub = 24; + Border border = 25; + string specialId = 26; + Image avatarBorder = 27; + Image medal = 28; + repeated Image realTimeIconsList = 29; + repeated Image newRealTimeIconsList = 30; + int64 topVipNo = 31; + UserAttr userAttr = 32; + OwnRoom ownRoom = 33; + int64 payScore = 34; + int64 ticketCount = 35; + AnchorInfo anchorInfo = 36; + int32 linkMicStats = 37; + string displayId = 38; + bool withCommercePermission = 39; + bool withFusionShopEntry = 40; + int64 totalRechargeDiamondCount = 41; + AnchorLevel webcastAnchorLevel = 42; + string verifiedContent = 43; + AuthorStats authorStats = 44; + repeated User topFansList = 45; + string secUid = 46; + int32 userRole = 47; + XiguaParams xiguaInfo = 48; + ActivityInfo activityReward = 49; + NobleLevelInfo nobleInfo = 50; + BrotherhoodInfo brotherhoodInfo = 51; + Image personalCard = 52; + AuthenticationInfo authenticationInfo = 53; + int32 authorizationInfo = 54; + int32 adversaryAuthorizationInfo = 55; + PoiInfo poiInfo = 56; + Image mediaBadgeImageListList = 57; + int32 adversaryUserStatus = 58; + UserVIPInfo userVipInfo = 59; + repeated int64 commerceWebcastConfigIdsList = 60; + Image badgeImageListV2List = 61; + IndustryCertification industryCertification = 62; + string locationCity = 63; + FansGroupInfo fansGroupInfo = 64; + string remarkName = 65; + int32 mysteryMan = 66; + string webRid = 67; + string desensitizedNickname = 68; + JAccreditInfo jAccreditInfo = 69; + Subscribe subscribe = 70; + bool isAnonymous = 71; + int32 consumeDiamondLevel = 72; + string webcastUid = 73; + ProfileStyleParams profileStyleParams = 74; + UserDressInfo userDressInfo = 75; + bool allowBeLocated = 1001; + bool allowFindByContacts = 1002; + bool allowOthersDownloadVideo = 1003; + bool allowOthersDownloadWhenSharingVideo = 1004; + bool allowShareShowProfile = 1005; + bool allowShowInGossip = 1006; + bool allowShowMyAction = 1007; + bool allowStrangeComment = 1008; + bool allowUnfollowerComment = 1009; + bool allowUseLinkmic = 1010; + AnchorLevel anchorLevel = 1011; + Image avatarJpg = 1012; + string bgImgUrl = 1013; + string birthdayDescription = 1014; + bool birthdayValid = 1015; + int32 blockStatus = 1016; + int32 commentRestrict = 1017; + string constellation = 1018; + int32 disableIchat = 1019; + int64 enableIchatImg = 1020; + int32 exp = 1021; + int64 fanTicketCount = 1022; + bool foldStrangerChat = 1023; + int64 followStatus = 1024; + bool hotsoonVerified = 1025; + string hotsoonVerifiedReason = 1026; + int32 ichatRestrictType = 1027; + string idStr = 1028; + bool isFollower = 1029; + bool isFollowing = 1030; + bool needProfileGuide = 1031; + int64 payScores = 1032; + bool pushCommentStatus = 1033; + bool pushDigg = 1034; + bool pushFollow = 1035; + bool pushFriendAction = 1036; + bool pushIchat = 1037; + bool pushStatus = 1038; + bool pushVideoPost = 1039; + bool pushVideoRecommend = 1040; + UserStats stats = 1041; + bool verifiedMobile = 1042; + string verifiedReason = 1043; + bool withCarManagementPermission = 1044; + int32 ageRange = 1045; + int64 watchDurationMonth = 1046; + + message ActivityInfo{ + + } + + message AnchorInfo { + + } + + message AnchorLevel{ + + } + + message AuthenticationInfo{ + + } + + message AuthorStats{ + + } + + message Border{ + + } + + message BrotherhoodInfo{ + + } + + message FansClub { + FansClubData data = 1; + map preferData = 2; + + message FansClubData { + string clubName = 1; + int32 level = 2; + int32 userFansClubStatus = 3; + UserBadge badge = 4; + repeated int64 availableGiftIds = 5; + int64 anchorId = 6; + + message UserBadge { + map icons = 1; + string title = 2; + } + + } + } + + message FansGroupInfo{ + + } + + message FollowInfo { + int64 followingCount = 1; + int64 followerCount = 2; + int64 followStatus = 3; + int64 pushStatus = 4; + string remarkName = 5; + } + + message JAccreditInfo{ + + } + + message NobleLevelInfo{ + + } + + message OwnRoom { + + } + + message PayGrade { + int64 totalDiamondCount = 1; + Image diamondIcon = 2; + string name = 3; + Image icon = 4; + string nextName = 5; + int64 level = 6; + Image nextIcon = 7; + int64 nextDiamond = 8; + int64 nowDiamond = 9; + int64 thisGradeMinDiamond = 10; + int64 thisGradeMaxDiamond = 11; + int64 payDiamondBak = 12; + string gradeDescribe = 13; + repeated GradeIcon gradeIconList = 14; + int64 screenChatType = 15; + Image imIcon = 16; + Image imIconWithLevel = 17; + Image liveIcon = 18; + Image newImIconWithLevel = 19; + Image newLiveIcon = 20; + int64 upgradeNeedConsume = 21; + string nextPrivileges = 22; + Image background = 23; + Image backgroundBack = 24; + int64 score = 25; + GradeBuffInfo buffInfo = 26; + string gradeBanner = 1001; + Image profileDialogBg = 1002; + Image profileDialogBgBack = 1003; + + message GradeIcon{ + Image icon = 1; + int64 iconDiamond = 2; + int64 level = 3; + string levelStr = 4; + } + + } + + message PoiInfo{ + + } + + message ProfileStyleParams{ + + } + + message Subscribe{ + + } + + message UserAttr{ + + } + + message UserDressInfo{ + + } + + message UserStats{ + + } + + message XiguaParams{ + + } +} + +message FollowInfo { + uint64 followingCount = 1; + uint64 followerCount = 2; + uint64 followStatus = 3; + uint64 pushStatus = 4; + string remarkName = 5; + string followerCountStr = 6; + string followingCountStr = 7; + +} + +message Image { + repeated string urlListList = 1; + string uri = 2; + uint64 height = 3; + uint64 width = 4; + string avgColor = 5; + uint32 imageType = 6; + string openWebUrl = 7; + ImageContent content = 8; + bool isAnimated = 9; + NinePatchSetting FlexSettingList = 10; + NinePatchSetting TextSettingList = 11; +} + +message NinePatchSetting { + repeated string settingListList = 1; +} + +message ImageContent { + string name = 1; + string fontColor = 2; + uint64 level = 3; + string alternativeText = 4; +} + +message PushFrame { + uint64 seqId = 1; + uint64 logId = 2; + uint64 service = 3; + uint64 method = 4; + repeated HeadersList headersList = 5; + string payloadEncoding = 6; + string payloadType = 7; + bytes payload = 8; + +} + +message kk { + uint32 k=14; +} + +message SendMessageBody { + string conversationId = 1; + uint32 conversationType = 2; + uint64 conversationShortId = 3; + string content = 4; + repeated ExtList ext = 5; + uint32 messageType = 6; + string ticket = 7; + string clientMessageId = 8; + +} + +message ExtList { + string key = 1; + string value = 2; +} + +message Rsp{ + int32 a = 1; + int32 b = 2; + int32 c = 3; + string d = 4; + int32 e = 5; + message F { + uint64 q1 = 1; + uint64 q3 = 3; + string q4 = 4; + uint64 q5 = 5; + } + F f = 6; + string g = 7; + uint64 h = 10; + uint64 i = 11; + uint64 j = 13; +} + +message PreMessage { + uint32 cmd = 1; + uint32 sequenceId = 2; + string sdkVersion = 3; + string token = 4; + uint32 refer = 5; + uint32 inboxType = 6; + string buildNumber = 7; + SendMessageBody sendMessageBody = 8; + string aa = 9; + string devicePlatform = 11; + repeated HeadersList headers = 15; + uint32 authType = 18; + string biz = 21; + string access = 22; +} + +message HeadersList { + string key = 1; + string value = 2; +} + +enum CommentTypeTag { + COMMENTTYPETAGUNKNOWN = 0; + COMMENTTYPETAGSTAR = 1; +} \ No newline at end of file From 1c45f0b2ef275130d04bd8d61cbf58e4d193a837 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 19:23:45 +0800 Subject: [PATCH 216/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E5=BC=B9=E5=B9=95=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/model.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/f2/apps/douyin/model.py b/f2/apps/douyin/model.py index afdca6c5..5be364e4 100644 --- a/f2/apps/douyin/model.py +++ b/f2/apps/douyin/model.py @@ -298,6 +298,21 @@ class UserFollower(BaseRequestModel): gps_access: int = 0 address_book_access: int = 0 is_top: int = 1 + + +class LiveWebcast(BaseWebCastModel): + webcast_sdk_version: str = "1.0.12" # 当前为1.0.14-beta.0 + update_version_code: str = "1.0.12" + compress: str = "gzip" + im_path: str = "/webcast/im/fetch/" + heartbeatDuration: int = 0 + room_id: str + user_unique_id: str + cursor: str + internal_ext: str + signature: str # 暂时调用execjs，纯算还在扣 + + class LiveImFetch(BaseWebCastModel): # resp_content_type: str = "protobuf" resp_content_type: str = "json" From 59cb9411c5619f78c2b2288b131ca21fc347f1dc Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 19:25:11 +0800 Subject: [PATCH 217/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E5=BC=B9=E5=B9=95protobuf=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/proto/douyin_webcast_pb2.py | 255 +++++++++++++++++++++ 1 file changed, 255 insertions(+) create mode 100644 f2/apps/douyin/proto/douyin_webcast_pb2.py diff --git a/f2/apps/douyin/proto/douyin_webcast_pb2.py b/f2/apps/douyin/proto/douyin_webcast_pb2.py new file mode 100644 index 00000000..8e8520fd --- /dev/null +++ b/f2/apps/douyin/proto/douyin_webcast_pb2.py @@ -0,0 +1,255 @@ +# -*- coding: utf-8 -*- +# Generated by the protocol buffer compiler. DO NOT EDIT! +# source: douyin_webcast.proto +# Protobuf Python Version: 4.25.1 +"""Generated protocol buffer code.""" +from google.protobuf import descriptor as _descriptor +from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import symbol_database as _symbol_database +from google.protobuf.internal import builder as _builder + +# @@protoc_insertion_point(imports) + +_sym_db = _symbol_database.Default() + + +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile( + b'\n\x14\x64ouyin_webcast.proto\x12\x06\x64ouyin"\xe4\x02\n\x08Response\x12%\n\x0cmessagesList\x18\x01 \x03(\x0b\x32\x0f.douyin.Message\x12\x0e\n\x06\x63ursor\x18\x02 \x01(\t\x12\x15\n\rfetchInterval\x18\x03 \x01(\x04\x12\x0b\n\x03now\x18\x04 \x01(\x04\x12\x13\n\x0binternalExt\x18\x05 \x01(\t\x12\x11\n\tfetchType\x18\x06 \x01(\r\x12\x36\n\x0brouteParams\x18\x07 \x03(\x0b\x32!.douyin.Response.RouteParamsEntry\x12\x19\n\x11heartbeatDuration\x18\x08 \x01(\x04\x12\x0f\n\x07needAck\x18\t \x01(\x08\x12\x12\n\npushServer\x18\n \x01(\t\x12\x12\n\nliveCursor\x18\x0b \x01(\t\x12\x15\n\rhistoryNoMore\x18\x0c \x01(\x08\x1a\x32\n\x10RouteParamsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01"\x9a\x01\n\x07Message\x12\x0e\n\x06method\x18\x01 \x01(\t\x12\x0f\n\x07payload\x18\x02 \x01(\x0c\x12\r\n\x05msgId\x18\x03 \x01(\x03\x12\x0f\n\x07msgType\x18\x04 \x01(\x05\x12\x0e\n\x06offset\x18\x05 \x01(\x03\x12\x15\n\rneedWrdsStore\x18\x06 \x01(\x08\x12\x13\n\x0bwrdsVersion\x18\x07 \x01(\x03\x12\x12\n\nwrdsSubKey\x18\x08 \x01(\t"\xca\x04\n\x0b\x43hatMessage\x12\x1e\n\x06\x63ommon\x18\x01 \x01(\x0b\x32\x0e.douyin.Common\x12\x1a\n\x04user\x18\x02 \x01(\x0b\x32\x0c.douyin.User\x12\x0f\n\x07\x63ontent\x18\x03 \x01(\t\x12\x17\n\x0fvisibleToSender\x18\x04 \x01(\x08\x12&\n\x0f\x62\x61\x63kgroundImage\x18\x05 \x01(\x0b\x32\r.douyin.Image\x12\x1b\n\x13\x66ullScreenTextColor\x18\x06 \x01(\t\x12(\n\x11\x62\x61\x63kgroundImageV2\x18\x07 \x01(\x0b\x32\r.douyin.Image\x12\x32\n\x10publicAreaCommon\x18\x08 \x01(\x0b\x32\x18.douyin.PublicAreaCommon\x12 \n\tgiftImage\x18\t \x01(\x0b\x32\r.douyin.Image\x12\x12\n\nagreeMsgId\x18\x0b \x01(\x04\x12\x15\n\rpriorityLevel\x18\x0c \x01(\r\x12\x38\n\x13landscapeAreaCommon\x18\r \x01(\x0b\x32\x1b.douyin.LandscapeAreaCommon\x12\x11\n\teventTime\x18\x0f \x01(\x04\x12\x12\n\nsendReview\x18\x10 \x01(\x08\x12\x14\n\x0c\x66romIntercom\x18\x11 \x01(\x08\x12\x1c\n\x14intercomHideUserCard\x18\x12 \x01(\x08\x12\x0e\n\x06\x63hatBy\x18\x14 \x01(\t\x12\x1e\n\x16individualChatPriority\x18\x15 \x01(\r\x12 \n\nrtfContent\x18\x16 \x01(\x0b\x32\x0c.douyin.Text"\xa1\x01\n\x13LandscapeAreaCommon\x12\x10\n\x08showHead\x18\x01 \x01(\x08\x12\x14\n\x0cshowNickname\x18\x02 \x01(\x08\x12\x15\n\rshowFontColor\x18\x03 \x01(\x08\x12\x16\n\x0e\x63olorValueList\x18\x04 \x03(\t\x12\x33\n\x13\x63ommentTypeTagsList\x18\x05 \x03(\x0e\x32\x16.douyin.CommentTypeTag"\x87\x03\n\x12RoomUserSeqMessage\x12\x1e\n\x06\x63ommon\x18\x01 \x01(\x0b\x32\x0e.douyin.Common\x12\x38\n\tranksList\x18\x02 \x03(\x0b\x32%.douyin.RoomUserSeqMessageContributor\x12\r\n\x05total\x18\x03 \x01(\x03\x12\x0e\n\x06popStr\x18\x04 \x01(\t\x12\x38\n\tseatsList\x18\x05 \x03(\x0b\x32%.douyin.RoomUserSeqMessageContributor\x12\x12\n\npopularity\x18\x06 \x01(\x03\x12\x11\n\ttotalUser\x18\x07 \x01(\x03\x12\x14\n\x0ctotalUserStr\x18\x08 \x01(\t\x12\x10\n\x08totalStr\x18\t \x01(\t\x12\x1b\n\x13onlineUserForAnchor\x18\n \x01(\t\x12\x18\n\x10totalPvForAnchor\x18\x0b \x01(\t\x12\x17\n\x0fupRightStatsStr\x18\x0c \x01(\t\x12\x1f\n\x17upRightStatsStrComplete\x18\r \x01(\t"Y\n\x0bRoomMessage\x12\x1e\n\x06\x63ommon\x18\x01 \x01(\x0b\x32\x0e.douyin.Common\x12\x0f\n\x07\x63ontent\x18\x02 \x01(\t\x12\x19\n\x11support_landscape\x18\x03 \x01(\x08"^\n\x11\x43ommonTextMessage\x12\x1e\n\x06\x63ommon\x18\x01 \x01(\x0b\x32\x0e.douyin.Common\x12\x1a\n\x04user\x18\x02 \x01(\x0b\x32\x0c.douyin.User\x12\r\n\x05scene\x18\x03 \x01(\t"\x89\x01\n\x16UpdateFanTicketMessage\x12\x1e\n\x06\x63ommon\x18\x01 \x01(\x0b\x32\x0e.douyin.Common\x12\x1e\n\x16roomFanTicketCountText\x18\x02 \x01(\t\x12\x1a\n\x12roomFanTicketCount\x18\x03 \x01(\x04\x12\x13\n\x0b\x66orceUpdate\x18\x04 \x01(\x08"\xa9\x01\n\x1dRoomUserSeqMessageContributor\x12\r\n\x05score\x18\x01 \x01(\x04\x12\x1a\n\x04user\x18\x02 \x01(\x0b\x32\x0c.douyin.User\x12\x0c\n\x04rank\x18\x03 \x01(\x04\x12\r\n\x05\x64\x65lta\x18\x04 \x01(\x04\x12\x10\n\x08isHidden\x18\x05 \x01(\x08\x12\x18\n\x10scoreDescription\x18\x06 \x01(\t\x12\x14\n\x0c\x65xactlyScore\x18\x07 \x01(\t"\x91\x07\n\x0bGiftMessage\x12\x1e\n\x06\x63ommon\x18\x01 \x01(\x0b\x32\x0e.douyin.Common\x12\x0e\n\x06giftId\x18\x02 \x01(\x04\x12\x16\n\x0e\x66\x61nTicketCount\x18\x03 \x01(\x04\x12\x12\n\ngroupCount\x18\x04 \x01(\x04\x12\x13\n\x0brepeatCount\x18\x05 \x01(\x04\x12\x12\n\ncomboCount\x18\x06 \x01(\x04\x12\x1a\n\x04user\x18\x07 \x01(\x0b\x32\x0c.douyin.User\x12\x1c\n\x06toUser\x18\x08 \x01(\x0b\x32\x0c.douyin.User\x12\x11\n\trepeatEnd\x18\t \x01(\r\x12&\n\ntextEffect\x18\n \x01(\x0b\x32\x12.douyin.TextEffect\x12\x0f\n\x07groupId\x18\x0b \x01(\x04\x12\x17\n\x0fincomeTaskgifts\x18\x0c \x01(\x04\x12\x1a\n\x12roomFanTicketCount\x18\r \x01(\x04\x12(\n\x08priority\x18\x0e \x01(\x0b\x32\x16.douyin.GiftIMPriority\x12 \n\x04gift\x18\x0f \x01(\x0b\x32\x12.douyin.GiftStruct\x12\r\n\x05logId\x18\x10 \x01(\t\x12\x10\n\x08sendType\x18\x11 \x01(\x04\x12\x32\n\x10publicAreaCommon\x18\x12 \x01(\x0b\x32\x18.douyin.PublicAreaCommon\x12%\n\x0ftrayDisplayText\x18\x13 \x01(\x0b\x32\x0c.douyin.Text\x12\x1c\n\x14\x62\x61nnedDisplayEffects\x18\x14 \x01(\x04\x12&\n\x08trayInfo\x18\x15 \x01(\x0b\x32\x14.douyin.GiftTrayInfo\x12\x36\n\x12\x61ssetEffectMixInfo\x18\x16 \x01(\x0b\x32\x1a.douyin.AssetEffectMixInfo\x12\x16\n\x0e\x64isplayForSelf\x18\x19 \x01(\x08\x12\x18\n\x10interactGiftInfo\x18\x1a \x01(\t\x12\x13\n\x0b\x64iyItemInfo\x18\x1b \x01(\t\x12\x17\n\x0fminAssetSetList\x18\x1c \x03(\x04\x12\x12\n\ntotalCount\x18\x1d \x01(\x04\x12\x18\n\x10\x63lientGiftSource\x18\x1e \x01(\r\x12\x15\n\rtoUserIdsList\x18 \x03(\x04\x12\x10\n\x08sendTime\x18! \x01(\x04\x12\x1b\n\x13\x66orceDisplayEffects\x18" \x01(\x04\x12\x0f\n\x07traceId\x18# \x01(\t\x12\x17\n\x0f\x65\x66\x66\x65\x63tDisplayTs\x18$ \x01(\x04"\x14\n\x12\x41ssetEffectMixInfo"p\n\x0f\x46\x61nsClubMessage\x12"\n\ncommonInfo\x18\x01 \x01(\x0b\x32\x0e.douyin.Common\x12\x0c\n\x04type\x18\x02 \x01(\x05\x12\x0f\n\x07\x63ontent\x18\x03 \x01(\t\x12\x1a\n\x04user\x18\x04 \x01(\x0b\x32\x0c.douyin.User"\xdc\x01\n\x0cGiftTrayInfo\x12%\n\x0ftrayDisplayText\x18\x01 \x01(\x0b\x32\x0c.douyin.Text\x12"\n\x0btrayBaseImg\x18\x02 \x01(\x0b\x32\r.douyin.Image\x12"\n\x0btrayHeadImg\x18\x03 \x01(\x0b\x32\r.douyin.Image\x12#\n\x0ctrayRightImg\x18\x04 \x01(\x0b\x32\r.douyin.Image\x12\x11\n\ttrayLevel\x18\x05 \x01(\x03\x12%\n\x0etrayDynamicImg\x18\x06 \x01(\x0b\x32\r.douyin.Image"\xe6\x0c\n\nGiftStruct\x12\x1c\n\x05image\x18\x01 \x01(\x0b\x32\r.douyin.Image\x12\x10\n\x08\x64\x65scribe\x18\x02 \x01(\t\x12\x0e\n\x06notify\x18\x03 \x01(\x08\x12\x10\n\x08\x64uration\x18\x04 \x01(\x03\x12\n\n\x02id\x18\x05 \x01(\x03\x12?\n\x0c\x66\x61nsclubInfo\x18\x06 \x01(\x0b\x32).douyin.GiftStruct.GiftStructFansClubInfo\x12\x12\n\nforLinkmic\x18\x07 \x01(\x08\x12\x0e\n\x06\x64oodle\x18\x08 \x01(\x08\x12\x13\n\x0b\x66orFansclub\x18\t \x01(\x08\x12\r\n\x05\x63ombo\x18\n \x01(\x08\x12\x0c\n\x04type\x18\x0b \x01(\x05\x12\x14\n\x0c\x64iamondCount\x18\x0c \x01(\x05\x12\x1a\n\x12isDisplayedOnPanel\x18\r \x01(\x05\x12\x17\n\x0fprimaryEffectId\x18\x0e \x01(\x03\x12$\n\rgiftLabelIcon\x18\x0f \x01(\x0b\x32\r.douyin.Image\x12\x0c\n\x04name\x18\x10 \x01(\t\x12\x0e\n\x06region\x18\x11 \x01(\t\x12\x0e\n\x06manual\x18\x12 \x01(\t\x12\x11\n\tforCustom\x18\x13 \x01(\x08\x12>\n\x0especialEffects\x18\x14 \x03(\x0b\x32&.douyin.GiftStruct.SpecialEffectsEntry\x12\x1b\n\x04icon\x18\x15 \x01(\x0b\x32\r.douyin.Image\x12\x12\n\nactionType\x18\x16 \x01(\x05\x12\x17\n\x0fwatermelonSeeds\x18\x17 \x01(\x05\x12\x12\n\ngoldEffect\x18\x18 \x01(\t\x12(\n\x04subs\x18\x19 \x03(\x0b\x32\x1a.douyin.LuckyMoneyGiftMeta\x12\x13\n\x0bgoldenBeans\x18\x1a \x01(\x03\x12\x12\n\nhonorLevel\x18\x1b \x01(\x03\x12\x10\n\x08itemType\x18\x1c \x01(\x05\x12\x11\n\tschemeUrl\x18\x1d \x01(\t\x12\x31\n\rgiftOperation\x18\x1e \x01(\x0b\x32\x1a.douyin.GiftPanelOperation\x12\x11\n\teventName\x18\x1f \x01(\t\x12\x12\n\nnobleLevel\x18 \x01(\x03\x12\x10\n\x08guideUrl\x18! \x01(\t\x12\x16\n\x0epunishMedicine\x18" \x01(\x08\x12\x11\n\tforPortal\x18# \x01(\x08\x12\x14\n\x0c\x62usinessText\x18$ \x01(\t\x12\x0f\n\x07\x63nyGift\x18% \x01(\x08\x12\r\n\x05\x61ppId\x18& \x01(\x03\x12\x10\n\x08vipLevel\x18\' \x01(\x03\x12\x0e\n\x06isGray\x18( \x01(\x08\x12\x15\n\rgraySchemeUrl\x18) \x01(\t\x12\x11\n\tgiftScene\x18* \x01(\x03\x12&\n\ngiftBanner\x18+ \x01(\x0b\x32\x12.douyin.GiftBanner\x12\x14\n\x0ctriggerWords\x18, \x03(\t\x12+\n\rgiftBuffInfos\x18- \x03(\x0b\x32\x14.douyin.GiftBuffInfo\x12\x18\n\x10\x66orFirstRecharge\x18. \x01(\x08\x12,\n\x15\x64ynamicImgForSelected\x18/ \x01(\x0b\x32\r.douyin.Image\x12\x17\n\x0f\x61\x66terSendAction\x18\x30 \x01(\x05\x12\x17\n\x0fgiftOfflineTime\x18\x31 \x01(\x03\x12\x12\n\ntopBarText\x18\x32 \x01(\t\x12%\n\x0etopRightAvatar\x18\x33 \x01(\x0b\x32\r.douyin.Image\x12\x17\n\x0f\x62\x61nnerSchemeUrl\x18\x34 \x01(\t\x12\x10\n\x08isLocked\x18\x35 \x01(\x08\x12\x14\n\x0creqExtraType\x18\x36 \x01(\x03\x12\x10\n\x08\x61ssetIds\x18\x37 \x03(\x03\x12\x30\n\x0fgiftPreviewInfo\x18\x38 \x01(\x0b\x32\x17.douyin.GiftPreviewInfo\x12 \n\x07giftTip\x18\x39 \x01(\x0b\x32\x0f.douyin.GiftTip\x12\x1b\n\x13needSweepLightCount\x18: \x01(\x05\x12(\n\tgroupInfo\x18; \x03(\x0b\x32\x15.douyin.GiftGroupInfo\x1a\x35\n\x13SpecialEffectsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x03:\x02\x38\x01\x1a=\n\x16GiftStructFansClubInfo\x12\x10\n\x08minLevel\x18\x01 \x01(\x05\x12\x11\n\tinsertPos\x18\x02 \x01(\x05"\x14\n\x12LuckyMoneyGiftMeta"\x14\n\x12GiftPanelOperation"\x0c\n\nGiftBanner"\x0e\n\x0cGiftBuffInfo"\x11\n\x0fGiftPreviewInfo"\t\n\x07GiftTip"\x0f\n\rGiftGroupInfo"U\n\x0eGiftIMPriority\x12\x16\n\x0equeueSizesList\x18\x01 \x03(\x04\x12\x19\n\x11selfQueuePriority\x18\x02 \x01(\x04\x12\x10\n\x08priority\x18\x03 \x01(\x04"e\n\nTextEffect\x12*\n\x08portrait\x18\x01 \x01(\x0b\x32\x18.douyin.TextEffectDetail\x12+\n\tlandscape\x18\x02 \x01(\x0b\x32\x18.douyin.TextEffectDetail"\xb6\x02\n\x10TextEffectDetail\x12\x1a\n\x04text\x18\x01 \x01(\x0b\x32\x0c.douyin.Text\x12\x14\n\x0ctextFontSize\x18\x02 \x01(\r\x12!\n\nbackground\x18\x03 \x01(\x0b\x32\r.douyin.Image\x12\r\n\x05start\x18\x04 \x01(\r\x12\x10\n\x08\x64uration\x18\x05 \x01(\r\x12\t\n\x01x\x18\x06 \x01(\r\x12\t\n\x01y\x18\x07 \x01(\r\x12\r\n\x05width\x18\x08 \x01(\r\x12\x0e\n\x06height\x18\t \x01(\r\x12\x10\n\x08shadowDx\x18\n \x01(\r\x12\x10\n\x08shadowDy\x18\x0b \x01(\r\x12\x14\n\x0cshadowRadius\x18\x0c \x01(\r\x12\x13\n\x0bshadowColor\x18\r \x01(\t\x12\x13\n\x0bstrokeColor\x18\x0e \x01(\t\x12\x13\n\x0bstrokeWidth\x18\x0f \x01(\r"\xe9\x05\n\rMemberMessage\x12\x1e\n\x06\x63ommon\x18\x01 \x01(\x0b\x32\x0e.douyin.Common\x12\x1a\n\x04user\x18\x02 \x01(\x0b\x32\x0c.douyin.User\x12\x13\n\x0bmemberCount\x18\x03 \x01(\x04\x12\x1e\n\x08operator\x18\x04 \x01(\x0b\x32\x0c.douyin.User\x12\x14\n\x0cisSetToAdmin\x18\x05 \x01(\x08\x12\x11\n\tisTopUser\x18\x06 \x01(\x08\x12\x11\n\trankScore\x18\x07 \x01(\x04\x12\x11\n\ttopUserNo\x18\x08 \x01(\x04\x12\x11\n\tenterType\x18\t \x01(\x04\x12\x0e\n\x06\x61\x63tion\x18\n \x01(\x04\x12\x19\n\x11\x61\x63tionDescription\x18\x0b \x01(\t\x12\x0e\n\x06userId\x18\x0c \x01(\x04\x12*\n\x0c\x65\x66\x66\x65\x63tConfig\x18\r \x01(\x0b\x32\x14.douyin.EffectConfig\x12\x0e\n\x06popStr\x18\x0e \x01(\t\x12/\n\x11\x65nterEffectConfig\x18\x0f \x01(\x0b\x32\x14.douyin.EffectConfig\x12&\n\x0f\x62\x61\x63kgroundImage\x18\x10 \x01(\x0b\x32\r.douyin.Image\x12(\n\x11\x62\x61\x63kgroundImageV2\x18\x11 \x01(\x0b\x32\r.douyin.Image\x12\'\n\x11\x61nchorDisplayText\x18\x12 \x01(\x0b\x32\x0c.douyin.Text\x12\x32\n\x10publicAreaCommon\x18\x13 \x01(\x0b\x32\x18.douyin.PublicAreaCommon\x12\x18\n\x10userEnterTipType\x18\x14 \x01(\x04\x12\x1a\n\x12\x61nchorEnterTipType\x18\x15 \x01(\x04\x12\x41\n\x0e\x62uriedPointMap\x18\x16 \x03(\x0b\x32).douyin.MemberMessage.BuriedPointMapEntry\x1a\x35\n\x13\x42uriedPointMapEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01"n\n\x10PublicAreaCommon\x12 \n\tuserLabel\x18\x01 \x01(\x0b\x32\r.douyin.Image\x12\x19\n\x11userConsumeInRoom\x18\x02 \x01(\x04\x12\x1d\n\x15userSendGiftCntInRoom\x18\x03 \x01(\x04"\xb7\x06\n\x0c\x45\x66\x66\x65\x63tConfig\x12\x0c\n\x04type\x18\x01 \x01(\x04\x12\x1b\n\x04icon\x18\x02 \x01(\x0b\x32\r.douyin.Image\x12\x11\n\tavatarPos\x18\x03 \x01(\x04\x12\x1a\n\x04text\x18\x04 \x01(\x0b\x32\x0c.douyin.Text\x12\x1f\n\x08textIcon\x18\x05 \x01(\x0b\x32\r.douyin.Image\x12\x10\n\x08stayTime\x18\x06 \x01(\r\x12\x13\n\x0b\x61nimAssetId\x18\x07 \x01(\x04\x12\x1c\n\x05\x62\x61\x64ge\x18\x08 \x01(\x0b\x32\r.douyin.Image\x12\x1c\n\x14\x66lexSettingArrayList\x18\t \x03(\x04\x12&\n\x0ftextIconOverlay\x18\n \x01(\x0b\x32\r.douyin.Image\x12$\n\ranimatedBadge\x18\x0b \x01(\x0b\x32\r.douyin.Image\x12\x15\n\rhasSweepLight\x18\x0c \x01(\x08\x12 \n\x18textFlexSettingArrayList\x18\r \x03(\x04\x12\x19\n\x11\x63\x65nterAnimAssetId\x18\x0e \x01(\x04\x12#\n\x0c\x64ynamicImage\x18\x0f \x01(\x0b\x32\r.douyin.Image\x12\x34\n\x08\x65xtraMap\x18\x10 \x03(\x0b\x32".douyin.EffectConfig.ExtraMapEntry\x12\x16\n\x0emp4AnimAssetId\x18\x11 \x01(\x04\x12\x10\n\x08priority\x18\x12 \x01(\x04\x12\x13\n\x0bmaxWaitTime\x18\x13 \x01(\x04\x12\x0f\n\x07\x64ressId\x18\x14 \x01(\t\x12\x11\n\talignment\x18\x15 \x01(\x04\x12\x17\n\x0f\x61lignmentOffset\x18\x16 \x01(\x04\x12\x13\n\x0b\x65\x66\x66\x65\x63tScene\x18\x17 \x01(\t\x12@\n\x0epieceValuesMap\x18\x18 \x03(\x0b\x32(.douyin.EffectConfig.PieceValuesMapEntry\x1a/\n\rExtraMapEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1aH\n\x13PieceValuesMapEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12 \n\x05value\x18\x02 \x01(\x0b\x32\x11.douyin.TextPiece:\x02\x38\x01"|\n\x04Text\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x15\n\rdefaultPatter\x18\x02 \x01(\t\x12)\n\rdefaultFormat\x18\x03 \x01(\x0b\x32\x12.douyin.TextFormat\x12%\n\npiecesList\x18\x04 \x03(\x0b\x32\x11.douyin.TextPiece"\xb4\x02\n\tTextPiece\x12\x0c\n\x04type\x18\x01 \x01(\x08\x12"\n\x06\x66ormat\x18\x02 \x01(\x0b\x32\x12.douyin.TextFormat\x12\x13\n\x0bstringValue\x18\x03 \x01(\t\x12(\n\tuserValue\x18\x04 \x01(\x0b\x32\x15.douyin.TextPieceUser\x12(\n\tgiftValue\x18\x05 \x01(\x0b\x32\x15.douyin.TextPieceGift\x12*\n\nheartValue\x18\x06 \x01(\x0b\x32\x16.douyin.TextPieceHeart\x12\x34\n\x0fpatternRefValue\x18\x07 \x01(\x0b\x32\x1b.douyin.TextPiecePatternRef\x12*\n\nimageValue\x18\x08 \x01(\x0b\x32\x16.douyin.TextPieceImage"C\n\x0eTextPieceImage\x12\x1c\n\x05image\x18\x01 \x01(\x0b\x32\r.douyin.Image\x12\x13\n\x0bscalingRate\x18\x02 \x01(\x02":\n\x13TextPiecePatternRef\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x16\n\x0e\x64\x65\x66\x61ultPattern\x18\x02 \x01(\t"\x1f\n\x0eTextPieceHeart\x12\r\n\x05\x63olor\x18\x01 \x01(\t"D\n\rTextPieceGift\x12\x0e\n\x06giftId\x18\x01 \x01(\x04\x12#\n\x07nameRef\x18\x02 \x01(\x0b\x32\x12.douyin.PatternRef"1\n\nPatternRef\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x16\n\x0e\x64\x65\x66\x61ultPattern\x18\x02 \x01(\t">\n\rTextPieceUser\x12\x1a\n\x04user\x18\x01 \x01(\x0b\x32\x0c.douyin.User\x12\x11\n\twithColon\x18\x02 \x01(\x08"\xa3\x01\n\nTextFormat\x12\r\n\x05\x63olor\x18\x01 \x01(\t\x12\x0c\n\x04\x62old\x18\x02 \x01(\x08\x12\x0e\n\x06italic\x18\x03 \x01(\x08\x12\x0e\n\x06weight\x18\x04 \x01(\r\x12\x13\n\x0bitalicAngle\x18\x05 \x01(\r\x12\x10\n\x08\x66ontSize\x18\x06 \x01(\r\x12\x1a\n\x12useHeighLightColor\x18\x07 \x01(\x08\x12\x15\n\ruseRemoteClor\x18\x08 \x01(\x08"\xca\x02\n\x0bLikeMessage\x12\x1e\n\x06\x63ommon\x18\x01 \x01(\x0b\x32\x0e.douyin.Common\x12\r\n\x05\x63ount\x18\x02 \x01(\x04\x12\r\n\x05total\x18\x03 \x01(\x04\x12\r\n\x05\x63olor\x18\x04 \x01(\x04\x12\x1a\n\x04user\x18\x05 \x01(\x0b\x32\x0c.douyin.User\x12\x0c\n\x04icon\x18\x06 \x01(\t\x12\x32\n\x10\x64oubleLikeDetail\x18\x07 \x01(\x0b\x32\x18.douyin.DoubleLikeDetail\x12\x36\n\x12\x64isplayControlInfo\x18\x08 \x01(\x0b\x32\x1a.douyin.DisplayControlInfo\x12\x17\n\x0flinkmicGuestUid\x18\t \x01(\x04\x12\r\n\x05scene\x18\n \x01(\t\x12\x30\n\x0fpicoDisplayInfo\x18\x0b \x01(\x0b\x32\x17.douyin.PicoDisplayInfo"\xcc\x01\n\rSocialMessage\x12\x1e\n\x06\x63ommon\x18\x01 \x01(\x0b\x32\x0e.douyin.Common\x12\x1a\n\x04user\x18\x02 \x01(\x0b\x32\x0c.douyin.User\x12\x11\n\tshareType\x18\x03 \x01(\x04\x12\x0e\n\x06\x61\x63tion\x18\x04 \x01(\x04\x12\x13\n\x0bshareTarget\x18\x05 \x01(\t\x12\x13\n\x0b\x66ollowCount\x18\x06 \x01(\x04\x12\x32\n\x10publicAreaCommon\x18\x07 \x01(\x0b\x32\x18.douyin.PublicAreaCommon"l\n\x0fPicoDisplayInfo\x12\x15\n\rcomboSumCount\x18\x01 \x01(\x04\x12\r\n\x05\x65moji\x18\x02 \x01(\t\x12 \n\temojiIcon\x18\x03 \x01(\x0b\x32\r.douyin.Image\x12\x11\n\temojiText\x18\x04 \x01(\t"_\n\x10\x44oubleLikeDetail\x12\x12\n\ndoubleFlag\x18\x01 \x01(\x08\x12\r\n\x05seqId\x18\x02 \x01(\r\x12\x13\n\x0brenewalsNum\x18\x03 \x01(\r\x12\x13\n\x0btriggersNum\x18\x04 \x01(\r"9\n\x12\x44isplayControlInfo\x12\x10\n\x08showText\x18\x01 \x01(\x08\x12\x11\n\tshowIcons\x18\x02 \x01(\x08"\xc8\x01\n\x12\x45pisodeChatMessage\x12\x1f\n\x06\x63ommon\x18\x01 \x01(\x0b\x32\x0f.douyin.Message\x12\x1a\n\x04user\x18\x02 \x01(\x0b\x32\x0c.douyin.User\x12\x0f\n\x07\x63ontent\x18\x03 \x01(\t\x12\x16\n\x0evisibleToSende\x18\x04 \x01(\x08\x12 \n\tgiftImage\x18\x07 \x01(\x0b\x32\r.douyin.Image\x12\x12\n\nagreeMsgId\x18\x08 \x01(\x04\x12\x16\n\x0e\x63olorValueList\x18\t \x03(\t"\x88\x01\n\x18MatchAgainstScoreMessage\x12\x1e\n\x06\x63ommon\x18\x01 \x01(\x0b\x32\x0e.douyin.Common\x12 \n\x07\x61gainst\x18\x02 \x01(\x0b\x32\x0f.douyin.Against\x12\x13\n\x0bmatchStatus\x18\x03 \x01(\r\x12\x15\n\rdisplayStatus\x18\x04 \x01(\r"\x92\x03\n\x07\x41gainst\x12\x10\n\x08leftName\x18\x01 \x01(\t\x12\x1f\n\x08leftLogo\x18\x02 \x01(\x0b\x32\r.douyin.Image\x12\x10\n\x08leftGoal\x18\x03 \x01(\t\x12\x11\n\trightName\x18\x06 \x01(\t\x12 \n\trightLogo\x18\x07 \x01(\x0b\x32\r.douyin.Image\x12\x11\n\trightGoal\x18\x08 \x01(\t\x12\x11\n\ttimestamp\x18\x0b \x01(\x04\x12\x0f\n\x07version\x18\x0c \x01(\x04\x12\x12\n\nleftTeamId\x18\r \x01(\x04\x12\x13\n\x0brightTeamId\x18\x0e \x01(\x04\x12\x19\n\x11\x64iffSei2absSecond\x18\x0f \x01(\x04\x12\x16\n\x0e\x66inalGoalStage\x18\x10 \x01(\r\x12\x18\n\x10\x63urrentGoalStage\x18\x11 \x01(\r\x12\x19\n\x11leftScoreAddition\x18\x12 \x01(\r\x12\x1a\n\x12rightScoreAddition\x18\x13 \x01(\r\x12\x13\n\x0bleftGoalInt\x18\x14 \x01(\x04\x12\x14\n\x0crightGoalInt\x18\x15 \x01(\x04"\x90\x04\n\x06\x43ommon\x12\x0e\n\x06method\x18\x01 \x01(\t\x12\r\n\x05msgId\x18\x02 \x01(\x04\x12\x0e\n\x06roomId\x18\x03 \x01(\x04\x12\x12\n\ncreateTime\x18\x04 \x01(\x04\x12\x0f\n\x07monitor\x18\x05 \x01(\r\x12\x11\n\tisShowMsg\x18\x06 \x01(\x08\x12\x10\n\x08\x64\x65scribe\x18\x07 \x01(\t\x12!\n\x0b\x64isplayText\x18\x08 \x01(\x0b\x32\x0c.douyin.Text\x12\x10\n\x08\x66oldType\x18\t \x01(\x04\x12\x16\n\x0e\x61nchorFoldType\x18\n \x01(\x04\x12\x15\n\rpriorityScore\x18\x0b \x01(\x04\x12\r\n\x05logId\x18\x0c \x01(\t\x12\x19\n\x11msgProcessFilterK\x18\r \x01(\t\x12\x19\n\x11msgProcessFilterV\x18\x0e \x01(\t\x12\x1a\n\x04user\x18\x0f \x01(\x0b\x32\x0c.douyin.User\x12\x1a\n\x04room\x18\x10 \x01(\x0b\x32\x0c.douyin.Room\x12\x18\n\x10\x61nchorFoldTypeV2\x18\x11 \x01(\x04\x12\x1a\n\x12processAtSeiTimeMs\x18\x12 \x01(\x04\x12\x18\n\x10randomDispatchMs\x18\x13 \x01(\x04\x12\x12\n\nisDispatch\x18\x14 \x01(\x08\x12\x11\n\tchannelId\x18\x15 \x01(\x04\x12\x19\n\x11\x64iffSei2absSecond\x18\x16 \x01(\x04\x12\x1a\n\x12\x61nchorFoldDuration\x18\x17 \x01(\x04"\xed\t\n\x04Room\x12\n\n\x02id\x18\x01 \x01(\x03\x12\r\n\x05idStr\x18\x02 \x01(\t\x12\x0e\n\x06status\x18\x03 \x01(\x03\x12\x13\n\x0bownerUserId\x18\x04 \x01(\x03\x12\r\n\x05title\x18\x05 \x01(\t\x12\x11\n\tuserCount\x18\x06 \x01(\x03\x12\x12\n\ncreateTime\x18\x07 \x01(\x03\x12\x15\n\rlinkmicLayout\x18\x08 \x01(\x03\x12\x12\n\nfinishTime\x18\t \x01(\x03\x12 \n\x05\x65xtra\x18\n \x01(\x0b\x32\x11.douyin.RoomExtra\x12\x17\n\x0f\x64ynamicCoverUri\x18\x0b \x01(\t\x12<\n\x10\x64ynamicCoverDict\x18\x0c \x03(\x0b\x32".douyin.Room.DynamicCoverDictEntry\x12\x14\n\x0clastPingTime\x18\r \x01(\x03\x12\x0e\n\x06liveId\x18\x0e \x01(\x03\x12\x16\n\x0estreamProvider\x18\x0f \x01(\x03\x12\x0e\n\x06osType\x18\x10 \x01(\x03\x12\x15\n\rclientVersion\x18\x11 \x01(\x03\x12\x13\n\x0bwithLinkmic\x18\x12 \x01(\x08\x12\x1d\n\x15\x65nableRoomPerspective\x18\x13 \x01(\x08\x12\x1c\n\x05\x63over\x18\x14 \x01(\x0b\x32\r.douyin.Image\x12#\n\x0c\x64ynamicCover\x18\x15 \x01(\x0b\x32\r.douyin.Image\x12&\n\x0f\x64ynamicCoverLow\x18\x16 \x01(\x0b\x32\r.douyin.Image\x12\x10\n\x08shareUrl\x18\x17 \x01(\t\x12\x17\n\x0f\x61nchorShareText\x18\x18 \x01(\t\x12\x15\n\ruserShareText\x18\x19 \x01(\t\x12\x10\n\x08streamId\x18\x1a \x01(\x03\x12\x13\n\x0bstreamIdStr\x18\x1b \x01(\t\x12$\n\tstreamUrl\x18\x1c \x01(\x0b\x32\x11.douyin.StreamUrl\x12\x14\n\x0cmosaicStatus\x18\x1d \x01(\x03\x12\x11\n\tmosaicTip\x18\x1e \x01(\t\x12\x11\n\tcellStyle\x18\x1f \x01(\x03\x12 \n\x07linkMic\x18 \x01(\x0b\x32\x0f.douyin.LinkMic\x12\x15\n\rluckymoneyNum\x18! \x01(\x03\x12$\n\x08\x64\x65\x63oList\x18" \x03(\x0b\x32\x12.douyin.Decoration\x12\x1f\n\x07topFans\x18# \x03(\x0b\x32\x0e.douyin.TopFan\x12 \n\x05stats\x18$ \x01(\x0b\x32\x11.douyin.RoomStats\x12\x1b\n\x13sunDailyIconContent\x18% \x01(\t\x12\x10\n\x08\x64istance\x18& \x01(\t\x12\x14\n\x0c\x64istanceCity\x18\' \x01(\t\x12\x10\n\x08location\x18( \x01(\t\x12\x14\n\x0crealDistance\x18) \x01(\t\x12$\n\rfeedRoomLabel\x18* \x01(\x0b\x32\r.douyin.Image\x12\x17\n\x0f\x63ommonLabelList\x18+ \x01(\t\x12-\n\x0flivingRoomAttrs\x18, \x01(\x0b\x32\x14.douyin.RoomUserAttr\x12\x14\n\x0c\x61\x64minUserIds\x18- \x03(\x03\x12\x1b\n\x05owner\x18. \x01(\x0b\x32\x0c.douyin.User\x12\x13\n\x0bprivateInfo\x18/ \x01(\t\x1a\x37\n\x15\x44ynamicCoverDictEntry\x12\x0b\n\x03key\x18\x01 \x01(\x03\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01"\x0b\n\tRoomExtra"\x0b\n\tRoomStats"\x0e\n\x0cRoomUserAttr"\x0b\n\tStreamUrl"\t\n\x07LinkMic"\x0c\n\nDecoration"\x08\n\x06TopFan"\xd9\x01\n\rGradeBuffInfo\x12\x11\n\tbuffLevel\x18\x01 \x01(\x03\x12\x0e\n\x06status\x18\x02 \x01(\x05\x12\x0f\n\x07\x65ndTime\x18\x03 \x01(\x03\x12=\n\x0cstatsInfoMap\x18\x04 \x03(\x0b\x32\'.douyin.GradeBuffInfo.StatsInfoMapEntry\x12 \n\tbuffBadge\x18\x05 \x01(\x0b\x32\r.douyin.Image\x1a\x33\n\x11StatsInfoMapEntry\x12\x0b\n\x03key\x18\x01 \x01(\x03\x12\r\n\x05value\x18\x02 \x01(\x03:\x02\x38\x01"\r\n\x0bUserVIPInfo"\x17\n\x15IndustryCertification"\xd1+\n\x04User\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x0f\n\x07shortId\x18\x02 \x01(\x03\x12\x10\n\x08nickname\x18\x03 \x01(\t\x12\x0e\n\x06gender\x18\x04 \x01(\x05\x12\x11\n\tsignature\x18\x05 \x01(\t\x12\r\n\x05level\x18\x06 \x01(\x05\x12\x10\n\x08\x62irthday\x18\x07 \x01(\x03\x12\x11\n\ttelephone\x18\x08 \x01(\t\x12"\n\x0b\x61vatarThumb\x18\t \x01(\x0b\x32\r.douyin.Image\x12#\n\x0c\x61vatarMedium\x18\n \x01(\x0b\x32\r.douyin.Image\x12"\n\x0b\x61vatarLarge\x18\x0b \x01(\x0b\x32\r.douyin.Image\x12\x10\n\x08verified\x18\x0c \x01(\x08\x12\x12\n\nexperience\x18\r \x01(\x05\x12\x0c\n\x04\x63ity\x18\x0e \x01(\t\x12\x0e\n\x06status\x18\x0f \x01(\x05\x12\x12\n\ncreateTime\x18\x10 \x01(\x03\x12\x12\n\nmodifyTime\x18\x11 \x01(\x03\x12\x0e\n\x06secret\x18\x12 \x01(\x05\x12\x16\n\x0eshareQrcodeUri\x18\x13 \x01(\t\x12\x1a\n\x12incomeSharePercent\x18\x14 \x01(\x05\x12)\n\x12\x62\x61\x64geImageListList\x18\x15 \x01(\x0b\x32\r.douyin.Image\x12+\n\nfollowInfo\x18\x16 \x01(\x0b\x32\x17.douyin.User.FollowInfo\x12\'\n\x08payGrade\x18\x17 \x01(\x0b\x32\x15.douyin.User.PayGrade\x12\'\n\x08\x66\x61nsClub\x18\x18 \x01(\x0b\x32\x15.douyin.User.FansClub\x12#\n\x06\x62order\x18\x19 \x01(\x0b\x32\x13.douyin.User.Border\x12\x11\n\tspecialId\x18\x1a \x01(\t\x12#\n\x0c\x61vatarBorder\x18\x1b \x01(\x0b\x32\r.douyin.Image\x12\x1c\n\x05medal\x18\x1c \x01(\x0b\x32\r.douyin.Image\x12(\n\x11realTimeIconsList\x18\x1d \x03(\x0b\x32\r.douyin.Image\x12+\n\x14newRealTimeIconsList\x18\x1e \x03(\x0b\x32\r.douyin.Image\x12\x10\n\x08topVipNo\x18\x1f \x01(\x03\x12\'\n\x08userAttr\x18 \x01(\x0b\x32\x15.douyin.User.UserAttr\x12%\n\x07ownRoom\x18! \x01(\x0b\x32\x14.douyin.User.OwnRoom\x12\x10\n\x08payScore\x18" \x01(\x03\x12\x13\n\x0bticketCount\x18# \x01(\x03\x12+\n\nanchorInfo\x18$ \x01(\x0b\x32\x17.douyin.User.AnchorInfo\x12\x14\n\x0clinkMicStats\x18% \x01(\x05\x12\x11\n\tdisplayId\x18& \x01(\t\x12\x1e\n\x16withCommercePermission\x18\' \x01(\x08\x12\x1b\n\x13withFusionShopEntry\x18( \x01(\x08\x12!\n\x19totalRechargeDiamondCount\x18) \x01(\x03\x12\x34\n\x12webcastAnchorLevel\x18* \x01(\x0b\x32\x18.douyin.User.AnchorLevel\x12\x17\n\x0fverifiedContent\x18+ \x01(\t\x12-\n\x0b\x61uthorStats\x18, \x01(\x0b\x32\x18.douyin.User.AuthorStats\x12!\n\x0btopFansList\x18- \x03(\x0b\x32\x0c.douyin.User\x12\x0e\n\x06secUid\x18. \x01(\t\x12\x10\n\x08userRole\x18/ \x01(\x05\x12+\n\txiguaInfo\x18\x30 \x01(\x0b\x32\x18.douyin.User.XiguaParams\x12\x31\n\x0e\x61\x63tivityReward\x18\x31 \x01(\x0b\x32\x19.douyin.User.ActivityInfo\x12.\n\tnobleInfo\x18\x32 \x01(\x0b\x32\x1b.douyin.User.NobleLevelInfo\x12\x35\n\x0f\x62rotherhoodInfo\x18\x33 \x01(\x0b\x32\x1c.douyin.User.BrotherhoodInfo\x12#\n\x0cpersonalCard\x18\x34 \x01(\x0b\x32\r.douyin.Image\x12;\n\x12\x61uthenticationInfo\x18\x35 \x01(\x0b\x32\x1f.douyin.User.AuthenticationInfo\x12\x19\n\x11\x61uthorizationInfo\x18\x36 \x01(\x05\x12"\n\x1a\x61\x64versaryAuthorizationInfo\x18\x37 \x01(\x05\x12%\n\x07poiInfo\x18\x38 \x01(\x0b\x32\x14.douyin.User.PoiInfo\x12.\n\x17mediaBadgeImageListList\x18\x39 \x01(\x0b\x32\r.douyin.Image\x12\x1b\n\x13\x61\x64versaryUserStatus\x18: \x01(\x05\x12(\n\x0buserVipInfo\x18; \x01(\x0b\x32\x13.douyin.UserVIPInfo\x12$\n\x1c\x63ommerceWebcastConfigIdsList\x18< \x03(\x03\x12+\n\x14\x62\x61\x64geImageListV2List\x18= \x01(\x0b\x32\r.douyin.Image\x12<\n\x15industryCertification\x18> \x01(\x0b\x32\x1d.douyin.IndustryCertification\x12\x14\n\x0clocationCity\x18? \x01(\t\x12\x31\n\rfansGroupInfo\x18@ \x01(\x0b\x32\x1a.douyin.User.FansGroupInfo\x12\x12\n\nremarkName\x18\x41 \x01(\t\x12\x12\n\nmysteryMan\x18\x42 \x01(\x05\x12\x0e\n\x06webRid\x18\x43 \x01(\t\x12\x1c\n\x14\x64\x65sensitizedNickname\x18\x44 \x01(\t\x12\x31\n\rjAccreditInfo\x18\x45 \x01(\x0b\x32\x1a.douyin.User.JAccreditInfo\x12)\n\tsubscribe\x18\x46 \x01(\x0b\x32\x16.douyin.User.Subscribe\x12\x13\n\x0bisAnonymous\x18G \x01(\x08\x12\x1b\n\x13\x63onsumeDiamondLevel\x18H \x01(\x05\x12\x12\n\nwebcastUid\x18I \x01(\t\x12;\n\x12profileStyleParams\x18J \x01(\x0b\x32\x1f.douyin.User.ProfileStyleParams\x12\x31\n\ruserDressInfo\x18K \x01(\x0b\x32\x1a.douyin.User.UserDressInfo\x12\x17\n\x0e\x61llowBeLocated\x18\xe9\x07 \x01(\x08\x12\x1c\n\x13\x61llowFindByContacts\x18\xea\x07 \x01(\x08\x12!\n\x18\x61llowOthersDownloadVideo\x18\xeb\x07 \x01(\x08\x12,\n#allowOthersDownloadWhenSharingVideo\x18\xec\x07 \x01(\x08\x12\x1e\n\x15\x61llowShareShowProfile\x18\xed\x07 \x01(\x08\x12\x1a\n\x11\x61llowShowInGossip\x18\xee\x07 \x01(\x08\x12\x1a\n\x11\x61llowShowMyAction\x18\xef\x07 \x01(\x08\x12\x1c\n\x13\x61llowStrangeComment\x18\xf0\x07 \x01(\x08\x12\x1f\n\x16\x61llowUnfollowerComment\x18\xf1\x07 \x01(\x08\x12\x18\n\x0f\x61llowUseLinkmic\x18\xf2\x07 \x01(\x08\x12.\n\x0b\x61nchorLevel\x18\xf3\x07 \x01(\x0b\x32\x18.douyin.User.AnchorLevel\x12!\n\tavatarJpg\x18\xf4\x07 \x01(\x0b\x32\r.douyin.Image\x12\x11\n\x08\x62gImgUrl\x18\xf5\x07 \x01(\t\x12\x1c\n\x13\x62irthdayDescription\x18\xf6\x07 \x01(\t\x12\x16\n\rbirthdayValid\x18\xf7\x07 \x01(\x08\x12\x14\n\x0b\x62lockStatus\x18\xf8\x07 \x01(\x05\x12\x18\n\x0f\x63ommentRestrict\x18\xf9\x07 \x01(\x05\x12\x16\n\rconstellation\x18\xfa\x07 \x01(\t\x12\x15\n\x0c\x64isableIchat\x18\xfb\x07 \x01(\x05\x12\x17\n\x0e\x65nableIchatImg\x18\xfc\x07 \x01(\x03\x12\x0c\n\x03\x65xp\x18\xfd\x07 \x01(\x05\x12\x17\n\x0e\x66\x61nTicketCount\x18\xfe\x07 \x01(\x03\x12\x19\n\x10\x66oldStrangerChat\x18\xff\x07 \x01(\x08\x12\x15\n\x0c\x66ollowStatus\x18\x80\x08 \x01(\x03\x12\x18\n\x0fhotsoonVerified\x18\x81\x08 \x01(\x08\x12\x1e\n\x15hotsoonVerifiedReason\x18\x82\x08 \x01(\t\x12\x1a\n\x11ichatRestrictType\x18\x83\x08 \x01(\x05\x12\x0e\n\x05idStr\x18\x84\x08 \x01(\t\x12\x13\n\nisFollower\x18\x85\x08 \x01(\x08\x12\x14\n\x0bisFollowing\x18\x86\x08 \x01(\x08\x12\x19\n\x10needProfileGuide\x18\x87\x08 \x01(\x08\x12\x12\n\tpayScores\x18\x88\x08 \x01(\x03\x12\x1a\n\x11pushCommentStatus\x18\x89\x08 \x01(\x08\x12\x11\n\x08pushDigg\x18\x8a\x08 \x01(\x08\x12\x13\n\npushFollow\x18\x8b\x08 \x01(\x08\x12\x19\n\x10pushFriendAction\x18\x8c\x08 \x01(\x08\x12\x12\n\tpushIchat\x18\x8d\x08 \x01(\x08\x12\x13\n\npushStatus\x18\x8e\x08 \x01(\x08\x12\x16\n\rpushVideoPost\x18\x8f\x08 \x01(\x08\x12\x1b\n\x12pushVideoRecommend\x18\x90\x08 \x01(\x08\x12&\n\x05stats\x18\x91\x08 \x01(\x0b\x32\x16.douyin.User.UserStats\x12\x17\n\x0everifiedMobile\x18\x92\x08 \x01(\x08\x12\x17\n\x0everifiedReason\x18\x93\x08 \x01(\t\x12$\n\x1bwithCarManagementPermission\x18\x94\x08 \x01(\x08\x12\x11\n\x08\x61geRange\x18\x95\x08 \x01(\x05\x12\x1b\n\x12watchDurationMonth\x18\x96\x08 \x01(\x03\x1a\x0e\n\x0c\x41\x63tivityInfo\x1a\x0c\n\nAnchorInfo\x1a\r\n\x0b\x41nchorLevel\x1a\x14\n\x12\x41uthenticationInfo\x1a\r\n\x0b\x41uthorStats\x1a\x08\n\x06\x42order\x1a\x11\n\x0f\x42rotherhoodInfo\x1a\xa7\x04\n\x08\x46\x61nsClub\x12\x30\n\x04\x64\x61ta\x18\x01 \x01(\x0b\x32".douyin.User.FansClub.FansClubData\x12\x39\n\npreferData\x18\x02 \x03(\x0b\x32%.douyin.User.FansClub.PreferDataEntry\x1aU\n\x0fPreferDataEntry\x12\x0b\n\x03key\x18\x01 \x01(\x05\x12\x31\n\x05value\x18\x02 \x01(\x0b\x32".douyin.User.FansClub.FansClubData:\x02\x38\x01\x1a\xd6\x02\n\x0c\x46\x61nsClubData\x12\x10\n\x08\x63lubName\x18\x01 \x01(\t\x12\r\n\x05level\x18\x02 \x01(\x05\x12\x1a\n\x12userFansClubStatus\x18\x03 \x01(\x05\x12;\n\x05\x62\x61\x64ge\x18\x04 \x01(\x0b\x32,.douyin.User.FansClub.FansClubData.UserBadge\x12\x18\n\x10\x61vailableGiftIds\x18\x05 \x03(\x03\x12\x10\n\x08\x61nchorId\x18\x06 \x01(\x03\x1a\x9f\x01\n\tUserBadge\x12\x46\n\x05icons\x18\x01 \x03(\x0b\x32\x37.douyin.User.FansClub.FansClubData.UserBadge.IconsEntry\x12\r\n\x05title\x18\x02 \x01(\t\x1a;\n\nIconsEntry\x12\x0b\n\x03key\x18\x01 \x01(\x05\x12\x1c\n\x05value\x18\x02 \x01(\x0b\x32\r.douyin.Image:\x02\x38\x01\x1a\x0f\n\rFansGroupInfo\x1ay\n\nFollowInfo\x12\x16\n\x0e\x66ollowingCount\x18\x01 \x01(\x03\x12\x15\n\rfollowerCount\x18\x02 \x01(\x03\x12\x14\n\x0c\x66ollowStatus\x18\x03 \x01(\x03\x12\x12\n\npushStatus\x18\x04 \x01(\x03\x12\x12\n\nremarkName\x18\x05 \x01(\t\x1a\x0f\n\rJAccreditInfo\x1a\x10\n\x0eNobleLevelInfo\x1a\t\n\x07OwnRoom\x1a\xd0\x07\n\x08PayGrade\x12\x19\n\x11totalDiamondCount\x18\x01 \x01(\x03\x12"\n\x0b\x64iamondIcon\x18\x02 \x01(\x0b\x32\r.douyin.Image\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x1b\n\x04icon\x18\x04 \x01(\x0b\x32\r.douyin.Image\x12\x10\n\x08nextName\x18\x05 \x01(\t\x12\r\n\x05level\x18\x06 \x01(\x03\x12\x1f\n\x08nextIcon\x18\x07 \x01(\x0b\x32\r.douyin.Image\x12\x13\n\x0bnextDiamond\x18\x08 \x01(\x03\x12\x12\n\nnowDiamond\x18\t \x01(\x03\x12\x1b\n\x13thisGradeMinDiamond\x18\n \x01(\x03\x12\x1b\n\x13thisGradeMaxDiamond\x18\x0b \x01(\x03\x12\x15\n\rpayDiamondBak\x18\x0c \x01(\x03\x12\x15\n\rgradeDescribe\x18\r \x01(\t\x12\x36\n\rgradeIconList\x18\x0e \x03(\x0b\x32\x1f.douyin.User.PayGrade.GradeIcon\x12\x16\n\x0escreenChatType\x18\x0f \x01(\x03\x12\x1d\n\x06imIcon\x18\x10 \x01(\x0b\x32\r.douyin.Image\x12&\n\x0fimIconWithLevel\x18\x11 \x01(\x0b\x32\r.douyin.Image\x12\x1f\n\x08liveIcon\x18\x12 \x01(\x0b\x32\r.douyin.Image\x12)\n\x12newImIconWithLevel\x18\x13 \x01(\x0b\x32\r.douyin.Image\x12"\n\x0bnewLiveIcon\x18\x14 \x01(\x0b\x32\r.douyin.Image\x12\x1a\n\x12upgradeNeedConsume\x18\x15 \x01(\x03\x12\x16\n\x0enextPrivileges\x18\x16 \x01(\t\x12!\n\nbackground\x18\x17 \x01(\x0b\x32\r.douyin.Image\x12%\n\x0e\x62\x61\x63kgroundBack\x18\x18 \x01(\x0b\x32\r.douyin.Image\x12\r\n\x05score\x18\x19 \x01(\x03\x12\'\n\x08\x62uffInfo\x18\x1a \x01(\x0b\x32\x15.douyin.GradeBuffInfo\x12\x14\n\x0bgradeBanner\x18\xe9\x07 \x01(\t\x12\'\n\x0fprofileDialogBg\x18\xea\x07 \x01(\x0b\x32\r.douyin.Image\x12+\n\x13profileDialogBgBack\x18\xeb\x07 \x01(\x0b\x32\r.douyin.Image\x1a^\n\tGradeIcon\x12\x1b\n\x04icon\x18\x01 \x01(\x0b\x32\r.douyin.Image\x12\x13\n\x0biconDiamond\x18\x02 \x01(\x03\x12\r\n\x05level\x18\x03 \x01(\x03\x12\x10\n\x08levelStr\x18\x04 \x01(\t\x1a\t\n\x07PoiInfo\x1a\x14\n\x12ProfileStyleParams\x1a\x0b\n\tSubscribe\x1a\n\n\x08UserAttr\x1a\x0f\n\rUserDressInfo\x1a\x0b\n\tUserStats\x1a\r\n\x0bXiguaParams"\xae\x01\n\nFollowInfo\x12\x16\n\x0e\x66ollowingCount\x18\x01 \x01(\x04\x12\x15\n\rfollowerCount\x18\x02 \x01(\x04\x12\x14\n\x0c\x66ollowStatus\x18\x03 \x01(\x04\x12\x12\n\npushStatus\x18\x04 \x01(\x04\x12\x12\n\nremarkName\x18\x05 \x01(\t\x12\x18\n\x10\x66ollowerCountStr\x18\x06 \x01(\t\x12\x19\n\x11\x66ollowingCountStr\x18\x07 \x01(\t"\xa2\x02\n\x05Image\x12\x13\n\x0burlListList\x18\x01 \x03(\t\x12\x0b\n\x03uri\x18\x02 \x01(\t\x12\x0e\n\x06height\x18\x03 \x01(\x04\x12\r\n\x05width\x18\x04 \x01(\x04\x12\x10\n\x08\x61vgColor\x18\x05 \x01(\t\x12\x11\n\timageType\x18\x06 \x01(\r\x12\x12\n\nopenWebUrl\x18\x07 \x01(\t\x12%\n\x07\x63ontent\x18\x08 \x01(\x0b\x32\x14.douyin.ImageContent\x12\x12\n\nisAnimated\x18\t \x01(\x08\x12\x31\n\x0f\x46lexSettingList\x18\n \x01(\x0b\x32\x18.douyin.NinePatchSetting\x12\x31\n\x0fTextSettingList\x18\x0b \x01(\x0b\x32\x18.douyin.NinePatchSetting"+\n\x10NinePatchSetting\x12\x17\n\x0fsettingListList\x18\x01 \x03(\t"W\n\x0cImageContent\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\tfontColor\x18\x02 \x01(\t\x12\r\n\x05level\x18\x03 \x01(\x04\x12\x17\n\x0f\x61lternativeText\x18\x04 \x01(\t"\xb3\x01\n\tPushFrame\x12\r\n\x05seqId\x18\x01 \x01(\x04\x12\r\n\x05logId\x18\x02 \x01(\x04\x12\x0f\n\x07service\x18\x03 \x01(\x04\x12\x0e\n\x06method\x18\x04 \x01(\x04\x12(\n\x0bheadersList\x18\x05 \x03(\x0b\x32\x13.douyin.HeadersList\x12\x17\n\x0fpayloadEncoding\x18\x06 \x01(\t\x12\x13\n\x0bpayloadType\x18\x07 \x01(\t\x12\x0f\n\x07payload\x18\x08 \x01(\x0c"\x0f\n\x02kk\x12\t\n\x01k\x18\x0e \x01(\r"\xcd\x01\n\x0fSendMessageBody\x12\x16\n\x0e\x63onversationId\x18\x01 \x01(\t\x12\x18\n\x10\x63onversationType\x18\x02 \x01(\r\x12\x1b\n\x13\x63onversationShortId\x18\x03 \x01(\x04\x12\x0f\n\x07\x63ontent\x18\x04 \x01(\t\x12\x1c\n\x03\x65xt\x18\x05 \x03(\x0b\x32\x0f.douyin.ExtList\x12\x13\n\x0bmessageType\x18\x06 \x01(\r\x12\x0e\n\x06ticket\x18\x07 \x01(\t\x12\x17\n\x0f\x63lientMessageId\x18\x08 \x01(\t"%\n\x07\x45xtList\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t"\xb7\x01\n\x03Rsp\x12\t\n\x01\x61\x18\x01 \x01(\x05\x12\t\n\x01\x62\x18\x02 \x01(\x05\x12\t\n\x01\x63\x18\x03 \x01(\x05\x12\t\n\x01\x64\x18\x04 \x01(\t\x12\t\n\x01\x65\x18\x05 \x01(\x05\x12\x18\n\x01\x66\x18\x06 \x01(\x0b\x32\r.douyin.Rsp.F\x12\t\n\x01g\x18\x07 \x01(\t\x12\t\n\x01h\x18\n \x01(\x04\x12\t\n\x01i\x18\x0b \x01(\x04\x12\t\n\x01j\x18\r \x01(\x04\x1a\x33\n\x01\x46\x12\n\n\x02q1\x18\x01 \x01(\x04\x12\n\n\x02q3\x18\x03 \x01(\x04\x12\n\n\x02q4\x18\x04 \x01(\t\x12\n\n\x02q5\x18\x05 \x01(\x04"\xb2\x02\n\nPreMessage\x12\x0b\n\x03\x63md\x18\x01 \x01(\r\x12\x12\n\nsequenceId\x18\x02 \x01(\r\x12\x12\n\nsdkVersion\x18\x03 \x01(\t\x12\r\n\x05token\x18\x04 \x01(\t\x12\r\n\x05refer\x18\x05 \x01(\r\x12\x11\n\tinboxType\x18\x06 \x01(\r\x12\x13\n\x0b\x62uildNumber\x18\x07 \x01(\t\x12\x30\n\x0fsendMessageBody\x18\x08 \x01(\x0b\x32\x17.douyin.SendMessageBody\x12\n\n\x02\x61\x61\x18\t \x01(\t\x12\x16\n\x0e\x64\x65vicePlatform\x18\x0b \x01(\t\x12$\n\x07headers\x18\x0f \x03(\x0b\x32\x13.douyin.HeadersList\x12\x10\n\x08\x61uthType\x18\x12 \x01(\r\x12\x0b\n\x03\x62iz\x18\x15 \x01(\t\x12\x0e\n\x06\x61\x63\x63\x65ss\x18\x16 \x01(\t")\n\x0bHeadersList\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t*C\n\x0e\x43ommentTypeTag\x12\x19\n\x15\x43OMMENTTYPETAGUNKNOWN\x10\x00\x12\x16\n\x12\x43OMMENTTYPETAGSTAR\x10\x01\x62\x06proto3' +) + +_globals = globals() +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "douyin_webcast_pb2", _globals) +if _descriptor._USE_C_DESCRIPTORS == False: + DESCRIPTOR._options = None + _globals["_RESPONSE_ROUTEPARAMSENTRY"]._options = None + _globals["_RESPONSE_ROUTEPARAMSENTRY"]._serialized_options = b"8\001" + _globals["_GIFTSTRUCT_SPECIALEFFECTSENTRY"]._options = None + _globals["_GIFTSTRUCT_SPECIALEFFECTSENTRY"]._serialized_options = b"8\001" + _globals["_MEMBERMESSAGE_BURIEDPOINTMAPENTRY"]._options = None + _globals["_MEMBERMESSAGE_BURIEDPOINTMAPENTRY"]._serialized_options = b"8\001" + _globals["_EFFECTCONFIG_EXTRAMAPENTRY"]._options = None + _globals["_EFFECTCONFIG_EXTRAMAPENTRY"]._serialized_options = b"8\001" + _globals["_EFFECTCONFIG_PIECEVALUESMAPENTRY"]._options = None + _globals["_EFFECTCONFIG_PIECEVALUESMAPENTRY"]._serialized_options = b"8\001" + _globals["_ROOM_DYNAMICCOVERDICTENTRY"]._options = None + _globals["_ROOM_DYNAMICCOVERDICTENTRY"]._serialized_options = b"8\001" + _globals["_GRADEBUFFINFO_STATSINFOMAPENTRY"]._options = None + _globals["_GRADEBUFFINFO_STATSINFOMAPENTRY"]._serialized_options = b"8\001" + _globals["_USER_FANSCLUB_PREFERDATAENTRY"]._options = None + _globals["_USER_FANSCLUB_PREFERDATAENTRY"]._serialized_options = b"8\001" + _globals["_USER_FANSCLUB_FANSCLUBDATA_USERBADGE_ICONSENTRY"]._options = None + _globals["_USER_FANSCLUB_FANSCLUBDATA_USERBADGE_ICONSENTRY"]._serialized_options = ( + b"8\001" + ) + _globals["_COMMENTTYPETAG"]._serialized_start = 19244 + _globals["_COMMENTTYPETAG"]._serialized_end = 19311 + _globals["_RESPONSE"]._serialized_start = 33 + _globals["_RESPONSE"]._serialized_end = 389 + _globals["_RESPONSE_ROUTEPARAMSENTRY"]._serialized_start = 339 + _globals["_RESPONSE_ROUTEPARAMSENTRY"]._serialized_end = 389 + _globals["_MESSAGE"]._serialized_start = 392 + _globals["_MESSAGE"]._serialized_end = 546 + _globals["_CHATMESSAGE"]._serialized_start = 549 + _globals["_CHATMESSAGE"]._serialized_end = 1135 + _globals["_LANDSCAPEAREACOMMON"]._serialized_start = 1138 + _globals["_LANDSCAPEAREACOMMON"]._serialized_end = 1299 + _globals["_ROOMUSERSEQMESSAGE"]._serialized_start = 1302 + _globals["_ROOMUSERSEQMESSAGE"]._serialized_end = 1693 + _globals["_ROOMMESSAGE"]._serialized_start = 1695 + _globals["_ROOMMESSAGE"]._serialized_end = 1784 + _globals["_COMMONTEXTMESSAGE"]._serialized_start = 1786 + _globals["_COMMONTEXTMESSAGE"]._serialized_end = 1880 + _globals["_UPDATEFANTICKETMESSAGE"]._serialized_start = 1883 + _globals["_UPDATEFANTICKETMESSAGE"]._serialized_end = 2020 + _globals["_ROOMUSERSEQMESSAGECONTRIBUTOR"]._serialized_start = 2023 + _globals["_ROOMUSERSEQMESSAGECONTRIBUTOR"]._serialized_end = 2192 + _globals["_GIFTMESSAGE"]._serialized_start = 2195 + _globals["_GIFTMESSAGE"]._serialized_end = 3108 + _globals["_ASSETEFFECTMIXINFO"]._serialized_start = 3110 + _globals["_ASSETEFFECTMIXINFO"]._serialized_end = 3130 + _globals["_FANSCLUBMESSAGE"]._serialized_start = 3132 + _globals["_FANSCLUBMESSAGE"]._serialized_end = 3244 + _globals["_GIFTTRAYINFO"]._serialized_start = 3247 + _globals["_GIFTTRAYINFO"]._serialized_end = 3467 + _globals["_GIFTSTRUCT"]._serialized_start = 3470 + _globals["_GIFTSTRUCT"]._serialized_end = 5108 + _globals["_GIFTSTRUCT_SPECIALEFFECTSENTRY"]._serialized_start = 4992 + _globals["_GIFTSTRUCT_SPECIALEFFECTSENTRY"]._serialized_end = 5045 + _globals["_GIFTSTRUCT_GIFTSTRUCTFANSCLUBINFO"]._serialized_start = 5047 + _globals["_GIFTSTRUCT_GIFTSTRUCTFANSCLUBINFO"]._serialized_end = 5108 + _globals["_LUCKYMONEYGIFTMETA"]._serialized_start = 5110 + _globals["_LUCKYMONEYGIFTMETA"]._serialized_end = 5130 + _globals["_GIFTPANELOPERATION"]._serialized_start = 5132 + _globals["_GIFTPANELOPERATION"]._serialized_end = 5152 + _globals["_GIFTBANNER"]._serialized_start = 5154 + _globals["_GIFTBANNER"]._serialized_end = 5166 + _globals["_GIFTBUFFINFO"]._serialized_start = 5168 + _globals["_GIFTBUFFINFO"]._serialized_end = 5182 + _globals["_GIFTPREVIEWINFO"]._serialized_start = 5184 + _globals["_GIFTPREVIEWINFO"]._serialized_end = 5201 + _globals["_GIFTTIP"]._serialized_start = 5203 + _globals["_GIFTTIP"]._serialized_end = 5212 + _globals["_GIFTGROUPINFO"]._serialized_start = 5214 + _globals["_GIFTGROUPINFO"]._serialized_end = 5229 + _globals["_GIFTIMPRIORITY"]._serialized_start = 5231 + _globals["_GIFTIMPRIORITY"]._serialized_end = 5316 + _globals["_TEXTEFFECT"]._serialized_start = 5318 + _globals["_TEXTEFFECT"]._serialized_end = 5419 + _globals["_TEXTEFFECTDETAIL"]._serialized_start = 5422 + _globals["_TEXTEFFECTDETAIL"]._serialized_end = 5732 + _globals["_MEMBERMESSAGE"]._serialized_start = 5735 + _globals["_MEMBERMESSAGE"]._serialized_end = 6480 + _globals["_MEMBERMESSAGE_BURIEDPOINTMAPENTRY"]._serialized_start = 6427 + _globals["_MEMBERMESSAGE_BURIEDPOINTMAPENTRY"]._serialized_end = 6480 + _globals["_PUBLICAREACOMMON"]._serialized_start = 6482 + _globals["_PUBLICAREACOMMON"]._serialized_end = 6592 + _globals["_EFFECTCONFIG"]._serialized_start = 6595 + _globals["_EFFECTCONFIG"]._serialized_end = 7418 + _globals["_EFFECTCONFIG_EXTRAMAPENTRY"]._serialized_start = 7297 + _globals["_EFFECTCONFIG_EXTRAMAPENTRY"]._serialized_end = 7344 + _globals["_EFFECTCONFIG_PIECEVALUESMAPENTRY"]._serialized_start = 7346 + _globals["_EFFECTCONFIG_PIECEVALUESMAPENTRY"]._serialized_end = 7418 + _globals["_TEXT"]._serialized_start = 7420 + _globals["_TEXT"]._serialized_end = 7544 + _globals["_TEXTPIECE"]._serialized_start = 7547 + _globals["_TEXTPIECE"]._serialized_end = 7855 + _globals["_TEXTPIECEIMAGE"]._serialized_start = 7857 + _globals["_TEXTPIECEIMAGE"]._serialized_end = 7924 + _globals["_TEXTPIECEPATTERNREF"]._serialized_start = 7926 + _globals["_TEXTPIECEPATTERNREF"]._serialized_end = 7984 + _globals["_TEXTPIECEHEART"]._serialized_start = 7986 + _globals["_TEXTPIECEHEART"]._serialized_end = 8017 + _globals["_TEXTPIECEGIFT"]._serialized_start = 8019 + _globals["_TEXTPIECEGIFT"]._serialized_end = 8087 + _globals["_PATTERNREF"]._serialized_start = 8089 + _globals["_PATTERNREF"]._serialized_end = 8138 + _globals["_TEXTPIECEUSER"]._serialized_start = 8140 + _globals["_TEXTPIECEUSER"]._serialized_end = 8202 + _globals["_TEXTFORMAT"]._serialized_start = 8205 + _globals["_TEXTFORMAT"]._serialized_end = 8368 + _globals["_LIKEMESSAGE"]._serialized_start = 8371 + _globals["_LIKEMESSAGE"]._serialized_end = 8701 + _globals["_SOCIALMESSAGE"]._serialized_start = 8704 + _globals["_SOCIALMESSAGE"]._serialized_end = 8908 + _globals["_PICODISPLAYINFO"]._serialized_start = 8910 + _globals["_PICODISPLAYINFO"]._serialized_end = 9018 + _globals["_DOUBLELIKEDETAIL"]._serialized_start = 9020 + _globals["_DOUBLELIKEDETAIL"]._serialized_end = 9115 + _globals["_DISPLAYCONTROLINFO"]._serialized_start = 9117 + _globals["_DISPLAYCONTROLINFO"]._serialized_end = 9174 + _globals["_EPISODECHATMESSAGE"]._serialized_start = 9177 + _globals["_EPISODECHATMESSAGE"]._serialized_end = 9377 + _globals["_MATCHAGAINSTSCOREMESSAGE"]._serialized_start = 9380 + _globals["_MATCHAGAINSTSCOREMESSAGE"]._serialized_end = 9516 + _globals["_AGAINST"]._serialized_start = 9519 + _globals["_AGAINST"]._serialized_end = 9921 + _globals["_COMMON"]._serialized_start = 9924 + _globals["_COMMON"]._serialized_end = 10452 + _globals["_ROOM"]._serialized_start = 10455 + _globals["_ROOM"]._serialized_end = 11716 + _globals["_ROOM_DYNAMICCOVERDICTENTRY"]._serialized_start = 11661 + _globals["_ROOM_DYNAMICCOVERDICTENTRY"]._serialized_end = 11716 + _globals["_ROOMEXTRA"]._serialized_start = 11718 + _globals["_ROOMEXTRA"]._serialized_end = 11729 + _globals["_ROOMSTATS"]._serialized_start = 11731 + _globals["_ROOMSTATS"]._serialized_end = 11742 + _globals["_ROOMUSERATTR"]._serialized_start = 11744 + _globals["_ROOMUSERATTR"]._serialized_end = 11758 + _globals["_STREAMURL"]._serialized_start = 11760 + _globals["_STREAMURL"]._serialized_end = 11771 + _globals["_LINKMIC"]._serialized_start = 11773 + _globals["_LINKMIC"]._serialized_end = 11782 + _globals["_DECORATION"]._serialized_start = 11784 + _globals["_DECORATION"]._serialized_end = 11796 + _globals["_TOPFAN"]._serialized_start = 11798 + _globals["_TOPFAN"]._serialized_end = 11806 + _globals["_GRADEBUFFINFO"]._serialized_start = 11809 + _globals["_GRADEBUFFINFO"]._serialized_end = 12026 + _globals["_GRADEBUFFINFO_STATSINFOMAPENTRY"]._serialized_start = 11975 + _globals["_GRADEBUFFINFO_STATSINFOMAPENTRY"]._serialized_end = 12026 + _globals["_USERVIPINFO"]._serialized_start = 12028 + _globals["_USERVIPINFO"]._serialized_end = 12041 + _globals["_INDUSTRYCERTIFICATION"]._serialized_start = 12043 + _globals["_INDUSTRYCERTIFICATION"]._serialized_end = 12066 + _globals["_USER"]._serialized_start = 12069 + _globals["_USER"]._serialized_end = 17654 + _globals["_USER_ACTIVITYINFO"]._serialized_start = 15723 + _globals["_USER_ACTIVITYINFO"]._serialized_end = 15737 + _globals["_USER_ANCHORINFO"]._serialized_start = 15739 + _globals["_USER_ANCHORINFO"]._serialized_end = 15751 + _globals["_USER_ANCHORLEVEL"]._serialized_start = 15753 + _globals["_USER_ANCHORLEVEL"]._serialized_end = 15766 + _globals["_USER_AUTHENTICATIONINFO"]._serialized_start = 15768 + _globals["_USER_AUTHENTICATIONINFO"]._serialized_end = 15788 + _globals["_USER_AUTHORSTATS"]._serialized_start = 15790 + _globals["_USER_AUTHORSTATS"]._serialized_end = 15803 + _globals["_USER_BORDER"]._serialized_start = 15805 + _globals["_USER_BORDER"]._serialized_end = 15813 + _globals["_USER_BROTHERHOODINFO"]._serialized_start = 15815 + _globals["_USER_BROTHERHOODINFO"]._serialized_end = 15832 + _globals["_USER_FANSCLUB"]._serialized_start = 15835 + _globals["_USER_FANSCLUB"]._serialized_end = 16386 + _globals["_USER_FANSCLUB_PREFERDATAENTRY"]._serialized_start = 15956 + _globals["_USER_FANSCLUB_PREFERDATAENTRY"]._serialized_end = 16041 + _globals["_USER_FANSCLUB_FANSCLUBDATA"]._serialized_start = 16044 + _globals["_USER_FANSCLUB_FANSCLUBDATA"]._serialized_end = 16386 + _globals["_USER_FANSCLUB_FANSCLUBDATA_USERBADGE"]._serialized_start = 16227 + _globals["_USER_FANSCLUB_FANSCLUBDATA_USERBADGE"]._serialized_end = 16386 + _globals["_USER_FANSCLUB_FANSCLUBDATA_USERBADGE_ICONSENTRY"]._serialized_start = ( + 16327 + ) + _globals["_USER_FANSCLUB_FANSCLUBDATA_USERBADGE_ICONSENTRY"]._serialized_end = 16386 + _globals["_USER_FANSGROUPINFO"]._serialized_start = 16388 + _globals["_USER_FANSGROUPINFO"]._serialized_end = 16403 + _globals["_USER_FOLLOWINFO"]._serialized_start = 16405 + _globals["_USER_FOLLOWINFO"]._serialized_end = 16526 + _globals["_USER_JACCREDITINFO"]._serialized_start = 16528 + _globals["_USER_JACCREDITINFO"]._serialized_end = 16543 + _globals["_USER_NOBLELEVELINFO"]._serialized_start = 16545 + _globals["_USER_NOBLELEVELINFO"]._serialized_end = 16561 + _globals["_USER_OWNROOM"]._serialized_start = 16563 + _globals["_USER_OWNROOM"]._serialized_end = 16572 + _globals["_USER_PAYGRADE"]._serialized_start = 16575 + _globals["_USER_PAYGRADE"]._serialized_end = 17551 + _globals["_USER_PAYGRADE_GRADEICON"]._serialized_start = 17457 + _globals["_USER_PAYGRADE_GRADEICON"]._serialized_end = 17551 + _globals["_USER_POIINFO"]._serialized_start = 17553 + _globals["_USER_POIINFO"]._serialized_end = 17562 + _globals["_USER_PROFILESTYLEPARAMS"]._serialized_start = 17564 + _globals["_USER_PROFILESTYLEPARAMS"]._serialized_end = 17584 + _globals["_USER_SUBSCRIBE"]._serialized_start = 17586 + _globals["_USER_SUBSCRIBE"]._serialized_end = 17597 + _globals["_USER_USERATTR"]._serialized_start = 17599 + _globals["_USER_USERATTR"]._serialized_end = 17609 + _globals["_USER_USERDRESSINFO"]._serialized_start = 17611 + _globals["_USER_USERDRESSINFO"]._serialized_end = 17626 + _globals["_USER_USERSTATS"]._serialized_start = 17628 + _globals["_USER_USERSTATS"]._serialized_end = 17639 + _globals["_USER_XIGUAPARAMS"]._serialized_start = 17641 + _globals["_USER_XIGUAPARAMS"]._serialized_end = 17654 + _globals["_FOLLOWINFO"]._serialized_start = 17657 + _globals["_FOLLOWINFO"]._serialized_end = 17831 + _globals["_IMAGE"]._serialized_start = 17834 + _globals["_IMAGE"]._serialized_end = 18124 + _globals["_NINEPATCHSETTING"]._serialized_start = 18126 + _globals["_NINEPATCHSETTING"]._serialized_end = 18169 + _globals["_IMAGECONTENT"]._serialized_start = 18171 + _globals["_IMAGECONTENT"]._serialized_end = 18258 + _globals["_PUSHFRAME"]._serialized_start = 18261 + _globals["_PUSHFRAME"]._serialized_end = 18440 + _globals["_KK"]._serialized_start = 18442 + _globals["_KK"]._serialized_end = 18457 + _globals["_SENDMESSAGEBODY"]._serialized_start = 18460 + _globals["_SENDMESSAGEBODY"]._serialized_end = 18665 + _globals["_EXTLIST"]._serialized_start = 18667 + _globals["_EXTLIST"]._serialized_end = 18704 + _globals["_RSP"]._serialized_start = 18707 + _globals["_RSP"]._serialized_end = 18890 + _globals["_RSP_F"]._serialized_start = 18839 + _globals["_RSP_F"]._serialized_end = 18890 + _globals["_PREMESSAGE"]._serialized_start = 18893 + _globals["_PREMESSAGE"]._serialized_end = 19199 + _globals["_HEADERSLIST"]._serialized_start = 19201 + _globals["_HEADERSLIST"]._serialized_end = 19242 +# @@protoc_insertion_point(module_scope) From cfae5bf023b3186deb734d8bf2b6a7327725d0b8 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 19:27:04 +0800 Subject: [PATCH 218/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E5=BC=B9=E5=B9=95=E7=88=AC=E8=99=AB?= =?UTF-8?q?=E5=8F=8A=E5=9B=9E=E8=B0=83=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/crawler.py | 291 +++++++++++++++++++++++++++++++++++++- 1 file changed, 289 insertions(+), 2 deletions(-) diff --git a/f2/apps/douyin/crawler.py b/f2/apps/douyin/crawler.py index 4c63f957..06653201 100644 --- a/f2/apps/douyin/crawler.py +++ b/f2/apps/douyin/crawler.py @@ -1,8 +1,14 @@ # path: f2/apps/douyin/crawler.py +import gzip +import traceback + +from google.protobuf import json_format + from f2.log.logger import logger from f2.i18n.translator import _ -from f2.crawlers.base_crawler import BaseCrawler +from f2.crawlers.base_crawler import BaseCrawler, WebSocketCrawler +from f2.utils.utils import BaseEndpointManager from f2.apps.douyin.api import DouyinAPIEndpoints as dyendpoint from f2.apps.douyin.model import ( UserProfile, @@ -21,10 +27,31 @@ LoginCheckQr, UserFollowing, UserFollower, + LiveWebcast, LiveImFetch, QueryUser, ) -from f2.apps.douyin.utils import XBogusManager +from f2.apps.douyin.utils import ( + XBogusManager, + ABogusManager, + ClientConfManager, + TokenManager, +) +from f2.apps.douyin.proto.douyin_webcast_pb2 import ( + PushFrame, + Response, + RoomMessage, + LikeMessage, + MemberMessage, + ChatMessage, + GiftMessage, + SocialMessage, + RoomUserSeqMessage, + UpdateFanTicketMessage, + CommonTextMessage, + MatchAgainstScoreMessage, + FansClubMessage, +) class DouyinCrawler(BaseCrawler): @@ -273,3 +300,263 @@ async def __aenter__(self): async def __aexit__(self, exc_type, exc_val, exc_tb): await self.close() + + +class DouyinWebSocketCrawler(WebSocketCrawler): + def __init__(self, kwargs: dict = ..., callbacks: dict = None): + # 需要与cli同步 + self.headers = kwargs.get("headers", {}) | { + "Cookie": f"ttwid={TokenManager.gen_ttwid()};" + } + self.callbacks = callbacks or {} + self.timeout = kwargs.get("timeout", 10) + super().__init__( + wss_headers=self.headers, callbacks=self.callbacks, timeout=self.timeout + ) + + async def fetch_live_danmaku(self, params: LiveWebcast): + endpoint = BaseEndpointManager.model_2_endpoint( + dyendpoint.LIVE_IM_WSS, + params.model_dump(), + ) + logger.debug(_("直播弹幕接口地址：{0}").format(endpoint)) + await self.connect_websocket(endpoint) + return await self.receive_messages() + + async def handle_wss_message(self, message: bytes): + """ + 处理 WebSocket 消息 + + Args: + message (bytes): WebSocket 消息的字节数据 + """ + try: + wss_package = PushFrame() + wss_package.ParseFromString(message) + log_id = wss_package.logId + decompressed = gzip.decompress(wss_package.payload) + payload_package = Response() + payload_package.ParseFromString(decompressed) + + # 发送 ack 包 + if payload_package.needAck: + await self.send_ack(log_id, payload_package.internalExt) + + # 处理每个消息 + for msg in payload_package.messagesList: + method = msg.method + payload = msg.payload + + # 调用对应的回调函数处理消息 + if method in self.callbacks: + await self.callbacks[method](data=payload) + else: + logger.warning( + _("未找到对应的回调函数处理消息：{0}").format(method) + ) + + except Exception: + logger.error(traceback.format_exc()) + + async def send_ack(self, log_id: str, internal_ext: str): + """ + 发送 ack 包 + + Args: + log_id: 日志ID + internal_ext: 内部扩展信息 + """ + ack = PushFrame() + ack.logId = log_id + ack.payloadType = internal_ext + data = ack.SerializeToString() + logger.debug(_("[SendAck] [💓发送ack包]")) + await self.websocket.send(data) + + async def send_ping(self): + """ + 发送 ping 包 + """ + ping = PushFrame() + ping.payloadType = "hb" + data = ping.SerializeToString() + logger.debug(_("[SendPing] [📤发送ping包]")) + await self.websocket.ping(data) + + async def on_message(self, message): + await self.handle_wss_message(message) + + async def on_error(self, message): + return await super().on_error(message) + + async def on_close(self, message): + return await super().on_close(message) + + async def on_open(self): + return await super().on_open() + + # 定义所有的回调消息函数 + @classmethod + async def WebcastRoomMessage(self, data: bytes): + roomMessage = RoomMessage() + roomMessage.ParseFromString(data) + data_dict = json_format.MessageToDict( + roomMessage, preserving_proto_field_name=True + ) + logger.info( + _("[WebcastRoomMessage] [🏠房间消息] ｜ {0}").format(data_dict.get("room")) + ) + return data_dict + + @classmethod + async def WebcastLikeMessage(self, data: bytes): + likeMessage = LikeMessage() + likeMessage.ParseFromString(data) + data_dict = json_format.MessageToDict( + likeMessage, preserving_proto_field_name=True + ) + logger.info( + "[WebcastLikeMessage] [👍点赞消息] ｜ " + + "[用户Id：{0}] [当前用户点赞：{1}] [总点赞：{2}]".format( + data_dict.get("user").get("id"), + data_dict.get("count"), + data_dict.get("total"), + ) + ) + return data_dict + + @classmethod + async def WebcastMemberMessage(self, data: bytes): + memberMessage = MemberMessage() + memberMessage.ParseFromString(data) + data_dict = json_format.MessageToDict( + memberMessage, preserving_proto_field_name=True + ) + logger.info( + f"[WebcastMemberMessage] [🚺观众加入消息] ｜ [用户Id：{data_dict.get('user').get('id')} 用户名：{data_dict.get('user').get('nickname')}]" + ) + return data_dict + + @classmethod + async def WebcastChatMessage(self, data: bytes): + chatMessage = ChatMessage() + chatMessage.ParseFromString(data) + data_dict = json_format.MessageToDict( + chatMessage, preserving_proto_field_name=True + ) + logger.info( + _("[WebcastChatMessage] [💬聊天消息] ｜ {0}").format( + data_dict.get("content") + ) + ) + return data + + @classmethod + async def WebcastGiftMessage(self, data: bytes): + giftMessage = GiftMessage() + giftMessage.ParseFromString(data) + data_dict = json_format.MessageToDict( + giftMessage, preserving_proto_field_name=True + ) + logger.info( + _("[WebcastGiftMessage] [🎁礼物消息] | [{0}]").format( + data_dict.get("common").get("describe") + ) + ) + return data_dict + + @classmethod + async def WebcastSocialMessage(self, data: bytes): + socialMessage = SocialMessage() + socialMessage.ParseFromString(data) + data_dict = json_format.MessageToDict( + socialMessage, preserving_proto_field_name=True + ) + logger.info( + _("[WebcastSocialMessage] [➕用户关注消息] | [{0}]").format( + data_dict.get("user").get("id") + ) + ) + return data_dict + + @classmethod + async def WebcastRoomUserSeqMessage(self, data: bytes): + roomUserSeqMessage = RoomUserSeqMessage() + roomUserSeqMessage.ParseFromString(data) + data_dict = json_format.MessageToDict( + roomUserSeqMessage, preserving_proto_field_name=True + ) + + logger.info( + _("[WebcastRoomUserSeqMessage] [👥在线观众排行榜] | [{0} {1} {2}]").format( + data_dict.get("ranksList")[0].get("user").get("id"), + data_dict.get("ranksList")[1].get("user").get("id"), + data_dict.get("ranksList")[2].get("user").get("id"), + ) + ) + return data_dict + + @classmethod + async def WebcastUpdateFanTicketMessage(self, data: bytes): + updateFanTicketMessage = UpdateFanTicketMessage() + updateFanTicketMessage.ParseFromString(data) + data_dict = json_format.MessageToDict( + updateFanTicketMessage, preserving_proto_field_name=True + ) + + logger.info( + _("[WebcastUpdateFanTicketMessage] [🎟️粉丝票更新消息] | [{0}]").format( + data_dict.get("roomFanTicketCount") + ) + ) + return data_dict + + @classmethod + async def WebcastCommonTextMessage(self, data: bytes): + commonTextMessage = CommonTextMessage() + commonTextMessage.ParseFromString(data) + data_dict = json_format.MessageToDict( + commonTextMessage, preserving_proto_field_name=True + ) + + logger.info( + _("[WebcastCommonTextMessage] [📝文本消息] | [{0}]").format(data_dict) + ) + return data_dict + + @classmethod + async def WebcastMatchAgainstScoreMessage(self, data: bytes): + matchAgainstScoreMessage = MatchAgainstScoreMessage() + matchAgainstScoreMessage.ParseFromString(data) + data_dict = json_format.MessageToDict( + matchAgainstScoreMessage, preserving_proto_field_name=True + ) + + logger.info( + _("[WebcastMatchAgainstScoreMessage] [🏆对战积分消息] | [{0}]").format( + data_dict + ) + ) + return data_dict + + @classmethod + async def WebcastFansclubMessage(self, data: bytes): + fansClubMessage = FansClubMessage() + fansClubMessage.ParseFromString(data) + data_dict = json_format.MessageToDict( + fansClubMessage, preserving_proto_field_name=True + ) + + logger.info( + _("[WebcastFansclubMessage] [🎉粉丝团消息] | [{0}]").format( + data_dict.get("content") + ) + ) + return data_dict + + async def __aenter__(self): + await super().__aenter__() + return self + + async def __aexit__(self, exc_type, exc_val, exc_tb): + await super().__aexit__(exc_type, exc_val, exc_tb) From 7e377226811ec79375731665c9ae2eae44cfed5e Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 19:27:49 +0800 Subject: [PATCH 219/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E5=BC=B9=E5=B9=95=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/handler.py | 62 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/f2/apps/douyin/handler.py b/f2/apps/douyin/handler.py index 6b5ead72..43469349 100644 --- a/f2/apps/douyin/handler.py +++ b/f2/apps/douyin/handler.py @@ -10,7 +10,7 @@ # from f2.utils.utils import split_set_cookie from f2.apps.douyin.db import AsyncUserDB, AsyncVideoDB -from f2.apps.douyin.crawler import DouyinCrawler +from f2.apps.douyin.crawler import DouyinCrawler, DouyinWebSocketCrawler from f2.apps.douyin.dl import DouyinDownloader from f2.apps.douyin.model import ( UserPost, @@ -30,6 +30,7 @@ UserFollower, PostRelated, FriendFeed, + LiveWebcast, LiveImFetch, QueryUser, FollowingUserLive, @@ -54,11 +55,13 @@ QueryUserFilter, FollowingUserLiveFilter, ) +from f2.apps.douyin.algorithm.webcast_signature import DouyinWebcastSignature from f2.apps.douyin.utils import ( SecUserIdFetcher, AwemeIdFetcher, MixIdFetcher, WebCastIdFetcher, + ClientConfManager, # VerifyFpManager, create_or_rename_user_folder, # show_qrcode, @@ -1626,6 +1629,63 @@ async def fetch_live_im(self, room_id: str, unique_id: str) -> LiveImFetchFilter return live_im + async def fetch_live_danmaku( + self, room_id: str, user_unique_id: str, internal_ext: str, cursor: str + ): + """ + 通过WebSocket连接获取直播间弹幕，再通过回调函数处理弹幕数据。 + + Args: + room_id: str: 直播间ID + user_unique_id: str: 用户ID + internal_ext: str: 内部扩展参数 + cursor: str: 弹幕cursor + + Return: + self.websocket: DouyinWebSocketCrawler: WebSocket连接对象 + """ + wss_callbacks = { + "WebcastRoomMessage": DouyinWebSocketCrawler.WebcastRoomMessage, + "WebcastLikeMessage": DouyinWebSocketCrawler.WebcastLikeMessage, + "WebcastMemberMessage": DouyinWebSocketCrawler.WebcastMemberMessage, + "WebcastChatMessage": DouyinWebSocketCrawler.WebcastChatMessage, + "WebcastGiftMessage": DouyinWebSocketCrawler.WebcastGiftMessage, + "WebcastSocialMessage": DouyinWebSocketCrawler.WebcastSocialMessage, + "WebcastRoomUserSeqMessage": DouyinWebSocketCrawler.WebcastRoomUserSeqMessage, + "WebcastUpdateFanTicketMessage": DouyinWebSocketCrawler.WebcastUpdateFanTicketMessage, + "WebcastCommonTextMessage": DouyinWebSocketCrawler.WebcastCommonTextMessage, + "WebcastMatchAgainstScoreMessage": DouyinWebSocketCrawler.WebcastMatchAgainstScoreMessage, + "WebcastFansclubMessage": DouyinWebSocketCrawler.WebcastFansclubMessage, + # TODO: WebcastRanklistHourEntranceMessage + # TODO: WebcastRoomStatsMessage + # TODO: WebcastRoomMessage + # TODO: WebcastLiveShoppingMessage + # TODO: WebcastLiveEcomGeneralMessage + # TODO: WebcastProductChangeMessage + # TODO: WebcastRoomStreamAdaptationMessage + } + async with DouyinWebSocketCrawler(self.kwargs, callbacks=wss_callbacks) as wss: + signature = DouyinWebcastSignature( + ClientConfManager.user_agent() + ).get_signature(room_id, user_unique_id) + + params = LiveWebcast( + room_id=room_id, + user_unique_id=user_unique_id, + internal_ext=internal_ext, + cursor=cursor, + signature=signature, + ) + + result = await wss.fetch_live_danmaku(params) + + if result == "closed": + logger.info(_("直播间：{0} 已结束直播").format(room_id)) + elif result == "error": + logger.error(_("直播间：{0} 弹幕连接异常").format(room_id)) + + return + async def fetch_user_following_lives(self) -> FollowingUserLiveFilter: """ 用于获取关注用户的直播间信息。 From 71543eca032278aca77252b9671127900fe084b5 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 19:30:11 +0800 Subject: [PATCH 220/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E5=BC=B9=E5=B9=95=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=AD=BE=E5=90=8D=E4=BB=A3=E7=A0=81=E7=89=87=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/snippets/douyin/webcast-signature.py | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 docs/snippets/douyin/webcast-signature.py diff --git a/docs/snippets/douyin/webcast-signature.py b/docs/snippets/douyin/webcast-signature.py new file mode 100644 index 00000000..092f8775 --- /dev/null +++ b/docs/snippets/douyin/webcast-signature.py @@ -0,0 +1,11 @@ +from f2.apps.douyin.algorithm.webcast_signature import DouyinWebcastSignature +from f2.apps.douyin.utils import ClientConfManager + + +if __name__ == "__main__": + room_id = "7383573503129258802" + user_unique_id = "7383588170770138661" + signature = DouyinWebcastSignature( + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0" + ).get_signature(room_id, user_unique_id) + print(signature) From 0d4688470933ed065d1ccb92bfe947d9620c1527 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 19:36:23 +0800 Subject: [PATCH 221/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E7=AE=97=E6=B3=95=E5=88=87=E6=8D=A2=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ab: abogus xb: xbogus --- f2/conf/conf.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/f2/conf/conf.yaml b/f2/conf/conf.yaml index 5a0e23d6..536c26fe 100644 --- a/f2/conf/conf.yaml +++ b/f2/conf/conf.yaml @@ -2,6 +2,8 @@ f2: version: "0.0.1.6" douyin: + encryption: ab + BaseRequestModel: version: code: "190500" From cf5cbaf09ed649b48302b371e9c4af9d69d001ae Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 20:05:21 +0800 Subject: [PATCH 222/299] =?UTF-8?q?feat:=20=E5=BC=80=E6=BA=90abogus(limit?= =?UTF-8?q?=20ua)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6月开源残血版ab算法，满血版待定开源 #99 #98 #88 https://github.com/Johnserf-Seed/TikTokDownload/issues/703 https://github.com/Johnserf-Seed/TikTokDownload/issues/718 https://github.com/Johnserf-Seed/TikTokDownload/issues/702 --- f2/utils/abogus.py | 777 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 777 insertions(+) create mode 100644 f2/utils/abogus.py diff --git a/f2/utils/abogus.py b/f2/utils/abogus.py new file mode 100644 index 00000000..d0aa787d --- /dev/null +++ b/f2/utils/abogus.py @@ -0,0 +1,777 @@ +# path: f2/utils/abogus.py + +#!/usr/bin/env python +# -*- encoding: utf-8 -*- +""" +@Description:abogus.py +@Date :2024/06/16 11:21:14 +@Author :JohnserfSeed +@version :0.0.1 +@License :Apache License 2.0 +@Github :https://github.com/johnserf-seed +@Mail :johnserf-seed@foxmail.com +------------------------------------------------- +Change Log : +2024/06/16 17:27:47 - Create ABogus algorithm & black style +2024/06/16 17:27:47 - Limit custom ua late open source full version +------------------------------------------------- +""" + +import time +import random + +from gmssl import sm3, func +from typing import Union, Callable, List, Dict + + +class StringProcessor: + """ + StringProcessor 类用于计算ABogus算法中所需的字符串处理方法。 + 包括字符串和 ASCII 码之间的转换、无符号右移运算等。 + + 类方法: + + to_ord_str(s: str) -> str: + 将字符串转换为 ASCII 码字符串。 + + to_ord_array(s: str) -> List[int]: + 将字符串转换为 ASCII 码列表。 + + to_char_str(s: str) -> str: + 将 ASCII 码列表转换为字符串。 + + to_char_array(s: str) -> List[int]: + 将字符串转换为 ASCII 码列表。 + + js_shift_right(val: int, n: int) -> int: + 实现 JavaScript 中的无符号右移运算。 + + generate_random_bytes(length: int = 3) -> str: + 生成一组伪随机字节字符串，用于混淆数据。 + + 使用示例: + # 将字符串转换为 ASCII 码字符串 + ord_str = StringProcessor.to_ord_str("Hello, World!") + print(ord_str) + + # 将字符串转换为 ASCII 码列表 + ord_array = StringProcessor.to_ord_array("Hello, World!") + print(ord_array) + + # 将 ASCII 码列表转换为字符串 + char_str = StringProcessor.to_char_str(ord_array) + print(char_str) + + # 将字符串转换为 ASCII 码列表 + char_array = StringProcessor.to_char_array("Hello, World!") + print(char_array) + + # 实现 JavaScript 中的无符号右移运算 + shifted_val = StringProcessor.js_shift_right(10, 2) + print(shifted_val) + + # 生成一组伪随机字节字符串 + random_bytes = StringProcessor.generate_random_bytes(3) + print(random_bytes) + """ + + @staticmethod + def to_ord_str(s: str) -> str: + """ + 将字符串转换为 ASCII 码字符串 (Convert a string to an ASCII code string). + + Args: + s (str): 输入字符串 (Input string). + + Returns: + str: 转换后的 ASCII 码字符串 (Converted ASCII code string). + """ + return "".join([chr(i) for i in s]) + + @staticmethod + def to_ord_array(s: str) -> List[int]: + """ + 将字符串转换为 ASCII 码列表 (Convert a string to a list of ASCII codes). + + Args: + s (str): 输入字符串 (Input string). + + Returns: + List[int]: 转换后的 ASCII 码列表 (Converted list of ASCII codes). + """ + return [ord(char) for char in s] + + @staticmethod + def to_char_str(s: str) -> str: + """ + 将 ASCII 码列表转换为字符串 (Convert a list of ASCII codes to a string). + + Args: + s (str): ASCII 码列表 (List of ASCII codes). + + Returns: + str: 转换后的字符串 (Converted string). + """ + return "".join([chr(i) for i in s]) + + @staticmethod + def to_char_array(s: str) -> List[int]: + """ + 将字符串转换为 ASCII 码列表 (Convert a string to a list of ASCII codes). + + Args: + s (str): 输入字符串 (Input string). + + Returns: + List[int]: 转换后的 ASCII 码列表 (Converted list of ASCII codes). + """ + return [ord(char) for char in s] + + @staticmethod + def js_shift_right(val: int, n: int) -> int: + """ + 实现 JavaScript 中的无符号右移运算 (Implement the unsigned right shift operation in JavaScript). + + Args: + val (int): 输入值 (Input value). + n (int): 右移位数 (Number of bits to shift right). + + Returns: + int: 右移后的值 (Value after right shift). + """ + return (val % 0x100000000) >> n + + @staticmethod + def generate_random_bytes(length: int = 3) -> str: + """ + 生成一组伪随机字节字符串，用于混淆数据 (Generate a pseudo-random byte string to obfuscate the data). + + Args: + length (int): 生成的字节序列长度 (Length of the byte sequence to generate). + + Returns: + str: 生成的伪随机字节字符串 (Generated pseudo-random byte string). + """ + + def generate_byte_sequence() -> List[str]: + _rd = int(random.random() * 10000) + return [ + chr(((_rd & 255) & 170) | 1), + chr(((_rd & 255) & 85) | 2), + chr((StringProcessor.js_shift_right(_rd, 8) & 170) | 5), + chr((StringProcessor.js_shift_right(_rd, 8) & 85) | 40), + ] + + result = [] + for _ in range(length): + result.extend(generate_byte_sequence()) + + return "".join(result) + + +class CryptoUtility: + """ + CryptoUtility 类用于提供加密和编码的工具方法，包括 SM3 哈希、添加盐值、Base64 编码和 RC4 加密等。 + """ + + def __init__(self, salt: str, custom_base64_alphabet: List[str]): + """ + 初始化 CryptoUtility 类 + Initialize the CryptoUtility class. + + Args: + salt (str): 加密盐值 (Encryption salt). + custom_base64_alphabet (List[str]): 自定义 Base64 字符表 (Custom Base64 alphabet). + """ + self.salt = salt + self.base64_alphabet = custom_base64_alphabet + + # fmt: off + self.big_array = [ + 121, 243, 55, 234, 103, 36, 47, 228, 30, 231, 106, 6, 115, 95, 78, 101, 250, 207, 198, 50, + 139, 227, 220, 105, 97, 143, 34, 28, 194, 215, 18, 100, 159, 160, 43, 8, 169, 217, 180, 120, + 247, 45, 90, 11, 27, 197, 46, 3, 84, 72, 5, 68, 62, 56, 221, 75, 144, 79, 73, 161, + 178, 81, 64, 187, 134, 117, 186, 118, 16, 241, 130, 71, 89, 147, 122, 129, 65, 40, 88, 150, + 110, 219, 199, 255, 181, 254, 48, 4, 195, 248, 208, 32, 116, 167, 69, 201, 17, 124, 125, 104, + 96, 83, 80, 127, 236, 108, 154, 126, 204, 15, 20, 135, 112, 158, 13, 1, 188, 164, 210, 237, + 222, 98, 212, 77, 253, 42, 170, 202, 26, 22, 29, 182, 251, 10, 173, 152, 58, 138, 54, 141, + 185, 33, 157, 31, 252, 132, 233, 235, 102, 196, 191, 223, 240, 148, 39, 123, 92, 82, 128, 109, + 57, 24, 38, 113, 209, 245, 2, 119, 153, 229, 189, 214, 230, 174, 232, 63, 52, 205, 86, 140, + 66, 175, 111, 171, 246, 133, 238, 193, 99, 60, 74, 91, 225, 51, 76, 37, 145, 211, 166, 151, + 213, 206, 0, 200, 244, 176, 218, 44, 184, 172, 49, 216, 93, 168, 53, 21, 183, 41, 67, 85, + 224, 155, 226, 242, 87, 177, 146, 70, 190, 12, 162, 19, 137, 114, 25, 165, 163, 192, 23, 59, + 9, 94, 179, 107, 35, 7, 142, 131, 239, 203, 149, 136, 61, 249, 14, 156 + ] + # fmt: on + + @staticmethod + def sm3_to_array(input_data: Union[str, List[int]]) -> List[int]: + """ + 计算请求体的 SM3 哈希值，并将结果转换为整数数组 (Calculate the SM3 hash value of the request body and convert the result to an array of integers). + + Args: + input_data (Union[str, List[int]]): 输入数据 (Input data). + + Returns: + List[int]: 哈希值的整数数组 (Array of integers representing the hash value). + """ + # 如果输入是字符串，则将其编码为字节数组 + if isinstance(input_data, str): + input_data_bytes = input_data.encode("utf-8") + else: + input_data_bytes = bytes(input_data) # 将 List[int] 转换为字节数组 + + # 将字节数组转换为适合 sm3.sm3_hash 函数处理的列表格式 + hex_result = sm3.sm3_hash(func.bytes_to_list(input_data_bytes)) + + # 将十六进制字符串结果转换为十进制整数列表 + return [int(hex_result[i : i + 2], 16) for i in range(0, len(hex_result), 2)] + + def add_salt(self, param: str) -> str: + """ + 为字符串参数添加盐值 (Add salt to the string parameter). + + Args: + param (str): 输入字符串 (Input string). + + Returns: + str: 添加盐值后的字符串 (String with added salt). + """ + return param + self.salt + + def process_param( + self, param: Union[str, List[int]], add_salt: bool + ) -> Union[str, List[int]]: + """ + 处理输入参数，根据需要添加盐值 (Process input parameter and add salt if needed). + + Args: + param (Union[str, List[int]]): 输入参数 (Input parameter). + add_salt (bool): 是否添加盐值 (Whether to add salt). + + Returns: + Union[str, List[int]]: 处理后的参数 (Processed parameter). + """ + if isinstance(param, str) and add_salt: + param = self.add_salt(param) + return param + + def params_to_array( + self, param: Union[str, List[int]], add_salt: bool = True + ) -> List[int]: + """ + 获取输入参数的哈希数组 (Get the hash array of the input parameter). + + Args: + param (Union[str, List[int]]): 输入参数 (Input parameter). + add_salt (bool): 是否添加盐值 (Whether to add salt). + + Returns: + List[int]: 哈希数组 (Hash array). + """ + processed_param = self.process_param(param, add_salt) + return self.sm3_to_array(processed_param) + + def transform_bytes(self, bytes_list: List[int]) -> str: + """ + 对输入的字节列表进行加密/解密操作，返回处理后的字符串 (Encrypt/decrypt the input byte list and return the processed string). + + Args: + bytes_list (List[int]): 输入的字节列表 (Input byte list). + + Returns: + str: 处理后的字符串 (Processed string). + """ + # 将字节列表转换为字符字符串 + bytes_str = StringProcessor.to_char_str(bytes_list) + result_str = [] + index_b = self.big_array[1] + initial_value = 0 + + for index, char in enumerate(bytes_str): + if index == 0: + initial_value = self.big_array[index_b] + sum_initial = index_b + initial_value + + self.big_array[1] = initial_value + self.big_array[index_b] = index_b + else: + sum_initial = initial_value + value_e + + char_value = ord(char) + sum_initial %= len(self.big_array) + value_f = self.big_array[sum_initial] + encrypted_char = char_value ^ value_f + result_str.append(chr(encrypted_char)) + + # 交换数组元素 + value_e = self.big_array[(index + 2) % len(self.big_array)] + sum_initial = (index_b + value_e) % len(self.big_array) + initial_value = self.big_array[sum_initial] + self.big_array[sum_initial] = self.big_array[ + (index + 2) % len(self.big_array) + ] + self.big_array[(index + 2) % len(self.big_array)] = initial_value + index_b = sum_initial + + return "".join(result_str) + + def base64_encode(self, input_string: str, selected_alphabet: int = 0) -> str: + """ + 使用自定义字符表对输入字符串进行 Base64 编码 (Encode the input string using a custom Base64 alphabet). + + Args: + input_string (str): 输入字符串 (Input string). + selected_alphabet (int): 选择的自定义 Base64 字符表索引 (Selected custom Base64 alphabet index). + + Returns: + str: 编码后的字符串 (Encoded string). + """ + + # 将输入字符串转换为ASCII码的二进制形式 + binary_string = "".join(["{:08b}".format(ord(char)) for char in input_string]) + + # 补全二进制字符串使其长度为6的倍数 + padding_length = (6 - len(binary_string) % 6) % 6 + binary_string += "0" * padding_length + + # 将二进制字符串分割为6位一组 + base64_indices = [ + int(binary_string[i : i + 6], 2) for i in range(0, len(binary_string), 6) + ] + + # 根据自定义字符表生成输出字符串 + output_string = "".join( + [self.base64_alphabet[selected_alphabet][index] for index in base64_indices] + ) + + # 添加等号填充，使符合 Base64 编码规范 + output_string += "=" * (padding_length // 2) + + return output_string + + def abogus_encode(self, abogus_bytes_str: str, selected_alphabet: int) -> str: + """ + 对输入的字节字符串进行自定义 Base64 编码，并添加位移和填充 (Encode the input byte string using a custom Base64 alphabet, and add shifts and padding). + + Args: + abogus_bytes_str (str): 输入的字节字符串 (Input byte string). + selected_alphabet (int): 选择的自定义 Base64 字符表索引 (Selected custom Base64 alphabet index). + + Returns: + str: 编码后的字符串 (Encoded string). + """ + abogus = [] + + for i in range(0, len(abogus_bytes_str), 3): + if i + 2 < len(abogus_bytes_str): + n = ( + (ord(abogus_bytes_str[i]) << 16) + | (ord(abogus_bytes_str[i + 1]) << 8) + | ord(abogus_bytes_str[i + 2]) + ) + elif i + 1 < len(abogus_bytes_str): + n = (ord(abogus_bytes_str[i]) << 16) | ( + ord(abogus_bytes_str[i + 1]) << 8 + ) + else: + n = ord(abogus_bytes_str[i]) << 16 + + for j, k in zip(range(18, -1, -6), (0xFC0000, 0x03F000, 0x0FC0, 0x3F)): + if j == 6 and i + 1 >= len(abogus_bytes_str): + break + if j == 0 and i + 2 >= len(abogus_bytes_str): + break + abogus.append(self.base64_alphabet[selected_alphabet][(n & k) >> j]) + + abogus.append("=" * ((4 - len(abogus) % 4) % 4)) + return "".join(abogus) + + @staticmethod + def rc4_encrypt(key: bytes, plaintext: str) -> bytes: + """ + 使用 RC4 算法加密数据 (Encrypt data using the RC4 algorithm). + + Args: + key (bytes): 加密密钥 (Encryption key). + plaintext (str): 明文数据 (Plaintext data). + + Returns: + bytes: 加密后的数据 (Encrypted data). + """ + S = list(range(256)) + j = 0 + for i in range(256): + j = (j + S[i] + key[i % len(key)]) % 256 + S[i], S[j] = S[j], S[i] + + i = j = 0 + ciphertext = [] + for char in plaintext: + i = (i + 1) % 256 + j = (j + S[i]) % 256 + S[i], S[j] = S[j], S[i] + K = S[(S[i] + S[j]) % 256] + ciphertext.append(ord(char) ^ K) + + return bytes(ciphertext) + + +class BrowserFingerprintGenerator: + """ + BrowserFingerprintGenerator 用于生成模拟的浏览器指纹信息，用于在不同浏览器环境中进行测试和数据采集。 + + 类属性: + browsers (Dict[str, Callable[[], str]]): 浏览器类型和生成浏览器指纹的映射关系。 + + 方法: + generate_fingerprint(browser_type="Edge"): + 根据指定的浏览器类型生成浏览器指纹。 + + generate_chrome_fingerprint(): + 生成 Chrome 浏览器指纹。 + + generate_firefox_fingerprint(): + 生成 Firefox 浏览器指纹。 + + generate_safari_fingerprint(): + 生成 Safari 浏览器指纹。 + + generate_edge_fingerprint(): + 生成 Edge 浏览器指纹。 + + _generate_fingerprint(platform="Win32"): + 根据给定的参数生成浏览器指纹字符串。 + + 使用示例: + chrome_fp = BrowserFingerprintGenerator.generate_fingerprint("Chrome") + print(chrome_fp) + """ + + @classmethod + def generate_fingerprint(cls, browser_type: str = "Edge") -> str: + """ + 根据指定的浏览器类型生成浏览器指纹。 (Generate a browser fingerprint based on the specified browser type.) + + Args: + browser_type (str): 浏览器类型 (Browser type). + + Returns: + str: 生成的浏览器指纹字符串 (Generated browser fingerprint string). + """ + cls.browsers: Dict[str, Callable[[], str]] = { + "Chrome": cls.generate_chrome_fingerprint, + "Firefox": cls.generate_firefox_fingerprint, + "Safari": cls.generate_safari_fingerprint, + "Edge": cls.generate_edge_fingerprint, + } + return cls.browsers.get(browser_type, cls.generate_chrome_fingerprint)() + + @classmethod + def generate_chrome_fingerprint(cls) -> str: + return cls._generate_fingerprint(platform="Win32") + + @classmethod + def generate_firefox_fingerprint(cls) -> str: + return cls._generate_fingerprint(platform="Win32") + + @classmethod + def generate_safari_fingerprint(cls) -> str: + return cls._generate_fingerprint(platform="MacIntel") + + @classmethod + def generate_edge_fingerprint(cls) -> str: + return cls._generate_fingerprint(platform="Win32") + + @staticmethod + def _generate_fingerprint(platform: str) -> str: + """ + 根据给定的参数生成浏览器指纹字符串。 (Generate a browser fingerprint string based on the given parameters.) + + Args: + platform (str): 操作系统平台 (Operating system platform). + + Returns: + str: 生成的浏览器指纹字符串 (Generated browser fingerprint string). + """ + inner_width = random.randint(1024, 1920) + inner_height = random.randint(768, 1080) + outer_width = inner_width + random.randint(24, 32) + outer_height = inner_height + random.randint(75, 90) + screen_x = 0 + screen_y = random.choice([0, 30]) + avail_width = random.randint(1280, 1920) + avail_height = random.randint(800, 1080) + + fingerprint = ( + f"{inner_width}|{inner_height}|{outer_width}|{outer_height}|" + f"{screen_x}|{screen_y}|0|0|{avail_width}|{avail_height}|" + f"{avail_width}|{avail_height}|{inner_width}|{inner_height}|24|24|{platform}" + ) + return fingerprint + + +class ABogus: + """ + ABogus 类用于生成 ABogus 参数。 + + 类属性: + array1 (List[int]): 加密请求体 (Encrypted request body). + array2 (List[int]): 加密请求头 (Encrypted request header). + array3 (List[int]): 加密 UA (Encrypted User-Agent). + aid (int): AID 值 (AID value). + pageId (int): 页面 ID (Page ID). + salt (str): 加密盐值 (Encryption salt). + options (List[int]): 请求选项 (Request options). + ua_key (bytes): UA 加密密钥 (UA encryption key). + character (str): 自定义 Base64 字符表 (Custom Base64 alphabet). + character2 (str): 自定义 Base64 字符表 (Custom Base64 alphabet). + character_list (List[str]): 自定义 Base64 字符表列表 (List of custom Base64 alphabets). + crypto_utility (CryptoUtility): 加密工具类 (Encryption utility). + user_agent (str): 自定义 UA (Custom User-Agent). + browser_fp (str): 浏览器指纹 (Browser fingerprint). + sort_index (List[int]): 排序索引 (Sort index). + sort_index_2 (List[int]): 排序索引 (Sort index). + + 方法: + encode_data(data: str, alphabet_index: int = 0) -> str: + 使用指定的字符表对数据进行 Base64 编码 (Encode the data using the specified Base64 alphabet). + + generate_abogus(params: str, request: str = "") -> str: + 生成 ABogus 参数 (Generate the ABogus parameter). + + 使用示例: + # 生成 ABogus 参数，置空使用默认 UA 和浏览器指纹 + abogus = ABogus(user_agent="xxx", fp="xxx") + abogus_param = abogus.generate_abogus("device_platform=webapp&aid=6383&channel=channel_pc_web&aweme_id=7380308675841297704……省略……") + print(abogus_param[1]) + """ + + def __init__(self, fp: str = "", user_agent: str = ""): + self.aid = 6383 + self.pageId = 0 + self.salt = "cus" # 加密盐 + self.array1 = [] # 加密请求体 + self.array2 = [] # 加密请求头 为空 + # fmt: off + self.array3 = [] # 加密UA + # fmt: on + self.options = [0, 1, 14] # GET, POST, JSON + + self.character = ( + "Dkdpgh2ZmsQB80/MfvV36XI1R45-WUAlEixNLwoqYTOPuzKFjJnry79HbGcaStCe" + ) + self.character2 = ( + "ckdp1h4ZKsUB80/Mfvw36XIgR25+WQAlEi7NLboqYTOPuzmFjJnryx9HVGDaStCe" + ) + self.character_list = [self.character, self.character2] # 自定义base64字符表 + + self.crypto_utility = CryptoUtility( + self.salt, self.character_list + ) # 加密工具类 + + self.user_agent = ( + user_agent + if user_agent is not None and user_agent != "" + else "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0" + ) # 自定义ua，为空则设置一个默认ua + + self.browser_fp = ( + fp + if fp is not None and fp != "" + else BrowserFingerprintGenerator.generate_fingerprint("Edge") + ) # 自定义浏览器指纹，为空则生成Edge指纹 + + # fmt: off + self.sort_index = [ + 18, 20, 52, 26, 30, 34, 58, 38, 40, 53, 42, 21, 27, 54, 55, 31, 35, 57, 39, 41, 43, 22, 28, + 32, 60, 36, 23, 29, 33, 37, 44, 45, 59, 46, 47, 48, 49, 50, 24, 25, 65, 66, 70, 71 + ] + self.sort_index_2 = [ + 18, 20, 26, 30, 34, 38, 40, 42, 21, 27, 31, 35, 39, 41, 43, 22, 28, 32, 36, 23, 29, 33, 37, + 44, 45, 46, 47, 48, 49, 50, 24, 25, 52, 53, 54, 55, 57, 58, 59, 60, 65, 66, 70, 71 + ] + # fmt: on + + def encode_data(self, data: str, alphabet_index: int = 0) -> str: + """ + 使用指定的字符表对数据进行 Base64 编码 (Encode the data using the specified Base64 alphabet). + + Args: + data (str): 输入数据 (Input data). + alphabet_index (int): 自定义字符表索引 (Custom alphabet index). + + Returns: + str: 编码后的数据 (Encoded data). + """ + return self.crypto_utility.abogus_encode(data, alphabet_index) + + def generate_abogus(self, params: str, request: str = "") -> tuple: + """ + 生成 abogus 参数 (Generate the ABogus parameter). + + Args: + params (str): 请求参数 (Request parameters). + request (str): 请求方法，不明确则为空 (Request method, empty if unclear). + + Returns: + tuple: params 生成的 abogus 参数 和 ua (ABogus parameter generated by params and ua). + """ + ab_dir = { + 8: 3, # 固定 + 15: { + "aid": self.aid, + "pageId": self.pageId, + "boe": False, + "ddrt": 7, + "paths": { + "include": [{} for _ in range(7)], + "exclude": [], + }, + "track": {"mode": 0, "delay": 300, "paths": []}, + "dump": True, + "rpU": "", + }, + 18: 44, + 19: [1, 0, 1, 5], + 66: 0, # 固定 + 69: 0, # 固定 + 70: 0, # 固定 + 71: 0, # 固定 + } + + # 开始加密时间 + start_encryption = int(time.time() * 1000) + + array1 = self.crypto_utility.params_to_array( + self.crypto_utility.params_to_array(params) + ) + array2 = self.crypto_utility.params_to_array( + self.crypto_utility.params_to_array(request) + ) + # fmt: off + # 24/06/16 晚点开源自定义ua + # 配置文件请使用该ua "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0" + array3 = [ + 212, 61, 87, 195, 104, 163, 124, 28, 92, 126, 187, + 53, 218, 38, 254, 253, 252, 73, 83, 197, 194, 142, + 113, 37, 9, 67, 166, 36, 56, 72, 56, 64, + ] + # fmt: on + + # 结束加密时间 + end_encryption = int(time.time() * 1000) + + # 插入加密开始时间 + ab_dir[20] = (start_encryption >> 24) & 255 + ab_dir[21] = (start_encryption >> 16) & 255 + ab_dir[22] = (start_encryption >> 8) & 255 + ab_dir[23] = start_encryption & 255 + ab_dir[24] = int(start_encryption / 256 / 256 / 256 / 256) >> 0 + ab_dir[25] = int(start_encryption / 256 / 256 / 256 / 256 / 256) >> 0 + + # 插入请求头配置 + ab_dir[26] = (self.options[0] >> 24) & 255 + ab_dir[27] = (self.options[0] >> 16) & 255 + ab_dir[28] = (self.options[0] >> 8) & 255 + ab_dir[29] = self.options[0] & 255 + + # 插入请求方法 + ab_dir[30] = int(self.options[1] / 256) & 255 + ab_dir[31] = (self.options[1] % 256) & 255 + ab_dir[32] = (self.options[1] >> 24) & 255 + ab_dir[33] = (self.options[1] >> 16) & 255 + + # 插入请求头加密 + ab_dir[34] = (self.options[2] >> 24) & 255 + ab_dir[35] = (self.options[2] >> 16) & 255 + ab_dir[36] = (self.options[2] >> 8) & 255 + ab_dir[37] = self.options[2] & 255 + + # 插入请求体加密 + ab_dir[38] = array1[21] + ab_dir[39] = array1[22] + # 插入body加密 + ab_dir[40] = array2[21] + ab_dir[41] = array2[22] + # 插入ua加密 + ab_dir[42] = array3[23] + ab_dir[43] = array3[24] + + # 插入加密结束时间 + ab_dir[44] = (end_encryption >> 24) & 255 + ab_dir[45] = (end_encryption >> 16) & 255 + ab_dir[46] = (end_encryption >> 8) & 255 + ab_dir[47] = end_encryption & 255 + ab_dir[48] = ab_dir[8] + ab_dir[49] = int(end_encryption / 256 / 256 / 256 / 256) >> 0 + ab_dir[50] = int(end_encryption / 256 / 256 / 256 / 256 / 256) >> 0 + + # 插入固定值 + ab_dir[51] = (self.pageId >> 24) & 255 + ab_dir[52] = (self.pageId >> 16) & 255 + ab_dir[53] = (self.pageId >> 8) & 255 + ab_dir[54] = self.pageId & 255 + ab_dir[55] = self.pageId + ab_dir[56] = self.aid + ab_dir[57] = self.aid & 255 + ab_dir[58] = (self.aid >> 8) & 255 + ab_dir[59] = (self.aid >> 16) & 255 + ab_dir[60] = (self.aid >> 24) & 255 + + # 插入浏览器指纹 + ab_dir[64] = len(self.browser_fp) + ab_dir[65] = len(self.browser_fp) + + # 获取 ab_dir 中 sort_index 的值 + sorted_values = [ab_dir.get(i, 0) for i in self.sort_index] + + # 将浏览器指纹转换为 ASCII 码列表 + edge_fp_array = StringProcessor.to_char_array(self.browser_fp) + + # 将浏览器指纹长度的低 8 位作为异或值 + ab_xor = (len(self.browser_fp) & 255) >> 8 & 255 + + # 进行异或计算 + for index in range(len(self.sort_index_2) - 1): + if index == 0: + ab_xor = ab_dir.get(self.sort_index_2[index], 0) + ab_xor ^= ab_dir.get(self.sort_index_2[index + 1], 0) + + sorted_values.extend(edge_fp_array) + sorted_values.append(ab_xor) + + abogus_bytes_str = ( + StringProcessor.generate_random_bytes() + + self.crypto_utility.transform_bytes(sorted_values) + ) + + abogus = self.crypto_utility.abogus_encode(abogus_bytes_str, 0) + params = "%s&a_bogus=%s" % (params, abogus) + return (params, abogus, self.user_agent) + + +if __name__ == "__main__": + # 24/06/16 晚点开源自定义ua + # 配置文件请使用该ua "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0" + user_agent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0" + url = "https://www.douyin.com/aweme/v1/web/aweme/detail/?" + params = "device_platform=webapp&aid=6383&channel=channel_pc_web&aweme_id=7380308675841297704&update_version_code=170400&pc_client_type=1&version_code=190500&version_name=19.5.0&cookie_enabled=true&screen_width=1920&screen_height=1080&browser_language=zh-CN&browser_platform=Win32&browser_name=Edge&browser_version=125.0.0.0&browser_online=true&engine_name=Blink&engine_version=125.0.0.0&os_name=Windows&os_version=10&cpu_core_num=12&device_memory=8&platform=PC&downlink=10&effective_type=4g&round_trip_time=50&webid=7376294349792396827" + request = "GET" + + chrome_fp = BrowserFingerprintGenerator.generate_fingerprint("Chrome") + abogus = ABogus(user_agent=user_agent, fp=chrome_fp) + print(abogus.generate_abogus(params=params, request=request)) + + # # 测试生成100个abogus参数 和 100个指纹所需时间 + # start = time.time() + # for _ in range(100): + # abogus.generate_abogus(params=params, request=request) + # end = time.time() + # print("生成100个abogus参数和指纹所需时间:", end - start) # 生成100个abogus参数和指纹所需时间: 2.203000783920288 + + # start = time.time() + # for _ in range(100): + # BrowserFingerprintGenerator.generate_fingerprint("Chrome") + # end = time.time() + # print("生成100个指纹所需时间:", end - start) # 生成100个指纹所需时间: 0.00400090217590332 From 9df30f5b85717f1a13855de51d62b438fabb863d Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 20:06:20 +0800 Subject: [PATCH 223/299] =?UTF-8?q?feat:=20ClientConfManager=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0douyin=E5=88=87=E6=8D=A2=E5=8A=A0=E5=AF=86=E7=AE=97?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/utils.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/f2/apps/douyin/utils.py b/f2/apps/douyin/utils.py index 3fe97906..4451157a 100644 --- a/f2/apps/douyin/utils.py +++ b/f2/apps/douyin/utils.py @@ -51,6 +51,10 @@ def client(cls) -> dict: def conf_version(cls) -> str: return cls.client_conf.get("version", "unknown") + @classmethod + def encryption(cls) -> dict: + return cls.client().get("encryption", "ab") + @classmethod def base_request_model(cls) -> dict: return cls.client().get("BaseRequestModel", {}) From 029a40db144579deaf49e31a00d46c295e745764 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 20:06:44 +0800 Subject: [PATCH 224/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin=20ab?= =?UTF-8?q?=E7=AE=97=E6=B3=95=E7=AE=A1=E7=90=86=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/utils.py | 50 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/f2/apps/douyin/utils.py b/f2/apps/douyin/utils.py index 4451157a..0e864400 100644 --- a/f2/apps/douyin/utils.py +++ b/f2/apps/douyin/utils.py @@ -17,6 +17,7 @@ from f2.i18n.translator import _ from f2.log.logger import logger from f2.utils.xbogus import XBogus as XB +from f2.utils.abogus import ABogus as AB, BrowserFingerprintGenerator as BrowserFpGen from f2.utils.conf_manager import ConfigManager from f2.utils.utils import ( gen_random_str, @@ -605,6 +606,55 @@ def model_2_endpoint( return final_endpoint +class ABogusManager: + @classmethod + def str_2_endpoint( + cls, + user_agent: str, + params: str, + request_type: str = "", + ) -> str: + try: + browser_fp = BrowserFpGen.generate_fingerprint("Edge") + final_endpoint = AB(fp=browser_fp, user_agent=user_agent).generate_abogus( + params, request_type + ) + except Exception as e: + logger.error(traceback.format_exc()) + raise RuntimeError(_("生成A-Bogus失败: {0})").format(e)) + + return final_endpoint[0] + + @classmethod + def model_2_endpoint( + cls, + user_agent: str, + base_endpoint: str, + params: dict, + request_type: str = "", + ) -> str: + if not isinstance(params, dict): + raise TypeError(_("参数必须是字典类型")) + + param_str = "&".join([f"{k}={v}" for k, v in params.items()]) + + try: + browser_fp = BrowserFpGen.generate_fingerprint("Edge") + ab_value = AB(fp=browser_fp, user_agent=user_agent).generate_abogus( + param_str, request_type + ) + except Exception as e: + logger.error(traceback.format_exc()) + raise RuntimeError(_("生成A-Bogus失败: {0})").format(e)) + + # 检查base_endpoint是否已有查询参数 (Check if base_endpoint already has query parameters) + separator = "&" if "?" in base_endpoint else "?" + + final_endpoint = f"{base_endpoint}{separator}{param_str}&a_bogus={ab_value[1]}" + + return final_endpoint + + class SecUserIdFetcher(BaseCrawler): """ SecUserIdFetcher 用于从给定的 URL 中获取 sec_user_id。 From 3f517dd7328b4dbc30dc8688488d5a8e88b52503 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 20:07:12 +0800 Subject: [PATCH 225/299] =?UTF-8?q?test:=20=E6=B7=BB=E5=8A=A0douyin=20ab?= =?UTF-8?q?=E7=AE=97=E6=B3=95=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/test/test_douyin_apps_model.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/f2/apps/douyin/test/test_douyin_apps_model.py b/f2/apps/douyin/test/test_douyin_apps_model.py index 6c91913a..11f939ea 100644 --- a/f2/apps/douyin/test/test_douyin_apps_model.py +++ b/f2/apps/douyin/test/test_douyin_apps_model.py @@ -1,6 +1,6 @@ import pytest from f2.apps.douyin.model import UserPost -from f2.apps.douyin.utils import XBogusManager +from f2.apps.douyin.utils import XBogusManager, ABogusManager from f2.apps.douyin.api import DouyinAPIEndpoints as dyendpoint @@ -18,3 +18,19 @@ def test_xbogus_manager(): ) assert final_endpoint, "Failed to get a final endpoint." + + +def test_abogus_manager(): + params = UserPost( + max_cursor=0, + count=20, + sec_user_id="MS4wLjABAAAA5OCaznf4ihGfC65u0imbLzmBOuWDpUMo58CdnVTcX_R8bD9HZQknOJ4ZX9FdZnIq", + ) + + final_endpoint = ABogusManager.model_2_endpoint( + user_agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", + base_endpoint=dyendpoint.USER_DETAIL, + params=params.model_dump(), + ) + + assert final_endpoint, "Failed to get a final endpoint." From 9e15604e637beea8500614731be0f83415bac869 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 20:07:28 +0800 Subject: [PATCH 226/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0douyin?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=8E=A5=E5=8F=A3=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/model.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/f2/apps/douyin/model.py b/f2/apps/douyin/model.py index 5be364e4..16d97770 100644 --- a/f2/apps/douyin/model.py +++ b/f2/apps/douyin/model.py @@ -248,15 +248,17 @@ class SuggestWord(BaseRequestModel): class PostSearch(BaseRequestModel): search_channel: str = "aweme_general" - sort_type: int = 0 # 0 综合 - publish_time: int = 0 + filter_selected: str keyword: str - search_source: str = "hot_search_board" + search_source: str = "normal_search" + # search_sug # tab_search # normal_search # guide_search # hot_search_board + search_id: str = "" query_correct_type: int = 1 is_filter_search: int = 0 from_group_id: str = "" offset: int = 0 count: int = 15 + need_filter_settings: int = 1 class LoginGetQr(BaseLoginModel): From bd8a2f48edb91779f7f2c047d2c40047e4e7a127 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 20:07:53 +0800 Subject: [PATCH 227/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0douyin?= =?UTF-8?q?=E7=88=AC=E8=99=AB=E5=88=87=E6=8D=A2=E5=8A=A0=E5=AF=86=E7=AE=97?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/crawler.py | 54 +++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/f2/apps/douyin/crawler.py b/f2/apps/douyin/crawler.py index 06653201..ca7c641b 100644 --- a/f2/apps/douyin/crawler.py +++ b/f2/apps/douyin/crawler.py @@ -62,10 +62,14 @@ def __init__( # 需要与cli同步 proxies = kwargs.get("proxies", {"http://": None, "https://": None}) self.headers = kwargs.get("headers", {}) | {"Cookie": kwargs["cookie"]} + if ClientConfManager.encryption() == "ab": + self.bogus_manager = ABogusManager + else: + self.bogus_manager = XBogusManager super().__init__(proxies=proxies, crawler_headers=self.headers) async def fetch_user_profile(self, params: UserProfile): - endpoint = XBogusManager.model_2_endpoint( + endpoint = self.bogus_manager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.USER_DETAIL, params.model_dump(), @@ -74,7 +78,7 @@ async def fetch_user_profile(self, params: UserProfile): return await self._fetch_get_json(endpoint) async def fetch_user_post(self, params: UserPost): - endpoint = XBogusManager.model_2_endpoint( + endpoint = self.bogus_manager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.USER_POST, params.model_dump(), @@ -83,7 +87,7 @@ async def fetch_user_post(self, params: UserPost): return await self._fetch_get_json(endpoint) async def fetch_user_like(self, params: UserLike): - endpoint = XBogusManager.model_2_endpoint( + endpoint = self.bogus_manager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.USER_FAVORITE_A, params.model_dump(), @@ -92,7 +96,7 @@ async def fetch_user_like(self, params: UserLike): return await self._fetch_get_json(endpoint) async def fetch_user_collection(self, params: UserCollection): - endpoint = XBogusManager.model_2_endpoint( + endpoint = self.bogus_manager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.USER_COLLECTION, params.model_dump(), @@ -101,7 +105,7 @@ async def fetch_user_collection(self, params: UserCollection): return await self._fetch_post_json(endpoint, params.model_dump()) async def fetch_user_collects(self, params: UserCollects): - endpoint = XBogusManager.model_2_endpoint( + endpoint = self.bogus_manager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.USER_COLLECTS, params.model_dump(), @@ -110,7 +114,7 @@ async def fetch_user_collects(self, params: UserCollects): return await self._fetch_get_json(endpoint) async def fetch_user_collects_video(self, params: UserCollectsVideo): - endpoint = XBogusManager.model_2_endpoint( + endpoint = self.bogus_manager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.USER_COLLECTS_VIDEO, params.model_dump(), @@ -119,7 +123,7 @@ async def fetch_user_collects_video(self, params: UserCollectsVideo): return await self._fetch_get_json(endpoint) async def fetch_user_music_collection(self, params: UserMusicCollection): - endpoint = XBogusManager.model_2_endpoint( + endpoint = self.bogus_manager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.USER_MUSIC_COLLECTION, params.model_dump(), @@ -128,7 +132,7 @@ async def fetch_user_music_collection(self, params: UserMusicCollection): return await self._fetch_get_json(endpoint) async def fetch_user_mix(self, params: UserMix): - endpoint = XBogusManager.model_2_endpoint( + endpoint = self.bogus_manager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.MIX_AWEME, params.model_dump(), @@ -137,7 +141,7 @@ async def fetch_user_mix(self, params: UserMix): return await self._fetch_get_json(endpoint) async def fetch_post_detail(self, params: PostDetail): - endpoint = XBogusManager.model_2_endpoint( + endpoint = self.bogus_manager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.POST_DETAIL, params.model_dump(), @@ -146,7 +150,7 @@ async def fetch_post_detail(self, params: PostDetail): return await self._fetch_get_json(endpoint) async def fetch_post_comment(self, params: PostDetail): - endpoint = XBogusManager.model_2_endpoint( + endpoint = self.bogus_manager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.POST_COMMENT, params.model_dump(), @@ -155,7 +159,7 @@ async def fetch_post_comment(self, params: PostDetail): return await self._fetch_get_json(endpoint) async def fetch_post_feed(self, params: PostDetail): - endpoint = XBogusManager.model_2_endpoint( + endpoint = self.bogus_manager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.TAB_FEED, params.model_dump(), @@ -164,7 +168,7 @@ async def fetch_post_feed(self, params: PostDetail): return await self._fetch_get_json(endpoint) async def fetch_follow_feed(self, params: PostDetail): - endpoint = XBogusManager.model_2_endpoint( + endpoint = self.bogus_manager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.FOLLOW_FEED, params.model_dump(), @@ -173,7 +177,7 @@ async def fetch_follow_feed(self, params: PostDetail): return await self._fetch_get_json(endpoint) async def fetch_friend_feed(self, params: PostDetail): - endpoint = XBogusManager.model_2_endpoint( + endpoint = self.bogus_manager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.FRIEND_FEED, params.model_dump(), @@ -182,7 +186,7 @@ async def fetch_friend_feed(self, params: PostDetail): return await self._fetch_post_json(endpoint) async def fetch_post_related(self, params: PostDetail): - endpoint = XBogusManager.model_2_endpoint( + endpoint = self.bogus_manager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.POST_RELATED, params.model_dump(), @@ -191,7 +195,7 @@ async def fetch_post_related(self, params: PostDetail): return await self._fetch_get_json(endpoint) async def fetch_live(self, params: UserLive): - endpoint = XBogusManager.model_2_endpoint( + endpoint = self.bogus_manager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.LIVE_INFO, params.model_dump(), @@ -204,7 +208,7 @@ async def fetch_live_room_id(self, params: UserLive2): try: # 避免invalid session self.aclient.headers.update({"Cookie": ""}) - endpoint = XBogusManager.model_2_endpoint( + endpoint = self.bogus_manager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.LIVE_INFO_ROOM_ID, params.model_dump(), @@ -215,7 +219,7 @@ async def fetch_live_room_id(self, params: UserLive2): self.aclient.headers = original_headers async def fetch_following_live(self, params: FollowingUserLive): - endpoint = XBogusManager.model_2_endpoint( + endpoint = self.bogus_manager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.FOLLOW_USER_LIVE, params.model_dump(), @@ -224,7 +228,7 @@ async def fetch_following_live(self, params: FollowingUserLive): return await self._fetch_get_json(endpoint) async def fetch_locate_post(self, params: UserPost): - endpoint = XBogusManager.model_2_endpoint( + endpoint = self.bogus_manager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.LOCATE_POST, params.model_dump(), @@ -233,7 +237,7 @@ async def fetch_locate_post(self, params: UserPost): return await self._fetch_get_json(endpoint) async def fetch_login_qrcode(self, parms: LoginGetQr): - endpoint = XBogusManager.model_2_endpoint( + endpoint = self.bogus_manager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.SSO_LOGIN_GET_QR, parms.model_dump(), @@ -242,7 +246,7 @@ async def fetch_login_qrcode(self, parms: LoginGetQr): return await self._fetch_get_json(endpoint) async def fetch_check_qrcode(self, parms: LoginCheckQr): - endpoint = XBogusManager.model_2_endpoint( + endpoint = self.bogus_manager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.SSO_LOGIN_CHECK_QR, parms.model_dump(), @@ -251,7 +255,7 @@ async def fetch_check_qrcode(self, parms: LoginCheckQr): return await self._fetch_response(endpoint) async def fetch_check_login(self, parms: LoginCheckQr): - endpoint = XBogusManager.model_2_endpoint( + endpoint = self.bogus_manager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.SSO_LOGIN_CHECK_LOGIN, parms.model_dump(), @@ -260,7 +264,7 @@ async def fetch_check_login(self, parms: LoginCheckQr): return await self._fetch_get_json(endpoint) async def fetch_user_following(self, params: UserFollowing): - endpoint = XBogusManager.model_2_endpoint( + endpoint = self.bogus_manager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.USER_FOLLOWING, params.model_dump(), @@ -269,7 +273,7 @@ async def fetch_user_following(self, params: UserFollowing): return await self._fetch_get_json(endpoint) async def fetch_user_follower(self, params: UserFollower): - endpoint = XBogusManager.model_2_endpoint( + endpoint = self.bogus_manager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.USER_FOLLOWER, params.model_dump(), @@ -278,7 +282,7 @@ async def fetch_user_follower(self, params: UserFollower): return await self._fetch_get_json(endpoint) async def fetch_live_im_fetch(self, params: LiveImFetch): - endpoint = XBogusManager.model_2_endpoint( + endpoint = self.bogus_manager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.LIVE_IM_FETCH, params.model_dump(), @@ -287,7 +291,7 @@ async def fetch_live_im_fetch(self, params: LiveImFetch): return await self._fetch_get_json(endpoint) async def fetch_query_user(self, params: QueryUser): - endpoint = XBogusManager.model_2_endpoint( + endpoint = self.bogus_manager.model_2_endpoint( self.headers.get("User-Agent"), dyendpoint.QUERY_USER, params.model_dump(), From 085f98a7e80bfe2f01e1198337db4366461ebdeb Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 20:08:35 +0800 Subject: [PATCH 228/299] =?UTF-8?q?style:=20=E6=B3=A8=E9=87=8A=E4=B8=8E?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/cli.py | 3 ++- f2/apps/douyin/filter.py | 1 + f2/apps/douyin/handler.py | 1 - f2/apps/douyin/utils.py | 2 ++ f2/apps/tiktok/model.py | 2 +- f2/utils/xbogus.py | 2 ++ 6 files changed, 8 insertions(+), 3 deletions(-) diff --git a/f2/apps/douyin/cli.py b/f2/apps/douyin/cli.py index cc62829a..b2c934e7 100644 --- a/f2/apps/douyin/cli.py +++ b/f2/apps/douyin/cli.py @@ -3,7 +3,8 @@ import f2 import click import typing -import asyncio + +# import asyncio from pathlib import Path diff --git a/f2/apps/douyin/filter.py b/f2/apps/douyin/filter.py index 29a6fa65..a90d78ce 100644 --- a/f2/apps/douyin/filter.py +++ b/f2/apps/douyin/filter.py @@ -2055,6 +2055,7 @@ def _to_dict(self) -> dict: if not prop_name.startswith("__") and not prop_name.startswith("_") } + class LiveImFetchFilter(JSONModel): @property def status_code(self): diff --git a/f2/apps/douyin/handler.py b/f2/apps/douyin/handler.py index 43469349..c9c8ce87 100644 --- a/f2/apps/douyin/handler.py +++ b/f2/apps/douyin/handler.py @@ -1576,7 +1576,6 @@ async def fetch_query_user(self) -> QueryUserFilter: logger.info(_("开始查询用户信息")) logger.debug("===================================") - async with DouyinCrawler(self.kwargs) as crawler: params = QueryUser() response = await crawler.fetch_query_user(params) diff --git a/f2/apps/douyin/utils.py b/f2/apps/douyin/utils.py index 0e864400..7e96c388 100644 --- a/f2/apps/douyin/utils.py +++ b/f2/apps/douyin/utils.py @@ -577,6 +577,7 @@ def str_2_endpoint( try: final_endpoint = XB(user_agent).getXBogus(endpoint) except Exception as e: + logger.error(traceback.format_exc()) raise RuntimeError(_("生成X-Bogus失败: {0})").format(e)) return final_endpoint[0] @@ -596,6 +597,7 @@ def model_2_endpoint( try: xb_value = XB(user_agent).getXBogus(param_str) except Exception as e: + logger.error(traceback.format_exc()) raise RuntimeError(_("生成X-Bogus失败: {0})").format(e)) # 检查base_endpoint是否已有查询参数 (Check if base_endpoint already has query parameters) diff --git a/f2/apps/tiktok/model.py b/f2/apps/tiktok/model.py index af0693a5..bab21387 100644 --- a/f2/apps/tiktok/model.py +++ b/f2/apps/tiktok/model.py @@ -28,7 +28,7 @@ class BaseRequestModel(BaseModel): channel: str = "tiktok_web" cookie_enabled: str = "true" device_id: str = ClientConfManager.brm_device().get( - "id", "7372218823115949569" + "id", "7379572768071239176" ) # 风控参数 device_platform: str = ClientConfManager.brm_device().get("platform", "web_pc") focus_state: str = "true" diff --git a/f2/utils/xbogus.py b/f2/utils/xbogus.py index ae59dd95..56fa09ae 100644 --- a/f2/utils/xbogus.py +++ b/f2/utils/xbogus.py @@ -1,3 +1,5 @@ +# path: f2/utils/xbogus.py + #!/usr/bin/env python # -*- encoding: utf-8 -*- """ From 5a0b854afb158a8e3da250c57e909a72fcc37dc8 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 20:09:06 +0800 Subject: [PATCH 229/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin=20ab?= =?UTF-8?q?=E7=AE=97=E6=B3=95=E4=BB=A3=E7=A0=81=E7=89=87=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/snippets/douyin/abogus.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 docs/snippets/douyin/abogus.py diff --git a/docs/snippets/douyin/abogus.py b/docs/snippets/douyin/abogus.py new file mode 100644 index 00000000..3a69865b --- /dev/null +++ b/docs/snippets/douyin/abogus.py @@ -0,0 +1,17 @@ +from f2.apps.douyin.utils import ABogusManager + + +if __name__ == "__main__": + user_agent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0" + url = "https://www.douyin.com/aweme/v1/web/aweme/detail/?" + params = "device_platform=webapp&aid=6383&channel=channel_pc_web&aweme_id=7380308675841297704&update_version_code=170400&pc_client_type=1&version_code=190500&version_name=19.5.0&cookie_enabled=true&screen_width=1920&screen_height=1080&browser_language=zh-CN&browser_platform=Win32&browser_name=Edge&browser_version=125.0.0.0&browser_online=true&engine_name=Blink&engine_version=125.0.0.0&os_name=Windows&os_version=10&cpu_core_num=12&device_memory=8&platform=PC&downlink=10&effective_type=4g&round_trip_time=50&webid=7376294349792396827" + request = "GET" + + endpoint = ABogusManager.str_2_endpoint( + user_agent, + params, + request, + ) + + print(url + endpoint) + print(user_agent) From 961957d102873b2ae93f3333cf9083f7fac628ad Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 20:11:52 +0800 Subject: [PATCH 230/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0douyin?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E5=BC=B9=E5=B9=95=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=89=87=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/snippets/douyin/user-live-im-fetch.py | 53 ++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 docs/snippets/douyin/user-live-im-fetch.py diff --git a/docs/snippets/douyin/user-live-im-fetch.py b/docs/snippets/douyin/user-live-im-fetch.py new file mode 100644 index 00000000..68a87277 --- /dev/null +++ b/docs/snippets/douyin/user-live-im-fetch.py @@ -0,0 +1,53 @@ +import asyncio + +from f2.apps.douyin.handler import DouyinHandler + +kwargs = { + "headers": { + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", + "Referer": "https://www.douyin.com/", + "Content-Type": "application/protobuffer;", + }, + "proxies": {"http://": None, "https://": None}, + "timeout": 10, + "cookie": "YOUR_COOKIE_HERE", +} + +kwargs2 = { + "headers": { + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", + "Upgrade": "websocket", + "Connection": "Upgrade", + }, + "proxies": {"http://": None, "https://": None}, + "timeout": 10, + "cookie": "DO_NOT_USE_COOKIE_HERE", +} + + +async def main(): + # 获取游客ttwid的user_unique_id，你可以通过TokenManager.gen_ttwid()生成新的游客ttwid + user = await DouyinHandler(kwargs).fetch_query_user() + # print(user.user_unique_id) + + # 通过此接口获取room_id，参数为live_id + room = await DouyinHandler(kwargs).fetch_user_live_videos("662122193366") + # print(room.room_id) + + # 通过该接口获取wss所需的cursor和internal_ext + live_im = await DouyinHandler(kwargs).fetch_live_im( + room_id=room.room_id, unique_id=user.user_unique_id + ) + # print(live_im.cursor, live_im.internal_ext) + + # 获取直播弹幕 + await DouyinHandler(kwargs2).fetch_live_danmaku( + room_id=room.room_id, + user_unique_id=user.user_unique_id, + internal_ext=live_im.internal_ext, + cursor=live_im.cursor, + ) + + +if __name__ == "__main__": + asyncio.run(main()) From 3b2c38ef58382a4aa4bc089f3e8892e26ab55fec Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 22:22:49 +0800 Subject: [PATCH 231/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0weibo?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/__init__.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/f2/__init__.py b/f2/__init__.py index a0c0dcf9..ec3fb05c 100644 --- a/f2/__init__.py +++ b/f2/__init__.py @@ -48,4 +48,10 @@ "live", ] +WEIBO_MODE_LIST = [ + "one", + "post", + "like", +] + PYPI_URL = "https://pypi.org/pypi" From e73cb7cc9cf768db40fb886fe2d5fd6bd42e3d0a Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 22:23:09 +0800 Subject: [PATCH 232/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0weibo?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/weibo/api.py | 74 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 f2/apps/weibo/api.py diff --git a/f2/apps/weibo/api.py b/f2/apps/weibo/api.py new file mode 100644 index 00000000..a9463ae5 --- /dev/null +++ b/f2/apps/weibo/api.py @@ -0,0 +1,74 @@ +# path: f2/apps/weibo/api.py + + +class WeiboAPIEndpoints: + """ + API Endpoints for Weibo + """ + + # Weibo Domain + WEIBO_DOMAIN = "https://weibo.com" + + # Weibo img domain + WEIBO_IMG_DOMAIN = "https://wx4.sinaimg.cn" + + # 未读好友时间轴 / 全部 + UNREAD_FRIENDS_TIMELINE = "/ajax/feed/unreadfriendstimeline" + + # 原创微博 + ORIGINAL_WEIBO = f"{WEIBO_DOMAIN}/ajax/feed/friendstimeline" + + # 视频微博 + VIDEO_WEIBO = f"{WEIBO_DOMAIN}/ajax/feed/friendstimeline" + + # 最新微博 + NEWEST_WEIBO = f"{WEIBO_DOMAIN}/ajax/feed/friendstimeline" + + # 特别关注 + SPECIAL_WEIBO = f"{WEIBO_DOMAIN}/ajax/feed/groupstimeline" + + # 好友圈 + FRIENDS_TIMELINE = f"{WEIBO_DOMAIN}/ajax/feed/groupstimeline" + + # 超话社区 + SUPER_TOPIC = f"{WEIBO_DOMAIN}/ajax/feed/groupstimeline" + + # 单条微博 + WeiboDetail = f"{WEIBO_DOMAIN}/ajax/statuses/show" + + # 微博评论 + WEIBO_COMMENTS = f"{WEIBO_DOMAIN}/ajax/statuses/buildComments" + + # 个人信息 + USER_INFO = f"{WEIBO_DOMAIN}/ajax/profile/info" + + # 个人详情 + USER_DETAIL = f"{WEIBO_DOMAIN}/ajax/profile/detail" + + # 个人微博 + USER_WEIBO = f"{WEIBO_DOMAIN}/ajax/statuses/mymblog" + + # 个人关注 + USER_FOLLOW = f"{WEIBO_DOMAIN}/ajax/friendships/friends" + + # 个人粉丝 + USER_FANS = f"{WEIBO_DOMAIN}/ajax/friendships/friends" + + # 个人收藏 + USER_FAVORITES = f"{WEIBO_DOMAIN}/ajax/favorites/all_fav" + + # IMG + THUMBNAIL = f"{WEIBO_IMG_DOMAIN}/wap180" + + BMIIDDLE = f"{WEIBO_IMG_DOMAIN}/wap360" + + LARGE = f"{WEIBO_IMG_DOMAIN}/orj960" + + ORIGINAL = f"{WEIBO_IMG_DOMAIN}/orj1080" + + # 原图 + LARGEST = f"{WEIBO_IMG_DOMAIN}/large" + + MW2000 = f"{WEIBO_IMG_DOMAIN}/mw2000" + + LARGE_COVER = f"{WEIBO_IMG_DOMAIN}/cmw960" From d6c4a47c3777a861aded72c7ad26a213952c4ea1 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 22:23:24 +0800 Subject: [PATCH 233/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=BE=AE?= =?UTF-8?q?=E5=8D=9A=E7=88=AC=E8=99=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/weibo/crawler.py | 52 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 f2/apps/weibo/crawler.py diff --git a/f2/apps/weibo/crawler.py b/f2/apps/weibo/crawler.py new file mode 100644 index 00000000..7a70c853 --- /dev/null +++ b/f2/apps/weibo/crawler.py @@ -0,0 +1,52 @@ +# path: f2/apps/weibo/crawler.py + +from f2.log.logger import logger +from f2.i18n.translator import _ +from f2.crawlers.base_crawler import BaseCrawler +from f2.apps.weibo.api import WeiboAPIEndpoints as wbendpoint +from f2.apps.weibo.model import ( + UserInfo, + UserDetail, + UserWeibo, + WeiboDetail, +) +from f2.apps.weibo.utils import ModelManager, ClientConfManager + + +class WeiboCrawler(BaseCrawler): + def __init__( + self, + kwargs: dict = ..., + ): + # 需要与cli同步 + proxies = kwargs.get("proxies", {"http://": None, "https://": None}) + self.headers = kwargs.get("headers") | {"Cookie": kwargs["cookie"]} + super().__init__(proxies=proxies, crawler_headers=self.headers) + + async def fetch_user_info(self, params: UserInfo): + endpoint = ModelManager.model_2_endpoint( + wbendpoint.USER_INFO, params.model_dump() + ) + logger.debug(_("用户信息接口地址:" + endpoint)) + return await self._fetch_get_json(endpoint) + + async def fetch_user_detail(self, params: UserDetail): + endpoint = ModelManager.model_2_endpoint( + wbendpoint.USER_DETAIL, params.model_dump() + ) + logger.debug(_("用户详情接口地址:" + endpoint)) + return await self._fetch_get_json(endpoint) + + async def fetch_user_weibo(self, params: UserWeibo): + endpoint = ModelManager.model_2_endpoint( + wbendpoint.USER_WEIBO, params.model_dump() + ) + logger.debug(_("用户微博接口地址:" + endpoint)) + return await self._fetch_get_json(endpoint) + + async def fetch_weibo_detail(self, params: WeiboDetail): + endpoint = ModelManager.model_2_endpoint( + wbendpoint.WeiboDetail, params.model_dump() + ) + logger.debug(_("单条微博接口地址:" + endpoint)) + return await self._fetch_get_json(endpoint) From a6e4537d838b5bbeacbdf8a5dfbfb5896fd66b7f Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 22:23:39 +0800 Subject: [PATCH 234/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0weibo?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE=E8=BF=87=E6=BB=A4=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/weibo/filter.py | 429 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 429 insertions(+) create mode 100644 f2/apps/weibo/filter.py diff --git a/f2/apps/weibo/filter.py b/f2/apps/weibo/filter.py new file mode 100644 index 00000000..ccad63a7 --- /dev/null +++ b/f2/apps/weibo/filter.py @@ -0,0 +1,429 @@ +# path: f2/apps/weibo/filter.py + +from f2.utils.json_filter import JSONModel +from f2.utils.utils import _get_first_item_from_list, timestamp_2_str, replaceT + +# Filter + + +class UserInfoFilter(JSONModel): + + @property + def status(self): + return self._get_attr_value("$.data.ok") + + @property + def blockText(self): + return self._get_attr_value("$.data.blockText") + + @property + def avatar_hd(self): + return self._get_attr_value("$.data.user.avatar_hd") + + @property + def cover_image(self): + return self._get_attr_value("$.data.user.cover_image_phone") + + @property + def description(self): + return replaceT(self._get_attr_value("$.data.user.description")) + + @property + def nickname(self): + return replaceT(self._get_attr_value("$.data.user.screen_name")) + + @property + def follow_me(self): + return self._get_attr_value("$.data.user.follow_me") + + @property + def following(self): + return self._get_attr_value("$.data.user.following") + + @property + def followers_count(self): + return self._get_attr_value("$.data.user.followers_count") + + @property + def friends_count(self): + return self._get_attr_value("$.data.user.friends_count") + + @property + def weibo_count(self): + return self._get_attr_value("$.data.user.statuses_count") + + @property + def gender(self): + return self._get_attr_value("$.data.user.gender") + + @property + def uid(self): + return self._get_attr_value("$.data.user.idstr") + + @property + def weihao(self): + return self._get_attr_value("$.data.user.weihao") + + @property + def is_muteuser(self): + return self._get_attr_value("$.data.user.is_muteuser") + + @property + def is_star(self): + return self._get_attr_value("$.data.user.is_star") + + @property + def location(self): + return self._get_attr_value("$.data.user.location") + + @property + def profile_url(self): + return "https://weibo.com" + self._get_attr_value("$.data.user.profile_url") + + @property + def user_type(self): + return self._get_attr_value("$.data.user.user_type") + + @property + def verified(self): + return self._get_attr_value("$.data.user.verified") + + @property + def vvip(self): + return self._get_attr_value("$.data.user.vvip") + + def _to_raw(self) -> dict: + return self._data + + def _to_dict(self) -> dict: + return { + prop_name: getattr(self, prop_name) + for prop_name in dir(self) + if not prop_name.startswith("__") and not prop_name.startswith("_") + } + + +class UserDetailFilter(JSONModel): + + @property + def status(self): + return self._get_attr_value("$.ok") + + @property + def message(self): + return self._get_attr_value("$.message") + + @property + def birthday(self): + return self._get_attr_value("$.data.birthday") + + @property + def description(self): + return replaceT(self._get_attr_value("$.data.description")) + + @property + def description_raw(self): + return self._get_attr_value("$.data.description") + + @property + def location(self): + return self._get_attr_value("$.data.ip_location") + + @property + def gender(self): + return self._get_attr_value("$.data.gender") + + @property + def create_at(self): + return self._get_attr_value("$.data.created_at").replace(":", "-") + + @property + def video_play_count(self): + return self._get_attr_value("$.data.label_desc[0].name") + + @property + def real_name(self): + return self._get_attr_value("$.data.real_name.name") + + @property + def sunshine_credit(self): + return self._get_attr_value("$.data.sunshine_credit.level") + + def _to_raw(self) -> dict: + return self._data + + def _to_dict(self) -> dict: + return { + prop_name: getattr(self, prop_name) + for prop_name in dir(self) + if not prop_name.startswith("__") and not prop_name.startswith("_") + } + + +class WeiboDetailFilter(JSONModel): + + @property + def status(self): + return self._get_attr_value("$.ok") + + @property + def message(self): + return self._get_attr_value("$.message") + + @property + def error_code(self): + return self._get_attr_value("$.error_code") + + @property + def weibo_id(self): + return self._get_attr_value("$.idstr") + + @property + def weibo_blog_id(self): + return self._get_attr_value("$.mblogid") + + @property + def weibo_type(self): + return self._get_attr_value("$.mblogtype") + + @property + def rid(self): + return self._get_attr_value("$.rid") + + @property + def create_time(self): + return timestamp_2_str(self._get_attr_value("$.created_at")) + + @property + def desc(self): + return replaceT(self._get_attr_value("$.text")) + + @property + def descLength(self): + return self._get_attr_value("$.textLength") + + @property + def descRaw(self): + return replaceT(self._get_attr_value("$.text_raw")) + + @property + def descRaw_raw(self): + return self._get_attr_value("$.text_raw") + + @property + def digg_count(self): + return self._get_attr_value("$.attitudes_count") + + @property + def comments_count(self): + return self._get_attr_value("$.comments_count") + + @property + def share_count(self): + return self._get_attr_value("$.reposts_count") + + # IMG + @property + def pic_ids(self): + return self._get_attr_value("$.pic_ids") + + @property + def pic_num(self): + return self._get_attr_value("$.pic_num") + + @property + def pic_infos(self): + # 每个图片的信息都是pic_ids作为下标的 + return self._get_attr_value("$.pic_infos") + + # VIDEO + @property + def bitrate_list(self): + return self._get_list_attr_value( + "$.page_info.media_info.playback_list[*].play_info.bitrate" + ) + + @property + def playback_list(self): + return self._get_list_attr_value( + "$.page_info.media_info.playback_list[*].play_info.url" + ) + + @property + def quality_list(self): + return self._get_list_attr_value( + "$.page_info.media_info.playback_list[*].play_info.quality_class" + ) + + @property + def region(self): + return self._get_attr_value("$.region_name") + + @property + def source(self): + return self._get_attr_value("$.source") + + @property + def isLongText(self): + return self._get_attr_value("$.isLongText") + + @property + def is_paid(self): + return self._get_attr_value("$.is_paid") + + @property + def is_public(self): + return self._get_attr_value("$.title.text") + + @property + def is_visible(self): + return self._get_attr_value("$.visible.type") + + # user + @property + def user_id(self): + return self._get_attr_value("$.user.idstr") + + @property + def nickname(self): + return replaceT(self._get_attr_value("$.user.screen_name")) + + def _to_raw(self) -> dict: + return self._data + + def _to_dict(self) -> dict: + return { + prop_name: getattr(self, prop_name) + for prop_name in dir(self) + if not prop_name.startswith("__") and not prop_name.startswith("_") + } + + +class UserWeiboFilter(JSONModel): + + @property + def status(self): + return self._get_attr_value("$.ok") + + @property + def message(self): + return self._get_attr_value("$.message") + + @property + def weibo_total(self): + return self._get_attr_value("$.data.total") + + # Weibo + @property + def weibo_visible(self): + return self._get_attr_value("$.data.list[*].visible.type") + + @property + def weibo_created_at(self): + return self._get_attr_value("$.data.list[*].created_at") + + @property + def weibo_id(self): + return self._get_attr_value("$.data.list[*].idstr") + + @property + def weibo_isLongText(self): + return self._get_attr_value("$.data.list[*].isLongText") + + @property + def weibo_is_paid(self): + return self._get_attr_value("$.data.list[*].is_paid") + + @property + def weibo_mblogid(self): + return self._get_attr_value("$.data.list[*].mblogid") + + @property + def weibo_views(self): + return self._get_attr_value( + "$.data.list[*].number_display_strategy.display_text" + ) + + @property + def weibo_digg_count(self): + return self._get_attr_value("$.data.list[*].attitudes_count") + + @property + def weibo_read_count(self): + return self._get_attr_value("$.data.list[*].reads_count") + + @property + def weibo_pic_ids(self): + return self._get_attr_value("$.data.list[*].pic_ids") + + @property + def weibo_pic_num(self): + return self._get_attr_value("$.data.list[*].pic_num") + + @property + def weibo_location(self): + return self._get_attr_value("$.data.list[*].region_name") + + @property + def weibo_reposts_count(self): + return self._get_attr_value("$.data.list[*].reposts_count") + + @property + def weibo_showFeedComment(self): + return self._get_attr_value("$.data.list[*].showFeedComment") + + @property + def weibo_showFeedRepost(self): + return self._get_attr_value("$.data.list[*].showFeedRepost") + + @property + def weibo_showPictureViewer(self): + return self._get_attr_value("$.data.list[*].showPictureViewer") + + @property + def weibo_desc(self): + return replaceT(self._get_attr_value("$.data.list[*].text_raw")) + + @property + def weibo_desc_raw(self): + return self._get_attr_value("$.data.list[*].text_raw") + + @property + def weibo_sorce(self): + return self._get_attr_value("$.data.list[*].source") + + # 需要用#包裹并quote + @property + def weibo_topic_title(self): + return self._get_attr_value("$.data.list[*].topic_struct[*].topic_title") + + # User + @property + def weibo_user_name(self): + return replaceT(self._get_attr_value("$.data.list[*].user.screen_name")) + + @property + def weibo_user_name_raw(self): + return self._get_attr_value("$.data.list[*].user.screen_name") + + @property + def weibo_user_uid(self): + return self._get_attr_value("$.data.list[*].user.idstr") + + @property + def weibo_user_domain(self): + return self._get_attr_value("$.data.list[*].user.domain") + + @property + def weibo_user_avatar_hd(self): + return self._get_attr_value("$.data.list[*].user.avatar_hd") + + def _to_raw(self) -> dict: + return self._data + + def _to_dict(self) -> dict: + return { + prop_name: getattr(self, prop_name) + for prop_name in dir(self) + if not prop_name.startswith("__") and not prop_name.startswith("_") + } From 45a7a2bcbee45d67e9610de39088e6495230c487 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 22:23:57 +0800 Subject: [PATCH 235/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0weibo?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/weibo/db.py | 123 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 f2/apps/weibo/db.py diff --git a/f2/apps/weibo/db.py b/f2/apps/weibo/db.py new file mode 100644 index 00000000..a40bc35d --- /dev/null +++ b/f2/apps/weibo/db.py @@ -0,0 +1,123 @@ +# path: f2/apps/weibo/db.py + +from f2.db.base_db import BaseDB + + +class AsyncUserDB(BaseDB): + TABLE_NAME = "user_info_web" + + async def _create_table(self) -> None: + """在数据库中创建用户信息表""" + await super()._create_table() + + fields = [ + "uid TEXT PRIMARY KEY", + "nickname TEXT", + "blockText TEXT", + "avatar_hd TEXT", + "cover_image TEXT", + "description TEXT", + "follow_me BOOLEAN", + "following BOOLEAN", + "followers_count INTEGER", + "friends_count INTEGER", + "weibo_count INTEGER", + "gender TEXT", + "weihao TEXT", + "is_muteuser BOOLEAN", + "is_star TEXT", + "location TEXT", + "profile_url TEXT", + "user_type TEXT", + "verified BOOLEAN", + "vvip INTEGER", + ] + + fields_sql = ", ".join(fields) + await self.execute( + f"""CREATE TABLE IF NOT EXISTS {self.TABLE_NAME} ({fields_sql})""" + ) + await self.commit() + + async def add_user_info(self, ignore_fields: list = None, **kwargs) -> None: + """ + 添加用户信息 + + Args: + ignore_fields: 要忽略的字段列表，例如 ["field1", "field2"] + **kwargs: 用户的其他字段键值对 + """ + + # 如果 ignore_fields 未提供或者为 None，将其设置为空列表 + ignore_fields = ignore_fields or [] + + # 从 kwargs 中删除要忽略的字段 + for field in ignore_fields: + if field in kwargs: + del kwargs[field] + + keys = ", ".join(kwargs.keys()) + placeholders = ", ".join(["?"] * len(kwargs)) + values = tuple(kwargs.values()) + + await self.execute( + f"INSERT OR REPLACE INTO {self.TABLE_NAME} ({keys}) VALUES ({placeholders})", + values, + ) + await self.commit() + + async def updat_user_info(self, uid: str, **kwargs) -> None: + """ + 更新用户信息 + + Args: + uid: 用户 ID + **kwargs: 用户的其他字段键值对 + """ + + user_data = await self.get_user_info(uid) + if user_data: + set_sql = ", ".join([f"{key} = ?" for key in kwargs.keys()]) + await self.execute( + f"UPDATE {self.TABLE_NAME} SET {set_sql} WHERE uid=?", + (*kwargs.values(), uid), + ) + await self.commit() + + async def get_user_info(self, uid: str) -> dict: + """ + 获取用户信息 + + Args: + uid: 用户 ID + + Returns: + dict: 对应的用户信息，如果不存在则返回 None + """ + + cursor = await self.execute( + f"SELECT * FROM {self.TABLE_NAME} WHERE uid=?", (uid,) + ) + result = await cursor.fetchone() + if not result: + return {} + columns = [description[0] for description in cursor.description] + return dict(zip(columns, result)) + + async def delete_user_info(self, uid: str) -> None: + """ + 删除用户信息 + + Args: + uid: 用户 ID + """ + + await self.execute(f"DELETE FROM {self.TABLE_NAME} WHERE uid=?", (uid,)) + await self.commit() + + async def __aenter__(self): + await self.connect() + return self + + async def __aexit__(self, exc_type, exc_val, exc_tb): + await self.close() From c2eb42d46148feb9e5388e554fe486271a4eee4a Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 22:24:12 +0800 Subject: [PATCH 236/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0weibo?= =?UTF-8?q?=E5=91=BD=E4=BB=A4=E8=A1=8C=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/weibo/cli.py | 353 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 353 insertions(+) create mode 100644 f2/apps/weibo/cli.py diff --git a/f2/apps/weibo/cli.py b/f2/apps/weibo/cli.py new file mode 100644 index 00000000..1ab38bc0 --- /dev/null +++ b/f2/apps/weibo/cli.py @@ -0,0 +1,353 @@ +# path: f2/apps/weibo/cli.py + +import f2 +import click +import typing + +from pathlib import Path + +from f2 import helps +from f2.cli.cli_commands import set_cli_config +from f2.log.logger import logger +from f2.utils.utils import ( + split_dict_cookie, + get_resource_path, + get_cookie_from_browser, + check_invalid_naming, + merge_config, +) +from f2.utils.conf_manager import ConfigManager +from f2.i18n.translator import TranslationManager, _ +from f2.apps.weibo.utils import ClientConfManager + + +def handler_help( + ctx: click.Context, + param: typing.Union[click.Option, click.Parameter], + value: typing.Any, +) -> None: + """ + 处理帮助信息 (Handle help messages) + + 根据提供的值显示帮助信息或退出上下文 + (Display help messages based on the provided value or exit the context) + + Args: + ctx: click的上下文对象 (Click's context object). + param: 提供的参数或选项 (The provided parameter or option). + value: 参数或选项的值 (The value of the parameter or option). + """ + + if not value or ctx.resilient_parsing: + return + + helps.get_help("weibo") + ctx.exit() + + +def handler_auto_cookie( + ctx: click.Context, + param: typing.Union[click.Option, click.Parameter], + value: typing.Any, +) -> None: + """ + 用于自动从浏览器获取cookie (Used to automatically get cookies from the browser) + + Args: + ctx: click的上下文对象 (Click's context object) + param: 提供的参数或选项 (The provided parameter or option) + value: 参数或选项的值 (The value of the parameter or option) + """ + # 如果用户没有提供值或者设置了 resilient_parsing 或者设置了 --cookie，那么跳过自动获取过程 + if not value or ctx.resilient_parsing or ctx.params.get("cookie"): + return + + # 根据浏览器选择获取cookie + try: + cookie_value = split_dict_cookie(get_cookie_from_browser(value, "weibo.com")) + + if not cookie_value: + raise ValueError(_("无法从 {0} 浏览器中获取cookie").format(value)) + + # 如果没有提供配置文件，那么使用高频配置文件 + manager = ConfigManager( + ctx.params.get("config", get_resource_path(f2.APP_CONFIG_FILE_PATH)) + ) + manager.update_config_with_args("weibo", cookie=cookie_value) + except PermissionError: + logger.error(_("请关闭所有已打开的浏览器重试，并且你有适当的权限访问浏览器！")) + ctx.abort() + except Exception as e: + logger.error(_("自动获取Cookie失败：{0}").format(str(e))) + ctx.abort() + finally: + ctx.exit(0) + + +def handler_language( + ctx: click.Context, + param: typing.Union[click.Option, click.Parameter], + value: typing.Any, +) -> None: + """ + 处理语言选项 (Handle language options) + + Args: + ctx: click的上下文对象 (Click's context object) + param: 提供的参数或选项 (The provided parameter or option) + value: 参数或选项的值 (The value of the parameter or option) + """ + + if not value or ctx.resilient_parsing: + return + TranslationManager.get_instance().set_language(value) + global _ + _ = TranslationManager.get_instance().gettext + return value + + +def handler_naming( + ctx: click.Context, + param: typing.Union[click.Option, click.Parameter], + value: typing.Any, +) -> None: + """ + 处理命名选项 (Handle naming options) + + Args: + ctx: click的上下文对象 (Click's context object) + param: 提供的参数或选项 (The provided parameter or option) + value: 参数或选项的值 (The value of the parameter or option) + """ + + # 避免和配置文件参数冲突 + if not value or ctx.resilient_parsing: + return + + # 允许的模式和分隔符 + ALLOWED_PATTERNS = ["{nickname}", "{create}", "{weibo_id}", "{desc}", "{uid}"] + ALLOWED_SEPARATORS = ["-", "_"] + + # 检查命名是否符合命名规范 + invalid_patterns = check_invalid_naming(value, ALLOWED_PATTERNS, ALLOWED_SEPARATORS) + + if invalid_patterns: + raise click.BadParameter( + _("`{0}` 中的 `{1}` 不符合命名模式").format( + value, "".join(invalid_patterns) + ) + ) + + return value + + +@click.command(name="weibo", help=_("微博下载器")) +@click.option( + "-c", + "--config", + type=click.Path(file_okay=True, dir_okay=False, readable=True), + help=_("配置文件的路径，最低优先"), +) +@click.option( + "--url", + "-u", + type=str, + help=_("根据模式提供相应的链接"), +) +@click.option( + "--path", + "-p", + type=str, + help=_("作品保存位置，支持绝对与相对路径"), +) +@click.option( + "--folderize", + "-f", + type=bool, + help=_("是否将作品保存到单独的文件夹"), +) +@click.option( + "--mode", + "-M", + type=click.Choice(f2.WEIBO_MODE_LIST), + help=_("下载模式：单个微博(one)，主页微博(post)"), +) +@click.option( + "--naming", + "-n", + type=str, + help=_("全局微博文件命名方式，前往文档查看更多帮助"), + callback=handler_naming, +) +@click.option( + "--cookie", + "-k", + type=str, + help=_("登录后的[yellow]cookie[/yellow]"), +) +@click.option( + "--interval", + "-i", + type=str, + help=_("下载日期区间发布的微博，格式：2022-01-01|2023-01-01，'all' 为下载所有作品"), +) +@click.option( + "--timeout", + "-e", + type=int, + help=_("网络请求超时时间"), +) +@click.option( + "--max_retries", + "-r", + type=int, + help=_("网络请求超时重试数"), +) +@click.option( + "--max-connections", + "-x", + type=int, + help=_("网络请求并发连接数"), +) +@click.option( + "--max-tasks", + "-t", + type=int, + help=_("异步的任务数"), +) +@click.option( + "--max-counts", + "-o", + type=int, + help=_("最大微博下载数。0 表示无限制"), +) +@click.option( + "--page-counts", + "-s", + type=int, + help=_("从接口每页可获取微博数，不建议超过 20"), +) +@click.option( + "--languages", + "-l", + type=click.Choice(["zh_CN", "en_US"]), + default="zh_CN", + help=_("显示语言。默认为 'zh_CN'，可选：'zh_CN'、'en_US'，不支持配置文件修改"), + callback=handler_language, +) +@click.option( + "--proxies", + "-P", + type=str, + nargs=2, + help=_( + "代理服务器，最多 2 个参数，http://与https://。空格区分 2 个参数 http://x.x.x.x https://x.x.x.x" + ), +) +@click.option( + "--update-config", + type=bool, + is_flag=True, + help=_("使用命令行选项更新配置文件。需要先使用'-c'选项提供一个配置文件路径"), +) +@click.option( + "--init-config", type=str, help=_("初始化配置文件。不能同时初始化和更新配置文件") +) +@click.option( + "--auto-cookie", + type=click.Choice(f2.BROWSER_LIST), + help=_("自动从浏览器获取cookie，使用该命令前请确保关闭所选的浏览器"), + callback=handler_auto_cookie, +) +@click.option( + "-h", + is_flag=True, + is_eager=True, + expose_value=False, + help=_("显示富文本帮助"), + callback=handler_help, +) +@click.pass_context +def weibo( + ctx: click.Context, + config: str, + init_config: str, + update_config: bool, + **kwargs, +) -> None: + ################## + # f2 存在2个主配置文件，分别是app低频配置(app.yaml)和f2低频配置(conf.yaml) + # app低频配置存放app相关的参数 + # f2低频配置存放计算值所需的参数 + + # 其中cli参数具有最高优先，cli >= 自定义 >= 低频 + # 在f2低频配置中设置代理参数 + # 在app低频配置中设置好重试次数，超时时间，下载路径，下载线程，cookie等低频的参数 + # 在自定义配置中可以设置不同用户的高频参数，如用户主页，原声下载，封面下载，文案下载，下载模式等 + # cli参数为配置文件的热修改，可以随时修改每一个参数。 + ################## + + # 读取低频主配置文件 + main_manager = ConfigManager(f2.APP_CONFIG_FILE_PATH) + main_conf_path = get_resource_path(f2.APP_CONFIG_FILE_PATH) + main_conf = main_manager.get_config("weibo") + + # 更新主配置文件中的代理参数 + main_conf["proxies"] = ClientConfManager.proxies() + + # 更新主配置文件中的headers参数 + kwargs.setdefault("headers", {}) + kwargs["headers"]["User-Agent"] = ClientConfManager.user_agent() + kwargs["headers"]["Referer"] = ClientConfManager.referer() + + # 如果初始化配置文件，则与更新配置文件互斥 + if init_config and not update_config: + main_manager.generate_config("weibo", init_config) + return + elif init_config: + raise click.UsageError(_("不能同时初始化和更新配置文件")) + # 如果没有初始化配置文件，但是更新配置文件，则需要提供配置文件路径 + elif update_config and not config: + raise click.UsageError( + _("要更新配置, 首先需要使用'-c'选项提供一个自定义配置文件路径") + ) + + # 读取自定义配置文件 + if config: + custom_manager = ConfigManager(config) + else: + custom_manager = main_manager + config = main_conf_path + + custom_conf = custom_manager.get_config("weibo") + + if update_config: # 如果指定了 update_config，更新配置文件 + update_manger = ConfigManager(config) + update_manger.update_config_with_args("weibo", **kwargs) + return + + # 将kwargs["proxies"]中的tuple转换为dict + if kwargs.get("proxies"): + kwargs["proxies"] = { + "http://": kwargs["proxies"][0], + "https://": kwargs["proxies"][1], + } + + # 从低频配置开始到高频配置再到cli参数，逐级覆盖，如果键值不存在使用父级的键值 + kwargs = merge_config(main_conf, custom_conf, **kwargs) + + logger.info(_("模式：{0}").format(kwargs.get("mode"))) + logger.info(_("主配置路径：{0}").format(main_conf_path)) + logger.info(_("自定义配置路径：{0}").format(Path.cwd() / config)) + logger.debug(_("主配置参数：{0}").format(main_conf)) + logger.debug(_("自定义配置参数：{0}").format(custom_conf)) + logger.debug(_("CLI参数：{0}").format(kwargs)) + + # 尝试从命令行参数或kwargs中获取URL + if not kwargs.get("url"): + logger.error(_("缺乏URL参数，详情看命令帮助")) + handler_help(ctx, None, True) + + # 添加app_name到kwargs + kwargs["app_name"] = "weibo" + ctx.invoke(set_cli_config, **kwargs) From a80811cd5549e59ecc0fa25cf17b186e138ec1d7 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 22:24:42 +0800 Subject: [PATCH 237/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0weibo?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/weibo/dl.py | 153 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) create mode 100644 f2/apps/weibo/dl.py diff --git a/f2/apps/weibo/dl.py b/f2/apps/weibo/dl.py new file mode 100644 index 00000000..6add9865 --- /dev/null +++ b/f2/apps/weibo/dl.py @@ -0,0 +1,153 @@ +# path: f2/apps/weibo/dl.py + +import sys +from datetime import datetime +from typing import Any, Union + +from f2.log.logger import logger +from f2.i18n.translator import _ +from f2.dl.base_downloader import BaseDownloader +from f2.utils.utils import get_timestamp, timestamp_2_str +from f2.apps.weibo.db import AsyncUserDB +from f2.apps.weibo.utils import format_file_name +from f2.apps.weibo.api import WeiboAPIEndpoints + + +class WeiboDownloader(BaseDownloader): + def __init__(self, kwargs: dict = ...) -> None: + if kwargs["cookie"] is None: + raise ValueError( + _( + "cookie不能为空。请提供有效的 cookie 参数，或自动从浏览器获取 `--auto-cookie edge`" + ) + ) + + super().__init__(kwargs) + + async def create_download_tasks( + self, + kwargs: dict = ..., + weibo_datas: Union[list, dict] = ..., + user_path: Any = ..., + ) -> None: + """ + 创建下载任务 + + Args: + kwargs (dict): 命令行参数 + weibo_datas (list, dict): 微博数据列表或字典 + user_path (str): 用户目录路径 + """ + + if ( + not kwargs + or not weibo_datas + or not isinstance(weibo_datas, (list, dict)) + or not user_path + ): + return + + # 统一处理，将 weibo_datas 转为列表 + weibo_datas_list = ( + [weibo_datas] if isinstance(weibo_datas, dict) else weibo_datas + ) + + # 创建下载任务 + for weibo_data in weibo_datas_list: + await self.handler_download(kwargs, weibo_data, user_path) + + # 执行下载任务 + await self.execute_tasks() + + async def handler_download( + self, kwargs: dict, weibo_data_dict: dict, user_path: Any + ) -> None: + """ + 处理下载任务 + + Args: + kwargs (dict): 命令行参数 + weibo_data_dict (dict): 作品数据字典 + user_path (Any): 用户目录路径 + """ + + # 构建文件夹路径 + base_path = ( + user_path + / format_file_name(kwargs.get("naming", "{create}_{desc}"), weibo_data_dict) + if kwargs.get("folderize") + else user_path + ) + + user_id = weibo_data_dict.get("user_id") + weibo_id = weibo_data_dict.get("weibo_id") + + logger.debug(f"========{weibo_id}========") + logger.debug(weibo_data_dict) + logger.debug("===================================") + + # 检查微博是否可见 + if weibo_data_dict.get("is_visible"): + logger.error(_("微博 {0} 无查看权限").format(weibo_id)) + return + + # 检查微博是否有图片 + if weibo_data_dict.get("pic_num") == 0: + + # 说明是视频微博 + # print(weibo_data_dict.get("playback_list")) + logger.info( + _("清晰度列表：{0}，码率列表：{1}").format( + weibo_data_dict.get("quality_list"), + weibo_data_dict.get("bitrate_list"), + ) + ) + logger.info(weibo_data_dict.get("playback_list")[0]) + + video_name = ( + format_file_name( + kwargs.get("naming", "{create}_{desc}"), weibo_data_dict + ) + + "_video" + ) + video_url = weibo_data_dict.get("playback_list") + if video_url[0]: + await self.initiate_download( + _("视频"), + video_url[0], + base_path, + video_name, + ".mp4", + ) + else: + # 处理图片下载任务 + # logger.info( + # _("图片ID列表：{0}，图片数量：{1}").format( + # weibo_data_dict.get("pic_infos"), + # weibo_data_dict.get("pic_num"), + # ) + # ) + for i, image_url in enumerate(weibo_data_dict.get("pic_infos")): + image_name = f"{format_file_name(kwargs.get('naming'), weibo_data_dict)}_image_{i + 1}" + image_url = WeiboAPIEndpoints.LARGEST + f"/{image_url}" + if image_url != None: + await self.initiate_download( + _("图片"), image_url, base_path, image_name, ".jpg" + ) + else: + logger.warning( + _("{0} 该微博没有图片链接，无法下载").format(weibo_id) + ) + + # 处理文案下载任务 + if kwargs.get("desc"): + desc_name = ( + format_file_name( + kwargs.get("naming", "{create}_{desc}"), weibo_data_dict + ) + + "_desc" + ) + desc_content = weibo_data_dict.get("desc") + await self.initiate_static_download( + _("文案"), desc_content, base_path, desc_name, ".txt" + ) From 58de78f8e1621bc95ea69f1a6700de458dad9cbb Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 22:25:15 +0800 Subject: [PATCH 238/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0weibo?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/weibo/model.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 f2/apps/weibo/model.py diff --git a/f2/apps/weibo/model.py b/f2/apps/weibo/model.py new file mode 100644 index 00000000..7cc760e5 --- /dev/null +++ b/f2/apps/weibo/model.py @@ -0,0 +1,26 @@ +# path: f2/apps/weibo/model.py + +from typing import Any +from pydantic import BaseModel + + +# Model +class UserInfo(BaseModel): + uid: str + custom: str + + +class UserDetail(BaseModel): + uid: str + + +class UserWeibo(BaseModel): + uid: str + page: int = 1 + feature: int = 0 + since_id: str = "" + + +class WeiboDetail(BaseModel): + id: str # like `O8DM0BLLm` or `5020595169001740` + locale: str = "zh-CN" From 1bcacc868e03d20504db7be9cf818906fffb6987 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 22:25:40 +0800 Subject: [PATCH 239/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0weibo?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/weibo/handler.py | 228 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 228 insertions(+) create mode 100644 f2/apps/weibo/handler.py diff --git a/f2/apps/weibo/handler.py b/f2/apps/weibo/handler.py new file mode 100644 index 00000000..5edf1d4b --- /dev/null +++ b/f2/apps/weibo/handler.py @@ -0,0 +1,228 @@ +# path: f2/apps/weibo/handler.py + +from pathlib import Path +from typing import AsyncGenerator, Union, Dict, Any, List + +from f2.log.logger import logger +from f2.i18n.translator import _ +from f2.utils.decorators import mode_handler, mode_function_map +from f2.apps.weibo.db import AsyncUserDB +from f2.apps.weibo.crawler import WeiboCrawler +from f2.apps.weibo.dl import WeiboDownloader +from f2.apps.weibo.model import UserInfo, UserDetail, UserWeibo, WeiboDetail +from f2.apps.weibo.filter import UserInfoFilter, UserDetailFilter, WeiboDetailFilter +from f2.apps.weibo.utils import ( + WeiboIdFetcher, + WeiboUidFetcher, + create_or_rename_user_folder, +) +from f2.exceptions.api_exceptions import APIResponseError +from f2.cli.cli_console import RichConsoleManager + +rich_console = RichConsoleManager().rich_console +rich_prompt = RichConsoleManager().rich_prompt + + +class WeiboHandler: + + # 需要忽略的字段 + user_ignore_fields = ["status"] + + def __init__(self, kwargs) -> None: + self.kwargs = kwargs + self.downloader = WeiboDownloader(kwargs) + + async def fetch_user_info(self, uid: str = "", custom: str = "") -> UserInfoFilter: + """ + 获取用户个人信息 + (Get user personal info) + + Args: + uid (str): 用户ID (User ID) + custom (str): 用户自定义id (Custom ID) + + Returns: + UserInfoFilter: 用户信息过滤器 (User info filter) + + Note: + uid和custom只需传入一个 (Only need to pass in one of uid and custom) + """ + + async with WeiboCrawler(self.kwargs) as crawler: + params = UserInfo(uid=uid, custom=custom) + response = await crawler.fetch_user_info(params) + user = UserInfoFilter(response) + if user.nickname is None: + raise APIResponseError( + _("`fetch_user_info`请求失败，请更换cookie或稍后再试") + ) + return user + + async def fetch_user_detail(self, uid: str) -> UserDetailFilter: + """ + 获取用户详细信息 + (Get user detail info) + + Args: + uid (str): 用户ID (User ID) + + Returns: + UserDetailFilter: 用户详细信息 (User detail info) + """ + + async with WeiboCrawler(self.kwargs) as crawler: + params = UserDetail(uid=uid) + response = await crawler.fetch_user_detail(params) + user = UserDetailFilter(response) + if user.create_at is None: + raise APIResponseError( + _("`fetch_user_detail`请求失败，请更换cookie或稍后再试") + ) + return user + + async def get_or_add_user_data( + self, + kwargs: dict, + user_id: str, + db: AsyncUserDB, + ) -> Path: + """ + 获取或创建用户数据同时创建用户目录 + (Get or create user data and create user directory) + + Args: + kwargs (dict): 配置参数 (Conf parameters) + user_id (str): 用户ID (User ID) + db (AsyncUserDB): 用户数据库 (User database) + + Returns: + user_path (Path): 用户目录路径 (User directory path) + """ + + # 尝试从数据库中获取用户数据 + local_user_data = await db.get_user_info(user_id) + + # 从服务器获取当前用户最新数据 + current_user_data = await self.fetch_user_info(user_id) + + # 获取当前用户最新昵称 + current_nickname = current_user_data.nickname + + # 设置用户目录 + user_path = create_or_rename_user_folder( + kwargs, local_user_data, current_nickname + ) + + # 如果用户不在数据库中，将其添加到数据库 + if not local_user_data: + await db.add_user_info( + self.user_ignore_fields, **current_user_data._to_dict() + ) + + return user_path + + @mode_handler("one") + async def handle_one_weibo(self): + """ + 用于处理单个微博。 + (Used to process a single weibo.) + + Args: + kwargs: dict: 参数字典 (Parameter dictionary) + """ + + weibo_id = await WeiboIdFetcher.get_weibo_id(self.kwargs.get("url")) + + weibo = await self.fetch_one_weibo(weibo_id) + + # 检查是否有查看权限 + if weibo.error_code == 20112: + logger.error(_("微博 {0} 无查看权限，请配置Cookie").format(weibo_id)) + await self.downloader.close() + return + else: + logger.info( + f"微博ID: {weibo.weibo_id}, 微博文案: {weibo.descRaw}, 作者昵称: {weibo.nickname}, 发布时间: {weibo.create_time}" + ) + + async with AsyncUserDB("weibo_users.db") as db: + user_path = await self.get_or_add_user_data(self.kwargs, weibo.user_id, db) + + # async with AsyncUserDB("douyin_users.db") as db: + # user_path = await self.get_or_add_user_data( + # self.kwargs, weibo_data.get("sec_user_id"), db + # ) + + await self.downloader.create_download_tasks( + self.kwargs, weibo._to_dict(), user_path + ) + + async def fetch_one_weibo(self, weibo_id: str) -> WeiboDetailFilter: + """ + 用于获取单个微博。 + + Args: + weibo_id: str: 微博ID + + Return: + weibo_data: dict: 微博数据字典，包含微博ID、微博文案、作者昵称 + """ + + logger.info(_("开始爬取微博: {0}").format(weibo_id)) + + async with WeiboCrawler(self.kwargs) as crawler: + params = WeiboDetail(id=weibo_id) + response = await crawler.fetch_weibo_detail(params) + weibo = WeiboDetailFilter(response) + return weibo + + @mode_handler("post") + async def handle_user_weibo(self): + """ + 用于处理用户微博。 + (Used to process user weibo.) + + Args: + kwargs: dict: 参数字典 (Parameter dictionary) + """ + + user_id = await WeiboUidFetcher.get_weibo_uid(self.kwargs.get("url")) + + async with AsyncUserDB("weibo_users.db") as db: + user_path = await self.get_or_add_user_data(self.kwargs, user_id, db) + + # 获取用户微博数据 + weibo_data = await self.fetch_user_weibo(user_id) + + # 获取用户昵称 + user_nickname = weibo_data.get("nickname") + + logger.info( + f"用户ID: {user_id}, 用户昵称: {user_nickname}, 微博数量: {weibo_data.get('total')}" + ) + + await self.downloader.create_download_tasks(self.kwargs, weibo_data, user_path) + + async def fetch_user_weibo(self, user_id: str) -> Dict[str, Any]: + """ + 用于获取用户微博数据。 + + Args: + user_id: str: 用户ID + + Return: + weibo_data: dict: 用户微博数据字典 + """ + + async with WeiboCrawler(self.kwargs) as crawler: + params = UserWeibo(uid=user_id) + response = await crawler.fetch_user_weibo(params) + return response + + +async def main(kwargs): + mode = kwargs.get("mode") + if mode in mode_function_map: + await mode_function_map[mode](WeiboHandler(kwargs)) + else: + logger.error(_("不存在该模式: {0}").format(mode)) From eebbe316dd6f067a0b523a449cc798dfde4ae36c Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 22:26:06 +0800 Subject: [PATCH 240/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0weibo?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/weibo/utils.py | 490 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 490 insertions(+) create mode 100644 f2/apps/weibo/utils.py diff --git a/f2/apps/weibo/utils.py b/f2/apps/weibo/utils.py new file mode 100644 index 00000000..ce5c01a9 --- /dev/null +++ b/f2/apps/weibo/utils.py @@ -0,0 +1,490 @@ +# path: f2/apps/weibo/utils.py + +import f2 +import re +import httpx +import asyncio + +from typing import Union +from pathlib import Path + +from f2.i18n.translator import _ +from f2.log.logger import logger +from f2.utils.conf_manager import ConfigManager +from f2.utils.utils import extract_valid_urls, split_filename, split_set_cookie +from f2.exceptions.api_exceptions import ( + APIError, + APIConnectionError, + APIResponseError, + APIUnavailableError, + APIUnauthorizedError, + APINotFoundError, +) + + +class ClientConfManager: + """ + 用于管理客户端配置 (Used to manage client configuration) + """ + + client_conf = ConfigManager(f2.F2_CONFIG_FILE_PATH).get_config("f2") + weibo_conf = client_conf.get("weibo", {}) + + @classmethod + def client(cls) -> dict: + return cls.weibo_conf + + @classmethod + def version(cls) -> str: + return cls.client_conf.get("version", "unknown") + + @classmethod + def proxies(cls) -> dict: + return cls.weibo_conf.get("proxies", {}) + + @classmethod + def visitor(cls) -> dict: + return cls.weibo_conf.get("visitor", {}) + + @classmethod + def headers(cls) -> dict: + return cls.weibo_conf.get("headers", {}) + + @classmethod + def user_agent(cls) -> str: + return cls.headers().get("User-Agent", "") + + @classmethod + def referer(cls) -> str: + return cls.headers().get("Referer", "") + + +class ModelManager: + + @classmethod + def model_2_endpoint(cls, base_endpoint: str, params: dict = ...) -> str: + if not params: + return base_endpoint + + if not isinstance(params, dict): + raise ValueError("参数必须是字典类型") + + param_str = "&".join([f"{k}={v}" for k, v in params.items()]) + # 检查base_endpoint是否已有查询参数 (Check if base_endpoint already has query parameters) + separator = "&" if "?" in base_endpoint else "?" + + final_endpoint = f"{base_endpoint}{separator}{param_str}" + + return final_endpoint + + +class VisitorManager: + """ + 用于管理访客信息 (Used to manage visitor information) + """ + + visitor_conf = ClientConfManager.visitor() + proxies = ClientConfManager.proxies() + + @classmethod + async def gen_visitor(cls) -> str: + """ + 生成访客信息 (Generate visitor information) + + Args: + kwargs (dict): 配置参数 (Conf parameters) + + Returns: + str: 访客cookie (Visitor cookie) + """ + + payload = { + "cb": cls.visitor_conf["cb"], + "tid": cls.visitor_conf["tid"], + "from": cls.visitor_conf["from"], + } + headers = { + "User-Agent": ClientConfManager.user_agent(), + "Content-Type": "application/x-www-form-urlencoded", + } + transport = httpx.AsyncHTTPTransport(retries=5) + async with httpx.AsyncClient( + transport=transport, proxies=cls.proxies, timeout=10 + ) as aclient: + try: + response = await aclient.post( + url=cls.visitor_conf["url"], + data=payload, + headers=headers, + ) + response.raise_for_status() + + visitor_cookie = split_set_cookie( + response.headers.get("set-cookie", "") + ) + + return visitor_cookie + + except httpx.RequestError as exc: + # 捕获所有与 httpx 请求相关的异常情况 (Captures all httpx request-related exceptions) + raise APIConnectionError( + _( + "请求端点失败，请检查当前网络环境。 链接：{0}，代理：{1}，异常类名：{2}，异常详细信息：{3}" + ).format(cls.visitor_conf["url"], cls.proxies, cls.__name__, exc) + ) + + except httpx.HTTPStatusError as e: + # 捕获 httpx 的状态代码错误 (captures specific status code errors from httpx) + if e.response.status_code == 401: + raise APIUnauthorizedError( + _( + "参数验证失败，请更新 F2 配置文件中的 {0}，以匹配 {1} 新规则" + ).format("visitor", "weibo") + ) + + elif e.response.status_code == 404: + raise APINotFoundError(_("{0} 无法找到API端点").format("visitor")) + else: + raise APIResponseError( + _("链接：{0}，状态码 {1}：{2} ").format( + e.response.url, e.response.status_code, e.response.text + ) + ) + + +class WeiboIdFetcher: + # 预编译正则表达式 + # (Pre-compile regular expression) + + # weibo.com/2265830070/O8DM0BLLm + # https://weibo.com/2265830070/O8DM0BLLm + # https://weibo.com/2265830070/O8DM0BLLm/ + # https://weibo.com/2265830070/O8DM0BLLm/?test=123 + + # https://www.weibo.com/2265830070/5020595169001740 + # https://www.weibo.com/2265830070/5020595169001740?test=123 + # https://www.weibo.com/2265830070/5020595169001740/ + # https://www.weibo.com/2265830070/5020595169001740/?test=123 + # www.weibo.com/2265830070/5020595169001740 + _WEIBO_ID_PATTERN = re.compile( + r"(?:https?://)?(?:www\.)?(?:weibo\.com|weibo\.cn|m\.weibo\.cn)/(?:\d{10}|status)/(\w{9}|\w{16})(?:/|\?|#.*$|$)" + ) + + @classmethod + async def get_weibo_id(cls, url: str) -> str: + """ + 从微博链接中提取微博ID + (Extract weibo ID from weibo link) + + Args: + url (str): 微博链接 (weibo link) + + Returns: + str: 微博ID (weibo ID) + """ + + if not url: + raise ValueError(_("微博链接不能为空")) + + if not isinstance(url, str): + raise TypeError(_("参数必须是字符串类型")) + + # 提取有效URL + url = extract_valid_urls(url) + + if url is None: + raise APINotFoundError(_("输入的URL不合法。类名：{0}").format(cls.__name__)) + + match = cls._WEIBO_ID_PATTERN.search(url) + + if match: + return match.group(1) + else: + raise APINotFoundError( + _( + "未在响应的地址中找到weibo_id，检查链接是否为微博链接。类名：{0}" + ).format(cls.__name__) + ) + + @classmethod + async def get_all_weibo_id(cls, urls: list) -> list: + """ + 从微博链接列表中提取微博ID + (Extract weibo ID from weibo link) + + Args: + urls (list): 微博链接 (Weibo link list) + + Returns: + list: 微博ID列表 (Weibo ID list) + """ + + if not isinstance(urls, list): + raise TypeError(_("参数必须是列表类型")) + + # 提取有效URL + urls = extract_valid_urls(urls) + + # 从链接中提取微博ID + if urls == []: + raise ( + APINotFoundError( + _("输入的URL List不合法。类名：{0}").format(cls.__name__) + ) + ) + + weibo_ids = [cls.get_weibo_id(url) for url in urls] + return await asyncio.gather(*weibo_ids) + + +class WeiboUidFetcher: + # 预编译正则表达式 + # (Pre-compile regular expression) + + # https://weibo.com/u/2265830070 + # https://weibo.com/u/2265830070/ + # https://weibo.com/u/2265830070?test=123 + # https://weibo.com/2265830070 + # https://weibo.com/2265830070?test=123 + # https://weibo.com/2265830070/ + # https://weibo.com/2265830070/?test=123 + _WEIBO_COM_UID_PATTERN = re.compile( + r"(?:https?://)?(?:www\.)?(?:weibo\.com|weibo\.cn|m\.weibo\.cn)/(?:u/)?(\d{10})(?:/|\?|$)" + ) + + @classmethod + async def get_weibo_uid(cls, url: str) -> str: + """ + 从微博主页链接中提取微博UID + (Extract weibo UID from weibo link) + + Args: + url (str): 微博链接 (Weibo link) + + Returns: + str: 微博UID (Weibo UID) + """ + + if not url: + raise ValueError(_("微博主页链接不能为空")) + + if not isinstance(url, str): + raise TypeError(_("参数必须是字符串类型")) + + # 提取有效URL + url = extract_valid_urls(url) + + if url is None: + raise ( + APINotFoundError(_("输入的URL不合法。类名：{0}").format(cls.__name__)) + ) + + match = cls._WEIBO_COM_UID_PATTERN.search(url) + if match: + return match.group(1) + else: + raise APINotFoundError( + _( + "未在响应的地址中找到weibo_uid，检查链接是否为微博主页链接。类名：{0}" + ).format(cls.__name__) + ) + + @classmethod + async def get_all_weibo_uid(cls, urls: list) -> list: + """ + 从微博主页链接列表中提取微博UID + (Extract weibo UID from weibo link) + + Args: + urls (list): 微博链接 (Weibo link list) + + Returns: + list: 微博UID列表 (Weibo UID list) + """ + + if not urls: + raise ValueError(_("微博链接列表不能为空")) + + if not isinstance(urls, list): + raise TypeError(_("参数必须是列表类型")) + + # 提取有效URL + urls = extract_valid_urls(urls) + + # 从链接中提取微博ID + if urls == []: + raise ( + APINotFoundError( + _("输入的URL List不合法。类名：{0}").format(cls.__name__) + ) + ) + + weibo_uids = [cls.get_weibo_uid(url) for url in urls] + return await asyncio.gather(*weibo_uids) + + +def format_file_name( + naming_template: str, + weibo_data: dict = {}, + custom_fields: dict = {}, +) -> str: + """ + 根据配置文件的全局格式化文件名 + (Format file name according to the global conf file) + + Args: + weibo_data (dict): 微博数据的字典 (dict of douyin data) + naming_template (str): 文件的命名模板, 如 "{create}_{desc}" (Naming template for files, such as "{create}_{desc}") + custom_fields (dict): 用户自定义字段, 用于替代默认的字段值 (Custom fields for replacing default field values) + + Note: + windows 文件名长度限制为 255 个字符, 开启了长文件名支持后为 32,767 个字符 + (Windows file name length limit is 255 characters, 32,767 characters after long file name support is enabled) + Unix 文件名长度限制为 255 个字符 + (Unix file name length limit is 255 characters) + 取去除后的50个字符, 加上后缀, 一般不会超过255个字符 + (Take the removed 50 characters, add the suffix, and generally not exceed 255 characters) + 详细信息请参考: https://en.wikipedia.org/wiki/Filename#Length + (For more information, please refer to: https://en.wikipedia.org/wiki/Filename#Length) + + Returns: + str: 格式化的文件名 (Formatted file name) + """ + + # 为不同系统设置不同的文件名长度限制 + os_limit = { + "win32": 200, + "cygwin": 60, + "darwin": 60, + "linux": 60, + } + + fields = { + "create": weibo_data.get("create_time", ""), # 长度固定19 + "nickname": weibo_data.get("nickname", ""), # 最长30 + "weibo_id": weibo_data.get("weibo_id", ""), # 长度固定19 + "desc": split_filename(weibo_data.get("descRaw", ""), os_limit), + "uid": weibo_data.get("uid", ""), # 固定10 + } + + if custom_fields: + # 更新自定义字段 + fields.update(custom_fields) + + try: + return naming_template.format(**fields) + except KeyError as e: + raise KeyError(_("文件名模板字段 {0} 不存在，请检查".format(e))) + + +def create_or_rename_user_folder( + kwargs: dict, local_user_data: dict, current_nickname: str +) -> Path: + """ + 创建或重命名用户目录 (Create or rename user directory) + + Args: + kwargs (dict): 配置参数 (Conf parameters) + local_user_data (dict): 本地用户数据 (Local user data) + current_nickname (str): 当前用户昵称 (Current user nickname) + + Returns: + user_path (Path): 用户目录路径 (User directory path) + """ + user_path = create_user_folder(kwargs, current_nickname) + + if not local_user_data: + return user_path + + if local_user_data.get("nickname") != current_nickname: + # 昵称不一致，触发目录更新操作 + user_path = rename_user_folder(user_path, current_nickname) + + return user_path + + +def create_user_folder(kwargs: dict, nickname: Union[str, int]) -> Path: + """ + 根据提供的配置文件和昵称，创建对应的保存目录。 + (Create the corresponding save directory according to the provided conf file and nickname.) + + Args: + kwargs (dict): 配置文件，字典格式。(Conf file, dict format) + nickname (Union[str, int]): 用户的昵称，允许字符串或整数。 (User nickname, allow strings or integers) + + Note: + 如果未在配置文件中指定路径，则默认为 "Download"。 + (If the path is not specified in the conf file, it defaults to "Download".) + 支持绝对与相对路径。 + (Support absolute and relative paths) + + Raises: + TypeError: 如果 kwargs 不是字典格式，将引发 TypeError。 + (If kwargs is not in dict format, TypeError will be raised.) + """ + + # 确定函数参数是否正确 + if not isinstance(kwargs, dict): + raise TypeError("kwargs 参数必须是字典") + + # 创建基础路径 + base_path = Path(kwargs.get("path", "Download")) + + # 添加下载模式和用户名 + user_path = ( + base_path / "weibo" / kwargs.get("mode", "PLEASE_SETUP_MODE") / str(nickname) + ) + + # 获取绝对路径并确保它存在 + resolve_user_path = user_path.resolve() + + # 创建目录 + resolve_user_path.mkdir(parents=True, exist_ok=True) + + return resolve_user_path + + +def rename_user_folder(old_path: Path, new_nickname: str) -> Path: + """ + 重命名用户目录 (Rename User Folder). + + Args: + old_path (Path): 旧的用户目录路径 (Path of the old user folder) + new_nickname (str): 新的用户昵称 (New user nickname) + + Returns: + Path: 重命名后的用户目录路径 (Path of the renamed user folder) + """ + # 获取目标目录的父目录 (Get the parent directory of the target folder) + parent_directory = old_path.parent + + # 构建新目录路径 (Construct the new directory path) + new_path = old_path.rename(parent_directory / new_nickname).resolve() + + return new_path + + +def create_or_rename_user_folder( + kwargs: dict, local_user_data: dict, current_nickname: str +) -> Path: + """ + 创建或重命名用户目录 (Create or rename user directory) + + Args: + kwargs (dict): 配置参数 (Conf parameters) + local_user_data (dict): 本地用户数据 (Local user data) + current_nickname (str): 当前用户昵称 (Current user nickname) + + Returns: + user_path (Path): 用户目录路径 (User directory path) + """ + user_path = create_user_folder(kwargs, current_nickname) + + if not local_user_data: + return user_path + + if local_user_data.get("nickname") != current_nickname: + # 昵称不一致，触发目录更新操作 + user_path = rename_user_folder(user_path, current_nickname) + + return user_path From c63e4e2dfaa25e0db07fe1017183070e888d7f3f Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 22:26:17 +0800 Subject: [PATCH 241/299] =?UTF-8?q?test:=20=E6=B7=BB=E5=8A=A0weibo?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/weibo/test/test_gen_visitor.py | 27 ++++ f2/apps/weibo/test/test_handler.py | 33 ++++ f2/apps/weibo/test/test_weibo_id.py | 207 +++++++++++++++++++++++++ f2/apps/weibo/test/test_weibo_uid.py | 167 ++++++++++++++++++++ 4 files changed, 434 insertions(+) create mode 100644 f2/apps/weibo/test/test_gen_visitor.py create mode 100644 f2/apps/weibo/test/test_handler.py create mode 100644 f2/apps/weibo/test/test_weibo_id.py create mode 100644 f2/apps/weibo/test/test_weibo_uid.py diff --git a/f2/apps/weibo/test/test_gen_visitor.py b/f2/apps/weibo/test/test_gen_visitor.py new file mode 100644 index 00000000..c811e458 --- /dev/null +++ b/f2/apps/weibo/test/test_gen_visitor.py @@ -0,0 +1,27 @@ +import pytest +from f2.apps.weibo.utils import VisitorManager + + +@pytest.mark.asyncio +async def test_gen_visitor(): + # 设置测试用的 visitor_conf + VisitorManager.visitor_conf = { + "cb": "visitor_gray_callback", + "tid": "", + "from": "weibo", + "url": "https://passport.weibo.com/visitor/genvisitor2", + } + + # 设置假的 proxies 和 user agent + VisitorManager.proxies = { + "http://": None, + "https://": None, + } + + visitor_cookie = await VisitorManager.gen_visitor() + + # 断言生成的 cookie 是否正确 + assert "SUB=" in visitor_cookie + assert "SUBP=" in visitor_cookie + assert "SRT=" in visitor_cookie + assert "SRF=" in visitor_cookie diff --git a/f2/apps/weibo/test/test_handler.py b/f2/apps/weibo/test/test_handler.py new file mode 100644 index 00000000..d296f92a --- /dev/null +++ b/f2/apps/weibo/test/test_handler.py @@ -0,0 +1,33 @@ +import pytest +from f2.apps.weibo.handler import WeiboHandler +from f2.utils.conf_manager import TestConfigManager + + +@pytest.fixture +def kwargs_fixture(): + return TestConfigManager.get_test_config("weibo") + + +@pytest.mark.asyncio +async def test_fetch_user_info(kwargs_fixture): + handler = WeiboHandler(kwargs_fixture) + user_info = await handler.fetch_user_info(uid="2265830070") + assert user_info is not None + assert user_info.uid == "2265830070" + + +@pytest.mark.asyncio +async def test_fetch_user_detail(kwargs_fixture): + handler = WeiboHandler(kwargs_fixture) + user_detail = await handler.fetch_user_detail(uid="2265830070") + + assert user_detail is not None + + +@pytest.mark.asyncio +async def test_handle_one_weibo(kwargs_fixture): + handler = WeiboHandler(kwargs_fixture) + weibo = await handler.fetch_one_weibo(weibo_id="LvFY288c0") + assert weibo is not None + assert weibo.weibo_id == "4775494941938120" + assert weibo.weibo_blog_id == "LvFY288c0" diff --git a/f2/apps/weibo/test/test_weibo_id.py b/f2/apps/weibo/test/test_weibo_id.py new file mode 100644 index 00000000..c73a7ebe --- /dev/null +++ b/f2/apps/weibo/test/test_weibo_id.py @@ -0,0 +1,207 @@ +import pytest +from f2.apps.weibo.utils import WeiboIdFetcher +from f2.exceptions.api_exceptions import ( + APINotFoundError, +) + + +@pytest.mark.asyncio +class TestWeiboIdFetcher: + async def test_get_weibo_id(self): + weibo_link = "https://weibo.com/u/2265830070/O8DM0BLLm" + with pytest.raises(APINotFoundError): + await WeiboIdFetcher.get_weibo_id(weibo_link) + + weibo_link = "https://weibo.com/u/2265830070/O8DM0BLLm?test=123" + with pytest.raises(APINotFoundError): + await WeiboIdFetcher.get_weibo_id(weibo_link) + + weibo_link = "https://weibo.com/u/2265830070/O8DM0BLLm/" + with pytest.raises(APINotFoundError): + await WeiboIdFetcher.get_weibo_id(weibo_link) + + weibo_link = "https://weibo.com/u/2265830070/O8DM0BLLm/?test=123" + with pytest.raises(APINotFoundError): + await WeiboIdFetcher.get_weibo_id(weibo_link) + + weibo_link = "weibo.com/2265830070/O8DM0BLLm" + with pytest.raises(APINotFoundError): + await WeiboIdFetcher.get_weibo_id(weibo_link) + + weibo_link = "https://weibo.com/2265830070/O8DM0BLLm" + weibo_id = await WeiboIdFetcher.get_weibo_id(weibo_link) + assert weibo_id == "O8DM0BLLm" + + weibo_link = "https://weibo.com/2265830070/O8DM0BLLm/" + weibo_id = await WeiboIdFetcher.get_weibo_id(weibo_link) + assert weibo_id == "O8DM0BLLm" + + weibo_link = "https://weibo.com/2265830070/O8DM0BLLm/?test=123" + weibo_id = await WeiboIdFetcher.get_weibo_id(weibo_link) + assert weibo_id == "O8DM0BLLm" + + weibo_link = "https://weibo.com/2265830070/O8DM0BLLm/%$#" + weibo_id = await WeiboIdFetcher.get_weibo_id(weibo_link) + assert weibo_id == "O8DM0BLLm" + + weibo_link = "https://www.weibo.com/2265830070/5020595169001740" + weibo_id = await WeiboIdFetcher.get_weibo_id(weibo_link) + assert weibo_id == "5020595169001740" + + weibo_link = "https://www.weibo.com/2265830070/5020595169001740?test=123" + weibo_id = await WeiboIdFetcher.get_weibo_id(weibo_link) + assert weibo_id == "5020595169001740" + + weibo_link = "https://www.weibo.com/2265830070/5020595169001740/" + weibo_id = await WeiboIdFetcher.get_weibo_id(weibo_link) + assert weibo_id == "5020595169001740" + + weibo_link = "https://www.weibo.com/2265830070/5020595169001740/?test=123" + weibo_id = await WeiboIdFetcher.get_weibo_id(weibo_link) + assert weibo_id == "5020595169001740" + + weibo_link = "https://m.weibo.cn/2265830070/5020595169001740" + weibo_id = await WeiboIdFetcher.get_weibo_id(weibo_link) + assert weibo_id == "5020595169001740" + + weibo_link = "https://m.weibo.cn/2265830070/5020595169001740?test=123" + weibo_id = await WeiboIdFetcher.get_weibo_id(weibo_link) + assert weibo_id == "5020595169001740" + + weibo_link = "https://m.weibo.cn/2265830070/5020595169001740/" + weibo_id = await WeiboIdFetcher.get_weibo_id(weibo_link) + assert weibo_id == "5020595169001740" + + weibo_link = "https://m.weibo.cn/2265830070/5020595169001740/?test=123" + weibo_id = await WeiboIdFetcher.get_weibo_id(weibo_link) + assert weibo_id == "5020595169001740" + + weibo_link = "https://weibo.cn/2265830070/O8DM0BLLm/" + weibo_id = await WeiboIdFetcher.get_weibo_id(weibo_link) + assert weibo_id == "O8DM0BLLm" + + weibo_link = "https://weibo.cn/2265830070/O8DM0BLLm/?test=123" + weibo_id = await WeiboIdFetcher.get_weibo_id(weibo_link) + assert weibo_id == "O8DM0BLLm" + + weibo_link = "https://weibo.cn/2265830070/O8DM0BLLm" + weibo_id = await WeiboIdFetcher.get_weibo_id(weibo_link) + assert weibo_id == "O8DM0BLLm" + + weibo_link = "https://weibo.cn/2265830070/O8DM0BLLm?test=123" + weibo_id = await WeiboIdFetcher.get_weibo_id(weibo_link) + assert weibo_id == "O8DM0BLLm" + + weibo_link = "https://weibo.cn/status/5020595169001740" + weibo_id = await WeiboIdFetcher.get_weibo_id(weibo_link) + assert weibo_id == "5020595169001740" + + weibo_link = "https://weibo.cn/status/5020595169001740?test=123" + weibo_id = await WeiboIdFetcher.get_weibo_id(weibo_link) + assert weibo_id == "5020595169001740" + + weibo_link = "https://weibo.cn/status/5020595169001740/" + weibo_id = await WeiboIdFetcher.get_weibo_id(weibo_link) + assert weibo_id == "5020595169001740" + + weibo_link = "https://weibo.cn/status/5020595169001740/?test=123" + weibo_id = await WeiboIdFetcher.get_weibo_id(weibo_link) + assert weibo_id == "5020595169001740" + + weibo_link = "https://weibo.com/2265830070" + with pytest.raises(APINotFoundError): + await WeiboIdFetcher.get_weibo_id(weibo_link) + + weibo_link = "https://weibo.com/2265830070/" + with pytest.raises(APINotFoundError): + await WeiboIdFetcher.get_weibo_id(weibo_link) + + weibo_link = "https://weibo.com/2265830070/?test=123" + with pytest.raises(APINotFoundError): + await WeiboIdFetcher.get_weibo_id(weibo_link) + + weibo_link = "https://weibo.com/userid/postid/" + with pytest.raises(APINotFoundError): + await WeiboIdFetcher.get_weibo_id(weibo_link) + + weibo_link = "" + with pytest.raises(ValueError): + await WeiboIdFetcher.get_weibo_id(weibo_link) + + weibo_link = None + with pytest.raises(ValueError): + await WeiboIdFetcher.get_weibo_id(weibo_link) + + weibo_link = "https://weibo.com/2265830070/O8DM0BLLm/" + "a" * 2048 + weibo_id = await WeiboIdFetcher.get_weibo_id(weibo_link) + assert weibo_id == "O8DM0BLLm" + + +@pytest.mark.asyncio +class TestWeiboAllIdFetcher: + async def test_get_all_weibo_id(self): + weibo_links = [] + with pytest.raises(APINotFoundError): + await WeiboIdFetcher.get_all_weibo_id(weibo_links) + + weibo_links = [ + "https://weibo.com/u/2265830070/O8DM0BLLm", + "https://weibo.com/u/2265830070/O8DM0BLLm/", + "https://weibo.com/u/2265830070/O8DM0BLLm/?test=123", + ] + with pytest.raises(APINotFoundError): + await WeiboIdFetcher.get_all_weibo_id(weibo_links) + + weibo_links = [ + "https://weibo.com/2265830070/O8DM0BLLm", + "https://weibo.com/2265830070/O8DM0BLLm/", + "https://weibo.com/2265830070/O8DM0BLLm/?test=123", + "https://weibo.com/2265830070/O8DM0BLLm/%$#", + "https://weibo.com/2265830070/O8DM0BLLm/" + "a" * 2048, + ] + weibo_ids = await WeiboIdFetcher.get_all_weibo_id(weibo_links) + assert weibo_ids == [ + "O8DM0BLLm", + "O8DM0BLLm", + "O8DM0BLLm", + "O8DM0BLLm", + "O8DM0BLLm", + ] + + weibo_links = [ + "https://www.weibo.com/2265830070/5020595169001740", + "https://www.weibo.com/2265830070/5020595169001740/", + "https://www.weibo.com/2265830070/5020595169001740/?test=123", + "https://www.weibo.com/2265830070/5020595169001740/%$#", + "https://www.weibo.com/2265830070/5020595169001740/" + "a" * 2048, + "https://weibo.cn/status/5020595169001740", + "https://weibo.cn/status/5020595169001740?test=123", + "https://m.weibo.cn/status/5020595169001740/", + "https://m.weibo.cn/status/5020595169001740/?test=123", + "https://m.weibo.cn/status/5020595169001740/%$#", + "https://m.weibo.cn/status/5020595169001740/" + "a" * 2048, + ] + weibo_ids = await WeiboIdFetcher.get_all_weibo_id(weibo_links) + assert weibo_ids == [ + "5020595169001740", + "5020595169001740", + "5020595169001740", + "5020595169001740", + "5020595169001740", + "5020595169001740", + "5020595169001740", + "5020595169001740", + "5020595169001740", + "5020595169001740", + "5020595169001740", + ] + + weibo_links = [ + "weibo.com/2265830070", + "https://weibo.com/2265830070", + "https://weibo.com/2265830070/", + "https://weibo.com/2265830070/?test=123", + "https://weibo.com/userid/postid/", + ] + with pytest.raises(APINotFoundError): + await WeiboIdFetcher.get_all_weibo_id(weibo_links) diff --git a/f2/apps/weibo/test/test_weibo_uid.py b/f2/apps/weibo/test/test_weibo_uid.py new file mode 100644 index 00000000..a6503cf5 --- /dev/null +++ b/f2/apps/weibo/test/test_weibo_uid.py @@ -0,0 +1,167 @@ +import pytest +from f2.apps.weibo.utils import WeiboUidFetcher +from f2.exceptions.api_exceptions import ( + APINotFoundError, +) + + +@pytest.mark.asyncio +class TestWeiboUidFetcher: + async def test_get_weibo_uid(self): + weibo_id = "https://weibo.com/u/2265830070" + weibo_uid = await WeiboUidFetcher.get_weibo_uid(weibo_id) + assert weibo_uid == "2265830070" + + weibo_id = "https://weibo.com/u/2265830070?test=123" + weibo_uid = await WeiboUidFetcher.get_weibo_uid(weibo_id) + assert weibo_uid == "2265830070" + + weibo_id = "https://weibo.com/u/2265830070/" + weibo_uid = await WeiboUidFetcher.get_weibo_uid(weibo_id) + assert weibo_uid == "2265830070" + + weibo_id = "https://weibo.com/u/2265830070/?test=123" + weibo_uid = await WeiboUidFetcher.get_weibo_uid(weibo_id) + assert weibo_uid == "2265830070" + + weibo_link = "https://weibo.com/2265830070" + weibo_uid = await WeiboUidFetcher.get_weibo_uid(weibo_link) + assert weibo_uid == "2265830070" + + weibo_link = "https://weibo.com/2265830070/" + weibo_uid = await WeiboUidFetcher.get_weibo_uid(weibo_link) + assert weibo_uid == "2265830070" + + weibo_link = "https://weibo.com/2265830070/?test=123" + weibo_uid = await WeiboUidFetcher.get_weibo_uid(weibo_link) + assert weibo_uid == "2265830070" + + weibo_link = "https://weibo.com/2265830070/O8DM0BLLm" + weibo_uid = await WeiboUidFetcher.get_weibo_uid(weibo_link) + assert weibo_uid == "2265830070" + + weibo_link = "https://weibo.com/2265830070/O8DM0BLLm/" + weibo_uid = await WeiboUidFetcher.get_weibo_uid(weibo_link) + assert weibo_uid == "2265830070" + + weibo_link = "https://weibo.com/2265830070/O8DM0BLLm/?test=123" + weibo_uid = await WeiboUidFetcher.get_weibo_uid(weibo_link) + assert weibo_uid == "2265830070" + + weibo_link = "https://weibo.com/2265830070/O8DM0BLLm/%$#" + weibo_id = await WeiboUidFetcher.get_weibo_uid(weibo_link) + assert weibo_id == "2265830070" + + weibo_link = "https://m.weibo.cn/2265830070/5020595169001740" + weibo_id = await WeiboUidFetcher.get_weibo_uid(weibo_link) + assert weibo_id == "2265830070" + + weibo_link = "https://m.weibo.cn/2265830070/5020595169001740?test=123" + weibo_id = await WeiboUidFetcher.get_weibo_uid(weibo_link) + assert weibo_id == "2265830070" + + weibo_link = "https://m.weibo.cn/2265830070/5020595169001740/" + weibo_id = await WeiboUidFetcher.get_weibo_uid(weibo_link) + assert weibo_id == "2265830070" + + weibo_link = "https://m.weibo.cn/2265830070/5020595169001740/?test=123" + weibo_id = await WeiboUidFetcher.get_weibo_uid(weibo_link) + assert weibo_id == "2265830070" + + weibo_link = "https://weibo.cn/2265830070/5020595169001740" + weibo_id = await WeiboUidFetcher.get_weibo_uid(weibo_link) + assert weibo_id == "2265830070" + + weibo_link = "https://weibo.cn/2265830070/5020595169001740?test=123" + weibo_id = await WeiboUidFetcher.get_weibo_uid(weibo_link) + assert weibo_id == "2265830070" + + weibo_link = "https://weibo.cn/2265830070/5020595169001740/" + weibo_id = await WeiboUidFetcher.get_weibo_uid(weibo_link) + assert weibo_id == "2265830070" + + weibo_link = "https://weibo.cn/2265830070/5020595169001740/?test=123" + weibo_id = await WeiboUidFetcher.get_weibo_uid(weibo_link) + assert weibo_id == "2265830070" + + weibo_link = "weibo.com/2265830070/O8DM0BLLm" + with pytest.raises(APINotFoundError): + await WeiboUidFetcher.get_weibo_uid(weibo_link) + + weibo_link = "https://weibo.com/O8DM0BLLm" + with pytest.raises(APINotFoundError): + await WeiboUidFetcher.get_weibo_uid(weibo_link) + + weibo_link = "https://weibo.com/O8DM0BLLm/" + with pytest.raises(APINotFoundError): + await WeiboUidFetcher.get_weibo_uid(weibo_link) + + weibo_link = "https://weibo.com/O8DM0BLLm/?test=123" + with pytest.raises(APINotFoundError): + await WeiboUidFetcher.get_weibo_uid(weibo_link) + + weibo_link = "https://weibo.com/userid/postid/" + with pytest.raises(APINotFoundError): + await WeiboUidFetcher.get_weibo_uid(weibo_link) + + weibo_link = "" + with pytest.raises(ValueError): + await WeiboUidFetcher.get_weibo_uid(weibo_link) + + weibo_link = None + with pytest.raises(ValueError): + await WeiboUidFetcher.get_weibo_uid(weibo_link) + + weibo_link = "https://weibo.com/2265830070/O8DM0BLLm/" + "a" * 2048 + weibo_id = await WeiboUidFetcher.get_weibo_uid(weibo_link) + assert weibo_id == "2265830070" + + +@pytest.mark.asyncio +class TestWeiboAllUidFetcher: + async def test_get_all_weibo_uid(self): + weibo_links = [ + "https://weibo.com/u/2265830070", + "https://weibo.com/u/2265830070/", + "https://weibo.com/u/2265830070/?test=123", + "https://weibo.com/2265830070", + "https://weibo.com/2265830070/", + "https://weibo.com/2265830070/?test=123", + "https://weibo.com/2265830070/O8DM0BLLm", + "https://weibo.com/2265830070/O8DM0BLLm/", + "https://weibo.com/2265830070/O8DM0BLLm/?test=123", + "https://weibo.com/2265830070/O8DM0BLLm/%$#", + "https://weibo.com/2265830070/O8DM0BLLm/" + "a" * 2048, + "https://m.weibo.cn/2265830070/5020595169001740", + "https://m.weibo.cn/2265830070/5020595169001740?test=123", + "https://m.weibo.cn/2265830070/5020595169001740/", + "https://m.weibo.cn/2265830070/5020595169001740/?test=123", + ] + weibo_uids = await WeiboUidFetcher.get_all_weibo_uid(weibo_links) + assert weibo_uids == [ + "2265830070", + "2265830070", + "2265830070", + "2265830070", + "2265830070", + "2265830070", + "2265830070", + "2265830070", + "2265830070", + "2265830070", + "2265830070", + "2265830070", + "2265830070", + "2265830070", + "2265830070", + ] + + weibo_links = [ + "weibo.com/O8DM0BLLm", + "https://weibo.com/O8DM0BLLm", + "https://weibo.com/O8DM0BLLm/", + "https://weibo.com/O8DM0BLLm/?test=123", + "https://weibo.com/userid/postid/", + ] + with pytest.raises(APINotFoundError): + await WeiboUidFetcher.get_all_weibo_uid(weibo_links) From 4ce34fcf4cb46c87a6388db8fabbe11c2a178a73 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 22:26:40 +0800 Subject: [PATCH 242/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0weibo=20conf.?= =?UTF-8?q?yaml=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/conf/conf.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/f2/conf/conf.yaml b/f2/conf/conf.yaml index 536c26fe..1713dd91 100644 --- a/f2/conf/conf.yaml +++ b/f2/conf/conf.yaml @@ -99,3 +99,17 @@ f2: odin_tt: url: https://www.tiktok.com/passport/web/account/info/?WebIdLastTime=1716637053&aid=1459&app_language=zh-Hans&app_name=tiktok_web&browser_language=zh-CN&browser_name=Mozilla&browser_online=true&browser_platform=Win32&browser_version=5.0%20%28Windows%20NT%2010.0%3B%20Win64%3B%20x64%29%20AppleWebKit%2F537.36%20%28KHTML%2C%20like%20Gecko%29%20Chrome%2F124.0.0.0%20Safari%2F537.36&channel=tiktok_web&cookie_enabled=true&device_id=7372899909097571857&device_platform=web_pc&focus_state=true&from_page=fyp&history_len=2&is_fullscreen=false&is_page_visible=true&odinId=7372898697492972561&os=windows&priority_region=&referer=®ion=SG&screen_height=1080&screen_width=1920&tz_name=Asia%2FHong_Kong&webcast_language=zh-Hans + weibo: + headers: + User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36 Edg/121.0.0.0 + Referer: https://weibo.com/ + + proxies: + http://: + https://: + + visitor: + url: https://passport.weibo.com/visitor/genvisitor2 + cb: visitor_gray_callback + tid: + from: weibo From c45143193534374b015d2ef457d69877c19d4e50 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 22:28:28 +0800 Subject: [PATCH 243/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0weibo?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/conf/test.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/f2/conf/test.yaml b/f2/conf/test.yaml index 4214d02f..5a504e11 100644 --- a/f2/conf/test.yaml +++ b/f2/conf/test.yaml @@ -14,4 +14,13 @@ tiktok: cookie: tt_csrf_token=NZdFHVu4-KtYghBEQDgHh_JKjgAdFhKIcgDU; ak_bmsc=165BFF3A4E2C445E031EEB9B347F3F99~000000000000000000000000000000~YAAQ3pPMF8pAiaiPAQAAWY/dyReR/C9ddS4mWedMGCN7W2a+ascE+7v5dTEEgGTrODWuBLEcqqPZyYRBBiVm99rjTDUSJi2P+0NziV9Ffe2olLI8uakawsAZkpKpZp0dsMpUlWCZ1lIlNgiLQ4OorRsxCrosSr6A56MOf6Q+X1cfFW5b4f3slHhUAgeUHJhNLZc2tN+zdBpIqRrK6Dc96MNa7IKVi6CNoYR/NRksJfINehDW3K3d2bDi//Et1nUcHFcKuw7L2hFhJQoILib/WjJmWOVomf3LSPfGEYZLHkm35SgskCTBlOMDX7oKaELbi98m5z00flHkvHwuyb0yltQjkvIZDA4DIvqBwqENAPesJQpIOULclJI5OIm69tYQGcE+sZ5u9ME=; tt_chain_token=zccwp7dvS61dC917u98Qdg==; bm_sv=2C218A189C99A8C0A7322DC4A6B52B2B~YAAQ3pPMF8tAiaiPAQAAz5HdyReH0vsS+BfXu7TAPBrd5wGaSHIGCvQj0n3LR/iub7ol4bhsXslOpYHY0pg/n6ZhD/yThWgU5wYI4InC/XCE85uuompY2T82hCGIC4zdMsyZ7JJpqerUagxgDTjTbxqPByQDNweuF7cLkzQisuCqfLNVoeId8LB7d2Jg+skOJoaUtDvY4r42wQH0pV/tZ0L7kRBfdJcbzbp2zGHKTNSrpgiPuPN550RtYLLv44QM~1; tiktok_webapp_theme_auto_dark_ab=1; tiktok_webapp_theme=system; ttwid=1%7C3skh2Vk1U1g6e8OS4OPTE7jZOHBW7MakDYrcBah14Ws%7C1717078699%7C449ad7f65ea5e1f1b014fbf3b4674e7bac68db6fd10201b6b3302c74274059ae; msToken=TxDdrpwkvfiXZJYTL4mrRxUhHJhSBKyd9cwgsI7zxYL4Cs9yyMXPRLGbw1nyaUI2iXjURwZaGT6fy3uztCVp6AIL8O9lqLxKerC6RxCdR9zh2umdd9JoAXSxK-EY; msToken=TxDdrpwkvfiXZJYTL4mrRxUhHJhSBKyd9cwgsI7zxYL4Cs9yyMXPRLGbw1nyaUI2iXjURwZaGT6fy3uztCVp6AIL8O9lqLxKerC6RxCdR9zh2umdd9JoAXSxK-EY proxies: http://: - https://: \ No newline at end of file + https://: + +weibo: + headers: + User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0 + Referer: https://www.weibo.com/ + cookie: XSRF-TOKEN=GxMcbrwRytI2afYndoarLKjJ; SUB=_2AkMRJL-Ef8NxqwFRmfwQz2rmZIVywg3EieKneE5fJRMxHRl-yT8XqlEmtRB6OqSRa3vF6f2fdNtQwdZNlAKdlpN1p7dT; SUBP=0033WrSXqPxfM72-Ws9jqgMF55529P9D9W5d3LX86ys6FPw-ljjWXw25; WBPSESS=Wk6CxkYDejV3DDBcnx2LOUWDIoRAGwNtFtgdJsHeFORJjYAOaFsShugP8UQ0ESPFYVi4zv3bd-yDJ_nOUlU6r5tEaTqi9GsMdESNWiZKcFssXVdv8LPGCfF_x1G4jj6N906MaQArmD8_aUiW5-mQXkubESA5BsVyta1YqRA0Jjg= + proxies: + http://: + https://: From 4b23b104789f0fde9013449bc0b0f7ae169fd793 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 22:29:17 +0800 Subject: [PATCH 244/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0weibo=20app.y?= =?UTF-8?q?aml=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/conf/app.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/f2/conf/app.yaml b/f2/conf/app.yaml index fae14ec8..8c224d70 100644 --- a/f2/conf/app.yaml +++ b/f2/conf/app.yaml @@ -22,3 +22,18 @@ tiktok: page_counts: 5 path: Download timeout: 10 + +weibo: + + path: Download + folderize: yes + mode: post + naming: '{create}_{desc}' + cookie: + interval: all + timeout: 10 + max_retries: 5 + max_connections: 5 + max_counts: 0 + max_tasks: 5 + page_counts: 20 From af7cf82a663b89da7efea48c34bd1c33029c7645 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 22:34:44 +0800 Subject: [PATCH 245/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0x=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/__init__.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/f2/__init__.py b/f2/__init__.py index ec3fb05c..fd6d52c2 100644 --- a/f2/__init__.py +++ b/f2/__init__.py @@ -54,4 +54,12 @@ "like", ] +TWITTER_MODE_LIST = [ + "one", + "post", + "retweet", + "like", + "bookmark", +] + PYPI_URL = "https://pypi.org/pypi" From 0460e7d130cb1185760f84a9ee566847ff670862 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 22:40:46 +0800 Subject: [PATCH 246/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0weibo?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E4=BB=A3=E7=A0=81=E7=89=87?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/snippets/weibo/user-profile.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 docs/snippets/weibo/user-profile.py diff --git a/docs/snippets/weibo/user-profile.py b/docs/snippets/weibo/user-profile.py new file mode 100644 index 00000000..968d5815 --- /dev/null +++ b/docs/snippets/weibo/user-profile.py @@ -0,0 +1,24 @@ +import asyncio +from f2.apps.weibo.handler import WeiboHandler +from f2.log.logger import logger + + +kwargs = { + "headers": { + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "Referer": "https://www.weibo.com/", + }, + "proxies": {"http://": None, "https://": None}, + "cookie": "YOUR_COOKIE_HERE", +} + + +async def main(): + user = await WeiboHandler(kwargs).fetch_user_info(uid="2265830070") + logger.info( + f"微博用户ID: {user.uid}, 昵称: {user.nickname}, 性别: {user.gender}, 地区: {user.location}, 关注数: {user.friends_count}, 粉丝数: {user.followers_count}, 微博数: {user.weibo_count}, 个人主页: {user.profile_url}" + ) + + +if __name__ == "__main__": + asyncio.run(main()) From bb6bd79650196cf8ed304849d087d3d6a78b2f24 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 22:41:07 +0800 Subject: [PATCH 247/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0weibo?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BB=A3=E7=A0=81=E7=89=87=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/snippets/weibo/user-weibo.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 docs/snippets/weibo/user-weibo.py diff --git a/docs/snippets/weibo/user-weibo.py b/docs/snippets/weibo/user-weibo.py new file mode 100644 index 00000000..48c244f1 --- /dev/null +++ b/docs/snippets/weibo/user-weibo.py @@ -0,0 +1,24 @@ +import asyncio +from f2.apps.weibo.handler import WeiboHandler +from f2.log.logger import logger + + +kwargs = { + "headers": { + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "Referer": "https://www.weibo.com/", + }, + "proxies": {"http://": None, "https://": None}, + "cookie": "YOUR_COOKIE_HERE", +} + + +async def main(): + weibo = await WeiboHandler(kwargs).fetch_one_weibo(weibo_id="O8DM0BLLm") + logger.info( + f"微博ID: {weibo.weibo_id}, 微博文案: {weibo.desc}, 作者昵称: {weibo.nickname}, 发布时间: {weibo.create_time}" + ) + + +if __name__ == "__main__": + asyncio.run(main()) From 7e178351ed161175592dc8a2ae27b19e7dd8e173 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Sun, 23 Jun 2024 22:44:27 +0800 Subject: [PATCH 248/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0x=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/conf/app.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/f2/conf/app.yaml b/f2/conf/app.yaml index 8c224d70..a1ebc517 100644 --- a/f2/conf/app.yaml +++ b/f2/conf/app.yaml @@ -23,6 +23,21 @@ tiktok: path: Download timeout: 10 +twitter: + + path: Download + folderize: yes + mode: one + naming: '{create}_{desc}' + cookie: + interval: all + timeout: 10 + max_retries: 5 + max_connections: 5 + max_counts: 0 + max_tasks: 5 + page_counts: 20 + weibo: path: Download From a248b4193f14c46779d6bf72227c76783bbc859c Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Mon, 24 Jun 2024 00:02:52 +0800 Subject: [PATCH 249/299] Update CHANGELOG.md --- CHANGELOG.md | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab8da989..65821e17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,14 +6,38 @@ ## [Unreleased] -- `0.0.1.6`版本中添加对`weibo`，`x`的支持 +- `0.0.1.7`版本中添加对`x`的支持，添加更多`douyin`，`tiktok`和`weibo`的接口 ## [0.0.1.6] - 2024-05-04 ### Added +- 添加`weibo`应用 +- 添加`abogus(limit ua)`加密 +- 添加`douyin`加密算法切换配置 +- 添加基础接口模型转url类 +- 添加`WebSocket`爬虫客户端 +- 添加`douyin`直播wss签名管理器 +- 添加`douyin`直播wss签名生成类 +- 添加`douyin`工具JS库`webmssdk.es5-1.0.0.53` +- 添加`douyin`直播间弹幕wss接口 +- 添加`F2`版本检测 +- 添加`tiktok`直播间开播状态 +- 添加`websockets>=11.0`依赖 +- 添加`tiktok` `device_id注册`与`cookie`管理类 +- 添加`douyin`生成`webid`配置 +- 添加`douyin`关注用户直播 +- 添加`douyin`，`tiktok`模型配置 +- 添加`conf.yaml`配置版本号 +- 添加`tiktok`集成测试 +- 添加`traceback`输出 +- 添加`douyin`短剧作品 +- 添加同步客户端的同步`transport` +- 添加同步客户端 +- 添加`douyin`直播弹幕初始化 - 添加`douyin`合集`mix_id`获取方法 +- 添加`douyin`查询用户 - 添加时间戳转换的默认时区设置（`UTC/GMT+08:00`） - 添加`ClientConfManager`为每个应用提供方便的配置读取 - 添加`uniqueId`查询`tiktok`的`user_db` @@ -27,6 +51,24 @@ ### Changed +- 更新`__aexit__`方法 +- 更新`douyin`加密算法代码片段 +- 更新`weibo`测试用例 +- 优化命令不存在的输出 +- 取消接口数据过滤器对`bool`的预处理 +- 调整停止异步任务信号 +- 更新`douyin`的`xbogus`调用 +- 为装饰器文件重命名 +- 更新获取`Content-Length`的方法 +- 防止`douyin`直播结束时下载崩溃 +- 更新`BaseCrawler`类处理`httpx`即将弃用`proxies`参数 +- 更新`tiktok`的`msToken`配置 +- 修复`ClientConfManager`参数 +- 更新了所有应用配置 +- 重构了所有工具类方法 +- 更新`base_downloader`的区块下载参数 +- 修改`douyin`生成的ttwid将绑定ua +- 修改`tiktok`用户直播下载流地址 - 修改`douyin`，`tiktok`获取用户信息方法名 - 完善时间戳转换类型，支持30位 - 修改应用的代理配置名（`http: https: -> http://: https://:`） @@ -40,6 +82,7 @@ ### Deprecated +- 弃用`douyin`SSO扫码登录 - 类`BaseModel`中的`dict`方法已弃用(`pydantic>=2.6.4`) - 类`datetime`中的`utcnow`方法已弃用 - 弃用`douyin`，`tiktok`获取用户名方法 @@ -51,6 +94,7 @@ ### Fixed +- 修复`_dl`日志输出 - 修复`douyin`下载合集时合集链接无法识别的情况 - 修复`tiktok`下载播放列表（合辑）的错误 - 修复`m3u8`流下载时会重复下载`ts`片段的问题 @@ -59,6 +103,7 @@ ### Security +- 更新`pytest`版本到`8.2.1` - 更新`pydantic`版本到`2.6.4` - 更新`httpx`版本到`0.27.0` - 更新`aiosqlite`版本到`0.20.0` From 1b93395b2a297614e91888c98acfd4854bf21434 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Wed, 26 Jun 2024 15:18:07 +0800 Subject: [PATCH 250/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0ua=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/en/quick-start.md | 2 +- docs/snippets/douyin/format-file-name.py | 4 ++-- docs/snippets/douyin/one-video.py | 2 +- docs/snippets/douyin/user-collection.py | 2 +- docs/snippets/douyin/user-collects.py | 2 +- docs/snippets/douyin/user-folder.py | 4 ++-- docs/snippets/douyin/user-follow-live.py | 2 +- docs/snippets/douyin/user-follower.py | 2 +- docs/snippets/douyin/user-following.py | 2 +- docs/snippets/douyin/user-get-add.py | 2 +- docs/snippets/douyin/user-like.py | 2 +- docs/snippets/douyin/user-live-room-id.py | 2 +- docs/snippets/douyin/user-live.py | 2 +- docs/snippets/douyin/user-mix.py | 2 +- docs/snippets/douyin/user-post.py | 2 +- docs/snippets/douyin/user-profile.py | 2 +- docs/snippets/douyin/video-get-add.py | 2 +- docs/snippets/douyin/xbogus.py | 2 +- docs/snippets/set-debug.py | 4 ++-- docs/snippets/tiktok/format-file-name.py | 2 +- docs/snippets/tiktok/one-video.py | 2 +- docs/snippets/tiktok/user-collect.py | 2 +- docs/snippets/tiktok/user-folder.py | 4 ++-- docs/snippets/tiktok/user-get-add.py | 2 +- docs/snippets/tiktok/user-like.py | 2 +- docs/snippets/tiktok/user-mix.py | 4 ++-- docs/snippets/tiktok/user-playlist.py | 2 +- docs/snippets/tiktok/user-post.py | 2 +- docs/snippets/tiktok/user-profile.py | 2 +- docs/snippets/tiktok/video-get-add.py | 2 +- docs/snippets/tiktok/xbogus.py | 2 +- docs/snippets/weibo/user-profile.py | 2 +- docs/snippets/weibo/user-weibo.py | 2 +- 33 files changed, 38 insertions(+), 38 deletions(-) diff --git a/docs/en/quick-start.md b/docs/en/quick-start.md index f33736d7..9be0a91c 100644 --- a/docs/en/quick-start.md +++ b/docs/en/quick-start.md @@ -47,7 +47,7 @@ The default configuration file (./conf/app.yaml) is a yaml file with a basic str ```yaml douyin: headers: - User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36 + User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0 Referer: https://www.douyin.com/ cookie: diff --git a/docs/snippets/douyin/format-file-name.py b/docs/snippets/douyin/format-file-name.py index ca68df0f..5980f071 100644 --- a/docs/snippets/douyin/format-file-name.py +++ b/docs/snippets/douyin/format-file-name.py @@ -7,7 +7,7 @@ async def main(): # 文件名模板 kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.douyin.com/", }, "naming": "{create}_{desc}_{aweme_id}", @@ -21,7 +21,7 @@ async def main(): # 文件名模板 kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.douyin.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/douyin/one-video.py b/docs/snippets/douyin/one-video.py index ca85a103..918e427a 100644 --- a/docs/snippets/douyin/one-video.py +++ b/docs/snippets/douyin/one-video.py @@ -3,7 +3,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.douyin.com/", }, "cookie": "YOUR_COOKIE_HERE", diff --git a/docs/snippets/douyin/user-collection.py b/docs/snippets/douyin/user-collection.py index 839747dc..f35f7cde 100644 --- a/docs/snippets/douyin/user-collection.py +++ b/docs/snippets/douyin/user-collection.py @@ -3,7 +3,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.douyin.com/", }, "cookie": "YOUR_COOKIE_HERE", diff --git a/docs/snippets/douyin/user-collects.py b/docs/snippets/douyin/user-collects.py index 181c7e8c..716676c0 100644 --- a/docs/snippets/douyin/user-collects.py +++ b/docs/snippets/douyin/user-collects.py @@ -3,7 +3,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.douyin.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/douyin/user-folder.py b/docs/snippets/douyin/user-folder.py index 8244ef4d..a9271c8f 100644 --- a/docs/snippets/douyin/user-folder.py +++ b/docs/snippets/douyin/user-folder.py @@ -4,7 +4,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.douyin.com/", }, "proxies": {"http": None, "https": None}, @@ -31,7 +31,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.douyin.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/douyin/user-follow-live.py b/docs/snippets/douyin/user-follow-live.py index d42baedc..b76fefc4 100644 --- a/docs/snippets/douyin/user-follow-live.py +++ b/docs/snippets/douyin/user-follow-live.py @@ -4,7 +4,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.douyin.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/douyin/user-follower.py b/docs/snippets/douyin/user-follower.py index 721793f9..2c15041b 100644 --- a/docs/snippets/douyin/user-follower.py +++ b/docs/snippets/douyin/user-follower.py @@ -4,7 +4,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.douyin.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/douyin/user-following.py b/docs/snippets/douyin/user-following.py index 84487276..7d636c9e 100644 --- a/docs/snippets/douyin/user-following.py +++ b/docs/snippets/douyin/user-following.py @@ -4,7 +4,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.douyin.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/douyin/user-get-add.py b/docs/snippets/douyin/user-get-add.py index b466547b..f75441b1 100644 --- a/docs/snippets/douyin/user-get-add.py +++ b/docs/snippets/douyin/user-get-add.py @@ -4,7 +4,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.douyin.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/douyin/user-like.py b/docs/snippets/douyin/user-like.py index 75bdb441..40539098 100644 --- a/docs/snippets/douyin/user-like.py +++ b/docs/snippets/douyin/user-like.py @@ -3,7 +3,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.douyin.com/", }, "cookie": "YOUR_COOKIE_HERE", diff --git a/docs/snippets/douyin/user-live-room-id.py b/docs/snippets/douyin/user-live-room-id.py index 7c9caf4b..e6f5bb6e 100644 --- a/docs/snippets/douyin/user-live-room-id.py +++ b/docs/snippets/douyin/user-live-room-id.py @@ -3,7 +3,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.douyin.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/douyin/user-live.py b/docs/snippets/douyin/user-live.py index 0fc21353..2a5c802c 100644 --- a/docs/snippets/douyin/user-live.py +++ b/docs/snippets/douyin/user-live.py @@ -3,7 +3,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.douyin.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/douyin/user-mix.py b/docs/snippets/douyin/user-mix.py index b7a80e30..24352f01 100644 --- a/docs/snippets/douyin/user-mix.py +++ b/docs/snippets/douyin/user-mix.py @@ -3,7 +3,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.douyin.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/douyin/user-post.py b/docs/snippets/douyin/user-post.py index 3069744b..9bdb0856 100644 --- a/docs/snippets/douyin/user-post.py +++ b/docs/snippets/douyin/user-post.py @@ -3,7 +3,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.douyin.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/douyin/user-profile.py b/docs/snippets/douyin/user-profile.py index be468da0..14968eb2 100644 --- a/docs/snippets/douyin/user-profile.py +++ b/docs/snippets/douyin/user-profile.py @@ -3,7 +3,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.douyin.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/douyin/video-get-add.py b/docs/snippets/douyin/video-get-add.py index e51175af..44dcf26f 100644 --- a/docs/snippets/douyin/video-get-add.py +++ b/docs/snippets/douyin/video-get-add.py @@ -7,7 +7,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.douyin.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/douyin/xbogus.py b/docs/snippets/douyin/xbogus.py index 73b9275f..e9639f7b 100644 --- a/docs/snippets/douyin/xbogus.py +++ b/docs/snippets/douyin/xbogus.py @@ -48,7 +48,7 @@ async def main(): kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.douyin.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/set-debug.py b/docs/snippets/set-debug.py index a4b92132..5a08cc28 100644 --- a/docs/snippets/set-debug.py +++ b/docs/snippets/set-debug.py @@ -15,7 +15,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.douyin.com/", }, "proxies": {"http://": None, "https://": None}, @@ -45,7 +45,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.douyin.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/tiktok/format-file-name.py b/docs/snippets/tiktok/format-file-name.py index 80dc69d1..2f5bb4c4 100644 --- a/docs/snippets/tiktok/format-file-name.py +++ b/docs/snippets/tiktok/format-file-name.py @@ -4,7 +4,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.tiktok.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/tiktok/one-video.py b/docs/snippets/tiktok/one-video.py index 438e1429..4b93b13f 100644 --- a/docs/snippets/tiktok/one-video.py +++ b/docs/snippets/tiktok/one-video.py @@ -3,7 +3,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.tiktok.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/tiktok/user-collect.py b/docs/snippets/tiktok/user-collect.py index 15e2ad54..837adafe 100644 --- a/docs/snippets/tiktok/user-collect.py +++ b/docs/snippets/tiktok/user-collect.py @@ -4,7 +4,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.tiktok.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/tiktok/user-folder.py b/docs/snippets/tiktok/user-folder.py index f276781a..e4bc5559 100644 --- a/docs/snippets/tiktok/user-folder.py +++ b/docs/snippets/tiktok/user-folder.py @@ -4,7 +4,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.tiktok.com/", }, "proxies": {"http://": None, "https://": None}, @@ -31,7 +31,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.tiktok.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/tiktok/user-get-add.py b/docs/snippets/tiktok/user-get-add.py index 0e423c02..8c30c981 100644 --- a/docs/snippets/tiktok/user-get-add.py +++ b/docs/snippets/tiktok/user-get-add.py @@ -4,7 +4,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.tiktok.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/tiktok/user-like.py b/docs/snippets/tiktok/user-like.py index af11fd41..6107eade 100644 --- a/docs/snippets/tiktok/user-like.py +++ b/docs/snippets/tiktok/user-like.py @@ -4,7 +4,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.tiktok.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/tiktok/user-mix.py b/docs/snippets/tiktok/user-mix.py index 7155cdd9..81a881b9 100644 --- a/docs/snippets/tiktok/user-mix.py +++ b/docs/snippets/tiktok/user-mix.py @@ -6,7 +6,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.tiktok.com/", }, "proxies": {"http://": None, "https://": None}, @@ -40,7 +40,7 @@ async def main(): kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.tiktok.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/tiktok/user-playlist.py b/docs/snippets/tiktok/user-playlist.py index e42af244..711b4a70 100644 --- a/docs/snippets/tiktok/user-playlist.py +++ b/docs/snippets/tiktok/user-playlist.py @@ -4,7 +4,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.tiktok.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/tiktok/user-post.py b/docs/snippets/tiktok/user-post.py index 7a1a094a..fbbe4cfc 100644 --- a/docs/snippets/tiktok/user-post.py +++ b/docs/snippets/tiktok/user-post.py @@ -4,7 +4,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.tiktok.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/tiktok/user-profile.py b/docs/snippets/tiktok/user-profile.py index 90cfcfd9..375fa518 100644 --- a/docs/snippets/tiktok/user-profile.py +++ b/docs/snippets/tiktok/user-profile.py @@ -3,7 +3,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.tiktok.com/", }, "cookie": "YOUR_COOKIE_HERE", diff --git a/docs/snippets/tiktok/video-get-add.py b/docs/snippets/tiktok/video-get-add.py index a1141e3f..9dd73cbe 100644 --- a/docs/snippets/tiktok/video-get-add.py +++ b/docs/snippets/tiktok/video-get-add.py @@ -7,7 +7,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.tiktok.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/tiktok/xbogus.py b/docs/snippets/tiktok/xbogus.py index 6af23622..c5747398 100644 --- a/docs/snippets/tiktok/xbogus.py +++ b/docs/snippets/tiktok/xbogus.py @@ -47,7 +47,7 @@ async def main(): kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.tiktok.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/weibo/user-profile.py b/docs/snippets/weibo/user-profile.py index 968d5815..c2a17b4a 100644 --- a/docs/snippets/weibo/user-profile.py +++ b/docs/snippets/weibo/user-profile.py @@ -5,7 +5,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.weibo.com/", }, "proxies": {"http://": None, "https://": None}, diff --git a/docs/snippets/weibo/user-weibo.py b/docs/snippets/weibo/user-weibo.py index 48c244f1..58790834 100644 --- a/docs/snippets/weibo/user-weibo.py +++ b/docs/snippets/weibo/user-weibo.py @@ -5,7 +5,7 @@ kwargs = { "headers": { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", "Referer": "https://www.weibo.com/", }, "proxies": {"http://": None, "https://": None}, From d59c08ef7ff0db7a587689a4c093149bf47039a0 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Wed, 26 Jun 2024 22:52:52 +0800 Subject: [PATCH 251/299] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0douyin?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=89=87=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/snippets/douyin/abogus.py | 88 +++++++++++++++++--- docs/snippets/douyin/aweme-related.py | 28 +++++++ docs/snippets/douyin/client-config.py | 11 +++ docs/snippets/douyin/json-2-lrc.py | 94 ++++++++++++++++++++++ docs/snippets/douyin/mix-id.py | 1 - docs/snippets/douyin/query-user.py | 2 +- docs/snippets/douyin/user-collection.py | 35 ++++++++ docs/snippets/douyin/user-collects.py | 34 ++++++++ docs/snippets/douyin/user-feed.py | 30 +++++++ docs/snippets/douyin/user-follower.py | 5 ++ docs/snippets/douyin/user-following.py | 10 ++- docs/snippets/douyin/user-friend.py | 26 ++++++ docs/snippets/douyin/user-live-im-fetch.py | 9 ++- docs/snippets/douyin/webcast-signature.py | 29 ++++++- docs/snippets/douyin/xbogus.py | 20 +++-- 15 files changed, 397 insertions(+), 25 deletions(-) create mode 100644 docs/snippets/douyin/aweme-related.py create mode 100644 docs/snippets/douyin/client-config.py create mode 100644 docs/snippets/douyin/json-2-lrc.py create mode 100644 docs/snippets/douyin/user-feed.py create mode 100644 docs/snippets/douyin/user-friend.py diff --git a/docs/snippets/douyin/abogus.py b/docs/snippets/douyin/abogus.py index 3a69865b..e9954196 100644 --- a/docs/snippets/douyin/abogus.py +++ b/docs/snippets/douyin/abogus.py @@ -1,17 +1,83 @@ -from f2.apps.douyin.utils import ABogusManager +// #region str-2-endpoint-snippet +# 使用接口地址直接生成请求链接 +import asyncio +from f2.apps.douyin.utils import ABogusManager, ClientConfManager -if __name__ == "__main__": - user_agent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0" - url = "https://www.douyin.com/aweme/v1/web/aweme/detail/?" - params = "device_platform=webapp&aid=6383&channel=channel_pc_web&aweme_id=7380308675841297704&update_version_code=170400&pc_client_type=1&version_code=190500&version_name=19.5.0&cookie_enabled=true&screen_width=1920&screen_height=1080&browser_language=zh-CN&browser_platform=Win32&browser_name=Edge&browser_version=125.0.0.0&browser_online=true&engine_name=Blink&engine_version=125.0.0.0&os_name=Windows&os_version=10&cpu_core_num=12&device_memory=8&platform=PC&downlink=10&effective_type=4g&round_trip_time=50&webid=7376294349792396827" +async def main(): request = "GET" + test_endpoint = "device_platform=webapp&aid=6383&channel=channel_pc_web&aweme_id=7380308675841297704&update_version_code=170400&pc_client_type=1&version_code=190500&version_name=19.5.0&cookie_enabled=true&screen_width=1920&screen_height=1080&browser_language=zh-CN&browser_platform=Win32&browser_name=Edge&browser_version=125.0.0.0&browser_online=true&engine_name=Blink&engine_version=125.0.0.0&os_name=Windows&os_version=10&cpu_core_num=12&device_memory=8&platform=PC&downlink=10&effective_type=4g&round_trip_time=50&webid=7376294349792396827" + return ABogusManager.str_2_endpoint( + ClientConfManager.user_agent(), + endpoint=test_endpoint, + request=request, + ) + + +if __name__ == "__main__": + print(asyncio.run(main())) + +// #endregion str-2-endpoint-snippet - endpoint = ABogusManager.str_2_endpoint( - user_agent, - params, - request, + +// #region model-2-endpoint-snippet +# 使用用户信息模型生成请求链接 +import asyncio +from f2.apps.douyin.api import DouyinAPIEndpoints as dyendpoint +from f2.apps.douyin.model import UserProfile +from f2.apps.douyin.utils import ABogusManager, ClientConfManager + + +async def gen_user_profile(params: UserProfile): + return ABogusManager.model_2_endpoint( + ClientConfManager.user_agent(), + base_endpoint=dyendpoint.USER_DETAIL, + params=params.model_dump(), + request = "GET", ) - print(url + endpoint) - print(user_agent) + +async def main(): + sec_user_id="MS4wLjABAAAANXSltcLCzDGmdNFI2Q_QixVTr67NiYzjKOIP5s03CAE" + params = UserProfile(sec_user_id=sec_user_id) + return await gen_user_profile(params) + + +if __name__ == "__main__": + print(asyncio.run(main())) + +// #endregion model-2-endpoint-snippet + + +// #region model-2-endpoint-2-filter-snippet +# 使用用户信息模型生成请求链接，请求接口并使用自定义过滤器输出所需接口数据 +import asyncio +from f2.apps.douyin.api import DouyinAPIEndpoints as dyendpoint +from f2.apps.douyin.crawler import DouyinCrawler +from f2.apps.douyin.model import UserProfile +from f2.apps.douyin.filter import UserProfileFilter + + +kwargs = { + "headers": { + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", + "Referer": "https://www.douyin.com/", + }, + "proxies": {"http://": None, "https://": None}, + "cookie": "YOUR_COOKIE_HERE", +} + + +async def main(): + async with DouyinCrawler(kwargs) as crawler: + sec_user_id="MS4wLjABAAAANXSltcLCzDGmdNFI2Q_QixVTr67NiYzjKOIP5s03CAE" + params = UserProfile(sec_user_id=sec_user_id) + response = await crawler.fetch_user_profile(params) + user = UserProfileFilter(response) + # return user # user为UserProfileFilter对象，需要调用_to_dict()方法转为字典格式 + return user._to_dict() + +if __name__ == "__main__": + print(asyncio.run(main())) + +// #endregion model-2-endpoint-2-filter-snippet \ No newline at end of file diff --git a/docs/snippets/douyin/aweme-related.py b/docs/snippets/douyin/aweme-related.py new file mode 100644 index 00000000..c68d2ffc --- /dev/null +++ b/docs/snippets/douyin/aweme-related.py @@ -0,0 +1,28 @@ +import asyncio +from f2.apps.douyin.handler import DouyinHandler + + +kwargs = { + "headers": { + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", + "Referer": "https://www.douyin.com/", + }, + "cookie": "YOUR_COOKIE_HERE", + "proxies": {"http://": None, "https://": None}, +} + + +async def main(): + video = await DouyinHandler(kwargs).fetch_related_videos( + aweme_id="7294994585925848359" + ) + print("=================_to_raw================") + print(video._to_raw()) + # print("=================_to_dict================") + # print(video._to_dict()) + # print("=================_to_list================") + # print(video._to_list()) + + +if __name__ == "__main__": + asyncio.run(main()) diff --git a/docs/snippets/douyin/client-config.py b/docs/snippets/douyin/client-config.py new file mode 100644 index 00000000..130bde62 --- /dev/null +++ b/docs/snippets/douyin/client-config.py @@ -0,0 +1,11 @@ +from f2.apps.douyin.utils import ClientConfManager + +if __name__ == "__main__": + print("Client Configuration:") + print(ClientConfManager.client()) + + print("Client Configuration version:") + print(ClientConfManager.conf_version()) + + print("Client Configuration user-agent:") + print(ClientConfManager.user_agent()) diff --git a/docs/snippets/douyin/json-2-lrc.py b/docs/snippets/douyin/json-2-lrc.py new file mode 100644 index 00000000..5b118b4f --- /dev/null +++ b/docs/snippets/douyin/json-2-lrc.py @@ -0,0 +1,94 @@ +from f2.apps.douyin.utils import json_2_lrc + + +data = [ + {"text": "CB on the beat,ho", "timeId": "5.700"}, + {"text": "Wasted CTA lovees wasted", "timeId": "10.210"}, + {"text": "Wasted I'm on these drugsI feel wasted", "timeId": "12.760"}, + {"text": "Wasted get her off my mind when I'm wasted", "timeId": "15.350"}, + {"text": "Wasted I'm waste all my time when I'm wasted", "timeId": "17.740"}, + {"text": "Wasted CTA lovees wasted", "timeId": "20.790"}, + {"text": "Wasted I'm on these drugsI feel wasted", "timeId": "22.900"}, + {"text": "Wasted get her off my mind when I'm wasted", "timeId": "25.850"}, + {"text": "Wasted I'm waste all my time when I'm wasted", "timeId": "28.210"}, + {"text": "Wasted", "timeId": "30.830"}, + {"text": "Damn why is she so demonic", "timeId": "31.320"}, + {"text": "She medusa with a little pocahontas", "timeId": "33.510"}, + {"text": "She been lacin all my drugs or sosomethin", "timeId": "36.150"}, + { + "text": "Cause every time that we're together I'm unconscious", + "timeId": "38.560", + }, + {"text": "Hold upuhlet me be honest", "timeId": "41.100"}, + {"text": "I know l saw her put the percs in my chronic", "timeId": "43.760"}, + {"text": "Smokintil my eyes roll back like the omen", "timeId": "46.370"}, + {"text": "Just another funeral for hergod damn", "timeId": "48.370"}, + {"text": "Wasted CTA lovees wasted", "timeId": "61.320"}, + {"text": "Wasted I'm on these drugsI feel wasted", "timeId": "63.890"}, + {"text": "Wasted get her off my mind when I'm wasted", "timeId": "66.400"}, + {"text": "Wasted I'm waste all my time when I'm wasted", "timeId": "68.970"}, + {"text": "Wasted", "timeId": "71.160"}, + {"text": "She do cocaine in my basement", "timeId": "72.170"}, + {"text": "I'm a doctorsbut I'm runninout of patience", "timeId": "74.270"}, + {"text": "She told me that she tryna get closer to satan", "timeId": "76.760"}, + {"text": "She be talkin to him when she in the matrix", "timeId": "79.450"}, + { + "text": "Rockstarthat's our stylethere boys can't take it", + "timeId": "81.770", + }, + {"text": "Hatin but they're still tryna take our cadence", "timeId": "83.930"}, + {"text": "No basicbrand new rari when I'm racin", "timeId": "86.870"}, + { + "text": "Take itlet you roll my weedplease don't lace ityeah", + "timeId": "89.340", + }, + {"text": "That's a bum that you chasinayy", "timeId": "92.330"}, + {"text": "Foreign with meshe a dominatrix", "timeId": "95.220"}, + {"text": "I love that girls and I do like her body", "timeId": "97.270"}, + {"text": "I don't what the moneyI just want the molly", "timeId": "98.820"}, + { + "text": "That's what she say when she livesd in the valley", + "timeId": "100.160", + }, + {"text": "Lil boyI'm your fatherhakuna matata", "timeId": "101.380"}, + {"text": "I made that girl girls all of that top up", "timeId": "102.220"}, + { + "text": "Got dreadrs in my headused to pray for the lock up", + "timeId": "103.360", + }, + { + "text": "I htit from the back and my legs start to lock up", + "timeId": "104.850", + }, + {"text": "Jacuzzi thar bootyI gave that girl flakka", "timeId": "106.540"}, + {"text": "I'm talkinblue caps that keep tweakinmy chakra", "timeId": "107.520"}, + {"text": "Rose on my chainthere's no hint like no copper", "timeId": "108.860"}, + {"text": "Take in the middle my head like I'm avatar", "timeId": "110.190"}, + {"text": "That's the reason that I ride on my appas", "timeId": "111.510"}, + {"text": "Wasted", "timeId": "112.710"}, + {"text": "WastedGTA lovees wasted", "timeId": "122.290"}, + {"text": "WastedI'm on these drugsI feel wasted", "timeId": "124.800"}, + {"text": "Wastedget her off my mind when I'm wasted", "timeId": "127.380"}, + {"text": "WastedI waste all my time when I'm wasted", "timeId": "130.120"}, + {"text": "My eyes closedhopinthis ain't makebelieve", "timeId": "132.850"}, + { + "text": "And she don't know hate all her demons like in me", + "timeId": "135.150", + }, + {"text": "L don't know l don't know", "timeId": "137.730"}, + {"text": "Don't know what she been onI don't know", "timeId": "143.870"}, + {"text": "All that lean l ain't have to let her in", "timeId": "146.470"}, + { + "text": "She ain't take my heart,but she took my medicine", + "timeId": "148.580", + }, + {"text": "Least somebody gon'take lthate to waste it", "timeId": "151.330"}, + {"text": "WastedGTA lovees wasted", "timeId": "152.980"}, + {"text": "WastedI'm on these drugsI feel wasted", "timeId": "155.610"}, + {"text": "Wastedget her off my mind when I'm wasted", "timeId": "158.070"}, + {"text": "WastedI waste all my time when I'm wasted", "timeId": "160.820"}, +] + + +if __name__ == "__main__": + print(json_2_lrc(data)) diff --git a/docs/snippets/douyin/mix-id.py b/docs/snippets/douyin/mix-id.py index afe7b360..8fc88b4e 100644 --- a/docs/snippets/douyin/mix-id.py +++ b/docs/snippets/douyin/mix-id.py @@ -5,7 +5,6 @@ async def main(): raw_url = "https://www.douyin.com/collection/7360898383181809676" - return await MixIdFetcher.get_mix_id(raw_url) diff --git a/docs/snippets/douyin/query-user.py b/docs/snippets/douyin/query-user.py index 933d428a..923f3526 100644 --- a/docs/snippets/douyin/query-user.py +++ b/docs/snippets/douyin/query-user.py @@ -2,6 +2,7 @@ from f2.apps.douyin.handler import DouyinHandler from f2.apps.douyin.utils import TokenManager + kwargs = { "headers": { "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 Edg/122.0.0.0", @@ -14,7 +15,6 @@ async def main(): - user = await DouyinHandler(kwargs).fetch_query_user() print("=================_to_raw================") print(user._to_raw()) diff --git a/docs/snippets/douyin/user-collection.py b/docs/snippets/douyin/user-collection.py index f35f7cde..2a135de9 100644 --- a/docs/snippets/douyin/user-collection.py +++ b/docs/snippets/douyin/user-collection.py @@ -1,3 +1,36 @@ +// #region user-collection-music-snippet +import asyncio +from f2.apps.douyin.handler import DouyinHandler + + +kwargs = { + "headers": { + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", + "Referer": "https://www.douyin.com/", + }, + "cookie": "YOUR_COOKIE_HERE", + "proxies": {"http://": None, "https://": None}, + "timeout": 10, +} + + +async def main(): + async for music_data_list in DouyinHandler(kwargs).fetch_user_music_collection(): + print("=================_to_raw================") + print(music_data_list._to_raw()) + # print("=================_to_dict===============") + # print(music_data_list._to_dict()) + # print("=================_to_list===============") + # print(music_data_list._to_list()) + + +if __name__ == "__main__": + asyncio.run(main()) + +// #endregion user-collection-music-snippet + + +// #region user-collection-video-snippet import asyncio from f2.apps.douyin.handler import DouyinHandler @@ -24,3 +57,5 @@ async def main(): if __name__ == "__main__": asyncio.run(main()) + +// #endregion user-collection-video-snippet \ No newline at end of file diff --git a/docs/snippets/douyin/user-collects.py b/docs/snippets/douyin/user-collects.py index 716676c0..b73e5c7f 100644 --- a/docs/snippets/douyin/user-collects.py +++ b/docs/snippets/douyin/user-collects.py @@ -1,6 +1,38 @@ +// #region user-collects-snippet import asyncio from f2.apps.douyin.handler import DouyinHandler + +kwargs = { + "headers": { + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", + "Referer": "https://www.douyin.com/", + }, + "proxies": {"http://": None, "https://": None}, + "timeout": 10, + "cookie": "YOUR_COOKIE_HERE", +} + + +async def main(): + async for collects in DouyinHandler(kwargs).fetch_user_collects(0, 10, 20): + print("=================_to_raw================") + print(collects._to_raw()) + # print("=================_to_dict===============") + # print(collects._to_dict()) + + +if __name__ == "__main__": + asyncio.run(main()) + +// #endregion user-collects-snippet + + +// #region user-collects-videos-snippet +import asyncio +from f2.apps.douyin.handler import DouyinHandler + + kwargs = { "headers": { "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", @@ -27,3 +59,5 @@ async def main(): if __name__ == "__main__": asyncio.run(main()) + +// #endregion user-collects-videos-snippet \ No newline at end of file diff --git a/docs/snippets/douyin/user-feed.py b/docs/snippets/douyin/user-feed.py new file mode 100644 index 00000000..01be14f8 --- /dev/null +++ b/docs/snippets/douyin/user-feed.py @@ -0,0 +1,30 @@ +import asyncio +from f2.apps.douyin.handler import DouyinHandler + + +kwargs = { + "headers": { + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", + "Referer": "https://www.douyin.com/", + }, + "proxies": {"http://": None, "https://": None}, + "timeout": 10, + "cookie": "YOUR_COOKIE_HERE", +} + + +async def main(): + sec_user_id = "" # 用户ID + async for feeds in DouyinHandler(kwargs).fetch_user_feed_videos( + sec_user_id, 0, 10, 20 + ): + print("=================_to_raw================") + print(feeds._to_raw()) + # print("=================_to_dict===============") + # print(feeds._to_dict()) + # print("=================_to_list===============") + # print(feeds._to_list()) + + +if __name__ == "__main__": + asyncio.run(main()) diff --git a/docs/snippets/douyin/user-follower.py b/docs/snippets/douyin/user-follower.py index 2c15041b..fa615a71 100644 --- a/docs/snippets/douyin/user-follower.py +++ b/docs/snippets/douyin/user-follower.py @@ -2,6 +2,7 @@ from f2.log.logger import logger from f2.apps.douyin.handler import DouyinHandler + kwargs = { "headers": { "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", @@ -14,10 +15,14 @@ async def main(): + user_id = "" # 公开粉丝的账号 sec_user_id = "" # 公开粉丝的账号 # sec_user_id = "MS4wLjABAAAAGPm-wPeGQuziCu5z6KerQA7WmSTnS99c8lU8WLToB0BsN02mqbPxPuxwDjKf7udZ" # 隐私设置的账号 + + # 至少提供 user_id 或 sec_user_id 中的一个参数 # 根据max_time 和 min_time 区间获取用户粉丝列表 async for follower in DouyinHandler(kwargs).fetch_user_follower( + user_id=user_id, sec_user_id=sec_user_id, # max_time=1668606509, # min_time=0, diff --git a/docs/snippets/douyin/user-following.py b/docs/snippets/douyin/user-following.py index 7d636c9e..8ab56550 100644 --- a/docs/snippets/douyin/user-following.py +++ b/docs/snippets/douyin/user-following.py @@ -2,6 +2,7 @@ from f2.log.logger import logger from f2.apps.douyin.handler import DouyinHandler + kwargs = { "headers": { "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", @@ -14,10 +15,17 @@ async def main(): + user_id = "" # 公开关注的账号 sec_user_id = "" # 公开关注的账号 # sec_user_id = "MS4wLjABAAAAGPm-wPeGQuziCu5z6KerQA7WmSTnS99c8lU8WLToB0BsN02mqbPxPuxwDjKf7udZ" # 隐私设置的账号 + + # 至少提供 user_id 或 sec_user_id 中的一个参数 + # 根据 max_time 和 min_time 区间获取关注用户列表 async for following in DouyinHandler(kwargs).fetch_user_following( - sec_user_id=sec_user_id + user_id=user_id, + sec_user_id=sec_user_id, + # max_time=1668606509, + # min_time=0, ): if following.status_code != 0: logger.error_("错误代码：{0} 错误消息：{1}").format( diff --git a/docs/snippets/douyin/user-friend.py b/docs/snippets/douyin/user-friend.py new file mode 100644 index 00000000..7ec23272 --- /dev/null +++ b/docs/snippets/douyin/user-friend.py @@ -0,0 +1,26 @@ +import asyncio +from f2.apps.douyin.handler import DouyinHandler + + +kwargs = { + "headers": { + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", + "Referer": "https://www.douyin.com/", + }, + "proxies": {"http://": None, "https://": None}, + "cookie": "YOUR_COOKIE_HERE", +} + + +async def main(): + friend_video_list = await DouyinHandler(kwargs).fetch_friend_feed_videos() + print("=================_to_raw================") + print(friend_video_list._to_raw()) + # print("=================_to_dict===============") + # print(friend_video_list._to_dict()) + # print("=================_to_list===============") + # print(friend_video_list._to_list()) + + +if __name__ == "__main__": + asyncio.run(main()) diff --git a/docs/snippets/douyin/user-live-im-fetch.py b/docs/snippets/douyin/user-live-im-fetch.py index 68a87277..e94e087d 100644 --- a/docs/snippets/douyin/user-live-im-fetch.py +++ b/docs/snippets/douyin/user-live-im-fetch.py @@ -1,7 +1,7 @@ import asyncio - from f2.apps.douyin.handler import DouyinHandler + kwargs = { "headers": { "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", @@ -13,6 +13,7 @@ "cookie": "YOUR_COOKIE_HERE", } + kwargs2 = { "headers": { "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", @@ -28,17 +29,17 @@ async def main(): # 获取游客ttwid的user_unique_id，你可以通过TokenManager.gen_ttwid()生成新的游客ttwid user = await DouyinHandler(kwargs).fetch_query_user() - # print(user.user_unique_id) + # print("游客user_unique_id：", user.user_unique_id) # 通过此接口获取room_id，参数为live_id room = await DouyinHandler(kwargs).fetch_user_live_videos("662122193366") - # print(room.room_id) + # print("直播间ID：", room.room_id) # 通过该接口获取wss所需的cursor和internal_ext live_im = await DouyinHandler(kwargs).fetch_live_im( room_id=room.room_id, unique_id=user.user_unique_id ) - # print(live_im.cursor, live_im.internal_ext) + # print("直播间IM页码：", live_im.cursor, "直播间IM扩展：", live_im.internal_ext) # 获取直播弹幕 await DouyinHandler(kwargs2).fetch_live_danmaku( diff --git a/docs/snippets/douyin/webcast-signature.py b/docs/snippets/douyin/webcast-signature.py index 092f8775..22174085 100644 --- a/docs/snippets/douyin/webcast-signature.py +++ b/docs/snippets/douyin/webcast-signature.py @@ -1,6 +1,5 @@ +// #region webcast-signature-snippet from f2.apps.douyin.algorithm.webcast_signature import DouyinWebcastSignature -from f2.apps.douyin.utils import ClientConfManager - if __name__ == "__main__": room_id = "7383573503129258802" @@ -9,3 +8,29 @@ "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0" ).get_signature(room_id, user_unique_id) print(signature) + +// #endregion webcast-signature-snippet + + +// #region webcast-signature-manager-snippet +# fetch_live_danmaku + +import asyncio +from f2.apps.douyin.api import DouyinAPIEndpoints as dyendpoint +from f2.apps.douyin.model import LiveWebcast +from f2.apps.douyin.utils import WebcastSignatureManager, ClientConfManager + + +async def main(params: LiveWebcast): + final_endpoint = WebcastSignatureManager.model_2_endpoint( + user_agent=ClientConfManager.user_agent(), + base_endpoint=dyendpoint.LIVE_IM_WSS, + params=params.model_dump(), + ) + return final_endpoint + + +if __name__ == "__main__": + print(asyncio.run(main())) + +// #endregion webcast-signature-manager-snippet diff --git a/docs/snippets/douyin/xbogus.py b/docs/snippets/douyin/xbogus.py index e9639f7b..a4bcf9a4 100644 --- a/docs/snippets/douyin/xbogus.py +++ b/docs/snippets/douyin/xbogus.py @@ -1,11 +1,16 @@ // #region str-2-endpoint-snippet # 使用接口地址直接生成请求链接 import asyncio -from f2.apps.douyin.utils import XBogusManager +from f2.apps.douyin.utils import XBogusManager, ClientConfManager + async def main(): test_endpoint = "aweme_id=7196239141472980280&aid=1128&version_name=23.5.0&device_platform=android&os_version=2333" - return XBogusManager.str_2_endpoint(endpoint=test_endpoint) + return XBogusManager.str_2_endpoint( + ClientConfManager.user_agent(), + endpoint=test_endpoint, + ) + if __name__ == "__main__": print(asyncio.run(main())) @@ -18,18 +23,23 @@ async def main(): import asyncio from f2.apps.douyin.api import DouyinAPIEndpoints as dyendpoint from f2.apps.douyin.model import UserProfile -from f2.apps.douyin.utils import XBogusManager +from f2.apps.douyin.utils import XBogusManager, ClientConfManager + async def gen_user_profile(params: UserProfile): return XBogusManager.model_2_endpoint( - base_endpoint=dyendpoint.USER_DETAIL, params=params.model_dump() + ClientConfManager.user_agent(), + base_endpoint=dyendpoint.USER_DETAIL, + params=params.model_dump(), ) + async def main(): sec_user_id="MS4wLjABAAAANXSltcLCzDGmdNFI2Q_QixVTr67NiYzjKOIP5s03CAE" params = UserProfile(sec_user_id=sec_user_id) return await gen_user_profile(params) + if __name__ == "__main__": print(asyncio.run(main())) @@ -43,7 +53,7 @@ async def main(): from f2.apps.douyin.crawler import DouyinCrawler from f2.apps.douyin.model import UserProfile from f2.apps.douyin.filter import UserProfileFilter -from f2.apps.douyin.utils import XBogusManager +from f2.apps.douyin.utils import XBogusManager, ClientConfManager kwargs = { From 6cad327a588aee46e5731110541e42c03b9805c1 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Wed, 26 Jun 2024 22:53:33 +0800 Subject: [PATCH 252/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0douyin=20hand?= =?UTF-8?q?ler=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/handler.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/f2/apps/douyin/handler.py b/f2/apps/douyin/handler.py index c9c8ce87..5b4efb15 100644 --- a/f2/apps/douyin/handler.py +++ b/f2/apps/douyin/handler.py @@ -214,7 +214,7 @@ async def fetch_one_video( aweme_id: str: 作品ID Return: - video: PostDetailFilter: 单个作品数据过滤器 + video: PostDetailFilter: 单个作品数据过滤器，包含作品数据的_to_raw、_to_dict、_to_list方法 """ logger.info(_("开始爬取作品：{0}").format(aweme_id)) @@ -279,7 +279,7 @@ async def fetch_user_post_videos( max_counts: int: 最大作品数 Return: - video: AsyncGenerator[UserPostFilter, Any]: 作品数据过滤器，包含作品数据的_to_raw、_to_dict、_to_list方法 + video: AsyncGenerator[UserPostFilter, Any]: 发布作品数据过滤器，包含作品数据的_to_raw、_to_dict、_to_list方法 """ max_counts = max_counts or float("inf") @@ -386,7 +386,7 @@ async def fetch_user_like_videos( max_counts: int: 最大作品数 Return: - video: AsyncGenerator[UserPostFilter, Any]: 作品数据过滤器，包含作品数据的_to_raw、_to_dict、_to_list方法 + video: AsyncGenerator[UserPostFilter, Any]: 喜欢作品数据过滤器，包含作品数据的_to_raw、_to_dict、_to_list方法 """ max_counts = max_counts or float("inf") @@ -580,7 +580,7 @@ async def fetch_user_collection_videos( max_counts: int: 最大作品数 (Maximum number of videos) Return: - collection: AsyncGenerator[UserCollectionFilter, Any]: 作品数据过滤器，包含作品数据的_to_raw、_to_dict、_to_list方法 + collection: AsyncGenerator[UserCollectionFilter, Any]: 收藏作品数据过滤器，包含作品数据的_to_raw、_to_dict、_to_list方法 Note: 该接口需要用POST且只靠cookie来获取数据。 @@ -744,7 +744,7 @@ async def fetch_user_collects( max_counts: int: 最大收藏夹数 (Max counts) Return: - collects: AsyncGenerator[UserCollectsFilter, Any]: 收藏夹数据过滤器，包含收藏夹数据的_to_raw、_to_dict、_to_list方法) + collects: AsyncGenerator[UserCollectsFilter, Any]: 收藏夹数据过滤器，包含收藏夹数据的_to_raw、_to_dict方法) """ max_counts = max_counts or float("inf") @@ -805,7 +805,7 @@ async def fetch_user_collects_videos( max_counts: int: 最大作品数 (Maximum number of videos) Return: - video: AsyncGenerator[UserCollectionFilter, Any]: 作品数据过滤器，包含作品数据的_to_raw、_to_dict、_to_list方法 + video: AsyncGenerator[UserCollectionFilter, Any]: 收藏夹作品数据过滤器，包含作品数据的_to_raw、_to_dict、_to_list方法 """ max_counts = max_counts or float("inf") @@ -1571,7 +1571,7 @@ async def fetch_query_user(self) -> QueryUserFilter: 用于查询用户信息，仅返回用户的基本信息，若需要获取更多信息请使用`fetch_user_profile`。 Return: - user: QueryUserFilter: 用户数据过滤器，包含用户数据的_to_raw、_to_dict、_to_list方法 + user: QueryUserFilter: 查询用户数据过滤器，包含用户数据的_to_raw、_to_dict方法 """ logger.info(_("开始查询用户信息")) @@ -1600,6 +1600,7 @@ async def fetch_live_im(self, room_id: str, unique_id: str) -> LiveImFetchFilter Args: room_id: str: 直播间ID + unique_id: str: 用户ID Return: live_im: LiveImFetchFilter: 直播间信息数据过滤器，包含直播间信息的_to_raw、_to_dict、_to_list方法 @@ -1657,7 +1658,6 @@ async def fetch_live_danmaku( "WebcastFansclubMessage": DouyinWebSocketCrawler.WebcastFansclubMessage, # TODO: WebcastRanklistHourEntranceMessage # TODO: WebcastRoomStatsMessage - # TODO: WebcastRoomMessage # TODO: WebcastLiveShoppingMessage # TODO: WebcastLiveEcomGeneralMessage # TODO: WebcastProductChangeMessage From 9e1b43bd921e0fe7399c612b47cc38da84f93457 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Wed, 26 Jun 2024 22:54:08 +0800 Subject: [PATCH 253/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0douyin=20?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E7=AD=BE=E5=90=8D=E7=AE=A1=E7=90=86=E5=99=A8?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89ua?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/f2/apps/douyin/utils.py b/f2/apps/douyin/utils.py index 7e96c388..7927118f 100644 --- a/f2/apps/douyin/utils.py +++ b/f2/apps/douyin/utils.py @@ -547,9 +547,9 @@ class WebcastSignatureManager: @classmethod def model_2_endpoint( cls, + user_agent: str, base_endpoint: str, params: dict, - request_type: str = "", ) -> str: if not isinstance(params, dict): raise TypeError(_("参数必须是字典类型")) @@ -557,7 +557,7 @@ def model_2_endpoint( param_str = ",".join([f"{k}={v}" for k, v in params.items()]) try: - signature = webcast_signature.get_sign(param_str) + signature = webcast_signature(user_agent).get_signature(param_str) except Exception as e: logger.error(traceback.format_exc()) raise RuntimeError(_("生成signature失败: {0})").format(e)) From d331928ae831c2ab7dd859d63d90dacdf2396547 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Wed, 26 Jun 2024 22:54:35 +0800 Subject: [PATCH 254/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0tiktok=20hand?= =?UTF-8?q?ler=E6=96=B9=E6=B3=95=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/handler.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/f2/apps/tiktok/handler.py b/f2/apps/tiktok/handler.py index 15461bd0..ed027409 100644 --- a/f2/apps/tiktok/handler.py +++ b/f2/apps/tiktok/handler.py @@ -154,7 +154,7 @@ async def get_or_add_video_data( await db.add_video_info(ignore_fields=ignore_fields, **aweme_data) @mode_handler("one") - async def handler_one_video(self): + async def handle_one_video(self): """ 用于获取指定作品的信息 (Used to get video info of specified video) @@ -214,7 +214,7 @@ async def fetch_one_video( return video @mode_handler("post") - async def handler_user_post(self): + async def handle_user_post(self): """ 用于获取指定用户的作品信息 (Used to get video info of specified user) @@ -314,7 +314,7 @@ async def fetch_user_post_videos( logger.debug(_("爬取结束，共爬取 {0} 个作品").format(videos_collected)) @mode_handler("like") - async def handler_user_like(self): + async def handle_user_like(self): """ 用于获取指定用户的点赞作品信息 (Used to get liked video info of specified user) @@ -416,7 +416,7 @@ async def fetch_user_like_videos( logger.debug(_("爬取结束，共爬取 {0} 个作品").format(videos_collected)) @mode_handler("collect") - async def handler_user_collect(self): + async def handle_user_collect(self): """ 用于获取指定用户的收藏作品信息 (Used to get collected video info of specified user) @@ -518,7 +518,7 @@ async def fetch_user_collect_videos( logger.debug(_("爬取结束，共爬取 {0} 个作品").format(videos_collected)) @mode_handler("mix") - async def handler_user_mix(self): + async def handle_user_mix(self): """ 用于获取指定用户的合集作品信息 (Used to get mix video info of specified user) @@ -710,7 +710,7 @@ async def fetch_user_mix_videos( logger.debug(_("爬取结束，共爬取 {0} 个作品").format(videos_collected)) @mode_handler("search") - async def handler_search(self): + async def handle_search(self): """ 用于搜索指定关键词的作品信息 (Used to search video info of specified keyword) @@ -825,7 +825,7 @@ async def fetch_search_videos( logger.info(_("搜索结束，共搜索到 {0} 个作品").format(videos_collected)) @mode_handler("live") - async def handler_user_live(self): + async def handle_user_live(self): """ 用于获取指定用户的直播信息 (Used to get live info of specified user) From 4b87826fe4d0a7048c8525e2b30b5c70cb7115e9 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Wed, 26 Jun 2024 22:55:02 +0800 Subject: [PATCH 255/299] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0douyin=20?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=80=85=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/guide/apps/douyin/index.md | 719 +++++++++++++++++++++++++++----- 1 file changed, 618 insertions(+), 101 deletions(-) diff --git a/docs/guide/apps/douyin/index.md b/docs/guide/apps/douyin/index.md index 1613dae1..c97af7d4 100644 --- a/docs/guide/apps/douyin/index.md +++ b/docs/guide/apps/douyin/index.md @@ -15,57 +15,71 @@ outline: deep | 下载单个作品 | handle_one_video | | 下载用户发布作品 | handle_user_post | | 下载用户喜欢作品 | handle_user_like | -| 下载用户收藏作品 | handle_user_collection | +| 下载用户收藏原声 | handle_user_music_collection | +| 下载用户收藏作品 | handle_user_collection | | 下载用户合辑作品 | handle_user_mix | | 下载用户直播流 | handle_user_live | | 下载用户首页推荐作品 | handle_user_feed | +| 下载相似作品 | handle_related | +| 下载好友作品 | handle_friend_feed | -| 数据与功能接口 | 方法 | 开发者接口 | -| :------------------ | :------------------- | :--------: | +| 数据方法接口 | 方法 | 开发者接口 | +| :------------------ | :------------------- | :--------: | +| 创建用户记录与目录 | get_or_add_user_data | 🟢 | +| 创建作品下载记录 | get_or_add_video_data | 🟢 | +| 获取用户信息 | fetch_user_profile | 🟢 | | 单个作品数据 | fetch_one_video | 🟢 | | 用户发布作品数据 | fetch_user_post_videos | 🟢 | | 用户喜欢作品数据 | fetch_user_like_videos | 🟢 | +| 用户收藏原声数据 | fetch_user_music_collection | 🟢 | | 用户收藏作品数据 | fetch_user_collection_videos | 🟢 | +| 用户收藏夹数据 | fetch_user_collects | 🟢 | +| 用户收藏夹作品数据 | fetch_user_collects_videos | 🟢 | | 用户合辑作品数据 | fetch_user_mix_videos | 🟢 | | 用户直播流数据 | fetch_user_live_videos | 🟢 | | 用户直播流数据2 | fetch_user_live_videos_by_room_id | 🟢 | | 用户首页推荐作品数据 | fetch_user_feed_videos | 🟢 | -| ...... | ...... | 🔵 | -| 用户信息 | fetch_user_profile | 🟢 | -| 获取指定用户名 | get_user_nickname | 🔴 | -| 创建用户记录与目录 | get_or_add_user_data | 🟡 | -| 创建作品下载记录 | get_or_add_video_data | 🟢 | -| SSO登录 | handle_sso_login | 🟢🟡 | +| 相似作品数据 | fetch_related_videos | 🟢 | +| 好友作品数据 | fetch_friend_feed_videos | 🟢 | +| 关注用户数据 | fetch_user_following | 🟢 | +| 粉丝用户数据 | fetch_user_follower | 🟢 | +| 查询用户数据 | fetch_query_user | 🟢 | +| 直播间wss负载数据 | fetch_live_im | 🟢 | +| 直播间wss弹幕 | fetch_live_danmaku | 🟢 | +| 关注用户的直播间信息 | fetch_user_following_lives | 🟢 | ::: ::: details utils接口列表 -| 开发者接口 | 类名 | 方法 | 状态 | +| 工具类接口 | 类名 | 方法 | 状态 | | :---------------- | :-------------- | :------------------ | :--: | +| 管理客户端配置 | ClientConfManager | | 🟢 | | 生成真实msToken | TokenManager | gen_real_msToken | 🟢 | | 生成虚假msToken | TokenManager | gen_false_msToken | 🟢 | | 生成ttwid | TokenManager | gen_ttwid | 🟢 | +| 生成webid | TokenManager | gen_webid | 🟢 | | 生成verify_fp | VerifyFpManager | gen_verify_fp | 🟢 | | 生成s_v_web_id | VerifyFpManager | gen_s_v_web_id | 🟢 | +| 生成直播signature | DouyinWebcastSignature | get_signature | 🟢 | +| 使用接口模型生成直播wss签名参数 | WebcastSignatureManager | model_2_endpoint | 🟢 | | 使用接口地址生成Xb参数 | XBogusManager | str_2_endpoint | 🟢 | | 使用接口模型生成Xb参数 | XBogusManager | model_2_endpoint | 🟢 | +| 使用接口地址生成Ab参数 | ABogusManager | str_2_endpoint | 🟢 | +| 使用接口模型生成Ab参数 | ABogusManager | model_2_endpoint | 🟢 | | 提取单个用户id | SecUserIdFetcher | get_sec_user_id | 🟢 | | 提取列表用户id | SecUserIdFetcher | get_all_sec_user_id | 🟢 | | 提取单个作品id | AwemeIdFetcher | get_aweme_id | 🟢 | | 提取列表作品id | AwemeIdFetcher | get_all_aweme_id | 🟢 | -| 提取合辑id | MixIdFetcher | - | 🟤 | +| 提取单个合辑id | MixIdFetcher | get_mix_id | 🟢 | +| 提取列表合辑id | MixIdFetcher | get_all_mix_id | 🟢 | | 提取单个直播间号 | WebCastIdFetcher | get_webcast_id | 🟢 | -| 提取列表直播间号 | WebCastIdFetcher | get_all_webcast_id | 🟢 | -| 获取请求count数列表 | - | get_request_sizes | 🔴 | -| 全局格式化文件名 | - | format_file_name | 🟢 | +| 提取列表直播间号 | WebCastIdFetcher | get_all_webcast_id | 🟢 | +| 全局格式化文件名 | - | format_file_name | 🟢 | | 创建用户目录 | - | create_user_folder | 🟢 | -| 重命名用户目录 | - | rename_user_folder | 🟢 | -| 创建或重命名用户目录 | - | create_or_rename_user_folder | 🟢 | -| 提取低版本接口的desc | - | extract_desc_from_share_desc | 🔴 | +| 重命名用户目录 | - | rename_user_folder | 🟢 | +| 创建或重命名用户目录 | - | create_or_rename_user_folder | 🟢 | | 显示二维码 | - | show_qrcode | 🟢 | -::: tip 注意 -合辑id其实就是作品id，使用`AwemeIdFetcher`即可。 -::: +| json歌词转lrc歌词 | - | json_2_lrc | 🟢 | ::: details cralwer接口列表 @@ -75,20 +89,43 @@ outline: deep | 主页作品接口地址 | DouyinCrawler | fetch_user_post | 🟢 | | 喜欢作品接口地址 | DouyinCrawler | fetch_user_like | 🟢 | | 收藏作品接口地址 | DouyinCrawler | fetch_user_collection | 🟢 | +| 收藏夹接口地址 | DouyinCrawler | fetch_user_collects | 🟢 | +| 收藏夹作品接口地址 | DouyinCrawler | fetch_user_collects_video | 🟢 | +| 音乐收藏接口地址 | DouyinCrawler | fetch_user_music_collection | 🟢 | | 合辑作品接口地址 | DouyinCrawler | fetch_user_mix | 🟢 | | 作品详情接口地址 | DouyinCrawler | fetch_post_detail | 🟢 | -| 作品评论接口地址 | DouyinCrawler | fetch_post_comment | 🟡 | -| 推荐作品接口地址 | DouyinCrawler | fetch_post_feed | 🟡 | -| 关注作品接口地址 | DouyinCrawler | fetch_follow_feed | 🟡 | -| 朋友作品接口地址 | DouyinCrawler | fetch_friend_feed | 🟡 | -| 相关推荐作品接口地址 | DouyinCrawler | fetch_post_related | 🟡 | +| 作品评论接口地址 | DouyinCrawler | fetch_post_comment | 🟢 | +| 推荐作品接口地址 | DouyinCrawler | fetch_post_feed | 🟢 | +| 关注作品接口地址 | DouyinCrawler | fetch_follow_feed | 🟢 | +| 朋友作品接口地址 | DouyinCrawler | fetch_friend_feed | 🟢 | +| 相关推荐作品接口地址 | DouyinCrawler | fetch_post_related | 🟢 | | 直播接口地址 | DouyinCrawler | fetch_live | 🟢 | | 直播接口地址（room_id） | DouyinCrawler | fetch_live_room_id | 🟢 | -| 关注用户直播接口地址 | DouyinCrawler | fetch_following_live | 🟡 | -| 定位上一次作品接口地址 | DouyinCrawler | fetch_locate_post | 🟡 | -| SSO获取二维码接口地址 | DouyinCrawler | fetch_login_qrcode | 🟢 | -| SSO检查扫码状态接口地址 | DouyinCrawler | fetch_check_qrcode | 🟢 | -| SSO检查登录状态接口地址 | DouyinCrawler | fetch_check_login | 🟡 | +| 关注用户直播接口地址 | DouyinCrawler | fetch_following_live | 🟢 | +| 定位上一次作品接口地址 | DouyinCrawler | fetch_locate_post | 🟢 | +| SSO获取二维码接口地址 | DouyinCrawler | fetch_login_qrcode | 🔴 | +| SSO检查扫码状态接口地址 | DouyinCrawler | fetch_check_qrcode | 🔴 | +| SSO检查登录状态接口地址 | DouyinCrawler | fetch_check_login | 🔴 | +| 用户关注列表接口地址 | DouyinCrawler | fetch_user_following | 🟢 | +| 用户粉丝列表接口地址 | DouyinCrawler | fetch_user_follower | 🟢 | +| 直播弹幕初始化接口地址 | DouyinCrawler | fetch_live_im_fetch | 🟢 | +| 查询用户接口地址 | DouyinCrawler | fetch_query_user | 🟢 | +| 直播弹幕接口地址 | DouyinWebSocketCrawler | fetch_live_danmaku | 🟢 | +| 处理 WebSocket 消息 | DouyinWebSocketCrawler | handle_wss_message | 🟢 | +| 发送 ack 包 | DouyinWebSocketCrawler | send_ack | 🟢 | +| 发送 ping 包 | DouyinWebSocketCrawler | send_ping | 🟢 | +| 直播间房间消息 | DouyinWebSocketCrawler | WebcastRoomMessage | 🟢 | +| 直播间点赞消息 | DouyinWebSocketCrawler | WebcastLikeMessage | 🟢 | +| 直播间观众加入消息 | DouyinWebSocketCrawler | WebcastMemberMessage | 🟢 | +| 直播间聊天消息 | DouyinWebSocketCrawler | WebcastLeaveMessage | 🟢 | +| 直播间礼物消息 | DouyinWebSocketCrawler | WebcastGiftMessage | 🟢 | +| 直播间用户关注消息 | DouyinWebSocketCrawler | WebcastSocialMessage | 🟢 | +| 直播间用户关注消息 | DouyinWebSocketCrawler | WebcastFollowMessage | 🟢 | +| 直播间在线观众排行榜 | DouyinWebSocketCrawler | WebcastRoomUserSeqMessage | 🟢 | +| 直播间粉丝团更新消息 | DouyinWebSocketCrawler | WebcastUpdateFanTicketMessage | 🟢 | +| 直播间文本消息 | DouyinWebSocketCrawler | WebcastCommonTextMessage | 🟢 | +| 直播间对战积分消息 | DouyinWebSocketCrawler | WebcastMatchAgainstScoreMessage | 🟢 | +| 直播间粉丝团消息 | DouyinWebSocketCrawler | WebcastFansclubMessage | 🟢 | ::: @@ -97,14 +134,67 @@ outline: deep | 下载器接口 | 类名 | 方法 | 状态 | | :----------- | :--------- | :---------- | :--: | | 保存最后一次请求的aweme_id | DouyinDownloader | save_last_aweme_id | 🟢 | +| 筛选指定日期区间内的作品 | DouyinDownloader | filter_aweme_datas_by_interval | 🟢 | | 创建下载任务 | DouyinDownloader | create_download_task | 🟢 | -| 处理下载任务 | DouyinDownloader | handle_download | 🟢 | +| 处理下载任务 | DouyinDownloader | handler_download | 🟢 | +| 创建原声下载任务 | DouyinDownloader | create_music_download_tasks | 🟢 | +| 处理原声下载任务 | DouyinDownloader | handler_music_download | 🟢 | | 创建流下载任务 | DouyinDownloader | create_stream_tasks | 🟢 | | 处理流下载任务 | DouyinDownloader | handle_stream | 🟢 | ::: ## handler接口列表 +### 创建用户记录与目录 🟢 + +异步方法，用于获取或创建用户数据同时创建用户目录。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| kwargs | dict | cli字典数据，需获取path参数 | +| sec_user_id| str | 用户ID | +| db | AsyncUserDB | 用户数据库 | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| user_path | Path | 用户目录路径对象 | + +<<< @/snippets/douyin/user-get-add.py{18,20-22} + +::: tip 提示 +此为cli模式的接口，开发者可自行定义创建用户目录的功能。 +::: + +### 创建作品下载记录 🟢 + +异步方法，用于获取或创建作品数据同时创建作品目录。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| aweme_data | dict | 作品数据字典 | +| db | AsyncVideoDB | 作品数据库 | +| ignore_fields | list | 忽略的字段列表 | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| 无 | 无 | 无 | + +<<< @/snippets/douyin/video-get-add.py{6,19-25} + +### 获取用户信息 🟢 + +异步方法，用于获取指定用户的信息。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| sec_user_id| str | 用户ID | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| UserProfileFilter | model | 用户数据过滤器，包含用户数据的_to_raw、_to_dict方法 | + +<<< @/snippets/douyin/user-profile.py{15,16} + ### 单个作品数据 🟢 异步方法，用于获取单个视频。 @@ -115,9 +205,9 @@ outline: deep | 返回 | 类型 | 说明 | | :--- | :--- | :--- | -| video_data | dict | 视频数据字典，包含视频ID、视频文案、作者昵称等 | +| PostDetailFilter | model | 单个作品数据过滤器，包含作品数据的_to_raw、_to_dict、_to_list方法 | -<<< @/snippets/douyin/one-video.py{15,17} +<<< @/snippets/douyin/one-video.py{15} ### 用户发布作品数据 🟢 @@ -132,9 +222,9 @@ outline: deep | 返回 | 类型 | 说明 | | :--- | :--- | :--- | -| video_data | dict | 视频数据字典，包含视频ID、视频文案、作者昵称、页码等 | +| UserPostFilter | AsyncGenerator | 发布作品数据过滤器，包含作品数据的_to_raw、_to_dict、_to_list方法 | -<<< @/snippets/douyin/user-post.py{15,17-20,25-28} +<<< @/snippets/douyin/user-post.py{16-20} ### 用户喜欢作品数据 🟢 @@ -149,9 +239,25 @@ outline: deep | 返回 | 类型 | 说明 | | :--- | :--- | :--- | -| aweme_data | dict | 视频数据字典，包含视频ID、视频文案、作者昵称、页码等 | +| UserPostFilter | AsyncGenerator | 喜欢作品数据过滤器，包含作品数据的_to_raw、_to_dict、_to_list方法 | + +<<< @/snippets/douyin/user-like.py{16-20} -<<< @/snippets/douyin/user-like.py{15,17-20,25-28} +### 用户收藏原声数据 🟢 + +异步方法，用于获取指定用户收藏的音乐列表，只能获取登录了账号的收藏音乐。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| max_cursor| int | 页码，初始为0 | +| page_counts| int | 页数，初始为20 | +| max_counts| int | 最大页数，初始为None | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| UserMusicCollectionFilter | AsyncGenerator | 收藏音乐数据过滤器，包含音乐数据的_to_raw、_to_dict、_to_list方法 | + +<<< @/snippets/douyin/user-collection.py#user-collection-music-snippet{17} ### 用户收藏作品数据 🟢 @@ -165,9 +271,42 @@ outline: deep | 返回 | 类型 | 说明 | | :--- | :--- | :--- | -| aweme_data | dict | 视频数据字典，包含视频ID、视频文案、作者昵称、页码等 | +| UserCollectionFilter | AsyncGenerator | 收藏作品数据过滤器，包含作品数据的_to_raw、_to_dict、_to_list方法 | + +<<< @/snippets/douyin/user-collection.py#user-collection-music-snippet{16} + +### 用户收藏夹数据 🟢 + +异步方法，用于获取指定用户的收藏夹列表，不是收藏夹作品数据。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| max_cursor| int | 页码，初始为0 | +| page_counts| int | 页数，初始为20 | +| max_counts| int | 最大页数，初始为None | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| UserCollectsFilter | AsyncGenerator | 收藏夹数据过滤器，包含收藏夹数据的_to_raw、_to_dict、_to_list方法 | + +<<< @/snippets/douyin/user-collects.py#user-collects-snippet{17} + +### 用户收藏夹作品数据 🟢 + +异步方法，用于获取指定用户收藏夹的视频列表，收藏夹作品数据。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| collect_id| str | 收藏夹ID | +| max_cursor| int | 页码，初始为0 | +| page_counts| int | 页数，初始为20 | +| max_counts| int | 最大页数，初始为None | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| UserCollectsVideosFilter | AsyncGenerator | 收藏夹作品数据过滤器，包含收藏夹作品数据的_to_raw、_to_dict、_to_list方法 | -<<< @/snippets/douyin/user-collection.py{16-17,22-25} +<<< @/snippets/douyin/user-collects.py#user-collects-videos-snippet{17-20} ### 用户合辑作品数据 🟢 @@ -182,9 +321,9 @@ outline: deep | 返回 | 类型 | 说明 | | :--- | :--- | :--- | -| aweme_data | dict | 视频数据字典，包含视频ID、视频文案、作者昵称、页码等 | +| UserMixFilter | AsyncGenerator | 合集作品数据过滤器，包含合集作品数据的_to_raw、_to_dict、_to_list方法 | -<<< @/snippets/douyin/user-mix.py{16-18,21-24,29-32} +<<< @/snippets/douyin/user-mix.py{16,19-21} ### 用户直播流数据 🟢 @@ -212,82 +351,191 @@ outline: deep | :--- | :--- | :--- | | webcast_data | dict | 直播数据字典，包含直播ID、直播标题、直播状态、观看人数、子分区、主播昵称等 | -<<< @/snippets/douyin/user-live-room-id.py{16-18} +<<< @/snippets/douyin/user-live-room-id.py{15-17} -### 用户信息 🟢 +### 用户首页推荐作品数据 🟢 -异步方法，用于获取指定用户的信息，不可以直接解析Filter的数据，需要使用自定义的_to_dict()或_to_list()方法。 +异步方法，用于获取指定用户的首页推荐作品。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | | sec_user_id| str | 用户ID | +| max_cursor| int | 页码，初始为0 | +| page_counts| int | 页数，初始为20 | +| max_counts| int | 最大页数，初始为None | | 返回 | 类型 | 说明 | | :--- | :--- | :--- | -| UserProfileFilter | _to_dict() | 自定义的接口数据过滤器 | 用户数据字典，包含用户ID、用户昵称、用户签名、用户头像等 | +| UserPostFilter | AsyncGenerator | 首页推荐作品数据过滤器，包含推荐作品数据的_to_raw、_to_dict、_to_list方法 | -<<< @/snippets/douyin/user-profile.py{15-16} +<<< @/snippets/douyin/user-feed.py{17-20} -### 获取指定用户名 🔴 +### 相似作品数据 🟢 -异步方法，用于获取指定用户的昵称，如果不存在，则从服务器获取并存储到数据库中。 +异步方法，用于获取指定作品的相似作品。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | -| sec_user_id| str | 用户ID | -| db | AsyncUserDB | 用户数据库 | +| aweme_id| str | 作品ID | +| filterGids| str | 过滤的Gids | +| page_counts| int | 页数，初始为20 | +| max_counts| int | 最大页数，初始为None | + | 返回 | 类型 | 说明 | | :--- | :--- | :--- | -| user_nickname | str | 用户昵称 | +| PostRelatedFilter | dict | 相关推荐作品数据过滤器，包含相关作品数据的_to_raw、_to_dict、_to_list方法 | -<<< @/snippets/douyin/user-nickname.py{17,19-21} +<<< @/snippets/douyin/aweme-related.py{16-18} -### 创建用户记录与目录 🟡 -异步方法，用于获取或创建用户数据同时创建用户目录。 +### 好友作品数据 🟢 +异步方法，用于获取好友的作品。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | -| kwargs | dict | cli字典数据，需获取path参数 | +| cursor| str | 页码，初始为0 | +| level| int | 作品级别，初始为1 | +| pull_type| int | 拉取类型，初始为0 | +| max_counts| int | 最大页数，初始为None | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| FriendFeedFilter | AsyncGenerator | 好友作品数据过滤器，包含好友作品数据的_to_raw、_to_dict、_to_list方法 | + +<<< @/snippets/douyin/user-friend.py{16} + +### 关注用户数据 🟢 + +异步方法，用于获取指定用户关注的用户列表。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| user_id| str | 用户ID | | sec_user_id| str | 用户ID | -| db | AsyncUserDB | 用户数据库 | +| offset| int | 页码，初始为0 | +| count| int | 页数，初始为20 | +| source_type| int | 源类型，初始为4 | +| min_time | int | 最早关注时间戳，初始为0 | +| max_time | int | 最晚关注时间戳，初始为0 | +| max_counts| float | 最大页数，初始为None | | 返回 | 类型 | 说明 | | :--- | :--- | :--- | -| user_path | Path | 用户目录路径对象 | +| UserFollowingFilter | AsyncGenerator | 关注用户数据过滤器，包含关注用户数据的_to_raw、_to_dict、_to_list方法 | -<<< @/snippets/douyin/user-get-add.py{18,20-22} +<<< @/snippets/douyin/user-following.py{18-20,22-29} -::: tip 提示 -此为cli模式的接口，开发者可自行定义创建用户目录的功能。 -::: +### 粉丝用户数据 🟢 -### 创建作品下载记录 🟢 +异步方法，用于获取指定用户的粉丝列表。 -异步方法，用于获取或创建作品数据同时创建作品目录。 +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| user_id| str | 用户ID | +| sec_user_id| str | 用户ID | +| offset| int | 页码，初始为0 | +| count| int | 页数，初始为20 | +| source_type| int | 源类型，初始为1 | +| min_time | int | 最早关注时间戳，初始为0 | +| max_time | int | 最晚关注时间戳，初始为0 | +| max_counts| float | 最大页数，初始为None | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| UserFollowerFilter | AsyncGenerator | 粉丝用户数据过滤器，包含粉丝用户数据的_to_raw、_to_dict、_to_list方法 | + +<<< @/snippets/douyin/user-follower.py{18-20,22-29} + +### 查询用户信息 🟢 + +通过`ttwid`的参数用于查询用户基本信息，若需要获取更多信息请使用`fetch_user_profile`。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | -| aweme_data | dict | 作品数据字典 | -| db | AsyncVideoDB | 作品数据库 | -| ignore_fields | list | 忽略的字段列表 | +| 无 | 无 | 无 | | 返回 | 类型 | 说明 | | :--- | :--- | :--- | -|None | None | 无 | +| QueryUserFilter | model | 查询用户数据过滤器，包含用户数据的_to_raw、_to_dict方法 | -<<< @/snippets/douyin/video-get-add.py{6,23-25} +<<< @/snippets/douyin/query-user.py{18} -### SSO登录 🟢 +### 直播间wss负载数据 🟢 -异步方法，用于处理用户SSO登录，获取用户的cookie。 +异步方法，用于获取直播间wss负载数据，是弹幕wss的必要参数。 +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| room_id| str | 直播间ID | +| unique_id| str | 用户ID | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| LiveImFetchFilter | model | 直播间wss负载数据过滤器，包含直播间wss负载数据的_to_raw、_to_dict方法 | + +<<< @/snippets/douyin/user-live-im-fetch.py{5-14,30-42} + +### 直播间wss弹幕 🟢 + +异步方法，用于获取直播间wss弹幕数据，使用内置多个回调处理不同类型的消息。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | -|None | None | 无 | +| room_id| str | 直播间ID | +| user_unique_id| str | 用户ID | +| internal_ext| str | 内部扩展参数 | +| cursor| str | 弹幕页码 | +| callback| dict | 自定义弹幕回调函数（待加入） | + +| 回调 | 说明 | +| :--- | :--- | +| WebcastRoomMessage | 直播间房间消息 | +| WebcastLikeMessage | 直播间点赞消息 | +| WebcastMemberMessage | 直播间观众加入消息 | +| WebcastChatMessage | 直播间聊天消息 | +| WebcastGiftMessage | 直播间礼物消息 | +| WebcastSocialMessage | 直播间用户关注消息 | +| WebcastRoomUserSeqMessage | 直播间在线观众排行榜 | +| WebcastUpdateFanTicketMessage | 直播间粉丝团更新消息 | +| WebcastCommonTextMessage | 直播间文本消息 | +| WebcastMatchAgainstScoreMessage | 直播间对战积分消息 | +| WebcastFansclubMessage | 直播间粉丝团消息 | +| TODO: WebcastRanklistHourEntranceMessage | 直播间小时榜消息 | +| TODO: WebcastRoomStatsMessage | 直播间统计消息 | +| TODO: WebcastLiveShoppingMessage | 直播间购物车消息 | +| TODO: WebcastLiveEcomGeneralMessage | 直播间电商消息 | +| TODO: WebcastProductChangeMessage | 直播间商品变更消息 | +| TODO: WebcastRoomStreamAdaptationMessage | 直播间流适配消息 | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| self.websocket | WebSocket | 弹幕WebSocket对象 | + +<<< @/snippets/douyin/user-live-im-fetch.py{17-26,44-50} + +### 关注用户的直播间信息 🟢 + +异步方法，用于获取关注用户的直播间信息列表，需要登录账号。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| 无 | 无 | 无 | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| FollowingUserLiveFilter | model | 关注用户直播间数据过滤器，包含关注用户直播间数据的_to_raw、_to_dict方法 | + +<<< @/snippets/douyin/user-follow-live.py{16} + +### SSO登录 🔴 + +异步方法，用于处理用户SSO登录，获取用户的cookie。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| 无 | 无 | 无 | | 返回 | 类型 | 说明 | | :--- | :--- | :--- | @@ -300,15 +548,30 @@ outline: deep 由于扫码登录受风控影响较大,多数cookie都无法使用。为了保障体验，建议使用--auto-cookie命令自动从浏览器获取cookie，更多使用帮助参考cli命令。 ::: + ## utils接口列表 +### 管理客户端配置 🟢 + +类方法，用于管理客户端配置 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| 无 | 无 | 无 | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| 配置文件值 | Any | 配置文件值 | + +<<< @/snippets/douyin/client-config.py{4,5,7,8,10,11} + ### 生成真实msToken 🟢 -静态方法，用于生成真实的msToken，当出现错误时返回虚假的值。 +类方法，用于生成真实的msToken，当出现错误时返回虚假的值。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | -| None | None | 无 | +| 无 | 无 | 无 | | 返回 | 类型 | 说明 | | :--- | :--- | :--- | @@ -318,11 +581,11 @@ outline: deep ### 生成虚假msToken 🟢 -静态方法，用于生成随机虚假的msToken，不同端点的msToken长度不同。 +类方法，用于生成随机虚假的msToken，不同端点的msToken长度不同。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | -| None | None | 无 | +| 无 | 无 | 无 | | 返回 | 类型 | 说明 | | :--- | :--- | :--- | @@ -336,11 +599,11 @@ outline: deep ### 生成ttwid 🟢 -静态方法，用于生成ttwid，部分请求必带。 +类方法，用于生成ttwid，部分请求必带，游客状态必须有。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | -| None | None | 无 | +| 无 | 无 | 无 | | 返回 | 类型 | 说明 | | :--- | :--- | :--- | @@ -348,13 +611,27 @@ outline: deep <<< @/snippets/douyin/ttwid.py{4} +### 生成webid 🟢 + +类方法，用于生成个性化追踪webid。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| 无 | 无 | 无 | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| webid | str | webid参数 | + +<<< @/snippets/douyin/webid.py{4} + ### 生成verify_fp 🟢 -静态方法，用于生成verify_fp，部分请求必带。 +类方法，用于生成verify_fp，部分请求必带。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | -| None | None | 无 | +| 无 | 无 | 无 | | 返回 | 类型 | 说明 | | :--- | :--- | :--- | @@ -364,11 +641,11 @@ outline: deep ### 生成s_v_web_id 🟢 -静态方法，用于生成s_v_web_id，部分请求必带，即verify_fp值。 +类方法，用于生成s_v_web_id，部分请求必带，即verify_fp值。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | -| None | None | 无 | +| 无 | 无 | 无 | | 返回 | 类型 | 说明 | | :--- | :--- | :--- | @@ -376,12 +653,45 @@ outline: deep <<< @/snippets/douyin/s_v_web_id.py{4} +### 生成直播signature 🟢 + +用于生成直播signature，请求弹幕wss必带。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| room_id | str | 直播间ID | +| user_unique_id | str | 用户ID | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| signature | str | 直播signature | + +<<< @/snippets/douyin/webcast-signature.py#webcast-signature-snippet{4-8} + +### 使用接口模型生成直播wss签名参数 🟢 + +类方法，用于使用不同接口数据模型生成直播wss签名参数。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| user_agent | str | 用户代理 | +| base_endpoint | str | 端点 | +| params | dict | 请求参数 | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| final_endpoint | str | 带wss签名参数的完整地址 | + +<<< @/snippets/douyin/webcast-signature.py#webcast-signature-manager-snippet{10-14} + + ### 使用接口地址生成Xb参数 🟢 -静态方法，用于直接使用接口地址生成Xbogus参数，部分接口不校验。 +类方法，用于直接使用接口地址生成Xbogus参数，部分接口不校验。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | +| user_agent | str | 用户代理 | | endpoint | str | 接口端点 | | 返回 | 类型 | 说明 | @@ -392,11 +702,12 @@ outline: deep ### 使用接口模型生成Xb参数 🟢 -静态方法，用于使用不同接口数据模型生成Xbogus参数，部分接口不校验。 +类方法，用于使用不同接口数据模型生成Xbogus参数，部分接口不校验。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | +| user_agent | str | 用户代理 | | endpoint | str | 端点 | | params | dict | 请求参数 | @@ -406,7 +717,7 @@ outline: deep 使用模型生成接口地址，需要先创建一个模型对象，然后调用`model_2_endpoint`方法。 -<<< @/snippets/douyin/xbogus.py#model-2-endpoint-snippet{8-10,13-15} +<<< @/snippets/douyin/xbogus.py#model-2-endpoint-snippet{9-13,17-19} 还可以使用爬虫引擎与过滤器采集数据。 @@ -414,14 +725,55 @@ outline: deep 更加抽象的高级方法可以直接调用handler接口的`fetch_user_profile`。 + +### 使用接口地址生成Ab参数 🟢 + +类方法，用于直接使用接口地址生成Ab参数，新接口都需要校验。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| user_agent | str | 用户代理 | +| params | str | 请求参数 | +| request_type | str | 请求类型 | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| final_params | str | 带Ab参数的请求参数 | + +<<< @/snippets/douyin/abogus.py#str-2-endpoint-snippet{7-13} + +### 使用接口模型生成Ab参数 🟢 + +类方法，用于使用不同接口数据模型生成Ab参数，新接口都需要校验。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| user_agent | str | 用户代理 | +| base_endpoint | str | 端点 | +| params | dict | 请求参数模型 | +| request_type | str | 请求类型 | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| final_params | str | 带Ab参数的请求参数 | + +使用模型生成接口地址，需要先创建一个模型对象，然后调用`model_2_endpoint`方法。 + +<<< @/snippets/douyin/abogus.py#model-2-endpoint-snippet{9-14,18-20} + +还可以使用爬虫引擎与过滤器采集数据。 + +<<< @/snippets/douyin/abogus.py#model-2-endpoint-2-filter-snippet{20-26} + +更加抽象的高级方法可以直接调用handler接口的`fetch_user_profile`。 + ::: tip 提示 -本项目中的UA参数为固定值，`Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, - like Gecko) Chrome/104.0.0.0 Safari/537.36`。 +本项目的残血版Ab算法的UA参数为固定值，`Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0`。 ::: ### 提取单个用户id 🟢 -静态方法，用于提取单个用户id。 +类方法，用于提取单个用户id。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | @@ -435,7 +787,7 @@ outline: deep ### 提取列表用户id 🟢 -静态方法，用于提取列表用户id。 +类方法，用于提取列表用户id。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | @@ -449,7 +801,7 @@ outline: deep ### 提取单个作品id 🟢 -静态方法，用于提取单个作品id。 +类方法，用于提取单个作品id。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | @@ -463,7 +815,7 @@ outline: deep ### 提取列表作品id 🟢 -静态方法，用于提取列表作品id。 +类方法，用于提取列表作品id。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | @@ -475,14 +827,37 @@ outline: deep <<< @/snippets/douyin/aweme-id.py#multi-aweme-id-snippet{15,18} -### 提取合辑id 🟤 +### 提取合辑id 🟢 + +类方法，用于从合集链接中提取合辑id。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| url | str | 合辑地址 | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| mix_id | str | 合辑ID | -静态方法，用于提取合辑id，合辑id其实就是作品id，使用`AwemeIdFetcher`即可。 +<<< @/snippets/douyin/mix-id.py#single-mix-id-snippet{6,7} +### 提取列表合辑id 🟢 + +类方法，用于从合集链接列表中提取合辑id。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| urls | list | 合辑地址列表 | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| mix_ids | list | 合辑ID列表 | + +<<< @/snippets/douyin/mix-id.py#multi-mix-id-snippet{7-10,13,16} ### 提取单个直播间号 🟢 -静态方法，用于提取单个直播间号。 +类方法，用于提取单个直播间号。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | @@ -493,11 +868,11 @@ outline: deep | webcast_id | str | 直播间RID | -<<< @/snippets/douyin/webcast-id.py#single-webcast-id-snippet{5,6} +<<< @/snippets/douyin/webcast-id.py#single-webcast-id-snippet{6,7} ### 提取列表直播间号 🟢 -静态方法，用于提取列表直播间号。 +类方法，用于提取列表直播间号。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | @@ -507,11 +882,11 @@ outline: deep | :--- | :--- | :--- | | webcast_ids | list | 直播间RID列表 | -<<< @/snippets/douyin/webcast-id.py#multi-webcast-id-snippet{15,18} +<<< @/snippets/douyin/webcast-id.py#multi-webcast-id-snippet{7-13,16,19} -::: tip 如何分辨Rid与room_id -Rid是直播间的短链标识，room_id是直播间的唯一标识。 -如`https://live.douyin.com/775841227732`中的775841227732就是Rid，而`https://webcast.amemv.com/douyin/webcast/reflow/7318296342189919011`中的7318296342189919011就是room_id。 +::: tip 如何分辨r_id与room_id +r_id是直播间的短链标识，room_id是直播间的唯一标识。 +如`https://live.douyin.com/775841227732`中的`775841227732`就是r_id，而`https://webcast.amemv.com/douyin/webcast/reflow/7318296342189919011`中的`7318296342189919011`就是room_id。 这2个链接都指向同一个直播间。 ::: @@ -621,7 +996,7 @@ Rid是直播间的短链标识，room_id是直播间的唯一标识。 | 返回 | 类型 | 说明 | | :--- | :--- | :--- | -| None | None | 无 | +| 无 | 无 | 无 | <<< @/snippets/douyin/show-qrcode.py{4,5} @@ -629,7 +1004,149 @@ Rid是直播间的短链标识，room_id是直播间的唯一标识。 show_image (bool): 是否显示图像，True 表示显示，False 表示在控制台显示 ::: +### json歌词转lrc歌词 🟢 + +用于将抖音原声的json格式的歌词转换为lrc格式的歌词。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| data | Union[str, list, dict] | json格式的歌词 | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| lrc_lines | str | lrc格式的歌词 | + +<<< @/snippets/douyin/json-2-lrc.py{94} + ## crawler接口 +### 用户信息接口地址 🟢 + +异步方法，用于获取用户信息数据。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| params | UserProfile | 请求参数 | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| parse_json() | dict | 用户信息数据 | + +### 主页作品接口地址 🟢 + +异步方法，用于获取主页作品数据。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| params | UserPost | 请求参数 | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| parse_json() | dict | 主页作品数据 | + +### 喜欢作品接口地址 🟢 + +异步方法，用于获取喜欢作品数据。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| params | UserLike | 请求参数 | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| parse_json() | dict | 喜欢作品数据 | + +### 收藏作品接口地址 🟢 + +异步方法，用于获取收藏作品数据。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| params | UserCollection | 请求参数 | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| parse_json() | dict | 收藏作品数据 | + +### 收藏夹接口地址 🟢 + +异步方法，用于获取收藏夹数据。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| params | UserCollects | 请求参数 | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| parse_json() | dict | 收藏夹数据 | + +### 收藏夹作品接口地址 🟢 + +异步方法，用于获取收藏夹作品数据。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| params | UserCollectsVideo | 请求参数 | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| parse_json() | dict | 收藏夹作品数据 | + +### 音乐收藏接口地址 🟢 + +异步方法，用于获取音乐收藏数据。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| params | UserMusicCollection | 请求参数 | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| parse_json() | dict | 音乐收藏数据 | + +## dl接口 + +### 保存最后一次请求的aweme_id 🟢 + +用于保存最后一次请求的aweme_id，用于下一次请求主页作品的参数。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| sec_user_id | str | 用户ID | +| aweme_id | str | 作品ID | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| 无 | 无 | 无 | + + +### 筛选指定日期区间内的作品 🟢 + +用于筛选指定日期区间内的作品。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| aweme_data | dict | 作品数据的字典 | +| interval | str | 日期区间 | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| filtered_aweme_datas | Union[list[dict], dict, None] | 筛选后的作品数据 | + +### 创建下载任务 🟢 + + +### 处理下载任务 🟢 + + +### 创建原声下载任务 🟢 + + +### 处理原声下载任务 🟢 + + +### 创建流下载任务 🟢 + + -## dl接口 \ No newline at end of file +### 处理流下载任务 🟢 \ No newline at end of file From b88b37578bf922424bfe5ffc302facd0ba6e1ba4 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Wed, 26 Jun 2024 22:55:36 +0800 Subject: [PATCH 256/299] =?UTF-8?q?docs:=20=E6=B7=BB=E5=8A=A0x=E7=9A=84?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=80=85=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/.vitepress/config.mts | 3 ++- docs/guide/apps/x/index.md | 0 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 docs/guide/apps/x/index.md diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts index 4fa7db76..de2a337a 100644 --- a/docs/.vitepress/config.mts +++ b/docs/.vitepress/config.mts @@ -78,7 +78,8 @@ export default defineConfig({ text: '开发者接口', items: [ {text: 'DouYin', link: '/guide/apps/douyin/index'}, - {text: 'TikTok', link: '/guide/apps/tiktok/index'} + {text: 'TikTok', link: '/guide/apps/tiktok/index'}, + {text: 'X', link: '/guide/apps/x/index'}, ] }, diff --git a/docs/guide/apps/x/index.md b/docs/guide/apps/x/index.md new file mode 100644 index 00000000..e69de29b From 0dc3a9e07adc21a2d84892131ece27a1f4fbdd4f Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Wed, 26 Jun 2024 22:55:54 +0800 Subject: [PATCH 257/299] =?UTF-8?q?docs:=20=E6=B7=BB=E5=8A=A0weibo?= =?UTF-8?q?=E7=9A=84=E5=BC=80=E5=8F=91=E8=80=85=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/.vitepress/config.mts | 1 + docs/guide/apps/weibo/index.md | 0 2 files changed, 1 insertion(+) create mode 100644 docs/guide/apps/weibo/index.md diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts index de2a337a..58f0599b 100644 --- a/docs/.vitepress/config.mts +++ b/docs/.vitepress/config.mts @@ -80,6 +80,7 @@ export default defineConfig({ {text: 'DouYin', link: '/guide/apps/douyin/index'}, {text: 'TikTok', link: '/guide/apps/tiktok/index'}, {text: 'X', link: '/guide/apps/x/index'}, + {text: 'WeiBo', link: '/guide/apps/weibo/index'}, ] }, diff --git a/docs/guide/apps/weibo/index.md b/docs/guide/apps/weibo/index.md new file mode 100644 index 00000000..e69de29b From b1e4709381c36ee72e360151bb681219329c07f3 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Wed, 26 Jun 2024 23:17:19 +0800 Subject: [PATCH 258/299] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0tiktok?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=89=87=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/snippets/tiktok/check-live-alive.py | 8 ++++---- docs/snippets/tiktok/client-config.py | 11 +++++++++++ docs/snippets/tiktok/device-id.py | 17 +++++++++++++++++ docs/snippets/tiktok/user-playlist.py | 1 + docs/snippets/tiktok/user-post.py | 1 + docs/snippets/tiktok/user-profile.py | 1 + docs/snippets/tiktok/video-get-add.py | 1 + docs/snippets/tiktok/xbogus.py | 1 + f2/apps/tiktok/utils.py | 2 +- 9 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 docs/snippets/tiktok/client-config.py diff --git a/docs/snippets/tiktok/check-live-alive.py b/docs/snippets/tiktok/check-live-alive.py index 54fd1abb..6da0b301 100644 --- a/docs/snippets/tiktok/check-live-alive.py +++ b/docs/snippets/tiktok/check-live-alive.py @@ -23,10 +23,10 @@ async def main(): print("=================_to_raw================") print(rooms._to_raw()) - print("=================_to_dict===============") - print(rooms._to_dict()) - print("=================_to_list===============") - print(rooms._to_list()) + # print("=================_to_dict===============") + # print(rooms._to_dict()) + # print("=================_to_list===============") + # print(rooms._to_list()) if __name__ == "__main__": diff --git a/docs/snippets/tiktok/client-config.py b/docs/snippets/tiktok/client-config.py new file mode 100644 index 00000000..1a2446d0 --- /dev/null +++ b/docs/snippets/tiktok/client-config.py @@ -0,0 +1,11 @@ +from f2.apps.tiktok.utils import ClientConfManager + +if __name__ == "__main__": + print("Client Configuration:") + print(ClientConfManager.client()) + + print("Client Configuration version:") + print(ClientConfManager.conf_version()) + + print("Client Configuration user-agent:") + print(ClientConfManager.user_agent()) diff --git a/docs/snippets/tiktok/device-id.py b/docs/snippets/tiktok/device-id.py index e0cf7c3e..e43690d0 100644 --- a/docs/snippets/tiktok/device-id.py +++ b/docs/snippets/tiktok/device-id.py @@ -1,3 +1,4 @@ +// #region device-id-snippet import asyncio from f2.apps.tiktok.utils import DeviceIdManager @@ -7,6 +8,20 @@ async def main(): print(device_id) device_id = await DeviceIdManager.gen_device_id(full_cookie=True) print(device_id) + + +if __name__ == "__main__": + asyncio.run(main()) + +// #endregion device-id-snippet + + +// #region device-ids-snippet +import asyncio +from f2.apps.tiktok.utils import DeviceIdManager + + +async def main(): device_ids = await DeviceIdManager.gen_device_ids(3) print(device_ids) device_ids = await DeviceIdManager.gen_device_ids(3, full_cookie=True) @@ -15,3 +30,5 @@ async def main(): if __name__ == "__main__": asyncio.run(main()) + +// #endregion device-ids-snippet \ No newline at end of file diff --git a/docs/snippets/tiktok/user-playlist.py b/docs/snippets/tiktok/user-playlist.py index 711b4a70..257a9d34 100644 --- a/docs/snippets/tiktok/user-playlist.py +++ b/docs/snippets/tiktok/user-playlist.py @@ -2,6 +2,7 @@ from f2.apps.tiktok.handler import TiktokHandler from f2.apps.tiktok.utils import SecUserIdFetcher + kwargs = { "headers": { "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", diff --git a/docs/snippets/tiktok/user-post.py b/docs/snippets/tiktok/user-post.py index fbbe4cfc..c829556f 100644 --- a/docs/snippets/tiktok/user-post.py +++ b/docs/snippets/tiktok/user-post.py @@ -2,6 +2,7 @@ from f2.apps.tiktok.handler import TiktokHandler from f2.apps.tiktok.utils import SecUserIdFetcher + kwargs = { "headers": { "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", diff --git a/docs/snippets/tiktok/user-profile.py b/docs/snippets/tiktok/user-profile.py index 375fa518..7d82f0bd 100644 --- a/docs/snippets/tiktok/user-profile.py +++ b/docs/snippets/tiktok/user-profile.py @@ -1,6 +1,7 @@ import asyncio from f2.apps.tiktok.handler import TiktokHandler + kwargs = { "headers": { "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0", diff --git a/docs/snippets/tiktok/video-get-add.py b/docs/snippets/tiktok/video-get-add.py index 9dd73cbe..a96a1b4b 100644 --- a/docs/snippets/tiktok/video-get-add.py +++ b/docs/snippets/tiktok/video-get-add.py @@ -2,6 +2,7 @@ from f2.apps.tiktok.handler import TiktokHandler from f2.apps.tiktok.db import AsyncVideoDB + # 需要忽略的字段（需过滤掉有时效性的字段） ignore_fields = ["video_play_addr", "images", "video_bit_rate", "cover"] diff --git a/docs/snippets/tiktok/xbogus.py b/docs/snippets/tiktok/xbogus.py index c5747398..69b0669b 100644 --- a/docs/snippets/tiktok/xbogus.py +++ b/docs/snippets/tiktok/xbogus.py @@ -3,6 +3,7 @@ import asyncio from f2.apps.tiktok.utils import XBogusManager + async def main(): test_endpoint = "aid=1988&app_language=zh-Hans&app_name=tiktok_web&browser_platform=Win32&browser_version=5.0%20%28Windows%20NT%2010.0%3B%20Win64%3B%20x64%29%20AppleWebKit%2F537.36%20%28KHTML%2C%20like%20Gecko%29%20Chrome%2F120.0.0.0%20Safari%2F537.36&channel=tiktok_web&cookie_enabled=true&count=16&coverFormat=2&device_id=7306060721837852167&device_platform=web_pc&itemID=7294298719665622305" return XBogusManager.str_2_endpoint(test_endpoint) diff --git a/f2/apps/tiktok/utils.py b/f2/apps/tiktok/utils.py index f2635bfb..5f3cca4a 100644 --- a/f2/apps/tiktok/utils.py +++ b/f2/apps/tiktok/utils.py @@ -44,7 +44,7 @@ def client(cls) -> dict: return cls.tiktok_conf @classmethod - def version(cls) -> str: + def conf_version(cls) -> str: return cls.client_conf.get("version", "unknown") @classmethod From 2061c63e46a711a783c72e2b1efeb8b42fcf5775 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Wed, 26 Jun 2024 23:18:43 +0800 Subject: [PATCH 259/299] =?UTF-8?q?style:=20=E6=B3=A8=E9=87=8A=E4=B8=8E?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/guide/apps/douyin/index.md | 1 - f2/apps/douyin/algorithm/webcast_signature.py | 2 +- f2/apps/tiktok/model.py | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guide/apps/douyin/index.md b/docs/guide/apps/douyin/index.md index c97af7d4..5bdb3427 100644 --- a/docs/guide/apps/douyin/index.md +++ b/docs/guide/apps/douyin/index.md @@ -1148,5 +1148,4 @@ show_image (bool): 是否显示图像，True 表示显示，False 表示在控 ### 创建流下载任务 🟢 - ### 处理流下载任务 🟢 \ No newline at end of file diff --git a/f2/apps/douyin/algorithm/webcast_signature.py b/f2/apps/douyin/algorithm/webcast_signature.py index 8156c59b..e573176e 100644 --- a/f2/apps/douyin/algorithm/webcast_signature.py +++ b/f2/apps/douyin/algorithm/webcast_signature.py @@ -14,7 +14,7 @@ def __init__(self, user_agent: str = None): else "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0" ) # 自定义 ua，为空则设置一个默认 ua - def get_signature(self, room_id: str, user_unique_id: str): + def get_signature(self, room_id: str, user_unique_id: str) -> str: """ 获取直播间签名 diff --git a/f2/apps/tiktok/model.py b/f2/apps/tiktok/model.py index bab21387..8d14d11c 100644 --- a/f2/apps/tiktok/model.py +++ b/f2/apps/tiktok/model.py @@ -140,6 +140,7 @@ class UserLive(BaseRequestModel): uniqueId: str sourceType: int = 54 + class CheckLiveAlive(BaseRequestModel): from_page: str = "live" room_ids: str From bd0860b722dcd1236d4cec61647857432e8bc7e8 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Wed, 26 Jun 2024 23:18:54 +0800 Subject: [PATCH 260/299] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0tiktok?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=80=85=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/guide/apps/tiktok/index.md | 132 ++++++++++++++++++++------------ 1 file changed, 84 insertions(+), 48 deletions(-) diff --git a/docs/guide/apps/tiktok/index.md b/docs/guide/apps/tiktok/index.md index 0cf925c5..c57717d7 100644 --- a/docs/guide/apps/tiktok/index.md +++ b/docs/guide/apps/tiktok/index.md @@ -17,28 +17,30 @@ outline: deep | 下载用户喜欢作品 | handle_user_like | | 下载用户收藏作品 | handle_user_collect | | 下载用户合辑(播放列表)作品 | handle_user_mix | +| 下载搜索作品 | handle_search_video | | 下载用户直播流 | handle_user_live | -| 下载用户首页推荐作品 | handle_user_feed | | 数据与功能接口 | 方法 | 开发者接口 | | :------------------ | :------------------- | :--------: | +| 用户信息 | fetch_user_profile | 🟢 | +| 创建用户记录与目录 | get_or_add_user_data | 🟢 | +| 创建作品下载记录 | get_or_add_video_data | 🟢 | | 单个作品数据 | fetch_one_video | 🟢 | | 用户发布作品数据 | fetch_user_post_videos | 🟢 | | 用户喜欢作品数据 | fetch_user_like_videos | 🟢 | | 用户收藏作品数据 | fetch_user_collect_videos | 🟢 | -| 用户播放列表作品数据 | fetch_play_list | 🟢 | -| 用户合辑(播放列表)作品 | fetch_user_mix_videos | 🟢 | -| ...... | ...... | 🔵 | -| 用户信息 | fetch_user_profile | 🟢 | -| 获取指定用户名 | get_user_nickname | 🔴 | -| 创建用户记录与目录 | get_or_add_user_data | 🟡 | -| 创建作品下载记录 | get_or_add_video_data | 🟢 | +| 用户播放列表数据 | fetch_play_list | 🟢 | +| 用户合辑(播放列表)作品数据 | fetch_user_mix_videos | 🟢 | +| 搜索作品数据 | fetch_search_videos | 🟢 | +| 用户直播流数据 | fetch_user_live_videos | 🟢 | +| 检查直播流状态 | fetch_check_live_alive | 🟢 | ::: ::: details utils接口列表 | 开发者接口 | 类名 | 方法 | 状态 | | :---------------- | :-------------- | :------------------ | :--: | +| 管理客户端配置 | ClientConfManager | | 🟢 | | 生成真实msToken | TokenManager | gen_real_msToken | 🟢 | | 生成虚假msToken | TokenManager | gen_false_msToken | 🟢 | | 生成ttwid | TokenManager | gen_ttwid | 🟢 | @@ -52,7 +54,8 @@ outline: deep | 提取列表用户id | SecUserIdFetcher | get_all_secUid | 🟢 | | 提取单个作品id | AwemeIdFetcher | get_aweme_id | 🟢 | | 提取列表作品id | AwemeIdFetcher | get_all_aweme_id | 🟢 | -| 提取合辑id | MixIdFetcher | - | 🟤 | +| 生成deviceId | DeviceIdManager | gen_device_id | 🟢 | +| 生成devideId列表 | DeviceIdManager | gen_device_ids | 🟢 | | 全局格式化文件名 | - | format_file_name | 🟢 | | 创建用户目录 | - | create_user_folder | 🟢 | | 重命名用户目录 | - | rename_user_folder | 🟢 | @@ -69,8 +72,11 @@ outline: deep | 合辑列表接口地址 | TiktokCrawler | fetch_user_play_list | 🟢 | | 合辑作品接口地址 | TiktokCrawler | fetch_user_mix | 🟢 | | 作品详情接口地址 | TiktokCrawler | fetch_post_detail | 🟢 | -| 作品评论接口地址 | TiktokCrawler | fetch_post_comment | 🟡 | -| 推荐作品接口地址 | TiktokCrawler | fetch_post_feed | 🟡 | +| 作品评论接口地址 | TiktokCrawler | fetch_post_comment | 🟢 | +| 首页推荐作品接口地址 | TiktokCrawler | fetch_post_feed | 🟢 | +| 搜索作品接口地址 | TiktokCrawler | fetch_post_search | 🟢 | +| 用户直播接口地址 | TiktokCrawler | fetch_user_live | 🟢 | +| 检测直播状态接口地址 | TiktokCrawler | fetch_check_live_alive | 🟢 | ::: ::: details dl接口列表 @@ -78,6 +84,7 @@ outline: deep | 下载器接口 | 类名 | 方法 | 状态 | | :----------- | :--------- | :---------- | :--: | | 保存最后一次请求的aweme_id | TiktokDownloader | save_last_aweme_id | 🟢 | +| 筛选指定时间区间的作品 | TiktokDownloader | filter_aweme_datas_by_interval | 🟢 | | 创建下载任务 | TiktokDownloader | create_download_task | 🟢 | | 处理下载任务 | TiktokDownloader | handle_download | 🟢 | | 创建流下载任务 | TiktokDownloader | create_stream_tasks | 🟢 | @@ -209,22 +216,8 @@ outline: deep TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 ::: -### 获取指定用户名 🔴 - -异步方法，用于获取指定用户的昵称，如果不存在，则从服务器获取并存储到数据库中。 - -| 参数 | 类型 | 说明 | -| :--- | :--- | :--- | -| secUid| str | 用户ID | -| db | AsyncUserDB | 用户数据库 | - -| 返回 | 类型 | 说明 | -| :--- | :--- | :--- | -| user_nickname | str | 用户昵称 | - -<<< @/snippets/tiktok/user-nickname.py{17-20} -### 创建用户记录与目录 🟡 +### 创建用户记录与目录 🟢 异步方法，用于获取或创建用户数据同时创建用户目录。 @@ -257,19 +250,33 @@ TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 | 返回 | 类型 | 说明 | | :--- | :--- | :--- | -|None | None | 无 | +|无 | 无 | 无 | <<< @/snippets/tiktok/video-get-add.py{6,23-25} ## utils接口列表 +### 管理客户端配置 🟢 + +类方法，用于管理客户端配置 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| 无 | 无 | 无 | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| 配置文件值 | Any | 配置文件值 | + +<<< @/snippets/tiktok/client-config.py{4,5,7,8,10,11} + ### 生成真实msToken 🟢 -静态方法，用于生成真实的msToken，当出现错误时返回虚假的值。 +类方法，用于生成真实的msToken，当出现错误时返回虚假的值。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | -| None | None | 无 | +| 无 | 无 | 无 | | 返回 | 类型 | 说明 | | :--- | :--- | :--- | @@ -279,11 +286,11 @@ TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 ### 生成虚假msToken 🟢 -静态方法，用于生成随机虚假的msToken，不同端点的msToken长度不同。 +类方法，用于生成随机虚假的msToken，不同端点的msToken长度不同。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | -| None | None | 无 | +| 无 | 无 | 无 | | 返回 | 类型 | 说明 | | :--- | :--- | :--- | @@ -297,11 +304,11 @@ TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 ### 生成ttwid 🟢 -静态方法，用于生成ttwid，部分请求必带。 +类方法，用于生成ttwid，部分请求必带。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | -| None | None | 无 | +| 无 | 无 | 无 | | 返回 | 类型 | 说明 | | :--- | :--- | :--- | @@ -315,11 +322,11 @@ TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 ### 生成odin_tt 🟢 -静态方法，用于生成odin_tt，部分请求必带。 +类方法，用于生成odin_tt，部分请求必带。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | -| None | None | 无 | +| 无 | 无 | 无 | | 返回 | 类型 | 说明 | | :--- | :--- | :--- | @@ -333,7 +340,7 @@ TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 ### 使用接口地址生成Xb参数 🟢 -静态方法，用于直接使用接口地址生成`Xbogus`参数，部分接口不校验。 +类方法，用于直接使用接口地址生成`Xbogus`参数，部分接口不校验。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | @@ -347,7 +354,7 @@ TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 ### 使用接口模型生成Xb参数 🟢 -静态方法，用于使用不同接口数据模型生成`Xbogus`参数，部分接口不校验。 +类方法，用于使用不同接口数据模型生成`Xbogus`参数，部分接口不校验。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | @@ -368,14 +375,10 @@ TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 更加抽象的高级方法可以直接调用handler接口的`fetch_user_profile`。 -::: tip 提示 -本项目中的UA参数为固定值，`Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, - like Gecko) Chrome/104.0.0.0 Safari/537.36`。 -::: ### 提取单个用户id 🟢 -静态方法，用于提取单个用户id。 +类方法，用于提取单个用户id。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | @@ -389,7 +392,7 @@ TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 ### 提取列表用户id 🟢 -静态方法，用于提取列表用户id。 +类方法，用于提取列表用户id。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | @@ -403,7 +406,7 @@ TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 ### 提取单个用户唯一id 🟢 -静态方法，用于提取单个用户唯一id。 +类方法，用于提取单个用户唯一id。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | @@ -417,7 +420,7 @@ TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 ### 提取列表用户唯一id 🟢 -静态方法，用于提取列表用户唯一id。 +类方法，用于提取列表用户唯一id。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | @@ -431,7 +434,7 @@ TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 ### 提取单个作品id 🟢 -静态方法，用于提取单个作品id。 +类方法，用于提取单个作品id。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | @@ -445,7 +448,7 @@ TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 ### 提取列表作品id 🟢 -静态方法，用于提取列表作品id。 +类方法，用于提取列表作品id。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | @@ -461,6 +464,39 @@ TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 从网页复制的链接和app分享的链接都是有效的。 ::: +### 生成deviceId 🟢 + +类方法，用于生成`deviceId`和`tt_chain_token`。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| full_cookie | bool | 是否返回完整的cookie | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| device_id | dict | 设备ID和cookie的字典 | + +<<< @/snippets/tiktok/device-id.py#device-id-snippet{6,8} + +### 生成devideId列表 🟢 + +类方法，用于生成多个`deviceId`和`tt_chain_token`。 + +| 参数 | 类型 | 说明 | +| :--- | :--- | :--- | +| count | int | 设备ID数量 | +| full_cookie | bool | 是否返回完整的cookie | + +| 返回 | 类型 | 说明 | +| :--- | :--- | :--- | +| device_ids | dict | 设备ID和cookie的列表字典 | + +<<< @/snippets/tiktok/device-id.py#device-ids-snippet{6,8} + +::: tip 提示 +`deviceId`和`tt_chain_token`影响视频地址的访问，403的情况就是这个问题。 +::: + ### 全局格式化文件名 🟢 根据配置文件的全局格式化文件名。 @@ -480,7 +516,7 @@ TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 | :--- | :--- | :--- | | file_name | str | 格式化后的文件名 | -<<< @/snippets/tiktok/format-file-name.py{18,20,23,25,27-30} +<<< @/snippets/tiktok/format-file-name.py{18,20,23,25,27-32} ### 创建用户目录 🟢 From a8ad2a63a0db8384d20e4ecf48b8257a6ea60d5b Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Wed, 26 Jun 2024 23:19:20 +0800 Subject: [PATCH 261/299] =?UTF-8?q?perf:=20=E4=B8=8D=E4=BD=BF=E7=94=A8sys?= =?UTF-8?q?=E9=80=80=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/handler.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/f2/apps/tiktok/handler.py b/f2/apps/tiktok/handler.py index ed027409..896d921e 100644 --- a/f2/apps/tiktok/handler.py +++ b/f2/apps/tiktok/handler.py @@ -1,7 +1,5 @@ # path: f2/apps/tiktok/handler.py -import sys - from pathlib import Path from urllib.parse import quote, unquote from typing import AsyncGenerator, Union, List, Any @@ -607,7 +605,8 @@ async def select_playlist( """ if playlists == {}: - sys.exit(_("用户没有作品合辑")) + logger.warning(_("用户没有作品合辑")) + return rich_console.print("[bold]请选择要下载的合辑：[/bold]") rich_console.print("0: [bold]全部下载[/bold]") From 295d8526a826ffbadc77498bc0236e1cdd8eb549 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Wed, 26 Jun 2024 23:19:50 +0800 Subject: [PATCH 262/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0x=E7=9A=84api?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/twitter/api.py | 54 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 f2/apps/twitter/api.py diff --git a/f2/apps/twitter/api.py b/f2/apps/twitter/api.py new file mode 100644 index 00000000..60d9dfe4 --- /dev/null +++ b/f2/apps/twitter/api.py @@ -0,0 +1,54 @@ +# path: f2/apps/twitter/api.py + + +class TwitterAPIEndpoints: + """ + API Endpoints for Twitter + """ + + # Twitter Domain + TWITTER_DOMAIN = "https://twitter.com" + + API_DOMAIN = "https://twitter.com/i/api/graphql" + + # Login + LOGIN_ENDPOINT = f"{TWITTER_DOMAIN}/login/" + + # Home Timeline + HOME_TIMELINE = f"{TWITTER_DOMAIN}/api/timeline/home.json" + + # User Timeline + USER_TIMELINE = f"{TWITTER_DOMAIN}/api/timeline/user_timeline.json" + + # User Detail + USER_PROFILE = f"{API_DOMAIN}/qW5u-DAuXpMEG0zA1F7UGQ/UserByScreenName" + + # User Post + USER_POST = f"{API_DOMAIN}/9zyyd1hebl7oNWIPdA8HRw/UserTweets" + + # User Like + USER_LIKE = f"{TWITTER_DOMAIN}/api/favorite/item_list.json" + + # User Collect + USER_COLLECT = f"{TWITTER_DOMAIN}/api/user/collect/item_list.json" + + # User Play List + USER_PLAY_LIST = f"{TWITTER_DOMAIN}/api/user/playlist.json" + + # User Mix + USER_MIX = f"{TWITTER_DOMAIN}/api/mix/item_list.json" + + # Guess You Like + GUESS_YOU_LIKE = f"{TWITTER_DOMAIN}/api/related/item_list.json" + + # User Follow + USER_FOLLOW = f"{TWITTER_DOMAIN}/api/relation/user/list.json" + + # User Fans + USER_FANS = f"{TWITTER_DOMAIN}/api/relation/follower/list.json" + + # Post Detail + POST_DETAIL = f"{API_DOMAIN}/F45teiuFI9MDxaS9UYKv-g/TweetDetail" + + # Post Comment + POST_COMMENT = f"{TWITTER_DOMAIN}/api/comment/list.json" From 12e5556241ea0bd46d1ad53c83943863d7f55c8a Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 14:48:07 +0800 Subject: [PATCH 263/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0x=E7=9A=84?= =?UTF-8?q?=E5=91=BD=E4=BB=A4=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/twitter/cli.py | 355 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 355 insertions(+) create mode 100644 f2/apps/twitter/cli.py diff --git a/f2/apps/twitter/cli.py b/f2/apps/twitter/cli.py new file mode 100644 index 00000000..a764d410 --- /dev/null +++ b/f2/apps/twitter/cli.py @@ -0,0 +1,355 @@ +# path: f2/apps/twitter/cli.py + +import f2 +import click +import typing + +from pathlib import Path + +from f2 import helps +from f2.cli.cli_commands import set_cli_config +from f2.log.logger import logger +from f2.utils.utils import ( + split_dict_cookie, + get_resource_path, + get_cookie_from_browser, + check_invalid_naming, + merge_config, +) +from f2.utils.conf_manager import ConfigManager +from f2.i18n.translator import TranslationManager, _ +from f2.apps.twitter.utils import ClientConfManager + + +def handler_help( + ctx: click.Context, + param: typing.Union[click.Option, click.Parameter], + value: typing.Any, +) -> None: + """ + 处理帮助信息 (Handle help messages) + + 根据提供的值显示帮助信息或退出上下文 + (Display help messages based on the provided value or exit the context) + + Args: + ctx: click的上下文对象 (Click's context object). + param: 提供的参数或选项 (The provided parameter or option). + value: 参数或选项的值 (The value of the parameter or option). + """ + + if not value or ctx.resilient_parsing: + return + + helps.get_help("twitter") + ctx.exit() + + +def handler_auto_cookie( + ctx: click.Context, + param: typing.Union[click.Option, click.Parameter], + value: typing.Any, +) -> None: + """ + 用于自动从浏览器获取cookie (Used to automatically get cookies from the browser) + + Args: + ctx: click的上下文对象 (Click's context object) + param: 提供的参数或选项 (The provided parameter or option) + value: 参数或选项的值 (The value of the parameter or option) + """ + # 如果用户没有提供值或者设置了 resilient_parsing 或者设置了 --cookie，那么跳过自动获取过程 + if not value or ctx.resilient_parsing or ctx.params.get("cookie"): + return + + # 根据浏览器选择获取cookie + try: + cookie_value = split_dict_cookie(get_cookie_from_browser(value, "twitter.com")) + + if not cookie_value: + raise ValueError(_("无法从 {0} 浏览器中获取cookie").format(value)) + + # 如果没有提供配置文件，那么使用高频配置文件 + manager = ConfigManager( + ctx.params.get("config", get_resource_path(f2.APP_CONFIG_FILE_PATH)) + ) + manager.update_config_with_args("twitter", cookie=cookie_value) + except PermissionError: + logger.error(_("请关闭所有已打开的浏览器重试，并且你有适当的权限访问浏览器！")) + ctx.abort() + except Exception as e: + logger.error(_("自动获取Cookie失败：{0}").format(str(e))) + ctx.abort() + finally: + ctx.exit(0) + + +def handler_language( + ctx: click.Context, + param: typing.Union[click.Option, click.Parameter], + value: typing.Any, +) -> None: + """ + 处理语言选项 (Handle language options) + + Args: + ctx: click的上下文对象 (Click's context object) + param: 提供的参数或选项 (The provided parameter or option) + value: 参数或选项的值 (The value of the parameter or option) + """ + + if not value or ctx.resilient_parsing: + return + TranslationManager.get_instance().set_language(value) + global _ + _ = TranslationManager.get_instance().gettext + return value + + +def handler_naming( + ctx: click.Context, + param: typing.Union[click.Option, click.Parameter], + value: typing.Any, +) -> None: + """ + 处理命名选项 (Handle naming options) + + Args: + ctx: click的上下文对象 (Click's context object) + param: 提供的参数或选项 (The provided parameter or option) + value: 参数或选项的值 (The value of the parameter or option) + """ + + # 避免和配置文件参数冲突 + if not value or ctx.resilient_parsing: + return + + # 允许的模式和分隔符 + ALLOWED_PATTERNS = ["{nickname}", "{create}", "{tweet_id}", "{desc}", "{uid}"] + ALLOWED_SEPARATORS = ["-", "_"] + + # 检查命名是否符合命名规范 + invalid_patterns = check_invalid_naming(value, ALLOWED_PATTERNS, ALLOWED_SEPARATORS) + + if invalid_patterns: + raise click.BadParameter( + _("`{0}` 中的 `{1}` 不符合命名模式").format( + value, "".join(invalid_patterns) + ) + ) + + return value + + +@click.command(name="twitter", help=_("推文下载器")) +@click.option( + "-c", + "--config", + type=click.Path(file_okay=True, dir_okay=False, readable=True), + help=_("配置文件的路径，最低优先"), +) +@click.option( + "--url", + "-u", + type=str, + help=_("根据模式提供相应的链接"), +) +@click.option( + "--path", + "-p", + type=str, + help=_("作品保存位置，支持绝对与相对路径"), +) +@click.option( + "--folderize", + "-f", + type=bool, + help=_("是否将作品保存到单独的文件夹"), +) +@click.option( + "--mode", + "-M", + type=click.Choice(f2.TWITTER_MODE_LIST), + help=_("下载模式：单个推文(one)，主页推文(post)"), +) +@click.option( + "--naming", + "-n", + type=str, + help=_("全局推文文件命名方式，前往文档查看更多帮助"), + callback=handler_naming, +) +@click.option( + "--cookie", + "-k", + type=str, + help=_("登录后的[yellow]cookie[/yellow]"), +) +@click.option( + "--interval", + "-i", + type=str, + help=_("下载日期区间发布的推文，格式：2022-01-01|2023-01-01，'all' 为下载所有作品"), +) +@click.option( + "--timeout", + "-e", + type=int, + help=_("网络请求超时时间"), +) +@click.option( + "--max_retries", + "-r", + type=int, + help=_("网络请求超时重试数"), +) +@click.option( + "--max-connections", + "-x", + type=int, + help=_("网络请求并发连接数"), +) +@click.option( + "--max-tasks", + "-t", + type=int, + help=_("异步的任务数"), +) +@click.option( + "--max-counts", + "-o", + type=int, + help=_("最大推文下载数。0 表示无限制"), +) +@click.option( + "--page-counts", + "-s", + type=int, + help=_("从接口每页可获取推文数，不建议超过 20"), +) +@click.option( + "--languages", + "-l", + type=click.Choice(["zh_CN", "en_US"]), + default="zh_CN", + help=_("显示语言。默认为 'zh_CN'，可选：'zh_CN'、'en_US'，不支持配置文件修改"), + callback=handler_language, +) +@click.option( + "--proxies", + "-P", + type=str, + nargs=2, + help=_( + "代理服务器，最多 2 个参数，http://与https://。空格区分 2 个参数 http://x.x.x.x https://x.x.x.x" + ), +) +@click.option( + "--update-config", + type=bool, + is_flag=True, + help=_("使用命令行选项更新配置文件。需要先使用'-c'选项提供一个配置文件路径"), +) +@click.option( + "--init-config", type=str, help=_("初始化配置文件。不能同时初始化和更新配置文件") +) +@click.option( + "--auto-cookie", + type=click.Choice(f2.BROWSER_LIST), + help=_("自动从浏览器获取cookie，使用该命令前请确保关闭所选的浏览器"), + callback=handler_auto_cookie, +) +@click.option( + "-h", + is_flag=True, + is_eager=True, + expose_value=False, + help=_("显示富文本帮助"), + callback=handler_help, +) +@click.pass_context +def twitter( + ctx: click.Context, + config: str, + init_config: str, + update_config: bool, + **kwargs, +) -> None: + ################## + # f2 存在2个主配置文件，分别是app低频配置(app.yaml)和f2低频配置(conf.yaml) + # app低频配置存放app相关的参数 + # f2低频配置存放计算值所需的参数 + + # 其中cli参数具有最高优先，cli >= 自定义 >= 低频 + # 在f2低频配置中设置代理参数 + # 在app低频配置中设置好重试次数，超时时间，下载路径，下载线程，cookie等低频的参数 + # 在自定义配置中可以设置不同用户的高频参数，如用户主页，原声下载，封面下载，文案下载，下载模式等 + # cli参数为配置文件的热修改，可以随时修改每一个参数。 + ################## + + # 读取低频主配置文件 + main_manager = ConfigManager(f2.APP_CONFIG_FILE_PATH) + main_conf_path = get_resource_path(f2.APP_CONFIG_FILE_PATH) + main_conf = main_manager.get_config("twitter") + + # 更新主配置文件中的代理参数 + main_conf["proxies"] = ClientConfManager.proxies() + + # 更新主配置文件中的headers参数 + kwargs.setdefault("headers", {}) + kwargs["headers"]["User-Agent"] = ClientConfManager.user_agent() + kwargs["headers"]["Referer"] = ClientConfManager.referer() + kwargs["headers"]["Authorization"] = ClientConfManager.authorization() + kwargs["headers"]["X-Csrf-Token"] = ClientConfManager.x_csrf_token() + + # 如果初始化配置文件，则与更新配置文件互斥 + if init_config and not update_config: + main_manager.generate_config("twitter", init_config) + return + elif init_config: + raise click.UsageError(_("不能同时初始化和更新配置文件")) + # 如果没有初始化配置文件，但是更新配置文件，则需要提供配置文件路径 + elif update_config and not config: + raise click.UsageError( + _("要更新配置, 首先需要使用'-c'选项提供一个自定义配置文件路径") + ) + + # 读取自定义配置文件 + if config: + custom_manager = ConfigManager(config) + else: + custom_manager = main_manager + config = main_conf_path + + custom_conf = custom_manager.get_config("twitter") + + if update_config: # 如果指定了 update_config，更新配置文件 + update_manger = ConfigManager(config) + update_manger.update_config_with_args("twitter", **kwargs) + return + + # 将kwargs["proxies"]中的tuple转换为dict + if kwargs.get("proxies"): + kwargs["proxies"] = { + "http": kwargs["proxies"][0], + "https": kwargs["proxies"][1], + } + + # 从低频配置开始到高频配置再到cli参数，逐级覆盖，如果键值不存在使用父级的键值 + kwargs = merge_config(main_conf, custom_conf, **kwargs) + + logger.info(_("模式：{0}").format(kwargs.get("mode"))) + logger.info(_("主配置路径：{0}").format(main_conf_path)) + logger.info(_("自定义配置路径：{0}").format(Path.cwd() / config)) + logger.debug(_("主配置参数：{0}").format(main_conf)) + logger.debug(_("自定义配置参数：{0}").format(custom_conf)) + logger.debug(_("CLI参数：{0}").format(kwargs)) + + # 尝试从命令行参数或kwargs中获取URL + if not kwargs.get("url"): + logger.error(_("缺乏URL参数，详情看命令帮助")) + handler_help(ctx, None, True) + + # 添加app_name到kwargs + kwargs["app_name"] = "twitter" + ctx.invoke(set_cli_config, **kwargs) From e7e84039ff51b79292d1db049ecb8f1ef170b966 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 14:48:39 +0800 Subject: [PATCH 264/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0x=E7=9A=84?= =?UTF-8?q?=E7=88=AC=E8=99=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/twitter/crawler.py | 64 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 f2/apps/twitter/crawler.py diff --git a/f2/apps/twitter/crawler.py b/f2/apps/twitter/crawler.py new file mode 100644 index 00000000..782da4ca --- /dev/null +++ b/f2/apps/twitter/crawler.py @@ -0,0 +1,64 @@ +# path: f2/apps/twitter/crawler.py + +from f2.log.logger import logger +from f2.i18n.translator import _ +from f2.crawlers.base_crawler import BaseCrawler +from f2.apps.twitter.api import TwitterAPIEndpoints as xendpoints +from f2.apps.twitter.model import ( + TweetDetail, + TweetDetailEncode, + UserProfile, + UserProfileEncode, + PostTweet, + PostTweetEncode, + encode_model, +) +from f2.apps.twitter.utils import ModelManager, ClientConfManager + + +class TwitterCrawler(BaseCrawler): + def __init__( + self, + kwargs: dict = ..., + ): + # 需要与cli同步 + proxies = kwargs.get("proxies", {"http://": None, "https://": None}) + + self.user_agent = ClientConfManager.user_agent() + self.referrer = ClientConfManager.referer() + self.authorization = ClientConfManager.authorization() + self.x_csrf_token = ClientConfManager.x_csrf_token() + + self.headers = { + "User-Agent": self.user_agent, + "Referer": self.referrer, + "Cookie": kwargs["cookie"], + "Authorization": self.authorization, + "X-Csrf-Token": self.x_csrf_token, + } + + super().__init__(proxies=proxies, crawler_headers=self.headers) + + async def fetch_tweet_detail(self, params: TweetDetailEncode): + endpoint = ModelManager.model_2_endpoint( + xendpoints.POST_DETAIL, + TweetDetail(variables=encode_model(params)).model_dump(), + ) + logger.debug(_("推文详情接口地址: {0}").format(endpoint)) + return await self._fetch_get_json(endpoint) + + async def fetch_user_profile(self, params: UserProfileEncode): + endpoint = ModelManager.model_2_endpoint( + xendpoints.USER_PROFILE, + UserProfile(variables=encode_model(params)).model_dump(), + ) + logger.debug(_("用户信息接口地址: {0}").format(endpoint)) + return await self._fetch_get_json(endpoint) + + async def fetch_post_tweet(self, params: PostTweetEncode): + endpoint = ModelManager.model_2_endpoint( + xendpoints.USER_POST, + PostTweet(variables=encode_model(params)).model_dump(), + ) + logger.debug(_("推文接口地址: {0}").format(endpoint)) + return await self._fetch_get_json(endpoint) From ad7b43d8aa65732b24dc96df9594592d9815b84e Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 14:48:54 +0800 Subject: [PATCH 265/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0x=E7=9A=84orm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/twitter/db.py | 123 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 f2/apps/twitter/db.py diff --git a/f2/apps/twitter/db.py b/f2/apps/twitter/db.py new file mode 100644 index 00000000..6766d408 --- /dev/null +++ b/f2/apps/twitter/db.py @@ -0,0 +1,123 @@ +# path: f2/apps/twitter/db.py + +from f2.db.base_db import BaseDB + + +class AsyncUserDB(BaseDB): + TABLE_NAME = "user_info_web" + + async def _create_table(self) -> None: + """ + 在数据库中创建用户信息表 + """ + await super()._create_table() + + fields = [ + "user_id TEXT", + "user_unique_id TEXT PRIMARY KEY", + "user_rest_id TEXT", + "join_time TEXT", + "nickname TEXT", + "nickname_raw TEXT", + "user_description TEXT", + "user_description_raw TEXT", + "user_pined_tweet_id TEXT", + "user_profile_banner_url TEXT", + "followers_count INTEGER", + "friends_count INTEGER", + "statuses_count INTEGER", + "media_count INTEGER", + "favourites_count INTEGER", + "has_custom_timelines BOOLEAN", + "location TEXT", + "can_dm BOOLEAN", + "is_blue_verified BOOLEAN", + ] + + fields_sql = ", ".join(fields) + await self.execute( + f"""CREATE TABLE IF NOT EXISTS {self.TABLE_NAME} ({fields_sql})""" + ) + await self.commit() + + async def add_user_info(self, ignore_fields=None, **kwargs) -> None: + """ + 添加用户信息 + + Args: + ignore_fields: 要忽略的字段列表，例如 ["field1", "field2"] + **kwargs: 用户的其他字段键值对 + """ + + # 如果 ignore_fields 未提供或者为 None，将其设置为空列表 + ignore_fields = ignore_fields or [] + + # 从 kwargs 中删除要忽略的字段 + for field in ignore_fields: + if field in kwargs: + del kwargs[field] + + keys = ", ".join(kwargs.keys()) + placeholders = ", ".join(["?"] * len(kwargs)) + values = tuple(kwargs.values()) + + await self.execute( + f"INSERT OR REPLACE INTO {self.TABLE_NAME} ({keys}) VALUES ({placeholders})", + values, + ) + # VALUES (?, {placeholders})', (kwargs.get('user_id'), *values)) + await self.commit() + + async def update_user_info(self, user_id: str, **kwargs) -> None: + """ + 更新用户信息 + + Args: + user_id (str): 用户唯一标识 + **kwargs: 用户的其他字段键值对 + """ + + user_data = await self.get_user_info(user_id) + if user_data: + set_sql = ", ".join([f"{key} = ?" for key in kwargs.keys()]) + await self.execute( + f"UPDATE {self.TABLE_NAME} SET {set_sql} WHERE user_id=?", + (*kwargs.values(), user_id), + ) + await self.commit() + + async def get_user_info(self, user_id: str) -> dict: + """ + 获取用户信息 + + Args: + user_id (str): 用户唯一标识 + + Returns: + dict: 对应的用户信息，如果不存在则返回 None + """ + cursor = await self.execute( + f"SELECT * FROM {self.TABLE_NAME} WHERE user_id=?", (user_id,) + ) + result = await cursor.fetchone() + if not result: + return {} + columns = [description[0] for description in cursor.description] + return dict(zip(columns, result)) + + async def delete_user_info(self, user_id: str) -> None: + """ + 删除用户信息 + + Args: + user_id (str): 用户唯一标识 + """ + await self.execute(f"DELETE FROM {self.TABLE_NAME} WHERE user_id=?", (user_id,)) + await self.commit() + + async def __aenter__(self): + await self.connect() + return self + + async def __aexit__(self, exc_type, exc_val, exc_tb): + await self.close() From e041f28ca5843e319b07b0360944a3abbd646adc Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 14:49:07 +0800 Subject: [PATCH 266/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0x=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/twitter/dl.py | 177 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 177 insertions(+) create mode 100644 f2/apps/twitter/dl.py diff --git a/f2/apps/twitter/dl.py b/f2/apps/twitter/dl.py new file mode 100644 index 00000000..6ae79c04 --- /dev/null +++ b/f2/apps/twitter/dl.py @@ -0,0 +1,177 @@ +# path: f2/apps/twitter/dl.py + +import sys +from datetime import datetime +from typing import Any, Union + +from f2.i18n.translator import _ +from f2.log.logger import logger +from f2.dl.base_downloader import BaseDownloader +from f2.utils.utils import get_timestamp, timestamp_2_str +from f2.apps.twitter.db import AsyncUserDB +from f2.apps.twitter.utils import format_file_name + + +class TwitterDownloader(BaseDownloader): + def __init__(self, kwargs: dict = {}): + if kwargs["cookie"] is None: + raise ValueError( + _( + "cookie不能为空。请提供有效的 cookie 参数，或自动从浏览器获取。如 `--auto-cookie edge`" + ) + ) + + super().__init__(kwargs) + + async def create_download_tasks( + self, kwargs: dict, tweet_datas: Union[list, dict], user_path: Any + ) -> None: + """ + 创建下载任务 + + Args: + kwargs (dict): 命令行参数 + tweet_datas (list, dict): 推文数据列表或字典 + user_path (str): 用户目录路径 + """ + if ( + not kwargs + or not tweet_datas + or not isinstance(tweet_datas, (list, dict)) + or not user_path + ): + return + + # 统一处理，将 tweet_datas 转为列表 + tweet_datas_list = ( + [tweet_datas] if isinstance(tweet_datas, dict) else tweet_datas + ) + + # 筛选指定日期区间内的推文 + if kwargs.get("interval") != "all": + tweet_datas_list = await self.filter_tweet_datas_by_interval( + tweet_datas_list, kwargs.get("interval") + ) + + # 检查是否有符合条件的推文 + if not tweet_datas_list: + logger.warning(_("没有找到符合条件的推文")) + await self.close() + sys.exit(0) + + # 创建下载任务 + for tweet_data in tweet_datas_list: + await self.handler_download(kwargs, tweet_data, user_path) + + # 执行下载任务 + await self.execute_tasks() + + async def handler_download( + self, kwargs: dict, tweet_data_dict: dict, user_path: Any + ) -> None: + """ + 处理下载任务 + + Args: + kwargs (dict): 命令行参数 + tweet_data_dict (dict): 作品数据字典 + user_path (Any): 用户目录路径 + """ + + user_id = tweet_data_dict.get("user_id") + + if user_id is None: + return + + tweet_id = tweet_data_dict.get("tweet_id") + tweet_media_type = tweet_data_dict.get("tweet_media_type") + tweet_media_url = tweet_data_dict.get("tweet_media_url") + + # logger.info(f"========{tweet_id}========") + # logger.info(tweet_data_dict) + # logger.info("===================================") + + # 构建文件夹路径 + base_path = ( + user_path + / format_file_name(kwargs.get("naming", "{create}_{desc}"), tweet_data_dict) + if kwargs.get("folderize") + else user_path + ) + + # # 检查微博是否可见 + # if tweet_data_dict.get("is_visible"): + # logger.error(_("微博 {0} 无查看权限").format(tweet_id)) + # return + + # 检查推文是否有图片 + if tweet_media_type == "video": + + # 说明是视频推文 + # logger.info( + # _("推文视频时长：{0}s，码率列表：{1}").format( + # tweet_data_dict.get("tweet_video_duration") // 1000, + # tweet_data_dict.get("tweet_video_bitrate"), + # ) + # ) + # logger.info(tweet_data_dict.get("playback_list")[0]) + + video_name = ( + format_file_name( + kwargs.get("naming", "{create}_{desc}"), tweet_data_dict + ) + + "_video" + ) + + video_url = tweet_data_dict.get("tweet_video_url") + if isinstance(video_url, list): + video_url = video_url[-1] + + await self.initiate_download( + _("视频"), + video_url, + base_path, + video_name, + ".mp4", + ) + elif tweet_media_type == "photo": + # 处理图片下载任务 + logger.info( + _("推文图片列表：{0}").format(tweet_data_dict.get("tweet_media_url")) + ) + if not tweet_data_dict.get("tweet_media_url"): + logger.warning( + _("{0} : {1}该推文没有图片链接").format( + tweet_id, tweet_data_dict.get("tweet_desc") + ) + ) + else: + if isinstance(tweet_media_url, str): + tweet_media_url = [tweet_data_dict.get("tweet_media_url")] + for i, image_url in enumerate(tweet_media_url): + image_name = f"{format_file_name(kwargs.get('naming'), tweet_data_dict)}_image_{i + 1}" + if image_url != None: + await self.initiate_download( + _("图片"), + f"{image_url}?format=jpg&name=large", + base_path, + image_name, + ".jpg", + ) + else: + logger.warning( + _("{0} 该推文没有图片链接，无法下载").format(tweet_id) + ) + + # 处理文案下载任务 + if kwargs.get("desc"): + desc_name = ( + format_file_name( + kwargs.get("naming", "{create}_{desc}"), tweet_data_dict + ) + + "_desc" + ) + desc_content = tweet_data_dict.get("tweet_desc") + await self.initiate_static_download( + _("文案"), desc_content, base_path, desc_name, ".txt" + ) From b05b61e24f85a2b8e37a0c745ae9358d1bda28f4 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 14:49:18 +0800 Subject: [PATCH 267/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0x=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=87=E6=BB=A4=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/twitter/filter.py | 1150 +++++++++++++++++++++++++++++++++++++ 1 file changed, 1150 insertions(+) create mode 100644 f2/apps/twitter/filter.py diff --git a/f2/apps/twitter/filter.py b/f2/apps/twitter/filter.py new file mode 100644 index 00000000..71266bba --- /dev/null +++ b/f2/apps/twitter/filter.py @@ -0,0 +1,1150 @@ +# path: f2/apps/twitter/filter.py + +from f2.utils.json_filter import JSONModel +from f2.utils.utils import _get_first_item_from_list, timestamp_2_str, replaceT + +# Filter + + +class TweetDetailFilter(JSONModel): + # tweet + @property + def tweet_id(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.legacy.id_str" + ) + + # tweet_id = property( + # lambda self: self._get_attr_value( + # "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.rest_id" + # ) + # ) + + @property + def tweet_type(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.itemType" + ) + + @property + def tweet_views_count(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.views.count" + ) + + # 收藏数 + @property + def tweet_bookmark_count(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.legacy.bookmark_count" + ) + + # 点赞数 + @property + def tweet_favorite_count(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.legacy.favorite_count" + ) + + # 评论数 + @property + def tweet_reply_count(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.legacy.reply_count" + ) + + # 转推数 + @property + def tweet_retweet_count(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.legacy.retweet_count" + ) + + # 发布时间 + @property + def tweet_created_time(self): + return timestamp_2_str( + self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.legacy.created_at" + ) + ) + + # 推文内容 + @property + def tweet_desc(self): + return replaceT( + self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.legacy.full_text" + ).split()[0] + ) + + @property + def tweet_desc_raw(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.legacy.full_text" + ) + + # 媒体状态 + @property + def tweet_media_status(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.legacy.entities.media[*].ext_media_availability.status" + ) + + # 媒体类型 + @property + def tweet_media_type(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.legacy.entities.media[*].type" + ) + + # 图片链接 + @property + def tweet_media_url(self): + media_urls = self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.legacy.entities.media[*].media_url_https" + ) + if not isinstance(media_urls, list): + media_urls = [media_urls] + return media_urls + + # 视频链接（清晰度依次提高） + @property + def tweet_video_url(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.legacy.extended_entities.media[*].video_info.variants[*].url" + ) + + # 视频时长 + @property + def tweet_video_duration(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.legacy.extended_entities.media[*].video_info.duration_millis" + ) + + # 视频码率 + @property + def tweet_video_bitrate(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.legacy.extended_entities.media[*].video_info.variants[*].bitrate" + ) + + # User + # 注册时间 + @property + def join_time(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.core.user_results.result.legacy.created_at" + ) + + # 蓝V认证 + @property + def is_blue_verified(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.core.user_results.result.is_blue_verified" + ) + + # 用户ID example: VXNlcjoxNDkzODI0MTA2Njk2OTAwNjEx + @property + def user_id(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.core.user_results.result.id" + ) + + # 用户唯一ID（推特ID） example: Asai_chan_ + @property + def user_unique_id(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.core.user_results.result.legacy.screen_name" + ) + + # 昵称 example: 核酸酱 + @property + def nickname(self): + return replaceT( + self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.core.user_results.result.legacy.name" + ) + ) + + @property + def nicename_raw(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.core.user_results.result.legacy.name" + ) + + @property + def user_description(self): + return replaceT( + self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.core.user_results.result.legacy.description" + ) + ) + + @property + def user_description_raw(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.core.user_results.result.legacy.description" + ) + + # 置顶推文ID + @property + def user_pined_tweet_id(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.core.user_results.result.legacy.pinned_tweet_ids_str[0]" + ) + + # 主页背景图片 + @property + def user_profile_banner_url(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.core.user_results.result.profile_banner_url" + ) + + # 关注者 + @property + def followers_count(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.core.user_results.result.followers_count" + ) + + # 正在关注 + @property + def friends_count(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.core.user_results.result.friends_count" + ) + + # 帖子数（推文数&回复 maybe？） + @property + def statuses_count(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.core.user_results.result.statuses_count" + ) + + # 媒体数（图片数&视频数） + @property + def media_count(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.core.user_results.result.media_count" + ) + + # 喜欢数 + @property + def favourites_count(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.core.user_results.result.favourites_count" + ) + + @property + def has_custom_timelines(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.core.user_results.result.has_custom_timelines" + ) + + @property + def location(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.core.user_results.result.location" + ) + + @property + def can_dm(self): + return self._get_attr_value( + "$.data.threaded_conversation_with_injections_v2.instructions[0].entries[0].content.itemContent.tweet_results.result.core.user_results.result.can_dm" + ) + + def _to_raw(self) -> dict: + return self._data + + def _to_dict(self) -> dict: + return { + prop_name: getattr(self, prop_name) + for prop_name in dir(self) + if not prop_name.startswith("__") and not prop_name.startswith("_") + } + + +class UserProfileFilter(JSONModel): + # User + + # 蓝V认证 + @property + def is_blue_verified(self): + return self._get_attr_value("$.data.user.result.is_blue_verified") + + # 用户ID example: VXNlcjoxNDkzODI0MTA2Njk2OTAwNjEx + @property + def user_id(self): + return self._get_attr_value("$.data.user.result.id") + + # 获取主页需要这个rest_id + @property + def user_rest_id(self): + return self._get_attr_value("$.data.user.result.rest_id") + + # 用户唯一ID（推特ID） example: Asai_chan_ + @property + def user_unique_id(self): + return self._get_attr_value("$.data.user.result.legacy.screen_name") + + # 注册时间 + @property + def join_time(self): + return timestamp_2_str( + self._get_attr_value("$.data.user.result.legacy.created_at") + ) + + # 昵称 example: 核酸酱 + @property + def nickname(self): + return replaceT(self._get_attr_value("$.data.user.result.legacy.name")) + + @property + def nickname_raw(self): + return self._get_attr_value("$.data.user.result.legacy.name") + + @property + def user_description(self): + return replaceT(self._get_attr_value("$.data.user.result.legacy.description")) + + @property + def user_description_raw(self): + return self._get_attr_value("$.data.user.result.legacy.description") + + # 置顶推文ID + @property + def user_pined_tweet_id(self): + return self._get_attr_value("$.data.user.result.legacy.pinned_tweet_ids_str[0]") + + # 主页背景图片 + @property + def user_profile_banner_url(self): + return self._get_attr_value("$.data.user.result.legacy.profile_banner_url") + + # 关注者 + @property + def followers_count(self): + return self._get_attr_value("$.data.user.result.legacy.followers_count") + + # 正在关注 + @property + def friends_count(self): + return self._get_attr_value("$.data.user.result.legacy.friends_count") + + # 帖子数（推文数&回复 maybe？） + @property + def statuses_count(self): + return self._get_attr_value("$.data.user.result.legacy.statuses_count") + + # 媒体数（图片数&视频数） + @property + def media_count(self): + return self._get_attr_value("$.data.user.result.legacy.media_count") + + # 喜欢数 + @property + def favourites_count(self): + return self._get_attr_value("$.data.user.result.legacy.favourites_count") + + @property + def has_custom_timelines(self): + return self._get_attr_value("$.data.user.result.legacy.has_custom_timelines") + + @property + def location(self): + return self._get_attr_value("$.data.user.result.legacy.location") + + @property + def can_dm(self): + return self._get_attr_value("$.data.user.result.legacy.can_dm") + + def _to_raw(self) -> dict: + return self._data + + def _to_dict(self) -> dict: + return { + prop_name: getattr(self, prop_name) + for prop_name in dir(self) + if not prop_name.startswith("__") and not prop_name.startswith("_") + } + + +class PostTweetFilter(JSONModel): + # 用户发布的推文__typename是TweetWithVisibilityResults + @property + def min_cursor(self): + return self._get_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[-2].content.value" + ) + + @property + def max_cursor(self): + return self._get_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[-1].content.value" + ) + + # tweet + @property + def tweet_id(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.legacy.conversation_id_str" + ) + + @property + def tweet_created_at(self): + create_times = self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.legacy.created_at" + ) + return ( + [timestamp_2_str(str(ct)) for ct in create_times] + if isinstance(create_times, list) + else timestamp_2_str(str(create_times)) + ) + + @property + def tweet_favorite_count(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.legacy.favorite_count" + ) + + @property + def tweet_reply_count(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.legacy.reply_count" + ) + + @property + def tweet_retweet_count(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.legacy.retweet_count" + ) + + @property + def tweet_quote_count(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.legacy.quote_count" + ) + + @property + def tweet_views_count(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.views.count" + ) + + @property + def tweet_desc(self): + return replaceT( + self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.legacy.full_text" + ) + ) + + @property + def tweet_desc_raw(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.legacy.full_text" + ) + + @property + def tweet_media_status(self): + # root = self._get_list_attr_value( + # "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.legacy.entities" + # ) + # print(root, type(root)) + # if root[0].get("media", None) is None: + # return None + + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.legacy.entities.media[*].ext_media_availability.status" + ) + + @property + def tweet_media_type(self): + # root = self._get_list_attr_value( + # "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.legacy.entities" + # ) + # if root[0].get("media", None) is None: + # return None + + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.legacy.entities.media[0].type" + ) + + @property + def tweet_media_url(self): + + media_list = [] + # root = self._get_list_attr_value( + # "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.legacy.entities" + # ) + # if root[0].get("media", None) is None: + # media_list.append(None) + + entries = self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.legacy.entities.media[*]" + ) + + if entries is not None: + for entry in entries: + media_list.append(entry.get("media_url_https", None)) + return media_list + + @property + def tweet_video_url(self): + + # [*].video_info.variants + # return [ + # ( + # [ + # video["url"] + # for video in video_url + # if "url" in video and video["url"] + # ] + # if video_url + # else None + # ) + # for video_url in video_url_list + # ] + + video_list = [] + # root = self._get_list_attr_value( + # "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.legacy.entities" + # ) + # if root[0].get("media", None) is None: + # video_list.append(None) + + video_url_list = self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.legacy.entities.media" + ) + + if video_url_list == []: + return [] + + if isinstance(video_url_list[0], dict): + video_url_list = [video_url_list] + + for video_url in video_url_list: + urls = [] + # 如果没有video_info字段，说明不是视频则为None + # 例如 [[1,2,3],None,[1,2,3]]，None要与index对应 + # 如果有video_info字段，说明是视频，返回url列表 + # 例如 [[1,2,3],[1,2,3],[1,2,3]] + for video in video_url: + video_info = video.get("video_info") + if video_info: + variants = video_info.get("variants") + for url in variants: + urls.append(url.get("url", None)) + video_list.append(urls if urls else None) + return video_list + + @property + def tweet_video_bitrate(self): + biterate_list = [] + # root = self._get_list_attr_value( + # "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.legacy.entities" + # ) + # if root[0].get("media", None) is None: + # biterate_list.append(None) + + biterate_url_list = self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.legacy.entities.media[*].video_info.variants[*]" + ) + + if biterate_url_list == []: + return [] + + if isinstance(biterate_url_list[0], dict): + biterate_url_list = [biterate_url_list] + + for biterate_url in biterate_url_list: + urls = [] + for biterate in biterate_url: + biterate_info = biterate.get("video_info") + if biterate_info: + variants = biterate_info.get("variants") + for url in variants: + urls.append(url.get("biterate", None)) + biterate_list.append(urls if urls else None) + return biterate_list + + # user + @property + def user_id(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.core.user_results.result.id" + ) + + @property + def is_blue_verified(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.core.user_results.result.is_blue_verified" + ) + + @property + def user_created_at(self): + create_times = self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.core.user_results.result.legacy.created_at" + ) + return ( + [timestamp_2_str(str(ct)) for ct in create_times] + if isinstance(create_times, list) + else timestamp_2_str(str(create_times)) + ) + + @property + def user_description(self): + return replaceT( + self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.core.user_results.result.legacy.description" + ) + ) + + @property + def user_description_raw(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.core.user_results.result.legacy.description" + ) + + @property + def user_location(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.core.user_results.result.legacy.location" + ) + + @property + def user_friends_count(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.core.user_results.result.legacy.friends_count" + ) + + @property + def user_followers_count(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.core.user_results.result.legacy.followers_count" + ) + + @property + def user_favourites_count(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.core.user_results.result.legacy.favourites_count" + ) + + @property + def user_media_count(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.core.user_results.result.legacy.media_count" + ) + + @property + def user_statuses_count(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.core.user_results.result.legacy.statuses_count" + ) + + @property + def nickname(self): + return replaceT( + self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.core.user_results.result.legacy.name" + ) + ) + + @property + def nickname_raw(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.core.user_results.result.legacy.name" + ) + + @property + def user_screen_name(self): + return replaceT( + self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.core.user_results.result.legacy.screen_name" + ) + ) + + @property + def user_screen_name_raw(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.core.user_results.result.legacy.screen_name" + ) + + @property + def user_profile_banner_url(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.tweet.core.user_results.result.legacy.profile_banner_url" + ) + + def _to_raw(self) -> dict: + return self._data + + def _to_dict(self) -> dict: + return { + prop_name: getattr(self, prop_name) + for prop_name in dir(self) + if not prop_name.startswith("__") and not prop_name.startswith("_") + } + + def _to_list(self) -> list: + exclude_list = [ + "max_cursor", + "min_cursor", + ] + + keys = [ + prop_name + for prop_name in dir(self) + if not prop_name.startswith("__") + and not prop_name.startswith("_") + and prop_name not in exclude_list + ] + + tweet_entries = ( + self._get_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries" + ) + or [] + ) + + list_dicts = [] + for entry in tweet_entries: + d = { + "max_cursor": self.max_cursor, + "min_cursor": self.min_cursor, + } + for key in keys: + attr_values = getattr(self, key) + index = tweet_entries.index(entry) + d[key] = attr_values[index] if index < len(attr_values) else None + list_dicts.append(d) + return list_dicts + + # list_dicts = [] + # for index, (key, entry) in enumerate(tweet_entries.items()): + # d = { + # "max_cursor": self.max_cursor, + # "min_cursor": self.min_cursor, + # } + # for key in keys: + # attr_values = getattr(self, key) + # if attr_values is not None: + # d[key] = attr_values[index] if index < len(attr_values) else None + # else: + # d[key] = None + # list_dicts.append(d) + # return list_dicts + + +class PostRetweetFilter(JSONModel): + # 用户发布的推文__typename是TweetWithVisibilityResults + @property + def min_cursor(self): + return self._get_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[-2].content.value" + ) + + @property + def max_cursor(self): + return self._get_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[-1].content.value" + ) + + # tweet + @property + def tweet_id(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.legacy.conversation_id_str" + ) + + @property + def tweet_created_at(self): + create_times = self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.legacy.created_at" + ) + return ( + [timestamp_2_str(str(ct)) for ct in create_times] + if isinstance(create_times, list) + else timestamp_2_str(str(create_times)) + ) + + @property + def tweet_favorite_count(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.legacy.favorite_count" + ) + + @property + def tweet_reply_count(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.legacy.reply_count" + ) + + @property + def tweet_retweet_count(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.legacy.retweet_count" + ) + + @property + def tweet_quote_count(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.legacy.quote_count" + ) + + @property + def tweet_views_count(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.views.count" + ) + + @property + def tweet_desc(self): + return replaceT( + self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.legacy.full_text" + ) + ) + + @property + def tweet_desc_raw(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.legacy.full_text" + ) + + @property + def tweet_media_status(self): + root = self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.legacy.entities" + ) + if root[0].get("media", None) is None: + return [] + + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.legacy.entities.media[*].ext_media_availability.status" + ) + + @property + def tweet_media_type(self): + root = self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.legacy.entities" + ) + if root[0].get("media", None) is None: + return [] + + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.legacy.entities.media[0].type" + ) + + @property + def tweet_media_url(self): + + media_list = [] + root = self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.legacy.entities" + ) + + if isinstance(root, dict): + root = [root] + + entries = self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.legacy.entities.media[*]" + ) + + if entries is not None: + for entry in entries: + if "media" not in root[entries.index(entry)]: + # print("media not in root") + media_list.append(None) + else: + # print("media in root") + media_list.append(entry.get("media_url_https", None)) + # print("media_list:", media_list) + + return media_list + + @property + def tweet_video_url(self): + + video_list = [] + root = self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.legacy.entities" + ) + + if isinstance(root, dict): + root = [root] + + video_url_list = self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.legacy.entities.media[*]" + ) + # print( + # "第一条推文==================================", + # video_url_list, + # type(video_url_list), + # ) + + # if video_url_list == []: + # return video_url_list + + # if isinstance(video_url_list[0], dict): + # video_url_list = [video_url_list] + + if video_url_list is not None: + for video_dict in video_url_list: + urls = [] + + # # 将有media的下标与root对应 + # video_index = video_url_list.index(video_dict) + # video_dict_list = root[video_index][ + # "media" + # ] # list，其中的media可能[{0},{1},{2}]或者{0} + + # 如果没有video_info字段，说明不是视频则为None + # 例如 [[1,2,3],None,[1,2,3]]，None要与index对应 + # 如果有video_info字段，说明是视频，返回url列表 + # 例如 [[1,2,3],[1,2,3],[1,2,3]] + # print("----------------------------------") + # print(root[video_url_list.index(video_dict)]) + # print("++++++++++++++++++++++++++++++++++") + if "media" not in root[video_url_list.index(video_dict)]: + print( + "这个内容没有media", + root[video_url_list.index(video_dict)], + "下标", + video_url_list.index(video_dict), + ) + print("++++++++++++++++++++++++++++++++++") + video_list.append(None) + else: + + video_dict_list = root[video_url_list.index(video_dict)][ + "media" + ] # list类型，其中的media可能[{0},{1},{2}]或者{0} + + # print("有media内容类型", video_dict.get("type")) + # print( + # "有media内容", + # root[video_url_list.index(video_dict)], + # "下标", + # video_url_list.index(video_dict), + # ) + # print( + # video_dict.get("expanded_url"), + # root[video_url_list.index(video_dict)]["media"][0][ + # "expanded_url" + # ], + # ) + # 视频类型的数据结构[[11],[11],[11,22,33]] + if video_dict_list[0].get("type") == "video": + for video_dict in video_dict_list: + # video_dict 为每一个视频字典 + video_info = video_dict.get("video_info") + if video_info: + variants = video_info.get("variants") + + # 只拿最后一个链接 + # urls.append() + # for url in variants: + # urls.append(url.get("url", None)) + # print("视频链接", urls[-1]) + + video_list.append(urls if urls else None) + else: + print("有media内容类型是照片的", video_dict_list[0].get("type")) + print( + "这个media内容没有video", + video_dict_list, + ) + print("++++++++++++++++++++++++++++++++++") + video_list.append(None) + print("video_list==============", video_list) + return video_list + + @property + def tweet_video_bitrate(self): + biterate_list = [] + root = self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.legacy.entities" + ) + # print("tweet_video_bitrate:", root[0].get("media", None)) + if root[0].get("media", None) is None: + print( + "============================tweet_video_bitrate:", + root[0].get("media", None), + "============================", + ) + return [] + + biterate_url_list = self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.legacy.entities.media[*].video_info.variants[*]" + ) + + if biterate_url_list == []: + return [] + + if isinstance(biterate_url_list[0], dict): + biterate_url_list = [biterate_url_list] + + for biterate_url in biterate_url_list: + urls = [] + for biterate in biterate_url: + biterate_info = biterate.get("video_info") + if biterate_info: + variants = biterate_info.get("variants") + for url in variants: + urls.append(url.get("biterate", None)) + biterate_list.append(urls if urls else None) + return biterate_list + + # user + @property + def user_id(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.core.user_results.result.id" + ) + + @property + def is_blue_verified(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.core.user_results.result.is_blue_verified" + ) + + @property + def user_created_at(self): + create_times = self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.core.user_results.result.legacy.created_at" + ) + return ( + [timestamp_2_str(str(ct)) for ct in create_times] + if isinstance(create_times, list) + else timestamp_2_str(str(create_times)) + ) + + @property + def user_description(self): + return replaceT( + self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.core.user_results.result.legacy.description" + ) + ) + + @property + def user_description_raw(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.core.user_results.result.legacy.description" + ) + + @property + def user_location(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.core.user_results.result.legacy.location" + ) + + @property + def user_friends_count(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.core.user_results.result.legacy.friends_count" + ) + + @property + def user_followers_count(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.core.user_results.result.legacy.followers_count" + ) + + @property + def user_favourites_count(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.core.user_results.result.legacy.favourites_count" + ) + + @property + def user_media_count(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.core.user_results.result.legacy.media_count" + ) + + @property + def user_statuses_count(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.core.user_results.result.legacy.statuses_count" + ) + + @property + def nickname(self): + return replaceT( + self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.core.user_results.result.legacy.name" + ) + ) + + @property + def nickname_raw(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.core.user_results.result.legacy.name" + ) + + @property + def user_screen_name(self): + return replaceT( + self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.core.user_results.result.legacy.screen_name" + ) + ) + + @property + def user_screen_name_raw(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.core.user_results.result.legacy.screen_name" + ) + + @property + def user_profile_banner_url(self): + return self._get_list_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries[*].content.itemContent.tweet_results.result.core.user_results.result.legacy.profile_banner_url" + ) + + def _to_raw(self) -> dict: + return self._data + + def _to_dict(self) -> dict: + return { + prop_name: getattr(self, prop_name) + for prop_name in dir(self) + if not prop_name.startswith("__") and not prop_name.startswith("_") + } + + def _to_list(self) -> list: + exclude_list = [ + "max_cursor", + "min_cursor", + ] + + keys = [ + prop_name + for prop_name in dir(self) + if not prop_name.startswith("__") + and not prop_name.startswith("_") + and prop_name not in exclude_list + ] + + tweet_entries = ( + self._get_attr_value( + "$.data.user.result.timeline_v2.timeline.instructions[-1].entries" + ) + or [] + ) + + list_dicts = [] + for entry in tweet_entries: + d = { + "max_cursor": self.max_cursor, + "min_cursor": self.min_cursor, + } + for key in keys: + attr_values = getattr(self, key) + index = tweet_entries.index(entry) + d[key] = attr_values[index] if index < len(attr_values) else None + list_dicts.append(d) + return list_dicts From 023b4d5247f4015373fd08d52dc7fc4b24e06857 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 14:49:33 +0800 Subject: [PATCH 268/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0x=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/twitter/handler.py | 388 +++++++++++++++++++++++++++++++++++++ 1 file changed, 388 insertions(+) create mode 100644 f2/apps/twitter/handler.py diff --git a/f2/apps/twitter/handler.py b/f2/apps/twitter/handler.py new file mode 100644 index 00000000..fa00b18a --- /dev/null +++ b/f2/apps/twitter/handler.py @@ -0,0 +1,388 @@ +# path: f2/apps/twitter/handler.py + +import asyncio +from pathlib import Path +from typing import AsyncGenerator, Union, Dict, Any, List + +from f2.log.logger import logger +from f2.i18n.translator import _ +from f2.utils.decorators import mode_handler, mode_function_map +from f2.utils.utils import split_set_cookie +from f2.apps.twitter.db import AsyncUserDB +from f2.apps.twitter.crawler import TwitterCrawler +from f2.apps.twitter.dl import TwitterDownloader +from f2.apps.twitter.model import ( + TweetDetailEncode, + UserProfileEncode, + PostTweetEncode, +) +from f2.apps.twitter.filter import ( + TweetDetailFilter, + UserProfileFilter, + PostTweetFilter, + PostRetweetFilter, +) +from f2.apps.twitter.utils import ( + UserIdFetcher, + TweetIdFetcher, + create_or_rename_user_folder, +) +from f2.cli.cli_console import RichConsoleManager +from f2.exceptions.api_exceptions import APIResponseError + +rich_console = RichConsoleManager().rich_console +rich_prompt = RichConsoleManager().rich_prompt + + +class TwitterHandler: + + def __init__(self, kwargs: dict = ...) -> None: + self.kwargs = kwargs + self.downloader = TwitterDownloader(kwargs) + + async def fetch_user_profile( + self, + uniqueId: str, + ) -> UserProfileFilter: + """ + 用于获取指定用户的个人信息 + (Used to get personal info of specified users) + + Args: + uniqueId: str: 用户ID (User ID) + + Return: + user: UserProfileFilter: 用户信息过滤器 (User info filter) + """ + + async with TwitterCrawler(self.kwargs) as crawler: + params = UserProfileEncode(screen_name=uniqueId) + response = await crawler.fetch_user_profile(params) + user = UserProfileFilter(response) + if user.nickname is None: + raise APIResponseError( + _("`fetch_user_profile`请求失败，请更换cookie或稍后再试") + ) + return UserProfileFilter(response) + + async def get_or_add_user_data( + self, + kwargs: dict, + uniqueId: str, + db: AsyncUserDB, + ) -> Path: + """ + 获取或创建用户数据同时创建用户目录 + (Get or create user data and create user directory) + + Args: + kwargs (dict): 配置参数 (Conf parameters) + uniqueId (str): 用户ID (User ID) + db (AsyncUserDB): 用户数据库 (User database) + + Returns: + user_path (Path): 用户目录路径 (User directory path) + """ + + # 尝试从数据库中获取用户数据 + local_user_data = await db.get_user_info(uniqueId) + + # 从服务器获取当前用户最新数据 + current_user_data = await self.fetch_user_profile(uniqueId) + + # 获取当前用户最新昵称 + current_nickname = current_user_data.nickname + + # 设置用户目录 + user_path = create_or_rename_user_folder( + kwargs, local_user_data, current_nickname + ) + + # 如果用户不在数据库中，将其添加到数据库 + if not local_user_data: + await db.add_user_info(**current_user_data._to_dict()) + + return user_path + + @mode_handler("one") + async def handle_one_tweet(self): + """ + 用于处理单个推文。 + (Used to process a single tweet.) + + Args: + kwargs: dict: 参数字典 (Parameter dictionary) + """ + + tweet_id = await TweetIdFetcher.get_tweet_id(self.kwargs.get("url")) + tweet_data = await self.fetch_one_tweet(tweet_id) + + async with AsyncUserDB("twitter_users.db") as db: + user_path = await self.get_or_add_user_data( + self.kwargs, tweet_data.user_unique_id, db + ) + + # async with AsynctweetDB("twitter_tweets.db") as db: + # await self.get_or_add_tweet_data( + # tweet_data._to_dict(), db, self.ignore_fields + # ) + + # logger.info(_("单个推文数据：{0}").format(tweet_data._to_dict())) + + # 创建下载任务 + await self.downloader.create_download_tasks( + self.kwargs, tweet_data._to_dict(), user_path + ) + + async def fetch_one_tweet( + self, + tweet_id: str, + ) -> TweetDetailFilter: + """ + 用于获取单个推文。 + + Args: + tweet_id: str: 推文ID + + Return: + tweet: TweetDetailFilter: 单个推文数据过滤器 + """ + + logger.info(_("开始爬取推文：{0}").format(tweet_id)) + async with TwitterCrawler(self.kwargs) as crawler: + params = TweetDetailEncode(focalTweetId=tweet_id) + response = await crawler.fetch_tweet_detail(params) + tweet = TweetDetailFilter(response) + + logger.info( + _("推文ID：{0} 推文文案：{1} 作者：{2}").format( + tweet.tweet_id, tweet.tweet_desc, tweet.nickname + ) + ) + + return tweet + + @mode_handler("post") + async def handle_post_tweet(self): + """ + 用于处理主页推文。 + (Used to process a post tweet.) + + Args: + kwargs: dict: 参数字典 (Parameter dictionary) + """ + + max_cursor = self.kwargs.get("max_cursor", "") + page_counts = self.kwargs.get("page_counts", 20) + max_counts = self.kwargs.get("max_counts") + + uniqueID = await UserIdFetcher.get_user_id(self.kwargs.get("url")) + user = await self.fetch_user_profile(uniqueID) + + async with AsyncUserDB("twitter_users.db") as udb: + user_path = await self.get_or_add_user_data(self.kwargs, uniqueID, udb) + + async for tweet_list in self.fetch_post_tweet( + user.user_rest_id, page_counts, max_cursor, max_counts + ): + # 创建下载任务 + await self.downloader.create_download_tasks( + self.kwargs, tweet_list._to_list(), user_path + ) + + async def fetch_post_tweet( + self, + userId: str, + page_counts: int = 20, + max_cursor: str = "", + max_counts: int = None, + ) -> AsyncGenerator[PostTweetFilter, Any]: + """ + 用于获取用户发布的推文。 + + Args: + userId: str: 用户ID + page_counts: int: 每次请求的推文数量 + max_cursor: str: 游标 + max_counts: int: 最大请求次数 + + Return: + tweet: PostTweetFilter: 用户发布的推文数据过滤器 + """ + + max_counts = max_counts or float("inf") + tweets_collected = 0 + + logger.info(_("开始爬取用户：{0} 发布的推文").format(userId)) + + while tweets_collected < max_counts: + current_request_size = min(page_counts, max_counts - tweets_collected) + + logger.debug("===================================") + logger.debug( + _("最大数量：{0} 每次请求数量：{1}").format( + max_counts, current_request_size + ) + ) + logger.info(_("开始爬取第 {0} 页").format(max_cursor)) + + async with TwitterCrawler(self.kwargs) as crawler: + params = PostTweetEncode( + userId=userId, count=current_request_size, cursor=max_cursor + ) + response = await crawler.fetch_post_tweet(params) + tweet = PostTweetFilter(response) + + logger.debug(_("当前请求的max_cursor：{0}").format(max_cursor)) + logger.info( + _("推文ID：{0} 推文文案：{1} 作者：{2}").format( + tweet.tweet_id, tweet.tweet_desc, tweet.nickname + ) + ) + logger.info(tweet._to_dict()) + if len(tweet.tweet_id) == 0: + # 只有tweet.tweet_id 和 tweet.tweet_desc都为None时，才认为已经爬取完毕 + # 且只有min_cursor与max_cursor 2个值时没有其他值时才认为到达底部 + if tweet.tweet_id is None and tweet.tweet_desc is None: + logger.info( + _("用户：{0} 所有发布的推文采集完毕").format(tweet.nickname) + ) + break + + logger.info(_("max_cursor：{0} 未找到发布的推文").format(max_cursor)) + max_cursor = tweet.max_cursor + await asyncio.sleep(self.kwargs.get("timeout", 5)) + continue + + yield tweet + + # 更新已经处理的作品数量 (Update the number of videos processed) + tweets_collected += len(tweet.tweet_id) + + max_cursor = tweet.max_cursor + logger.info(f"下一页{tweet.max_cursor}") + + # 避免请求过于频繁 + logger.info(_("等待 {0} 秒后继续").format(self.kwargs.get("timeout", 5))) + await asyncio.sleep(self.kwargs.get("timeout", 5)) + + logger.info(_("爬取结束，共爬取 {0} 个作品").format(tweets_collected)) + + @mode_handler("retweet") + async def handle_retweet(self): + """ + 用于处理转发推文。 + (Used to process retweet tweets.) + + Args: + kwargs: dict: 参数字典 (Parameter dictionary) + """ + + max_cursor = self.kwargs.get("max_cursor", "") + page_counts = self.kwargs.get("page_counts", 20) + max_counts = self.kwargs.get("max_counts") + + uniqueID = await UserIdFetcher.get_user_id(self.kwargs.get("url")) + user = await self.fetch_user_profile(uniqueID) + + async with AsyncUserDB("twitter_users.db") as udb: + user_path = await self.get_or_add_user_data(self.kwargs, uniqueID, udb) + + async for tweet_list in self.fetch_retweet( + user.user_rest_id, page_counts, max_cursor, max_counts + ): + # 创建下载任务 + await self.downloader.create_download_tasks( + self.kwargs, tweet_list._to_list(), user_path + ) + + async def fetch_retweet( + self, + userId: str, + page_counts: int = 20, + max_cursor: str = "", + max_counts: int = None, + ) -> AsyncGenerator[PostTweetFilter, Any]: + """ + 用于获取用户转发的推文。 + + Args: + userId: str: 用户ID + page_counts: int: 每次请求的推文数量 + max_cursor: str: 游标 + max_counts: int: 最大请求次数 + + Return: + tweet: PostTweetFilter: 用户转发的推文数据过滤器 + """ + + max_counts = max_counts or float("inf") + tweets_collected = 0 + + logger.info(_("开始爬取用户：{0} 转发的推文").format(userId)) + + while tweets_collected < max_counts: + current_request_size = min(page_counts, max_counts - tweets_collected) + + logger.debug("===================================") + logger.debug( + _("最大数量：{0} 每次请求数量：{1}").format( + max_counts, current_request_size + ) + ) + logger.info(_("开始爬取第 {0} 页").format(max_cursor)) + + async with TwitterCrawler(self.kwargs) as crawler: + params = PostTweetEncode( + userId=userId, count=current_request_size, cursor=max_cursor + ) + response = await crawler.fetch_post_tweet(params) + retweet = PostRetweetFilter(response) + + logger.debug(_("当前请求的max_cursor：{0}").format(max_cursor)) + # logger.info( + # _("推文ID：{0} 推文文案：{1} 作者：{2}").format( + # retweet.tweet_id, retweet.tweet_desc, retweet.nickname + # ) + # ) + logger.info( + _("推文文案：{0} 推文图片：{1} 推文视频：{2}").format( + retweet.tweet_desc, retweet.tweet_media_url, retweet.tweet_video_url + ) + ) + # logger.info(retweet._to_dict()) + if len(retweet.tweet_id) == 0: + # 只有tweet.tweet_id 和 tweet.tweet_desc都为None时，才认为已经爬取完毕 + # 且只有min_cursor与max_cursor 2个值时没有其他值时才认为到达底部 + if retweet.tweet_id is None and retweet.tweet_desc is None: + logger.info( + _("用户：{0} 所有转发的推文采集完毕").format(retweet.nickname) + ) + break + + logger.info(_("max_cursor：{0} 未找到转发的推文").format(max_cursor)) + max_cursor = retweet.max_cursor + await asyncio.sleep(self.kwargs.get("timeout", 5)) + continue + + yield retweet + + # 更新已经处理的作品数量 (Update the number of videos processed) + tweets_collected += len(retweet.tweet_id) + + max_cursor = retweet.max_cursor + logger.info(f"下一页{retweet.max_cursor}") + + # 避免请求过于频繁 + logger.info(_("等待 {0} 秒后继续").format(self.kwargs.get("timeout", 5))) + await asyncio.sleep(self.kwargs.get("timeout", 5)) + + logger.info(_("爬取结束，共爬取 {0} 个作品").format(tweets_collected)) + + +async def main(kwargs): + mode = kwargs.get("mode") + if mode in mode_function_map: + await mode_function_map[mode](TwitterHandler(kwargs)) + else: + logger.error(_("不存在该模式: {0}").format(mode)) From 409785a6224ddfbae363e6c7acc4881aa406e0f4 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 14:49:49 +0800 Subject: [PATCH 269/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0x=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/twitter/model.py | 139 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) create mode 100644 f2/apps/twitter/model.py diff --git a/f2/apps/twitter/model.py b/f2/apps/twitter/model.py new file mode 100644 index 00000000..d5d3ddb0 --- /dev/null +++ b/f2/apps/twitter/model.py @@ -0,0 +1,139 @@ +# path: f2/apps/twitter/models.py + +from typing import Any +from pydantic import BaseModel +import json +from urllib.parse import quote, unquote + + +def encode_model(model: BaseModel) -> str: + """ + 将 BaseModel 实例转换为 JSON 编码并进行 URL 编码后的字符串 + """ + return quote(model.model_dump_json()) + + +class BaseRequestModel(BaseModel): + variables: str + + +class TweetDetail(BaseRequestModel): + features: str = quote( + json.dumps( + { + "rweb_tipjar_consumption_enabled": False, + "responsive_web_graphql_exclude_directive_enabled": True, + "verified_phone_label_enabled": False, + "creator_subscriptions_tweet_preview_api_enabled": True, + "responsive_web_graphql_timeline_navigation_enabled": True, + "responsive_web_graphql_skip_user_profile_image_extensions_enabled": False, + "communities_web_enable_tweet_community_results_fetch": True, + "c9s_tweet_anatomy_moderator_badge_enabled": True, + "tweetypie_unmention_optimization_enabled": True, + "responsive_web_edit_tweet_api_enabled": True, + "graphql_is_translatable_rweb_tweet_is_translatable_enabled": True, + "view_counts_everywhere_api_enabled": True, + "longform_notetweets_consumption_enabled": True, + "responsive_web_twitter_article_tweet_consumption_enabled": True, + "tweet_awards_web_tipping_enabled": False, + "creator_subscriptions_quote_tweet_preview_enabled": False, + "freedom_of_speech_not_reach_fetch_enabled": True, + "standardized_nudges_misinfo": True, + "tweet_with_visibility_results_prefer_gql_limited_actions_policy_enabled": True, + "rweb_video_timestamps_enabled": True, + "longform_notetweets_rich_text_read_enabled": True, + "longform_notetweets_inline_media_enabled": True, + "responsive_web_enhance_cards_enabled": False, + } + ) + ) + fieldToggles: str = quote( + json.dumps({"withArticleRichContentState": True, "withArticlePlainText": False}) + ) + + +class TweetDetailEncode(BaseModel): + focalTweetId: str + cursor: str = "" + referrer: str = "tweet" + with_rux_injections: bool = True + includePromotedContent: bool = True + withCommunity: bool = True + withQuickPromoteEligibilityTweetFields: bool = True + withBirdwatchNotes: bool = True + withVoice: bool = True + withV2Timeline: bool = True + + +class UserProfile(BaseRequestModel): + features: str = quote( + json.dumps( + { + "hidden_profile_likes_enabled": True, + "hidden_profile_subscriptions_enabled": True, + "rweb_tipjar_consumption_enabled": True, + "responsive_web_graphql_exclude_directive_enabled": True, + "verified_phone_label_enabled": True, + "subscriptions_verification_info_is_identity_verified_enabled": True, + "subscriptions_verification_info_verified_since_enabled": True, + "highlights_tweets_tab_ui_enabled": True, + "responsive_web_twitter_article_notes_tab_enabled": True, + "creator_subscriptions_tweet_preview_api_enabled": True, + "responsive_web_graphql_skip_user_profile_image_extensions_enabled": False, + "responsive_web_graphql_timeline_navigation_enabled": True, + } + ) + ) + fieldToggles: str = quote(json.dumps({"withAuxiliaryUserLabels": False})) + + +class UserProfileEncode(BaseModel): + # uniqueId: asai_chan_ + screen_name: str + withSafetyModeUserFields: bool = True + + +class PostTweet(BaseRequestModel): + features: str = quote( + json.dumps( + { + "rweb_tipjar_consumption_enabled": True, + "responsive_web_graphql_exclude_directive_enabled": True, + "verified_phone_label_enabled": False, + "creator_subscriptions_tweet_preview_api_enabled": True, + "responsive_web_graphql_timeline_navigation_enabled": True, + "responsive_web_graphql_skip_user_profile_image_extensions_enabled": False, + "communities_web_enable_tweet_community_results_fetch": True, + "c9s_tweet_anatomy_moderator_badge_enabled": True, + "articles_preview_enabled": False, + "tweetypie_unmention_optimization_enabled": True, + "responsive_web_edit_tweet_api_enabled": True, + "graphql_is_translatable_rweb_tweet_is_translatable_enabled": True, + "view_counts_everywhere_api_enabled": True, + "longform_notetweets_consumption_enabled": True, + "responsive_web_twitter_article_tweet_consumption_enabled": True, + "tweet_awards_web_tipping_enabled": False, + "creator_subscriptions_quote_tweet_preview_enabled": False, + "freedom_of_speech_not_reach_fetch_enabled": True, + "standardized_nudges_misinfo": True, + "tweet_with_visibility_results_prefer_gql_limited_actions_policy_enabled": True, + "tweet_with_visibility_results_prefer_gql_media_interstitial_enabled": True, + "rweb_video_timestamps_enabled": True, + "longform_notetweets_rich_text_read_enabled": True, + "longform_notetweets_inline_media_enabled": True, + "responsive_web_enhance_cards_enabled": False, + } + ) + ) + + fieldToggles: str = quote(json.dumps({"withArticlePlainText": False})) + + +class PostTweetEncode(BaseModel): + userId: str + count: int + cursor: str = "" + includePromotedContent: bool = True + withQuickPromoteEligibilityTweetFields: bool = True + withVoice: bool = True + withV2Timeline: bool = True From 4062fe017609a533d13cb27c62a2d9cf9df34f65 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 14:50:07 +0800 Subject: [PATCH 270/299] =?UTF-8?q?test:=20=E6=B7=BB=E5=8A=A0x=E7=BB=A7?= =?UTF-8?q?=E6=89=BF=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/twitter/test/test_model.py | 13 ++++++ f2/apps/twitter/test/test_tweet_id.py | 63 +++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 f2/apps/twitter/test/test_model.py create mode 100644 f2/apps/twitter/test/test_tweet_id.py diff --git a/f2/apps/twitter/test/test_model.py b/f2/apps/twitter/test/test_model.py new file mode 100644 index 00000000..5aab255a --- /dev/null +++ b/f2/apps/twitter/test/test_model.py @@ -0,0 +1,13 @@ +from f2.apps.twitter.model import encode_model, TweetDetail, TweetDetailEncode + +if __name__ == "__main__": + + # tweet_detail_encode = quote( + # TweetDetailEncode(focalTweetId="1777291676568166526").model_dump_json() + # ) + # tweet_detail = TweetDetail(variables=tweet_detail_encode) + # print(tweet_detail.model_dump()) + + encoded_data = encode_model(TweetDetailEncode(focalTweetId="1777291676568166526")) + tweet_detail = TweetDetail(variables=encoded_data) + print(tweet_detail.model_dump()) diff --git a/f2/apps/twitter/test/test_tweet_id.py b/f2/apps/twitter/test/test_tweet_id.py new file mode 100644 index 00000000..0ab406b9 --- /dev/null +++ b/f2/apps/twitter/test/test_tweet_id.py @@ -0,0 +1,63 @@ +import pytest +from f2.apps.twitter.utils import TweetIdFetcher +from f2.exceptions.api_exceptions import ( + APINotFoundError, +) + + +@pytest.mark.asyncio +class TestTweetIdFetcher: + async def test_get_tweet_id(self): + tweet_link = "https://twitter.com/realDonaldTrump/status/1265255835124539392" + tweet_id = await TweetIdFetcher.get_tweet_id(tweet_link) + assert tweet_id == "1265255835124539392" + + tweet_link = "https://twitter.com/realDonaldTrump/status/1265255835124539392/" + tweet_id = await TweetIdFetcher.get_tweet_id(tweet_link) + assert tweet_id == "1265255835124539392" + + tweet_link = ( + "https://twitter.com/realDonaldTrump/status/1265255835124539392/?test=123" + ) + tweet_id = await TweetIdFetcher.get_tweet_id(tweet_link) + assert tweet_id == "1265255835124539392" + + tweet_link = ( + "https://twitter.com/realDonaldTrump/status/1265255835124539392/%$#" + ) + tweet_id = await TweetIdFetcher.get_tweet_id(tweet_link) + assert tweet_id == "1265255835124539392" + + tweet_link = ( + "https://www.twitter.com/realDonaldTrump/status/1265255835124539392" + ) + tweet_id = await TweetIdFetcher.get_tweet_id(tweet_link) + assert tweet_id == "1265255835124539392" + + tweet_link = "https://www.twitter.com/realDonaldTrump/status/1265255835124539392?test=123" + tweet_id = await TweetIdFetcher.get_tweet_id(tweet_link) + assert tweet_id == "1265255835124539392" + + tweet_link = ( + "https://www.twitter.com/realDonaldTrump/status/1265255835124539392/" + ) + tweet_id = await TweetIdFetcher.get_tweet_id(tweet_link) + assert tweet_id == "1265255835124539392" + + tweet_link = "https://www.twitter.com/realDonaldTrump/status/1265255835124539392/?test=123" + tweet_id = await TweetIdFetcher.get_tweet_id(tweet_link) + assert tweet_id == "1265255835124539392" + + tweet_link = ( + "https://www.twitter.com/realDonaldTrump/status/1265255835124539392/%$#" + ) + tweet_id = await TweetIdFetcher.get_tweet_id(tweet_link) + assert tweet_id == "1265255835124539392" + + tweet_link = "twitter.com/realDonaldTrump/status/1265255835124539392" + with pytest.raises(APINotFoundError): + await TweetIdFetcher.get_tweet_id(tweet_link) + + tweet_link = "https://t.co/1dBHtrG72J" + tweet_id = await TweetIdFetcher.get_tweet_id(tweet_link) + assert tweet_id == "1777291676568166526" From fbdb47cb6843beaec37d369cfc3c71ca6a12baa2 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 16:18:05 +0800 Subject: [PATCH 271/299] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0douyin?= =?UTF-8?q?=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/guide/apps/douyin/index.md | 219 ++++++++++++++++---------------- 1 file changed, 110 insertions(+), 109 deletions(-) diff --git a/docs/guide/apps/douyin/index.md b/docs/guide/apps/douyin/index.md index 5bdb3427..bb814ad1 100644 --- a/docs/guide/apps/douyin/index.md +++ b/docs/guide/apps/douyin/index.md @@ -12,120 +12,121 @@ outline: deep | CLI接口 | 方法 | | :------------------ | :------------------- | -| 下载单个作品 | handle_one_video | -| 下载用户发布作品 | handle_user_post | -| 下载用户喜欢作品 | handle_user_like | -| 下载用户收藏原声 | handle_user_music_collection | -| 下载用户收藏作品 | handle_user_collection | -| 下载用户合辑作品 | handle_user_mix | -| 下载用户直播流 | handle_user_live | -| 下载用户首页推荐作品 | handle_user_feed | -| 下载相似作品 | handle_related | -| 下载好友作品 | handle_friend_feed | +| 下载单个作品 | `handle_one_video` | +| 下载用户发布作品 | `handle_user_post` | +| 下载用户喜欢作品 | `handle_user_like` | +| 下载用户收藏原声 | `handle_user_music_collection` | +| 下载用户收藏作品 | `handle_user_collection` | +| 下载用户合辑作品 | `handle_user_mix` | +| 下载用户直播流 | `handle_user_live` | +| 下载用户首页推荐作品 | `handle_user_feed` | +| 下载相似作品 | `handle_related` | +| 下载好友作品 | `handle_friend_feed` | | 数据方法接口 | 方法 | 开发者接口 | | :------------------ | :------------------- | :--------: | -| 创建用户记录与目录 | get_or_add_user_data | 🟢 | -| 创建作品下载记录 | get_or_add_video_data | 🟢 | -| 获取用户信息 | fetch_user_profile | 🟢 | -| 单个作品数据 | fetch_one_video | 🟢 | -| 用户发布作品数据 | fetch_user_post_videos | 🟢 | -| 用户喜欢作品数据 | fetch_user_like_videos | 🟢 | -| 用户收藏原声数据 | fetch_user_music_collection | 🟢 | -| 用户收藏作品数据 | fetch_user_collection_videos | 🟢 | -| 用户收藏夹数据 | fetch_user_collects | 🟢 | -| 用户收藏夹作品数据 | fetch_user_collects_videos | 🟢 | -| 用户合辑作品数据 | fetch_user_mix_videos | 🟢 | -| 用户直播流数据 | fetch_user_live_videos | 🟢 | -| 用户直播流数据2 | fetch_user_live_videos_by_room_id | 🟢 | -| 用户首页推荐作品数据 | fetch_user_feed_videos | 🟢 | -| 相似作品数据 | fetch_related_videos | 🟢 | -| 好友作品数据 | fetch_friend_feed_videos | 🟢 | -| 关注用户数据 | fetch_user_following | 🟢 | -| 粉丝用户数据 | fetch_user_follower | 🟢 | -| 查询用户数据 | fetch_query_user | 🟢 | -| 直播间wss负载数据 | fetch_live_im | 🟢 | -| 直播间wss弹幕 | fetch_live_danmaku | 🟢 | -| 关注用户的直播间信息 | fetch_user_following_lives | 🟢 | +| 创建用户记录与目录 | `get_or_add_user_data` | 🟢 | +| 创建作品下载记录 | `get_or_add_video_data` | 🟢 | +| 获取用户信息 | `fetch_user_profile` | 🟢 | +| 单个作品数据 | `fetch_one_video` | 🟢 | +| 用户发布作品数据 | `fetch_user_post_videos` | 🟢 | +| 用户喜欢作品数据 | `fetch_user_like_videos` | 🟢 | +| 用户收藏原声数据 | `fetch_user_music_collection` | 🟢 | +| 用户收藏作品数据 | `fetch_user_collection_videos` | 🟢 | +| 用户收藏夹数据 | `fetch_user_collects` | 🟢 | +| 用户收藏夹作品数据 | `fetch_user_collects_videos` | 🟢 | +| 用户合辑作品数据 | `fetch_user_mix_videos` | 🟢 | +| 用户直播流数据 | `fetch_user_live_videos` | 🟢 | +| 用户直播流数据2 | `fetch_user_live_videos_by_room_id` | 🟢 | +| 用户首页推荐作品数据 | `fetch_user_feed_videos` | 🟢 | +| 相似作品数据 | `fetch_related_videos` | 🟢 | +| 好友作品数据 | `fetch_friend_feed_videos` | 🟢 | +| 关注用户数据 | `fetch_user_following` | 🟢 | +| 粉丝用户数据 | `fetch_user_follower` | 🟢 | +| 查询用户数据 | `fetch_query_user` | 🟢 | +| 直播间wss负载数据 | `fetch_live_im` | 🟢 | +| 直播间wss弹幕 | `fetch_live_danmaku` | 🟢 | +| 关注用户的直播间信息 | `fetch_user_following_lives` | 🟢 | ::: ::: details utils接口列表 | 工具类接口 | 类名 | 方法 | 状态 | | :---------------- | :-------------- | :------------------ | :--: | -| 管理客户端配置 | ClientConfManager | | 🟢 | -| 生成真实msToken | TokenManager | gen_real_msToken | 🟢 | -| 生成虚假msToken | TokenManager | gen_false_msToken | 🟢 | -| 生成ttwid | TokenManager | gen_ttwid | 🟢 | -| 生成webid | TokenManager | gen_webid | 🟢 | -| 生成verify_fp | VerifyFpManager | gen_verify_fp | 🟢 | -| 生成s_v_web_id | VerifyFpManager | gen_s_v_web_id | 🟢 | -| 生成直播signature | DouyinWebcastSignature | get_signature | 🟢 | -| 使用接口模型生成直播wss签名参数 | WebcastSignatureManager | model_2_endpoint | 🟢 | -| 使用接口地址生成Xb参数 | XBogusManager | str_2_endpoint | 🟢 | -| 使用接口模型生成Xb参数 | XBogusManager | model_2_endpoint | 🟢 | -| 使用接口地址生成Ab参数 | ABogusManager | str_2_endpoint | 🟢 | -| 使用接口模型生成Ab参数 | ABogusManager | model_2_endpoint | 🟢 | -| 提取单个用户id | SecUserIdFetcher | get_sec_user_id | 🟢 | -| 提取列表用户id | SecUserIdFetcher | get_all_sec_user_id | 🟢 | -| 提取单个作品id | AwemeIdFetcher | get_aweme_id | 🟢 | -| 提取列表作品id | AwemeIdFetcher | get_all_aweme_id | 🟢 | -| 提取单个合辑id | MixIdFetcher | get_mix_id | 🟢 | -| 提取列表合辑id | MixIdFetcher | get_all_mix_id | 🟢 | -| 提取单个直播间号 | WebCastIdFetcher | get_webcast_id | 🟢 | -| 提取列表直播间号 | WebCastIdFetcher | get_all_webcast_id | 🟢 | -| 全局格式化文件名 | - | format_file_name | 🟢 | -| 创建用户目录 | - | create_user_folder | 🟢 | -| 重命名用户目录 | - | rename_user_folder | 🟢 | -| 创建或重命名用户目录 | - | create_or_rename_user_folder | 🟢 | -| 显示二维码 | - | show_qrcode | 🟢 | -| json歌词转lrc歌词 | - | json_2_lrc | 🟢 | +| 管理客户端配置 | `ClientConfManager` | | 🟢 | +| 生成真实msToken | `TokenManager` | `gen_real_msToken` | 🟢 | +| 生成虚假msToken | `TokenManager` | `gen_false_msToken` | 🟢 | +| 生成ttwid | `TokenManager` | `gen_ttwid` | 🟢 | +| 生成webid | `TokenManager` | `gen_webid` | 🟢 | +| 生成verify_fp | `VerifyFpManager` | `gen_verify_fp` | 🟢 | +| 生成s_v_web_id | `VerifyFpManager` | `gen_s_v_web_id` | 🟢 | +| 生成直播signature | `DouyinWebcastSignature` | `get_signature` | 🟢 | +| 使用接口模型生成直播wss签名参数 | `WebcastSignatureManager` | `model_2_endpoint` | 🟢 | +| 使用接口地址生成Xb参数 | `XBogusManager` | `str_2_endpoint` | 🟢 | +| 使用接口模型生成Xb参数 | `XBogusManager` | `model_2_endpoint` | 🟢 | +| 使用接口地址生成Ab参数 | `ABogusManager` | `str_2_endpoint` | 🟢 | +| 使用接口模型生成Ab参数 | `ABogusManager` | `model_2_endpoint` | 🟢 | +| 提取单个用户id | `SecUserIdFetcher` | `get_sec_user_id` | 🟢 | +| 提取列表用户id | `SecUserIdFetcher` | `get_all_sec_user_id` | 🟢 | +| 提取单个作品id | `AwemeIdFetcher` | `get_aweme_id` | 🟢 | +| 提取列表作品id | `AwemeIdFetcher` | `get_all_aweme_id` | 🟢 | +| 提取单个合辑id | `MixIdFetcher` | `get_mix_id` | 🟢 | +| 提取列表合辑id | `MixIdFetcher` | `get_all_mix_id` | 🟢 | +| 提取单个直播间号 | `WebCastIdFetcher` | `get_webcast_id` | 🟢 | +| 提取列表直播间号 | `WebCastIdFetcher` | `get_all_webcast_id` | 🟢 | +| 全局格式化文件名 | - | `format_file_name` | 🟢 | +| 创建用户目录 | - | `create_user_folder` | 🟢 | +| 重命名用户目录 | - | `rename_user_folder` | 🟢 | +| 创建或重命名用户目录 | - | `create_or_rename_user_folder` | 🟢 | +| 显示二维码 | - | `show_qrcode` | 🟢 | +| json歌词转lrc歌词 | - | `json_2_lrc` | 🟢 | +::: ::: details cralwer接口列表 | 爬虫url接口 | 类名 | 方法 | 状态 | | :----------- | :--------- | :---------- | :--: | -| 用户信息接口地址 | DouyinCrawler | fetch_user_profile | 🟢 | -| 主页作品接口地址 | DouyinCrawler | fetch_user_post | 🟢 | -| 喜欢作品接口地址 | DouyinCrawler | fetch_user_like | 🟢 | -| 收藏作品接口地址 | DouyinCrawler | fetch_user_collection | 🟢 | -| 收藏夹接口地址 | DouyinCrawler | fetch_user_collects | 🟢 | -| 收藏夹作品接口地址 | DouyinCrawler | fetch_user_collects_video | 🟢 | -| 音乐收藏接口地址 | DouyinCrawler | fetch_user_music_collection | 🟢 | -| 合辑作品接口地址 | DouyinCrawler | fetch_user_mix | 🟢 | -| 作品详情接口地址 | DouyinCrawler | fetch_post_detail | 🟢 | -| 作品评论接口地址 | DouyinCrawler | fetch_post_comment | 🟢 | -| 推荐作品接口地址 | DouyinCrawler | fetch_post_feed | 🟢 | -| 关注作品接口地址 | DouyinCrawler | fetch_follow_feed | 🟢 | -| 朋友作品接口地址 | DouyinCrawler | fetch_friend_feed | 🟢 | -| 相关推荐作品接口地址 | DouyinCrawler | fetch_post_related | 🟢 | -| 直播接口地址 | DouyinCrawler | fetch_live | 🟢 | -| 直播接口地址（room_id） | DouyinCrawler | fetch_live_room_id | 🟢 | -| 关注用户直播接口地址 | DouyinCrawler | fetch_following_live | 🟢 | -| 定位上一次作品接口地址 | DouyinCrawler | fetch_locate_post | 🟢 | -| SSO获取二维码接口地址 | DouyinCrawler | fetch_login_qrcode | 🔴 | -| SSO检查扫码状态接口地址 | DouyinCrawler | fetch_check_qrcode | 🔴 | -| SSO检查登录状态接口地址 | DouyinCrawler | fetch_check_login | 🔴 | -| 用户关注列表接口地址 | DouyinCrawler | fetch_user_following | 🟢 | -| 用户粉丝列表接口地址 | DouyinCrawler | fetch_user_follower | 🟢 | -| 直播弹幕初始化接口地址 | DouyinCrawler | fetch_live_im_fetch | 🟢 | -| 查询用户接口地址 | DouyinCrawler | fetch_query_user | 🟢 | -| 直播弹幕接口地址 | DouyinWebSocketCrawler | fetch_live_danmaku | 🟢 | -| 处理 WebSocket 消息 | DouyinWebSocketCrawler | handle_wss_message | 🟢 | -| 发送 ack 包 | DouyinWebSocketCrawler | send_ack | 🟢 | -| 发送 ping 包 | DouyinWebSocketCrawler | send_ping | 🟢 | -| 直播间房间消息 | DouyinWebSocketCrawler | WebcastRoomMessage | 🟢 | -| 直播间点赞消息 | DouyinWebSocketCrawler | WebcastLikeMessage | 🟢 | -| 直播间观众加入消息 | DouyinWebSocketCrawler | WebcastMemberMessage | 🟢 | -| 直播间聊天消息 | DouyinWebSocketCrawler | WebcastLeaveMessage | 🟢 | -| 直播间礼物消息 | DouyinWebSocketCrawler | WebcastGiftMessage | 🟢 | -| 直播间用户关注消息 | DouyinWebSocketCrawler | WebcastSocialMessage | 🟢 | -| 直播间用户关注消息 | DouyinWebSocketCrawler | WebcastFollowMessage | 🟢 | -| 直播间在线观众排行榜 | DouyinWebSocketCrawler | WebcastRoomUserSeqMessage | 🟢 | -| 直播间粉丝团更新消息 | DouyinWebSocketCrawler | WebcastUpdateFanTicketMessage | 🟢 | -| 直播间文本消息 | DouyinWebSocketCrawler | WebcastCommonTextMessage | 🟢 | -| 直播间对战积分消息 | DouyinWebSocketCrawler | WebcastMatchAgainstScoreMessage | 🟢 | -| 直播间粉丝团消息 | DouyinWebSocketCrawler | WebcastFansclubMessage | 🟢 | +| 用户信息接口地址 | `DouyinCrawler` | `fetch_user_profile` | 🟢 | +| 主页作品接口地址 | `DouyinCrawler` | `fetch_user_post` | 🟢 | +| 喜欢作品接口地址 | `DouyinCrawler` | `fetch_user_like` | 🟢 | +| 收藏作品接口地址 | `DouyinCrawler` | `fetch_user_collection` | 🟢 | +| 收藏夹接口地址 | `DouyinCrawler` | `fetch_user_collects` | 🟢 | +| 收藏夹作品接口地址 | `DouyinCrawler` | `fetch_user_collects_video` | 🟢 | +| 音乐收藏接口地址 | `DouyinCrawler` | `fetch_user_music_collection` | 🟢 | +| 合辑作品接口地址 | `DouyinCrawler` | `fetch_user_mix` | 🟢 | +| 作品详情接口地址 | `DouyinCrawler` | `fetch_post_detail` | 🟢 | +| 作品评论接口地址 | `DouyinCrawler` | `fetch_post_comment` | 🟢 | +| 推荐作品接口地址 | `DouyinCrawler` | `fetch_post_feed` | 🟢 | +| 关注作品接口地址 | `DouyinCrawler` | `fetch_follow_feed` | 🟢 | +| 朋友作品接口地址 | `DouyinCrawler` | `fetch_friend_feed` | 🟢 | +| 相关推荐作品接口地址 | `DouyinCrawler` | `fetch_post_related` | 🟢 | +| 直播接口地址 | `DouyinCrawler` | `fetch_live` | 🟢 | +| 直播接口地址（room_id） | `DouyinCrawler` | `fetch_live_room_id` | 🟢 | +| 关注用户直播接口地址 | `DouyinCrawler` | `fetch_following_live` | 🟢 | +| 定位上一次作品接口地址 | `DouyinCrawler` | `fetch_locate_post` | 🟢 | +| SSO获取二维码接口地址 | `DouyinCrawler` | `fetch_login_qrcode` | 🔴 | +| SSO检查扫码状态接口地址 | `DouyinCrawler` | `fetch_check_qrcode` | 🔴 | +| SSO检查登录状态接口地址 | `DouyinCrawler` | `fetch_check_login` | 🔴 | +| 用户关注列表接口地址 | `DouyinCrawler` | `fetch_user_following` | 🟢 | +| 用户粉丝列表接口地址 | `DouyinCrawler` | `fetch_user_follower` | 🟢 | +| 直播弹幕初始化接口地址 | `DouyinCrawler` | `fetch_live_im_fetch` | 🟢 | +| 查询用户接口地址 | `DouyinCrawler` | `fetch_query_user` | 🟢 | +| 直播弹幕接口地址 | `DouyinWebSocketCrawler` | `fetch_live_danmaku` | 🟢 | +| 处理 WebSocket 消息 | `DouyinWebSocketCrawler` | `handle_wss_message` | 🟢 | +| 发送 ack 包 | `DouyinWebSocketCrawler` | `send_ack` | 🟢 | +| 发送 ping 包 | `DouyinWebSocketCrawler` | `send_ping` | 🟢 | +| 直播间房间消息 | `DouyinWebSocketCrawler` | `WebcastRoomMessage` | 🟢 | +| 直播间点赞消息 | `DouyinWebSocketCrawler` | `WebcastLikeMessage` | 🟢 | +| 直播间观众加入消息 | `DouyinWebSocketCrawler` | `WebcastMemberMessage` | 🟢 | +| 直播间聊天消息 | `DouyinWebSocketCrawler` | `WebcastLeaveMessage` | 🟢 | +| 直播间礼物消息 | `DouyinWebSocketCrawler` | `WebcastGiftMessage` | 🟢 | +| 直播间用户关注消息 | `DouyinWebSocketCrawler` | `WebcastSocialMessage` | 🟢 | +| 直播间用户关注消息 | `DouyinWebSocketCrawler` | `WebcastFollowMessage` | 🟢 | +| 直播间在线观众排行榜 | `DouyinWebSocketCrawler` | `WebcastRoomUserSeqMessage` | 🟢 | +| 直播间粉丝团更新消息 | `DouyinWebSocketCrawler` | `WebcastUpdateFanTicketMessage` | 🟢 | +| 直播间文本消息 | `DouyinWebSocketCrawler` | `WebcastCommonTextMessage` | 🟢 | +| 直播间对战积分消息 | `DouyinWebSocketCrawler` | `WebcastMatchAgainstScoreMessage` | 🟢 | +| 直播间粉丝团消息 | `DouyinWebSocketCrawler` | `WebcastFansclubMessage` | 🟢 | ::: @@ -133,14 +134,14 @@ outline: deep | 下载器接口 | 类名 | 方法 | 状态 | | :----------- | :--------- | :---------- | :--: | -| 保存最后一次请求的aweme_id | DouyinDownloader | save_last_aweme_id | 🟢 | -| 筛选指定日期区间内的作品 | DouyinDownloader | filter_aweme_datas_by_interval | 🟢 | -| 创建下载任务 | DouyinDownloader | create_download_task | 🟢 | -| 处理下载任务 | DouyinDownloader | handler_download | 🟢 | -| 创建原声下载任务 | DouyinDownloader | create_music_download_tasks | 🟢 | -| 处理原声下载任务 | DouyinDownloader | handler_music_download | 🟢 | -| 创建流下载任务 | DouyinDownloader | create_stream_tasks | 🟢 | -| 处理流下载任务 | DouyinDownloader | handle_stream | 🟢 | +| 保存最后一次请求的aweme_id | `DouyinDownloader` | `save_last_aweme_id` | 🟢 | +| 筛选指定日期区间内的作品 | `DouyinDownloader` | `filter_aweme_datas_by_interval` | 🟢 | +| 创建下载任务 | `DouyinDownloader` | `create_download_task` | 🟢 | +| 处理下载任务 | `DouyinDownloader` | `handler_download` | 🟢 | +| 创建原声下载任务 | `DouyinDownloader` | `create_music_download_tasks` | 🟢 | +| 处理原声下载任务 | `DouyinDownloader` | `handler_music_download` | 🟢 | +| 创建流下载任务 | `DouyinDownloader` | `create_stream_tasks` | 🟢 | +| 处理流下载任务 | `DouyinDownloader` | `handle_stream` | 🟢 | ::: ## handler接口列表 @@ -981,7 +982,7 @@ r_id是直播间的短链标识，room_id是直播间的唯一标识。 | user_path | Path | 用户目录路径对象 | ::: tip 提示 -该接口很好的解决了用户改名之后重复重新下载的问题。集合在hanlder接口的`get_or_add_user_data`中，开发者无需关心直接调用hanlder的数据接口即可。 +该接口很好的解决了用户改名之后重复重新下载的问题。集合在handler接口的`get_or_add_user_data`中，开发者无需关心直接调用handler的数据接口即可。 ::: From 3d81eaf76ffa8e8d13cbfe4297db48bdaff55f73 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 16:18:16 +0800 Subject: [PATCH 272/299] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0tiktok?= =?UTF-8?q?=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/guide/apps/tiktok/index.md | 151 ++++++++++++++++---------------- 1 file changed, 76 insertions(+), 75 deletions(-) diff --git a/docs/guide/apps/tiktok/index.md b/docs/guide/apps/tiktok/index.md index c57717d7..b6d472df 100644 --- a/docs/guide/apps/tiktok/index.md +++ b/docs/guide/apps/tiktok/index.md @@ -12,83 +12,84 @@ outline: deep | CLI接口 | 方法 | | :------------------ | :------------------- | -| 下载单个作品 | handle_one_video | -| 下载用户发布作品 | handle_user_post | -| 下载用户喜欢作品 | handle_user_like | -| 下载用户收藏作品 | handle_user_collect | -| 下载用户合辑(播放列表)作品 | handle_user_mix | -| 下载搜索作品 | handle_search_video | -| 下载用户直播流 | handle_user_live | +| 下载单个作品 | `handle_one_video` | +| 下载用户发布作品 | `handle_user_post` | +| 下载用户喜欢作品 | `handle_user_like` | +| 下载用户收藏作品 | `handle_user_collect` | +| 下载用户合辑(播放列表)作品 | `handle_user_mix` | +| 下载搜索作品 | `handle_search_video` | +| 下载用户直播流 | `handle_user_live` | | 数据与功能接口 | 方法 | 开发者接口 | | :------------------ | :------------------- | :--------: | -| 用户信息 | fetch_user_profile | 🟢 | -| 创建用户记录与目录 | get_or_add_user_data | 🟢 | -| 创建作品下载记录 | get_or_add_video_data | 🟢 | -| 单个作品数据 | fetch_one_video | 🟢 | -| 用户发布作品数据 | fetch_user_post_videos | 🟢 | -| 用户喜欢作品数据 | fetch_user_like_videos | 🟢 | -| 用户收藏作品数据 | fetch_user_collect_videos | 🟢 | -| 用户播放列表数据 | fetch_play_list | 🟢 | -| 用户合辑(播放列表)作品数据 | fetch_user_mix_videos | 🟢 | -| 搜索作品数据 | fetch_search_videos | 🟢 | -| 用户直播流数据 | fetch_user_live_videos | 🟢 | -| 检查直播流状态 | fetch_check_live_alive | 🟢 | +| 用户信息 | `fetch_user_profile` | 🟢 | +| 创建用户记录与目录 | `get_or_add_user_data` | 🟢 | +| 创建作品下载记录 | `get_or_add_video_data` | 🟢 | +| 单个作品数据 | `fetch_one_video` | 🟢 | +| 用户发布作品数据 | `fetch_user_post_videos` | 🟢 | +| 用户喜欢作品数据 | `fetch_user_like_videos` | 🟢 | +| 用户收藏作品数据 | `fetch_user_collect_videos` | 🟢 | +| 用户播放列表数据 | `fetch_play_list` | 🟢 | +| 用户合辑(播放列表)作品数据 | `fetch_user_mix_videos` | 🟢 | +| 搜索作品数据 | `fetch_search_videos` | 🟢 | +| 用户直播流数据 | `fetch_user_live_videos` | 🟢 | +| 检查直播流状态 | `fetch_check_live_alive` | 🟢 | ::: ::: details utils接口列表 | 开发者接口 | 类名 | 方法 | 状态 | | :---------------- | :-------------- | :------------------ | :--: | -| 管理客户端配置 | ClientConfManager | | 🟢 | -| 生成真实msToken | TokenManager | gen_real_msToken | 🟢 | -| 生成虚假msToken | TokenManager | gen_false_msToken | 🟢 | -| 生成ttwid | TokenManager | gen_ttwid | 🟢 | -| 生成odin_tt | TokenManager | gen_odin_tt | 🟢 | -| 使用接口地址生成Xb参数 | XBogusManager | str_2_endpoint | 🟢 | -| 使用接口模型生成Xb参数 | XBogusManager | model_2_endpoint | 🟢 | -| 提取单个用户id | SecUserIdFetcher | get_secuid | 🟢 | -| 提取列表用户id | SecUserIdFetcher | get_all_secuid | 🟢 | -| 提取单个用户唯一id | SecUserIdFetcher | get_uniqueid | 🟢 | -| 提取列表用户唯一id | SecUserIdFetcher | get_all_uniqueid | 🟢 | -| 提取列表用户id | SecUserIdFetcher | get_all_secUid | 🟢 | -| 提取单个作品id | AwemeIdFetcher | get_aweme_id | 🟢 | -| 提取列表作品id | AwemeIdFetcher | get_all_aweme_id | 🟢 | -| 生成deviceId | DeviceIdManager | gen_device_id | 🟢 | -| 生成devideId列表 | DeviceIdManager | gen_device_ids | 🟢 | -| 全局格式化文件名 | - | format_file_name | 🟢 | -| 创建用户目录 | - | create_user_folder | 🟢 | -| 重命名用户目录 | - | rename_user_folder | 🟢 | -| 创建或重命名用户目录 | - | create_or_rename_user_folder | 🟢 | +| 管理客户端配置 | `ClientConfManager` | | 🟢 | +| 生成真实msToken | `TokenManager` | `gen_real_msToken` | 🟢 | +| 生成虚假msToken | `TokenManager` | `gen_false_msToken` | 🟢 | +| 生成ttwid | `TokenManager` | `gen_ttwid` | 🟢 | +| 生成odin_tt | `TokenManager` | `gen_odin_tt` | 🟢 | +| 使用接口地址生成Xb参数 | `XBogusManager` | `str_2_endpoint` | 🟢 | +| 使用接口模型生成Xb参数 | `XBogusManager` | `model_2_endpoint` | 🟢 | +| 提取单个用户id | `SecUserIdFetcher` | `get_secuid` | 🟢 | +| 提取列表用户id | `SecUserIdFetcher` | `get_all_secuid` | 🟢 | +| 提取单个用户唯一id | `SecUserIdFetcher` | `get_uniqueid` | 🟢 | +| 提取列表用户唯一id | `SecUserIdFetcher` | `get_all_uniqueid` | 🟢 | +| 提取列表用户id | `SecUserIdFetcher` | `get_all_secUid` | 🟢 | +| 提取单个作品id | `AwemeIdFetcher` | `get_aweme_id` | 🟢 | +| 提取列表作品id | `AwemeIdFetcher` | `get_all_aweme_id` | 🟢 | +| 生成deviceId | `DeviceIdManager` | `gen_device_id` | 🟢 | +| 生成devideId列表 | `DeviceIdManager` | `gen_device_ids` | 🟢 | +| 全局格式化文件名 | - | `format_file_name` | 🟢 | +| 创建用户目录 | - | `create_user_folder` | 🟢 | +| 重命名用户目录 | - | `rename_user_folder` | 🟢 | +| 创建或重命名用户目录 | - | `create_or_rename_user_folder` | 🟢 | +::: ::: details crawler接口列表 | 爬虫url接口 | 类名 | 方法 | 状态 | | :----------- | :--------- | :---------- | :--: | -| 用户信息接口地址 | TiktokCrawler | fetch_user_profile | 🟢 | -| 主页作品接口地址 | TiktokCrawler | fetch_user_post | 🟢 | -| 喜欢作品接口地址 | TiktokCrawler | fetch_user_like | 🟢 | -| 收藏作品接口地址 | TiktokCrawler | fetch_user_collect | 🟢 | -| 合辑列表接口地址 | TiktokCrawler | fetch_user_play_list | 🟢 | -| 合辑作品接口地址 | TiktokCrawler | fetch_user_mix | 🟢 | -| 作品详情接口地址 | TiktokCrawler | fetch_post_detail | 🟢 | -| 作品评论接口地址 | TiktokCrawler | fetch_post_comment | 🟢 | -| 首页推荐作品接口地址 | TiktokCrawler | fetch_post_feed | 🟢 | -| 搜索作品接口地址 | TiktokCrawler | fetch_post_search | 🟢 | -| 用户直播接口地址 | TiktokCrawler | fetch_user_live | 🟢 | -| 检测直播状态接口地址 | TiktokCrawler | fetch_check_live_alive | 🟢 | +| 用户信息接口地址 | `TiktokCrawler` | `fetch_user_profile` | 🟢 | +| 主页作品接口地址 | `TiktokCrawler` | `fetch_user_post` | 🟢 | +| 喜欢作品接口地址 | `TiktokCrawler` | `fetch_user_like` | 🟢 | +| 收藏作品接口地址 | `TiktokCrawler` | `fetch_user_collect` | 🟢 | +| 合辑列表接口地址 | `TiktokCrawler` | `fetch_user_play_list` | 🟢 | +| 合辑作品接口地址 | `TiktokCrawler` | `fetch_user_mix` | 🟢 | +| 作品详情接口地址 | `TiktokCrawler` | `fetch_post_detail` | 🟢 | +| 作品评论接口地址 | `TiktokCrawler` | `fetch_post_comment` | 🟢 | +| 首页推荐作品接口地址 | `TiktokCrawler` | `fetch_post_feed` | 🟢 | +| 搜索作品接口地址 | `TiktokCrawler` | `fetch_post_search` | 🟢 | +| 用户直播接口地址 | `TiktokCrawler` | `fetch_user_live` | 🟢 | +| 检测直播状态接口地址 | `TiktokCrawler` | `fetch_check_live_alive` | 🟢 | ::: ::: details dl接口列表 | 下载器接口 | 类名 | 方法 | 状态 | | :----------- | :--------- | :---------- | :--: | -| 保存最后一次请求的aweme_id | TiktokDownloader | save_last_aweme_id | 🟢 | -| 筛选指定时间区间的作品 | TiktokDownloader | filter_aweme_datas_by_interval | 🟢 | -| 创建下载任务 | TiktokDownloader | create_download_task | 🟢 | -| 处理下载任务 | TiktokDownloader | handle_download | 🟢 | -| 创建流下载任务 | TiktokDownloader | create_stream_tasks | 🟢 | -| 处理流下载任务 | TiktokDownloader | handle_stream | 🟢 | +| 保存最后一次请求的aweme_id | `TiktokDownloader` | `save_last_aweme_id` | 🟢 | +| 筛选指定时间区间的作品 | `TiktokDownloader` | `filter_aweme_datas_by_interval` | 🟢 | +| 创建下载任务 | `TiktokDownloader` | `create_download_task` | 🟢 | +| 处理下载任务 | `TiktokDownloader` | `handle_download` | 🟢 | +| 创建流下载任务 | `TiktokDownloader` | `create_stream_tasks` | 🟢 | +| 处理流下载任务 | `TiktokDownloader` | `handle_stream` | 🟢 | ::: ## handler接口列表 @@ -105,7 +106,7 @@ outline: deep | :--- | :--- | :--- | | video_data | dict | 视频数据字典，包含视频ID、视频文案、作者昵称等 | -<<< @/snippets/tiktok/one-video.py{15,17} +<<< @/snippets/tiktok/one-video.py{15} ### 用户发布作品数据 🟢 @@ -122,7 +123,7 @@ outline: deep | :--- | :--- | :--- | | aweme_data | dict | 视频数据字典，包含视频ID、视频文案、作者昵称、页码等 | -<<< @/snippets/tiktok/user-post.py{16,19-22} +<<< @/snippets/tiktok/user-post.py{18,20-22} ### 用户喜欢作品数据 🟢 @@ -139,7 +140,7 @@ outline: deep | :--- | :--- | :--- | | aweme_data | dict | 视频数据字典，包含视频ID、视频文案、作者昵称、页码等 | -<<< @/snippets/tiktok/user-like.py{16-18,21-25} +<<< @/snippets/tiktok/user-like.py{17-19,21-23} ### 用户收藏作品数据 🟢 @@ -156,7 +157,7 @@ outline: deep | :--- | :--- | :--- | | aweme_data | dict | 视频数据字典，包含视频ID、视频文案、作者昵称、页码等 | -<<< @/snippets/tiktok/user-collect.py{16-18,21-24} +<<< @/snippets/tiktok/user-collect.py{17-19,21-23} ### 用户播放列表作品数据 🟢 @@ -172,7 +173,7 @@ outline: deep | :--- | :--- | :--- | | aweme_data | dict | 视频数据字典，包含视频ID、视频文案、作者昵称、页码等 | -<<< @/snippets/tiktok/user-playlist.py{16-17,21} +<<< @/snippets/tiktok/user-playlist.py{17-18} ### 用户合辑作品数据 🟢 @@ -189,13 +190,13 @@ outline: deep | :--- | :--- | :--- | | aweme_data | dict | 视频数据字典，包含视频ID、视频文案、作者昵称、页码等 | -<<< @/snippets/tiktok/user-mix.py#playlist-sinppet{17-18,21-23} +<<< @/snippets/tiktok/user-mix.py#playlist-sinppet{18-19,21-22} ::: tip 注意 多个播放列表会包含多个`mix_id`，使用`select_playlist`方法来返回用户输入的合辑下标。 ::: -<<< @/snippets/tiktok/user-mix.py#select-playlist-sinppet{19-21} +<<< @/snippets/tiktok/user-mix.py#select-playlist-sinppet{19-22} ### 用户信息 🟢 @@ -210,7 +211,7 @@ outline: deep | :--- | :--- | :--- | | UserProfileFilter | _to_dict() | 自定义的接口数据过滤器 | 用户数据字典，包含用户ID、用户昵称、用户签名、用户头像等 | -<<< @/snippets/tiktok/user-profile.py{16,18-19,21} +<<< @/snippets/tiktok/user-profile.py{16-20,26} ::: tip 提示 TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 @@ -232,7 +233,7 @@ TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 | :--- | :--- | :--- | | user_path | Path | 用户目录路径对象 | -<<< @/snippets/tiktok/user-get-add.py{18-22} +<<< @/snippets/tiktok/user-get-add.py{17-23} ::: tip 提示 此为cli模式的接口，开发者可自行定义创建用户目录的功能。 @@ -252,7 +253,7 @@ TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 | :--- | :--- | :--- | |无 | 无 | 无 | -<<< @/snippets/tiktok/video-get-add.py{6,23-25} +<<< @/snippets/tiktok/video-get-add.py{6,7,23-26} ## utils接口列表 @@ -350,7 +351,7 @@ TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 | :--- | :--- | :--- | | final_endpoint | str | 带Xbogus参数的完整地址 | -<<< @/snippets/tiktok/xbogus.py#str-2-endpoint-snippet{7} +<<< @/snippets/tiktok/xbogus.py#str-2-endpoint-snippet{7,8} ### 使用接口模型生成Xb参数 🟢 @@ -388,7 +389,7 @@ TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 | :--- | :--- | :--- | | sec_uid | str | 用户ID | -<<< @/snippets/tiktok/sec-uid.py#single-secuid-snippet{7} +<<< @/snippets/tiktok/sec-uid.py#single-secuid-snippet{8} ### 提取列表用户id 🟢 @@ -402,7 +403,7 @@ TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 | :--- | :--- | :--- | | secuids | list | 用户ID列表 | -<<< @/snippets/tiktok/sec-uid.py#multi-secuid-snippet{13,16} +<<< @/snippets/tiktok/sec-uid.py#multi-secuid-snippet{14,17} ### 提取单个用户唯一id 🟢 @@ -416,7 +417,7 @@ TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 | :--- | :--- | :--- | | unique_id | str | 用户唯一ID | -<<< @/snippets/tiktok/unique-id.py#single-unique-id-snippet{7} +<<< @/snippets/tiktok/unique-id.py#single-unique-id-snippet{8} ### 提取列表用户唯一id 🟢 @@ -430,7 +431,7 @@ TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 | :--- | :--- | :--- | | unique_ids | list | 用户唯一ID列表 | -<<< @/snippets/tiktok/unique-id.py#multi-unique-id-snippet{13,16} +<<< @/snippets/tiktok/unique-id.py#multi-unique-id-snippet{14,17} ### 提取单个作品id 🟢 @@ -444,7 +445,7 @@ TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 | :--- | :--- | :--- | | aweme_id | str | 作品ID | -<<< @/snippets/tiktok/aweme-id.py#single-aweme-id-snippet{7} +<<< @/snippets/tiktok/aweme-id.py#single-aweme-id-snippet{8} ### 提取列表作品id 🟢 @@ -563,7 +564,7 @@ TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 | :--- | :--- | :--- | | new_path | Path | 新的用户目录路径对象 | -<<< @/snippets/tiktok/user-folder.py#rename-user-folder{22-24,26-29} +<<< @/snippets/tiktok/user-folder.py#rename-user-folder{20-24,26-29} ::: tip 提示 如果目录不存在会先创建该用户目录再重命名。 @@ -584,7 +585,7 @@ TikTok的用户接口支持`secUid`和`uniqueId`两种用户ID。 | user_path | Path | 用户目录路径对象 | ::: tip 提示 -该接口很好的解决了用户改名之后重复重新下载的问题。集合在hanlder接口的`get_or_add_user_data`中，开发者无需关心直接调用hanlder的数据接口即可。 +该接口很好的解决了用户改名之后重复重新下载的问题。集合在handler接口的`get_or_add_user_data`中，开发者无需关心直接调用handler的数据接口即可。 ::: ## crawler接口 From 863c04537232fd083a8dbee179e4b2e84e1236ca Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 16:18:29 +0800 Subject: [PATCH 273/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0x=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/twitter/utils.py | 418 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 418 insertions(+) create mode 100644 f2/apps/twitter/utils.py diff --git a/f2/apps/twitter/utils.py b/f2/apps/twitter/utils.py new file mode 100644 index 00000000..6e9811fc --- /dev/null +++ b/f2/apps/twitter/utils.py @@ -0,0 +1,418 @@ +# path: f2/apps/twitter/utils.py + +import f2 +import re +import httpx +import asyncio +from typing import Union +from pathlib import Path + +from f2.i18n.translator import _ +from f2.utils.conf_manager import ConfigManager +from f2.utils.utils import extract_valid_urls, split_filename +from f2.exceptions.api_exceptions import ( + APIError, + APIConnectionError, + APIResponseError, + APIUnavailableError, + APIUnauthorizedError, + APINotFoundError, +) + + +class ClientConfManager: + """ + 用于管理客户端配置 (Used to manage client configuration) + """ + + client_conf = ConfigManager(f2.F2_CONFIG_FILE_PATH).get_config("f2") + twitter_conf = client_conf.get("twitter", {}) + + @classmethod + def client(cls) -> dict: + return cls.twitter_conf + + @classmethod + def version(cls) -> str: + return cls.client_conf.get("version", "unknown") + + @classmethod + def proxies(cls) -> dict: + return cls.twitter_conf.get("proxies", {}) + + @classmethod + def headers(cls) -> dict: + return cls.twitter_conf.get("headers", {}) + + @classmethod + def user_agent(cls) -> str: + return cls.headers().get("User-Agent", "") + + @classmethod + def referer(cls) -> str: + return cls.headers().get("Referer", "") + + @classmethod + def authorization(cls) -> str: + return cls.headers().get("Authorization", "") + + @classmethod + def x_csrf_token(cls) -> str: + return cls.headers().get("X-Csrf-Token", "") + + +class ModelManager: + + @classmethod + def model_2_endpoint( + cls, + base_endpoint: str, + params: dict, + ) -> str: + if not isinstance(params, dict): + raise TypeError(_("参数必须是字典类型")) + + param_str = "&".join([f"{k}={v}" for k, v in params.items()]) + + # 检查base_endpoint是否已有查询参数 (Check if base_endpoint already has query parameters) + separator = "&" if "?" in base_endpoint else "?" + + final_endpoint = f"{base_endpoint}{separator}{param_str}" + + return final_endpoint + + +class UserIdFetcher: + # https://x.com/CaroylnG61544 + # https://x.com/CaroylnG61544/ + # https://x.com/CaroylnG61544/followers + # https://x.com/CaroylnG61544/status/1440000000000000000 + # https://twitter.com/CaroylnG61544/status/1440000000000000000/photo/1 + + # 预编译正则表达式 + _USER_ID_PATTERN = re.compile( + r"(?:https?://)?(?:www\.)?(twitter\.com|x\.com)/(?:@)?([a-zA-Z0-9_]+)" + ) + + @classmethod + async def get_user_id(cls, url: str) -> str: + """ + 从用户URL中提取用户ID + (Extract user ID from user URL) + + Args: + url (str): 用户URL (User URL) + + Returns: + str: 用户ID (User ID) + """ + + if not isinstance(url, str): + raise TypeError(_("参数必须是字符串类型")) + + # 提取有效URL + url = extract_valid_urls(url) + + match = cls._USER_ID_PATTERN.search(url) + + if match: + return match.group(2) + else: + raise APINotFoundError( + _( + "未在响应的地址中找到user_id，检查链接是否为用户链接。类名：{0}" + ).format(cls.__name__) + ) + + @classmethod + async def get_all_user_ids(cls, urls: list) -> list: + """ + 从用户URL列表中提取所有用户ID + (Extract all user IDs from the list of user URLs) + + Args: + urls (list): 用户URL列表 (List of user URLs) + + Returns: + list: 用户ID列表 (List of user IDs) + """ + + if not isinstance(urls, list): + raise TypeError(_("参数必须是列表类型")) + + # 提取有效URL + urls = extract_valid_urls(urls) + + # 获取所有用户ID + if urls == []: + raise ( + APINotFoundError( + _("输入的URL List不合法。类名：{0}").format(cls.__name__) + ) + ) + + user_ids = [cls.get_user_id(url) for url in urls] + return await asyncio.gather(*user_ids) + + +class TweetIdFetcher: + # 预编译正则表达式 + _TWEET_URL_PATTERN = re.compile( + r"(?:https?://)?(?:www\.)?(?:twitter|x)\.com/.*/status/(\d+)(?:/|\?|#.*$|$)" + ) + + @classmethod + async def get_tweet_id(cls, url: str) -> str: + """ + 从推文URL中提取推文ID + (Extract tweet ID from tweet URL) + + Args: + url (str): 推文URL (Tweet URL) + + Returns: + str: 推文ID (Tweet ID) + """ + + if not isinstance(url, str): + raise TypeError(_("参数必须是字符串类型")) + + # 提取有效URL + url = extract_valid_urls(url) + + if url is None: + raise ( + APINotFoundError(_("输入的URL不合法。类名：{0}").format(cls.__name__)) + ) + + if "t.co" in url: + try: + transport = httpx.AsyncHTTPTransport(retries=5) + async with httpx.AsyncClient( + transport=transport, proxies=ClientConfManager.proxies(), timeout=10 + ) as client: + response = await client.get( + url, headers=ClientConfManager.headers(), follow_redirects=True + ) + url = response.text + response.raise_for_status() + except httpx.HTTPStatusError as e: + raise APINotFoundError( + _("未找到推文，请检查推文链接是否正确。类名：{0}").format( + cls.__name__ + ), + e.response.status_code, + ) + except httpx.RequestError as exc: + raise APIConnectionError( + _( + "请求端点失败，请检查当前网络环境。 链接：{0}，代理：{1}，异常类名：{2}，异常详细信息：{3}" + ).format(url, ClientConfManager.proxies(), cls.__name__, exc) + ) + + match = cls._TWEET_URL_PATTERN.search(url) + + if match: + return match.group(1) + else: + raise APINotFoundError( + _( + "未在响应的地址中找到tweet_id，检查链接是否为推文链接。类名：{0}" + ).format(cls.__name__) + ) + + @classmethod + async def get_all_tweet_ids(cls, urls: list) -> list: + """ + 从推文URL列表中提取所有推文ID + (Extract all tweet IDs from the list of tweet URLs) + + Args: + urls (list): 推文URL列表 (List of tweet URLs) + + Returns: + list: 推文ID列表 (List of tweet IDs) + """ + + if not isinstance(urls, list): + raise TypeError(_("参数必须是列表类型")) + + # 提取有效URL + urls = extract_valid_urls(urls) + + # 获取所有推文ID + if urls == []: + raise ( + APINotFoundError( + _("输入的URL List不合法。类名：{0}").format(cls.__name__) + ) + ) + + tweet_ids = [cls.get_tweet_id(url) for url in urls] + return await asyncio.gather(*tweet_ids) + + +def format_file_name( + naming_template: str, + tweet_data: dict = {}, + custom_fields: dict = {}, +) -> str: + """ + 根据配置文件的全局格式化文件名 + (Format file name according to the global conf file) + + Args: + tweet_data (dict): 微博数据的字典 (dict of douyin data) + naming_template (str): 文件的命名模板, 如 "{create}_{desc}" (Naming template for files, such as "{create}_{desc}") + custom_fields (dict): 用户自定义字段, 用于替代默认的字段值 (Custom fields for replacing default field values) + + Note: + windows 文件名长度限制为 255 个字符, 开启了长文件名支持后为 32,767 个字符 + (Windows file name length limit is 255 characters, 32,767 characters after long file name support is enabled) + Unix 文件名长度限制为 255 个字符 + (Unix file name length limit is 255 characters) + 取去除后的50个字符, 加上后缀, 一般不会超过255个字符 + (Take the removed 50 characters, add the suffix, and generally not exceed 255 characters) + 详细信息请参考: https://en.wikipedia.org/wiki/Filename#Length + (For more information, please refer to: https://en.wikipedia.org/wiki/Filename#Length) + + Returns: + str: 格式化的文件名 (Formatted file name) + """ + + # 为不同系统设置不同的文件名长度限制 + os_limit = { + "win32": 200, + "cygwin": 60, + "darwin": 60, + "linux": 60, + } + fields = { + "create": tweet_data.get("tweet_created_time", ""), # 长度固定19 + "nickname": tweet_data.get("nickname", ""), # 不固定 + "tweet_id": tweet_data.get("tweet_id", ""), # 长度固定19 + "desc": split_filename(tweet_data.get("tweet_desc", ""), os_limit), + "uid": tweet_data.get("user_unique_id", ""), # 不固定 + } + + if custom_fields: + # 更新自定义字段 + fields.update(custom_fields) + + try: + return naming_template.format(**fields) + except KeyError as e: + raise KeyError(_("文件名模板字段 {0} 不存在，请检查".format(e))) + + +def create_or_rename_user_folder( + kwargs: dict, local_user_data: dict, current_nickname: str +) -> Path: + """ + 创建或重命名用户目录 (Create or rename user directory) + + Args: + kwargs (dict): 配置参数 (Conf parameters) + local_user_data (dict): 本地用户数据 (Local user data) + current_nickname (str): 当前用户昵称 (Current user nickname) + + Returns: + user_path (Path): 用户目录路径 (User directory path) + """ + user_path = create_user_folder(kwargs, current_nickname) + + if not local_user_data: + return user_path + + if local_user_data.get("nickname") != current_nickname: + # 昵称不一致，触发目录更新操作 + user_path = rename_user_folder(user_path, current_nickname) + + return user_path + + +def create_user_folder(kwargs: dict, nickname: Union[str, int]) -> Path: + """ + 根据提供的配置文件和昵称，创建对应的保存目录。 + (Create the corresponding save directory according to the provided conf file and nickname.) + + Args: + kwargs (dict): 配置文件，字典格式。(Conf file, dict format) + nickname (Union[str, int]): 用户的昵称，允许字符串或整数。 (User nickname, allow strings or integers) + + Note: + 如果未在配置文件中指定路径，则默认为 "Download"。 + (If the path is not specified in the conf file, it defaults to "Download".) + 支持绝对与相对路径。 + (Support absolute and relative paths) + + Raises: + TypeError: 如果 kwargs 不是字典格式，将引发 TypeError。 + (If kwargs is not in dict format, TypeError will be raised.) + """ + + # 确定函数参数是否正确 + if not isinstance(kwargs, dict): + raise TypeError("kwargs 参数必须是字典") + + # 创建基础路径 + base_path = Path(kwargs.get("path", "Download")) + + # 添加下载模式和用户名 + user_path = ( + base_path / "twitter" / kwargs.get("mode", "PLEASE_SETUP_MODE") / str(nickname) + ) + + # 获取绝对路径并确保它存在 + resolve_user_path = user_path.resolve() + + # 创建目录 + resolve_user_path.mkdir(parents=True, exist_ok=True) + + return resolve_user_path + + +def rename_user_folder(old_path: Path, new_nickname: str) -> Path: + """ + 重命名用户目录 (Rename User Folder). + + Args: + old_path (Path): 旧的用户目录路径 (Path of the old user folder) + new_nickname (str): 新的用户昵称 (New user nickname) + + Returns: + Path: 重命名后的用户目录路径 (Path of the renamed user folder) + """ + # 获取目标目录的父目录 (Get the parent directory of the target folder) + parent_directory = old_path.parent + + # 构建新目录路径 (Construct the new directory path) + new_path = old_path.rename(parent_directory / new_nickname).resolve() + + return new_path + + +def create_or_rename_user_folder( + kwargs: dict, local_user_data: dict, current_nickname: str +) -> Path: + """ + 创建或重命名用户目录 (Create or rename user directory) + + Args: + kwargs (dict): 配置参数 (Conf parameters) + local_user_data (dict): 本地用户数据 (Local user data) + current_nickname (str): 当前用户昵称 (Current user nickname) + + Returns: + user_path (Path): 用户目录路径 (User directory path) + """ + user_path = create_user_folder(kwargs, current_nickname) + + if not local_user_data: + return user_path + + if local_user_data.get("nickname") != current_nickname: + # 昵称不一致，触发目录更新操作 + user_path = rename_user_folder(user_path, current_nickname) + + return user_path From 58e7cf73aa62fc36ba6bc9c4531f68feea4834e1 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 16:19:08 +0800 Subject: [PATCH 274/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0tiktok?= =?UTF-8?q?=E8=AE=BE=E5=A4=87id=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/conf/conf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/f2/conf/conf.yaml b/f2/conf/conf.yaml index 1713dd91..15fc9d3d 100644 --- a/f2/conf/conf.yaml +++ b/f2/conf/conf.yaml @@ -66,12 +66,12 @@ f2: version: 5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 device: - id: "7372218823115949569" + id: "7377772863376426514" platform: web_pc os: windows region: SG - priority_region: US + priority_region: "" webcast_language: zh-Hans tz_name: Asia/Hong_Kong From 859120cff70b3c049c8cbb9d28bf7af6106a122d Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 16:19:48 +0800 Subject: [PATCH 275/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0x=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/conf/conf.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/f2/conf/conf.yaml b/f2/conf/conf.yaml index 15fc9d3d..01b34af8 100644 --- a/f2/conf/conf.yaml +++ b/f2/conf/conf.yaml @@ -99,6 +99,17 @@ f2: odin_tt: url: https://www.tiktok.com/passport/web/account/info/?WebIdLastTime=1716637053&aid=1459&app_language=zh-Hans&app_name=tiktok_web&browser_language=zh-CN&browser_name=Mozilla&browser_online=true&browser_platform=Win32&browser_version=5.0%20%28Windows%20NT%2010.0%3B%20Win64%3B%20x64%29%20AppleWebKit%2F537.36%20%28KHTML%2C%20like%20Gecko%29%20Chrome%2F124.0.0.0%20Safari%2F537.36&channel=tiktok_web&cookie_enabled=true&device_id=7372899909097571857&device_platform=web_pc&focus_state=true&from_page=fyp&history_len=2&is_fullscreen=false&is_page_visible=true&odinId=7372898697492972561&os=windows&priority_region=&referer=®ion=SG&screen_height=1080&screen_width=1920&tz_name=Asia%2FHong_Kong&webcast_language=zh-Hans + twitter: + headers: + User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0 + Referer: https://twitter.com/ + Authorization: Bearer AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA + X-Csrf-Token: + + proxies: + http://: + https://: + weibo: headers: User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36 Edg/121.0.0.0 From 2565c77ef25d1b533a8d08057cc44b80b9620306 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 16:20:26 +0800 Subject: [PATCH 276/299] =?UTF-8?q?test:=20=E6=B7=BB=E5=8A=A0pytest?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pytest.ini | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 pytest.ini diff --git a/pytest.ini b/pytest.ini new file mode 100644 index 00000000..b7ca0bd8 --- /dev/null +++ b/pytest.ini @@ -0,0 +1,4 @@ +[pytest] +markers = + apps: 与 apps 模块相关的测试 + asyncio: 异步相关的测试 From e5dbd350fbcc29530b68bc221853e36b6586368c Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 16:24:10 +0800 Subject: [PATCH 277/299] =?UTF-8?q?build:=20=E6=B7=BB=E5=8A=A0=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit "PyExecJS==1.5.1" "protobuf==4.23.0" --- pyproject.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index e44b983a..52fe40eb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,6 +41,8 @@ dependencies = [ "pydantic==2.6.4", "qrcode==7.4.2", "websockets>=11.0", + "PyExecJS==1.5.1", + "protobuf==4.23.0", ] [project.scripts] From 5c06f74323424279dbcfd197e9645637bc0e0f62 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 16:25:10 +0800 Subject: [PATCH 278/299] Update CHANGELOG.md --- CHANGELOG.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65821e17..6fc6f1c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ ## [Unreleased] -- `0.0.1.7`版本中添加对`x`的支持，添加更多`douyin`，`tiktok`和`weibo`的接口 +- `0.0.1.7`版本中将会添加接口本地转发的支持，添加更多`douyin`，`tiktok`，`weibo`和`x`的接口。 ## [0.0.1.6] - 2024-05-04 @@ -24,8 +24,10 @@ - 添加`douyin`直播间弹幕wss接口 - 添加`F2`版本检测 - 添加`tiktok`直播间开播状态 +- 添加`PyExecJS==1.5.1`依赖 +- 添加`protobuf==4.23.0`依赖 - 添加`websockets>=11.0`依赖 -- 添加`tiktok` `device_id注册`与`cookie`管理类 +- 添加`tiktok`的`device_id注册`与`cookie`管理类 - 添加`douyin`生成`webid`配置 - 添加`douyin`关注用户直播 - 添加`douyin`，`tiktok`模型配置 @@ -67,7 +69,7 @@ - 更新了所有应用配置 - 重构了所有工具类方法 - 更新`base_downloader`的区块下载参数 -- 修改`douyin`生成的ttwid将绑定ua +- 修改`douyin`生成的`ttwid`将绑定`ua` - 修改`tiktok`用户直播下载流地址 - 修改`douyin`，`tiktok`获取用户信息方法名 - 完善时间戳转换类型，支持30位 @@ -77,6 +79,7 @@ - 更新应用初始化配置文件后退出 (#70) - 更新应用使用`--auto-cookie`命令后退出 - 更新`douyin`过滤器，将`video_play_addr`返回完整视频列表便于下载失败轮替 +- 更改`douyin`图集文件名（`jpg -> webp`） - 更改应用直播下载文件名（`mp4 -> flv`） - 更新应用工具类网络错误捕获 From b7007f320204a2800f7c1c9f8c5ebb12b4b2040d Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 16:25:58 +0800 Subject: [PATCH 279/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0weibo?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/conf/defaults.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/f2/conf/defaults.yaml b/f2/conf/defaults.yaml index 88605ed1..9511139c 100644 --- a/f2/conf/defaults.yaml +++ b/f2/conf/defaults.yaml @@ -37,3 +37,20 @@ tiktok: max_tasks: page_counts: languages: + +weibo: + url: + path: + folderize: + mode: + naming: + cookie: + keyword: + interval: + timeout: + max_retries: + max_connections: + max_counts: + max_tasks: + page_counts: + languages: \ No newline at end of file From 3f5905aea2cc3a8b7d4f8da1a27983f9737fac4b Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 16:36:48 +0800 Subject: [PATCH 280/299] =?UTF-8?q?docs:=20=E6=B7=BB=E5=8A=A0tiktok=20403?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E8=A7=A3=E5=86=B3=E5=8A=9E=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/question-answer/qa.md | 5 +++++ docs/snippets/QA.md | 19 ++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/docs/question-answer/qa.md b/docs/question-answer/qa.md index 774d183e..0d050349 100644 --- a/docs/question-answer/qa.md +++ b/docs/question-answer/qa.md @@ -27,3 +27,8 @@ ## _ssl.c:975 The handshake operation timed out <<< @/snippets/QA.md#ssl-faild-02 + + +## tiktok 403 Forbidden + +<<< @/snippets/QA.md#tiktok-403-forbidden diff --git a/docs/snippets/QA.md b/docs/snippets/QA.md index 0f3fda3a..b9b794a1 100644 --- a/docs/snippets/QA.md +++ b/docs/snippets/QA.md @@ -72,4 +72,21 @@ https://github.com/Johnserf-Seed/TikTokDownload/issues/660 4. 调整超时设置 这个问题可能涉及到多个方面，需要自己逐步排查和解决。 -// #endregion ssl-faild-02 \ No newline at end of file +// #endregion ssl-faild-02 + + +// #region tiktok-403-forbidden +当下载`tiktok`视频时出现`403 Forbidden`错误时，是由于`设备id`被封禁导致的。 + +`设备id`与生成的`cookie`是一一对应的，如果`设备id`被封禁，那么生成的`cookie`也会被封禁。 + +解决办法： +1. 运行生成`device_Id`的代码片段，获取新的`device_Id`。 +2. 将新的`device_Id`替换到配置文件中。 +3. 将新的`cookie`里的值替换到配置文件的`cookie`中（增量非覆盖）。 +4. 重新运行下载命令。 + +代码片段： +https://johnserf-seed.github.io/f2/guide/apps/tiktok/#%E7%94%9F%E6%88%90deviceid-%F0%9F%9F%A2 + +// #endregion tiktok-403-forbidden \ No newline at end of file From 72c99b579438ba495d231610617c3c51b05b6029 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 20:27:11 +0800 Subject: [PATCH 281/299] =?UTF-8?q?perf:=20=E8=B0=83=E6=95=B4mix=E4=B8=BA?= =?UTF-8?q?=E5=90=88=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 +- docs/guide/apps/douyin/index.md | 30 +++++++++++++++--------------- docs/guide/apps/tiktok/index.md | 14 +++++++------- f2/apps/douyin/cli.py | 4 ++-- f2/apps/douyin/help.py | 4 ++-- f2/apps/tiktok/api.py | 2 +- f2/apps/tiktok/cli.py | 4 ++-- f2/apps/tiktok/crawler.py | 4 ++-- f2/apps/tiktok/handler.py | 18 +++++++++--------- f2/apps/tiktok/help.py | 4 ++-- f2/helps.py | 4 ++-- 11 files changed, 45 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fc6f1c9..9d2d2326 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -99,7 +99,7 @@ - 修复`_dl`日志输出 - 修复`douyin`下载合集时合集链接无法识别的情况 -- 修复`tiktok`下载播放列表（合辑）的错误 +- 修复`tiktok`下载播放列表（合集）的错误 - 修复`m3u8`流下载时会重复下载`ts`片段的问题 - 修复`m3u8`流获取`content_length`时没有提供代理参数造成的访问失败 - 修复`douyin`，`tiktok`因提前引发异常导致无法生成虚假的msToken diff --git a/docs/guide/apps/douyin/index.md b/docs/guide/apps/douyin/index.md index bb814ad1..3c93c076 100644 --- a/docs/guide/apps/douyin/index.md +++ b/docs/guide/apps/douyin/index.md @@ -17,7 +17,7 @@ outline: deep | 下载用户喜欢作品 | `handle_user_like` | | 下载用户收藏原声 | `handle_user_music_collection` | | 下载用户收藏作品 | `handle_user_collection` | -| 下载用户合辑作品 | `handle_user_mix` | +| 下载用户合集作品 | `handle_user_mix` | | 下载用户直播流 | `handle_user_live` | | 下载用户首页推荐作品 | `handle_user_feed` | | 下载相似作品 | `handle_related` | @@ -35,7 +35,7 @@ outline: deep | 用户收藏作品数据 | `fetch_user_collection_videos` | 🟢 | | 用户收藏夹数据 | `fetch_user_collects` | 🟢 | | 用户收藏夹作品数据 | `fetch_user_collects_videos` | 🟢 | -| 用户合辑作品数据 | `fetch_user_mix_videos` | 🟢 | +| 用户合集作品数据 | `fetch_user_mix_videos` | 🟢 | | 用户直播流数据 | `fetch_user_live_videos` | 🟢 | | 用户直播流数据2 | `fetch_user_live_videos_by_room_id` | 🟢 | | 用户首页推荐作品数据 | `fetch_user_feed_videos` | 🟢 | @@ -70,8 +70,8 @@ outline: deep | 提取列表用户id | `SecUserIdFetcher` | `get_all_sec_user_id` | 🟢 | | 提取单个作品id | `AwemeIdFetcher` | `get_aweme_id` | 🟢 | | 提取列表作品id | `AwemeIdFetcher` | `get_all_aweme_id` | 🟢 | -| 提取单个合辑id | `MixIdFetcher` | `get_mix_id` | 🟢 | -| 提取列表合辑id | `MixIdFetcher` | `get_all_mix_id` | 🟢 | +| 提取单个合集id | `MixIdFetcher` | `get_mix_id` | 🟢 | +| 提取列表合集id | `MixIdFetcher` | `get_all_mix_id` | 🟢 | | 提取单个直播间号 | `WebCastIdFetcher` | `get_webcast_id` | 🟢 | | 提取列表直播间号 | `WebCastIdFetcher` | `get_all_webcast_id` | 🟢 | | 全局格式化文件名 | - | `format_file_name` | 🟢 | @@ -93,7 +93,7 @@ outline: deep | 收藏夹接口地址 | `DouyinCrawler` | `fetch_user_collects` | 🟢 | | 收藏夹作品接口地址 | `DouyinCrawler` | `fetch_user_collects_video` | 🟢 | | 音乐收藏接口地址 | `DouyinCrawler` | `fetch_user_music_collection` | 🟢 | -| 合辑作品接口地址 | `DouyinCrawler` | `fetch_user_mix` | 🟢 | +| 合集作品接口地址 | `DouyinCrawler` | `fetch_user_mix` | 🟢 | | 作品详情接口地址 | `DouyinCrawler` | `fetch_post_detail` | 🟢 | | 作品评论接口地址 | `DouyinCrawler` | `fetch_post_comment` | 🟢 | | 推荐作品接口地址 | `DouyinCrawler` | `fetch_post_feed` | 🟢 | @@ -309,9 +309,9 @@ outline: deep <<< @/snippets/douyin/user-collects.py#user-collects-videos-snippet{17-20} -### 用户合辑作品数据 🟢 +### 用户合集作品数据 🟢 -异步方法，用于获取指定用户合辑的视频列表，合辑视频的mix_id是一致的，从单个作品数据接口中获取即可。 +异步方法，用于获取指定用户合集的视频列表，合集视频的mix_id是一致的，从单个作品数据接口中获取即可。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | @@ -828,31 +828,31 @@ outline: deep <<< @/snippets/douyin/aweme-id.py#multi-aweme-id-snippet{15,18} -### 提取合辑id 🟢 +### 提取合集id 🟢 -类方法，用于从合集链接中提取合辑id。 +类方法，用于从合集链接中提取合集id。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | -| url | str | 合辑地址 | +| url | str | 合集地址 | | 返回 | 类型 | 说明 | | :--- | :--- | :--- | -| mix_id | str | 合辑ID | +| mix_id | str | 合集ID | <<< @/snippets/douyin/mix-id.py#single-mix-id-snippet{6,7} -### 提取列表合辑id 🟢 +### 提取列表合集id 🟢 -类方法，用于从合集链接列表中提取合辑id。 +类方法，用于从合集链接列表中提取合集id。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | -| urls | list | 合辑地址列表 | +| urls | list | 合集地址列表 | | 返回 | 类型 | 说明 | | :--- | :--- | :--- | -| mix_ids | list | 合辑ID列表 | +| mix_ids | list | 合集ID列表 | <<< @/snippets/douyin/mix-id.py#multi-mix-id-snippet{7-10,13,16} diff --git a/docs/guide/apps/tiktok/index.md b/docs/guide/apps/tiktok/index.md index b6d472df..fb6fb5c9 100644 --- a/docs/guide/apps/tiktok/index.md +++ b/docs/guide/apps/tiktok/index.md @@ -16,7 +16,7 @@ outline: deep | 下载用户发布作品 | `handle_user_post` | | 下载用户喜欢作品 | `handle_user_like` | | 下载用户收藏作品 | `handle_user_collect` | -| 下载用户合辑(播放列表)作品 | `handle_user_mix` | +| 下载用户合集(播放列表)作品 | `handle_user_mix` | | 下载搜索作品 | `handle_search_video` | | 下载用户直播流 | `handle_user_live` | @@ -30,7 +30,7 @@ outline: deep | 用户喜欢作品数据 | `fetch_user_like_videos` | 🟢 | | 用户收藏作品数据 | `fetch_user_collect_videos` | 🟢 | | 用户播放列表数据 | `fetch_play_list` | 🟢 | -| 用户合辑(播放列表)作品数据 | `fetch_user_mix_videos` | 🟢 | +| 用户合集(播放列表)作品数据 | `fetch_user_mix_videos` | 🟢 | | 搜索作品数据 | `fetch_search_videos` | 🟢 | | 用户直播流数据 | `fetch_user_live_videos` | 🟢 | | 检查直播流状态 | `fetch_check_live_alive` | 🟢 | @@ -70,8 +70,8 @@ outline: deep | 主页作品接口地址 | `TiktokCrawler` | `fetch_user_post` | 🟢 | | 喜欢作品接口地址 | `TiktokCrawler` | `fetch_user_like` | 🟢 | | 收藏作品接口地址 | `TiktokCrawler` | `fetch_user_collect` | 🟢 | -| 合辑列表接口地址 | `TiktokCrawler` | `fetch_user_play_list` | 🟢 | -| 合辑作品接口地址 | `TiktokCrawler` | `fetch_user_mix` | 🟢 | +| 合集列表接口地址 | `TiktokCrawler` | `fetch_user_play_list` | 🟢 | +| 合集作品接口地址 | `TiktokCrawler` | `fetch_user_mix` | 🟢 | | 作品详情接口地址 | `TiktokCrawler` | `fetch_post_detail` | 🟢 | | 作品评论接口地址 | `TiktokCrawler` | `fetch_post_comment` | 🟢 | | 首页推荐作品接口地址 | `TiktokCrawler` | `fetch_post_feed` | 🟢 | @@ -175,9 +175,9 @@ outline: deep <<< @/snippets/tiktok/user-playlist.py{17-18} -### 用户合辑作品数据 🟢 +### 用户合集作品数据 🟢 -异步方法，用于获取指定用户合辑的视频列表，合辑视频的mix_id是一致的，从单个作品数据接口中获取即可。 +异步方法，用于获取指定用户合集的视频列表，合集视频的mix_id是一致的，从单个作品数据接口中获取即可。 | 参数 | 类型 | 说明 | | :--- | :--- | :--- | @@ -193,7 +193,7 @@ outline: deep <<< @/snippets/tiktok/user-mix.py#playlist-sinppet{18-19,21-22} ::: tip 注意 -多个播放列表会包含多个`mix_id`，使用`select_playlist`方法来返回用户输入的合辑下标。 +多个播放列表会包含多个`mix_id`，使用`select_playlist`方法来返回用户输入的合集下标。 ::: <<< @/snippets/tiktok/user-mix.py#select-playlist-sinppet{19-22} diff --git a/f2/apps/douyin/cli.py b/f2/apps/douyin/cli.py index b2c934e7..4fc6bc87 100644 --- a/f2/apps/douyin/cli.py +++ b/f2/apps/douyin/cli.py @@ -195,7 +195,7 @@ def handler_naming( type=str, # default="", help=_( - "根据模式提供相应的链接。例如：主页、点赞、收藏作品填入主页链接，单作品填入作品链接，合辑与直播同上" + "根据模式提供相应的链接。例如：主页、点赞、收藏作品填入主页链接，单作品填入作品链接，合集与直播同上" ), ) @click.option( @@ -240,7 +240,7 @@ def handler_naming( # default="post", # required=True, help=_( - "下载模式：单个作品(one)，主页作品(post)，点赞作品(like)，收藏作品(collection)，收藏夹作品(collects)，收藏音乐(music)，合辑(mix)，直播(live)" + "下载模式：单个作品(one)，主页作品(post)，点赞作品(like)，收藏作品(collection)，收藏夹作品(collects)，收藏音乐(music)，合集(mix)，直播(live)" ), ) @click.option( diff --git a/f2/apps/douyin/help.py b/f2/apps/douyin/help.py index 23f7d401..16b162b8 100644 --- a/f2/apps/douyin/help.py +++ b/f2/apps/douyin/help.py @@ -21,7 +21,7 @@ def help() -> None: "-u --url", "[dark_cyan]str", _( - "根据模式提供相应的链接。例如：主页、点赞、收藏作品填入主页链接，单作品填入作品链接，合辑与直播同上" + "根据模式提供相应的链接。例如：主页、点赞、收藏作品填入主页链接，单作品填入作品链接，合集与直播同上" ), ), ("-m --music", "[dark_cyan]Bool", _("是否保存视频原声")), @@ -37,7 +37,7 @@ def help() -> None: "-M --mode", "[dark_cyan]Choice", _( - "下载模式：单个作品(one)，主页作品(post)，点赞作品(like)，收藏作品(collection)，收藏夹作品(collects)，合辑(mix)，直播(live)" + "下载模式：单个作品(one)，主页作品(post)，点赞作品(like)，收藏作品(collection)，收藏夹作品(collects)，合集(mix)，直播(live)" ), ), ( diff --git a/f2/apps/tiktok/api.py b/f2/apps/tiktok/api.py index 4e84906b..e9bace8b 100644 --- a/f2/apps/tiktok/api.py +++ b/f2/apps/tiktok/api.py @@ -33,7 +33,7 @@ class TiktokAPIEndpoints: # 用户播放列表 (User Play List) USER_PLAY_LIST = f"{TIKTOK_DOMAIN}/api/user/playlist/" - # 用户合辑 (User Mix) + # 用户合集 (User Mix) USER_MIX = f"{TIKTOK_DOMAIN}/api/mix/item_list/" # 猜你喜欢 (Guess You Like) diff --git a/f2/apps/tiktok/cli.py b/f2/apps/tiktok/cli.py index 16ee05e6..062678db 100644 --- a/f2/apps/tiktok/cli.py +++ b/f2/apps/tiktok/cli.py @@ -162,7 +162,7 @@ def handler_naming( type=str, # default="", help=_( - "根据模式提供相应的链接。例如：主页、点赞、收藏作品填入主页链接，单作品填入作品链接，合辑与直播同上" + "根据模式提供相应的链接。例如：主页、点赞、收藏作品填入主页链接，单作品填入作品链接，合集与直播同上" ), ) @click.option( @@ -207,7 +207,7 @@ def handler_naming( # default="post", # required=True, help=_( - "下载模式：单个作品(one)，主页作品(post), 点赞作品(like), 收藏作品(collect), 合辑播放列表(mix)" + "下载模式：单个作品(one)，主页作品(post), 点赞作品(like), 收藏作品(collect), 合集播放列表(mix)" ), ) @click.option( diff --git a/f2/apps/tiktok/crawler.py b/f2/apps/tiktok/crawler.py index d4bc57e0..1287ad0b 100644 --- a/f2/apps/tiktok/crawler.py +++ b/f2/apps/tiktok/crawler.py @@ -72,7 +72,7 @@ async def fetch_user_play_list(self, params: UserPlayList): tkendpoint.USER_PLAY_LIST, params.model_dump(), ) - logger.debug(_("合辑列表接口地址：{0}").format(endpoint)) + logger.debug(_("合集列表接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) async def fetch_user_mix(self, params: UserMix): @@ -81,7 +81,7 @@ async def fetch_user_mix(self, params: UserMix): tkendpoint.USER_MIX, params.model_dump(), ) - logger.debug(_("合辑作品接口地址：{0}").format(endpoint)) + logger.debug(_("合集作品接口地址：{0}").format(endpoint)) return await self._fetch_get_json(endpoint) async def fetch_post_detail(self, params: PostDetail): diff --git a/f2/apps/tiktok/handler.py b/f2/apps/tiktok/handler.py index 896d921e..8ef19c3a 100644 --- a/f2/apps/tiktok/handler.py +++ b/f2/apps/tiktok/handler.py @@ -594,21 +594,21 @@ async def select_playlist( playlists: Union[dict, UserPlayListFilter], ) -> Union[str, List[str]]: """ - 用于选择要下载的作品合辑 + 用于选择要下载的作品合集 (Used to select the video mix to download) Args: - playlists: Union[dict, UserPlayListFilter]: 作品合辑列表 (Video mix list) + playlists: Union[dict, UserPlayListFilter]: 作品合集列表 (Video mix list) Return: - selected_index: Union[str, List[str]]: 选择的作品合辑序号 (Selected video mix index) + selected_index: Union[str, List[str]]: 选择的作品合集序号 (Selected video mix index) """ if playlists == {}: - logger.warning(_("用户没有作品合辑")) + logger.warning(_("用户没有作品合集")) return - rich_console.print("[bold]请选择要下载的合辑：[/bold]") + rich_console.print("[bold]请选择要下载的合集：[/bold]") rich_console.print("0: [bold]全部下载[/bold]") for i in range(len(playlists.mixId)): @@ -622,10 +622,10 @@ async def select_playlist( ) # rich_prompt 会有字符刷新问题，暂时使用rich_print - rich_console.print(_("[bold yellow]请输入希望下载的合辑序号：[/bold yellow]")) + rich_console.print(_("[bold yellow]请输入希望下载的合集序号：[/bold yellow]")) selected_index = int( rich_prompt.ask( - # _("[bold yellow]请输入希望下载的合辑序号:[/bold yellow]"), + # _("[bold yellow]请输入希望下载的合集序号:[/bold yellow]"), choices=[str(i) for i in range(len(playlists.mixId) + 1)], ) ) @@ -692,14 +692,14 @@ async def fetch_user_mix_videos( videos_collected += len(mix.aweme_id) if not mix.hasMore and str(mix.api_status_code) == "0": - logger.debug(_("合辑: {0} 所有作品采集完毕").format(mixId)) + logger.debug(_("合集: {0} 所有作品采集完毕").format(mixId)) break else: logger.debug(_("第 {0} 页没有找到作品").format(cursor)) if not mix.hasMore and str(mix.api_status_code) == "0": - logger.debug(_("合辑: {0} 所有作品采集完毕").format(mixId)) + logger.debug(_("合集: {0} 所有作品采集完毕").format(mixId)) break # 更新已经处理的作品数量 (Update the number of videos processed) diff --git a/f2/apps/tiktok/help.py b/f2/apps/tiktok/help.py index c668a969..b9c55f39 100644 --- a/f2/apps/tiktok/help.py +++ b/f2/apps/tiktok/help.py @@ -21,7 +21,7 @@ def help() -> None: "-u --url", "[dark_cyan]str", _( - "根据模式提供相应的链接。例如：主页、点赞、收藏作品填入主页链接，单作品填入作品链接，合辑与直播同上" + "根据模式提供相应的链接。例如：主页、点赞、收藏作品填入主页链接，单作品填入作品链接，合集与直播同上" ), ), ("-m --music", "[dark_cyan]Choice", _("是否保存视频原声。可选：'yes'、'no'")), @@ -37,7 +37,7 @@ def help() -> None: "-M --mode", "[dark_cyan]Choice", _( - "下载模式：单个作品(one)，主页作品(post), 点赞作品(like), 收藏作品(collect), 合辑播放列表(mix)" + "下载模式：单个作品(one)，主页作品(post), 点赞作品(like), 收藏作品(collect), 合集播放列表(mix)" ), ), ( diff --git a/f2/helps.py b/f2/helps.py index ece0bc36..b18a830c 100644 --- a/f2/helps.py +++ b/f2/helps.py @@ -66,14 +66,14 @@ def main() -> None: table.add_row( _("douyin 或 dy"), _( - "- 单个作品，主页作品，点赞作品，收藏作品，合辑作品，图文，文案，封面，直播，原声。" + "- 单个作品，主页作品，点赞作品，收藏作品，合集作品，图文，文案，封面，直播，原声。" ), _("✔"), ) table.add_row( _("tiktok 或 tk"), _( - "- 单个作品，主页作品，点赞作品，收藏作品，播放列表（合辑）作品，文案，封面，原声。" + "- 单个作品，主页作品，点赞作品，收藏作品，播放列表（合集）作品，文案，封面，原声。" ), _("✔"), ) From 069b72f86a493d389f397e598208c5cd77525175 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 20:27:45 +0800 Subject: [PATCH 282/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0x=E7=9A=84?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/conf/defaults.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/f2/conf/defaults.yaml b/f2/conf/defaults.yaml index 9511139c..7d9f3d14 100644 --- a/f2/conf/defaults.yaml +++ b/f2/conf/defaults.yaml @@ -53,4 +53,20 @@ weibo: max_counts: max_tasks: page_counts: + languages: + +x: + url: + path: + folderize: + mode: + naming: + cookie: + interval: + timeout: + max_retries: + max_connections: + max_counts: + max_tasks: + page_counts: languages: \ No newline at end of file From ba16e2dbc1512b59adf17a1f093a5ec5ff7a8c07 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 20:29:48 +0800 Subject: [PATCH 283/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/conf/test.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/f2/conf/test.yaml b/f2/conf/test.yaml index 5a504e11..328aa3d1 100644 --- a/f2/conf/test.yaml +++ b/f2/conf/test.yaml @@ -1,6 +1,6 @@ douyin: headers: - User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36 + User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0 Referer: https://www.douyin.com/ cookie: ttwid=1%7CmA00PxWh-zoEXR6YIC77BSmyQ96T7QextS6YFZ9Ocgg%7C1717076775%7C22722d2a9b78b258483ab482ed7d58c0cdd69c75a951b2bb67ec58d00c6b57d6; home_can_add_dy_2_desktop=%220%22; stream_recommend_feed_params=%22%7B%5C%22cookie_enabled%5C%22%3Atrue%2C%5C%22screen_width%5C%22%3A1920%2C%5C%22screen_height%5C%22%3A1080%2C%5C%22browser_online%5C%22%3Atrue%2C%5C%22cpu_core_num%5C%22%3A12%2C%5C%22device_memory%5C%22%3A8%2C%5C%22downlink%5C%22%3A10%2C%5C%22effective_type%5C%22%3A%5C%224g%5C%22%2C%5C%22round_trip_time%5C%22%3A200%7D%22; FORCE_LOGIN=%7B%22videoConsumedRemainSeconds%22%3A180%7D; strategyABtestKey=%221717076781.199%22; volume_info=%7B%22isUserMute%22%3Afalse%2C%22isMute%22%3Afalse%2C%22volume%22%3A0.5%7D; passport_csrf_token=28a44ba980807da79b895df1ac4e16ea; passport_csrf_token_default=28a44ba980807da79b895df1ac4e16ea; bd_ticket_guard_client_data=eyJiZC10aWNrZXQtZ3VhcmQtdmVyc2lvbiI6MiwiYmQtdGlja2V0LWd1YXJkLWl0ZXJhdGlvbi12ZXJzaW9uIjoxLCJiZC10aWNrZXQtZ3VhcmQtcmVlLXB1YmxpYy1rZXkiOiJCSFVoWGRMd0dkaVUvQmdOU2xXa2U3b2tmS0NlRkxOQ0o0Vk9ieGFMclNwNWhkTzdTK3RpazdZZU0xQmpCYWVhZmJFeVA2YjZndm1seDBxTktTVC9hWUU9IiwiYmQtdGlja2V0LWd1YXJkLXdlYi12ZXJzaW9uIjoxfQ%3D%3D; bd_ticket_guard_client_web_domain=2; download_guide=%221%2F20240530%2F0%22; IsDouyinActive=true; stream_player_status_params=%22%7B%5C%22is_auto_play%5C%22%3A0%2C%5C%22is_full_screen%5C%22%3A0%2C%5C%22is_full_webscreen%5C%22%3A0%2C%5C%22is_mute%5C%22%3A0%2C%5C%22is_speed%5C%22%3A1%2C%5C%22is_visible%5C%22%3A1%7D%22; odin_tt=9e666e08aa7c209164e2c3192087a9b9d9b72860dfa94785cd0d5d24d812e598b06848fa210bc71c3ed59f8ea381839a18a47c99dda8b3b6a28c95f9b3e52663336fec7ab8aeea181e5be0287392027f; msToken=fxUIQB8U7zUO7ec0ZI4OsvWRqHUExFN-bPUapHIvRDvL1s3F4Ywzz8fDj5MWoJnutglkgdxV2AZux90jpq1cBwELFWrQu9myVyylg94= proxies: @@ -24,3 +24,12 @@ weibo: proxies: http://: https://: + +twitter: + headers: + User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/12 + Referer: https://twitter.com/ + cookie: guest_id=171949133021733050; night_mode=2; guest_id_marketing=v1%3A171949133021733050; guest_id_ads=v1%3A171949133021733050; gt=1806303677675958490; personalization_id="v1_jd7qHm6d2VrljV2ulxzSMw==" + proxies: + http://: + https://: From 116fccdd63e9b0b3d0cdf4d56a33b68e18aafe49 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 20:32:11 +0800 Subject: [PATCH 284/299] =?UTF-8?q?build:=20=E6=9B=B4=E6=96=B0sm3=E7=AE=97?= =?UTF-8?q?=E6=B3=95=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 52fe40eb..bd29ded8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,6 +43,7 @@ dependencies = [ "websockets>=11.0", "PyExecJS==1.5.1", "protobuf==4.23.0", + "gmssl==3.2.2", ] [project.scripts] From 10753895aed2d35f3d68eacd8041f0b1a9ec4363 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 20:37:49 +0800 Subject: [PATCH 285/299] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E5=AE=A2=E6=88=B7=E7=AB=AF=E7=9A=84=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/crawlers/base_crawler.py | 2 +- f2/dl/base_downloader.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/f2/crawlers/base_crawler.py b/f2/crawlers/base_crawler.py index 007423f6..24c714c1 100644 --- a/f2/crawlers/base_crawler.py +++ b/f2/crawlers/base_crawler.py @@ -394,7 +394,7 @@ def handle_http_status_error(self, http_error, url: str, attempt): async def close(self): # 如果没有初始化客户端，则不关闭 (If the client is not initialized, do not close) if self._client: - await self.client.aclose() + self.client.close() if self._aclient: await self.aclient.aclose() diff --git a/f2/dl/base_downloader.py b/f2/dl/base_downloader.py index 9658e67e..bf6e1cab 100644 --- a/f2/dl/base_downloader.py +++ b/f2/dl/base_downloader.py @@ -573,7 +573,7 @@ async def execute_tasks(self): async def close(self) -> None: """关闭下载器 (Close the downloader)""" if self.client: - await self.client.close() + self.client.close() if self.aclient: await self.aclient.aclose() From 22719acfbb6c12aa7425175eb73a533d98582c2a Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 20:46:39 +0800 Subject: [PATCH 286/299] =?UTF-8?q?test:=20=E6=9B=B4=E6=96=B0tiktok?= =?UTF-8?q?=E8=AE=BE=E5=A4=87id=E6=B3=A8=E5=86=8C=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=96=AD=E8=A8=80=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/test/test_tiktok_device_id.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/f2/apps/tiktok/test/test_tiktok_device_id.py b/f2/apps/tiktok/test/test_tiktok_device_id.py index 8b3e01c6..60a8c7cf 100644 --- a/f2/apps/tiktok/test/test_tiktok_device_id.py +++ b/f2/apps/tiktok/test/test_tiktok_device_id.py @@ -47,7 +47,7 @@ async def test_gen_device_ids(): for tt_chain_token in tt_chain_tokens: assert tt_chain_token is not None - assert len(tt_chain_token) == 39 + assert len(tt_chain_token) > 40 @pytest.mark.asyncio @@ -69,4 +69,4 @@ async def test_gen_device_ids_with_full_cookie(): for tt_chain_token in cookies: assert tt_chain_token is not None - assert len(tt_chain_token) == 224 + assert len(tt_chain_token) > 225 From 139c6dfc0891a8a7e0fc6e3805c7d25aaf92a9ca Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 20:48:10 +0800 Subject: [PATCH 287/299] =?UTF-8?q?perf:=20=E9=BB=98=E8=AE=A4=E7=BD=AE?= =?UTF-8?q?=E7=A9=BA=E9=98=B2=E6=AD=A2httpx=E6=97=A0=E6=B3=95=E8=AF=BB?= =?UTF-8?q?=E5=8F=96headers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/conf/conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/f2/conf/conf.yaml b/f2/conf/conf.yaml index 01b34af8..7e235174 100644 --- a/f2/conf/conf.yaml +++ b/f2/conf/conf.yaml @@ -104,7 +104,7 @@ f2: User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0 Referer: https://twitter.com/ Authorization: Bearer AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA - X-Csrf-Token: + X-Csrf-Token: "" proxies: http://: From 7abd4ac998af8d744c2007610e4e2ba7a16859c5 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 20:52:04 +0800 Subject: [PATCH 288/299] =?UTF-8?q?perf:=20=E5=88=A0=E9=99=A4tiktok?= =?UTF-8?q?=E8=AE=BE=E5=A4=87id=E6=B3=A8=E5=86=8C=E6=B5=8B=E8=AF=95cookie?= =?UTF-8?q?=E6=96=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/test/test_tiktok_device_id.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/f2/apps/tiktok/test/test_tiktok_device_id.py b/f2/apps/tiktok/test/test_tiktok_device_id.py index 60a8c7cf..acfd7e55 100644 --- a/f2/apps/tiktok/test/test_tiktok_device_id.py +++ b/f2/apps/tiktok/test/test_tiktok_device_id.py @@ -12,7 +12,6 @@ async def test_gen_device_id(): tt_chain_token = device["cookie"] assert tt_chain_token is not None - assert len(tt_chain_token) == 39 @pytest.mark.asyncio @@ -25,7 +24,6 @@ async def test_gen_device_id_with_full_cookie(): cookie = device["cookie"] assert cookie is not None - assert len(cookie) == 224 @pytest.mark.asyncio @@ -47,7 +45,6 @@ async def test_gen_device_ids(): for tt_chain_token in tt_chain_tokens: assert tt_chain_token is not None - assert len(tt_chain_token) > 40 @pytest.mark.asyncio @@ -69,4 +66,3 @@ async def test_gen_device_ids_with_full_cookie(): for tt_chain_token in cookies: assert tt_chain_token is not None - assert len(tt_chain_token) > 225 From e1b86c91eba314b892cffb1e59feff1abdf129ea Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 22:27:44 +0800 Subject: [PATCH 289/299] =?UTF-8?q?perf:=20=E7=A7=BB=E9=99=A4=E6=9A=82?= =?UTF-8?q?=E4=B8=8D=E6=94=AF=E6=8C=81=E7=9A=84cli=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/twitter/cli.py | 6 ------ f2/apps/weibo/cli.py | 6 ------ 2 files changed, 12 deletions(-) diff --git a/f2/apps/twitter/cli.py b/f2/apps/twitter/cli.py index a764d410..044bfc8d 100644 --- a/f2/apps/twitter/cli.py +++ b/f2/apps/twitter/cli.py @@ -185,12 +185,6 @@ def handler_naming( type=str, help=_("登录后的[yellow]cookie[/yellow]"), ) -@click.option( - "--interval", - "-i", - type=str, - help=_("下载日期区间发布的推文，格式：2022-01-01|2023-01-01，'all' 为下载所有作品"), -) @click.option( "--timeout", "-e", diff --git a/f2/apps/weibo/cli.py b/f2/apps/weibo/cli.py index 1ab38bc0..71f4f87f 100644 --- a/f2/apps/weibo/cli.py +++ b/f2/apps/weibo/cli.py @@ -185,12 +185,6 @@ def handler_naming( type=str, help=_("登录后的[yellow]cookie[/yellow]"), ) -@click.option( - "--interval", - "-i", - type=str, - help=_("下载日期区间发布的微博，格式：2022-01-01|2023-01-01，'all' 为下载所有作品"), -) @click.option( "--timeout", "-e", From 5eb0081b2c4fe4509be9db57c492baa38c60efc7 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 22:29:58 +0800 Subject: [PATCH 290/299] =?UTF-8?q?docs:=20=E6=B7=BB=E5=8A=A0=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E5=91=BD=E4=BB=A4=E8=A1=8C=E6=8C=87=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/Johnserf-Seed/TikTokDownload/issues/732 --- docs/.vitepress/config.mts | 9 ++++ docs/cli.md | 20 +++++++- docs/guide/apps/douyin/cli.md | 91 +++++++++++++++++++++++++++++++++++ docs/guide/apps/tiktok/cli.md | 90 ++++++++++++++++++++++++++++++++++ docs/guide/apps/weibo/cli.md | 71 +++++++++++++++++++++++++++ docs/guide/apps/x/cli.md | 69 ++++++++++++++++++++++++++ 6 files changed, 349 insertions(+), 1 deletion(-) create mode 100644 docs/guide/apps/douyin/cli.md create mode 100644 docs/guide/apps/tiktok/cli.md create mode 100644 docs/guide/apps/weibo/cli.md create mode 100644 docs/guide/apps/x/cli.md diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts index 58f0599b..2e20b2be 100644 --- a/docs/.vitepress/config.mts +++ b/docs/.vitepress/config.mts @@ -83,6 +83,15 @@ export default defineConfig({ {text: 'WeiBo', link: '/guide/apps/weibo/index'}, ] }, + { + text: '命令行指引', + items: [ + {text: 'DouyYin', link: '/guide/apps/douyin/cli'}, + {text: 'TikTok', link: '/guide/apps/tiktok/cli'}, + {text: 'X', link: '/guide/apps/x/cli'}, + {text: 'WeiBo', link: '/guide/apps/weibo/cli'}, + ] + } ], '/question-answer/': [ diff --git a/docs/cli.md b/docs/cli.md index 1f03d1f4..65902452 100644 --- a/docs/cli.md +++ b/docs/cli.md @@ -103,4 +103,22 @@ F2 会智能的识别出混乱文本中的链接，同时也支持长短链的 $ f2 dy -M one -u '7.64 gOX:/ w@f.oD 05/14 世界这本书 又多读了一页。冰岛????旅行记# 冰岛 https://v.douyin.com/iR2syBRn/ 复制此链接，打开Dou音搜索，直接观看视！ ' -c conf/app.yaml ``` -::: \ No newline at end of file +::: + +## 应用命令行 + +### DouYin + +- [CLI 参考](/guide/apps/douyin/cli) + +### TikTok + +- [CLI 参考](/guide/apps/tiktok/cli) + +### Twitter + +- [CLI 参考](/guide/apps/twitter/cli) + +### WeiBo + +- [CLI 参考](/guide/apps/weibo/cli) \ No newline at end of file diff --git a/docs/guide/apps/douyin/cli.md b/docs/guide/apps/douyin/cli.md new file mode 100644 index 00000000..f9b800ae --- /dev/null +++ b/docs/guide/apps/douyin/cli.md @@ -0,0 +1,91 @@ +## CLI 帮助 - 抖音 + +### 参数列表 + +| 短参数 | 长参数 | 类型 | 说明 | +| ------ | ------ | ---- | ---- | +| `-c` | `--config` | `TEXT` | 配置文件的路径，最低优先 | +| `-u` | `--url` | `TEXT` | 根据模式提供相应的链接 | +| `-m` | `--music` | `BOOLEAN` | 是否保存视频原声 | +| `-v` | `--cover` | `BOOLEAN` | 是否保存视频封面 | +| `-d` | `--desc` | `BOOLEAN` | 是否保存视频文案 | +| `-p` | `--path` | `TEXT` | 作品保存位置 | +| `-f` | `--folderize` | `BOOLEAN` | 是否将作品保存到单独的文件夹 | +| `-M` | `--mode` | `ENUM` | 下载模式 | +| `-n` | `--naming` | `TEXT` | 全局作品文件命名方式 | +| `-k` | `--cookie` | `TEXT` | 登录后的cookie | +| `-i` | `--interval` | `TEXT` | 下载日期区间 | +| `-e` | `--timeout` | `INTEGER` | 网络请求超时时间 | +| `-r` | `--max_retries` | `INTEGER` | 网络请求超时重试数 | +| `-x` | `--max-connections` | `INTEGER` | 网络请求并发连接数 | +| `-t` | `--max-tasks` | `INTEGER` | 异步的任务数 | +| `-o` | `--max-counts` | `INTEGER` | 最大作品下载数 | +| `-s` | `--page-counts` | `INTEGER` | 每页获取作品数 | +| `-l` | `--languages` | `ENUM` | 显示语言 | +| `-P` | `--proxies` | `TEXT...` | 代理服务器 | +| `-L` | `--lyric` | `BOOLEAN` | 是否保存原声歌词 | +| | `--update-config` | `BOOLEAN` | 更新配置文件 | +| | `--init-config` | `TEXT` | 初始化配置文件 | +| | `--auto-cookie` | `ENUM` | 自动获取cookie | +| `-h` | | `FLAG` | 显示富文本帮助 | +| | `--help` | `FLAG` | 显示帮助信息并退出 | + +### 详细说明 + +#### `--config` + +配置文件的路径，最低优先。默认配置文件路径为 `f2/conf/app.yaml`。支持绝对路径与相对路径。 + +#### `--url` + +根据模式提供相应的链接。例如：主页、点赞、收藏作品填入主页链接，单作品填入作品链接，合集与直播同上。 + +#### `--mode` + +下载模式： +- `one`：单个作品 +- `post`：主页作品 +- `like`：点赞作品 +- `collection`：收藏作品 +- `collects`：收藏夹作品 +- `music`：收藏音乐 +- `mix`：合集 +- `live`：直播 + +#### `--naming` + +全局作品文件命名方式。默认为 `{create}_{desc}`，支持的变量有：`{nickname}`，`{create}`，`{aweme_id}`，`{desc}`，`{uid}`。支持的分割符有：`_`，`-`。 + +- `{nickname}`：作者昵称 +- `{create}`：作品创建时间 +- `{aweme_id}`：作品ID +- `{desc}`：作品文案 +- `{uid}`：作者ID + +#### `--interval` + +下载日期区间发布的作品，格式：`年-月-日` 如：`2022-01-01|2023-01-01`，设置`all` 为下载所有作品。 + +#### `--languages` + +显示语言。默认为 `zh_CN`，可选：`zh_CN`、`en_US`，不支持配置文件修改。 + +#### `--proxies` + +代理服务器，最多 2 个参数，`http://`与`https://`。空格区分 2 个参数，例如：`http://x.x.x.x https://x.x.x.x`。如果你的代理不支持`出口HTTPS`，那么请使用`http://x.x.x.x http://x.x.x.x`。 + +#### `--auto-cookie` + +自动从浏览器获取cookie，使用该命令前请确保关闭所选的浏览器。支持的浏览器有： +- `chrome` +- `firefox` +- `edge` +- `opera` +- `opera_gx` +- `safari` +- `chromium` +- `brave` +- `vivaldi` +- `librewolf` + +不支持切换浏览器用户配置。 diff --git a/docs/guide/apps/tiktok/cli.md b/docs/guide/apps/tiktok/cli.md new file mode 100644 index 00000000..6510d595 --- /dev/null +++ b/docs/guide/apps/tiktok/cli.md @@ -0,0 +1,90 @@ +## CLI 帮助 - TikTok + +### 参数列表 + +| 短参数 | 长参数 | 类型 | 说明 | +| ------ | ------ | ---- | ---- | +| `-c` | `--config` | `FILE` | 配置文件的路径，最低优先 | +| `-u` | `--url` | `TEXT` | 根据模式提供相应的链接。例如：主页、点赞、收藏作品填入主页链接，单作品填入作品链接，合集与直播同上 | +| `-m` | `--music` | `BOOLEAN` | 是否保存视频原声 | +| `-v` | `--cover` | `BOOLEAN` | 是否保存视频封面 | +| `-d` | `--desc` | `BOOLEAN` | 是否保存视频文案 | +| `-p` | `--path` | `TEXT` | 作品保存位置，支持绝对与相对路径 | +| `-f` | `--folderize` | `BOOLEAN` | 是否将作品保存到单独的文件夹 | +| `-M` | `--mode` | `[one\|post\|like\|collect\|mix\|search\|live]` | 下载模式：单个作品(one)，主页作品(post)，点赞作品(like)，收藏作品(collect)，合集播放列表(mix)，搜索(search)，直播(live) | +| `-n` | `--naming` | `TEXT` | 全局作品文件命名方式，前往文档查看更多帮助 | +| `-k` | `--cookie` | `TEXT` | 登录后的cookie，如果使用未登录的cookie，则无法持久稳定下载作品 | +| `-i` | `--interval` | `TEXT` | 下载日期区间发布的作品，格式：`2022-01-01|2023-01-01`，`all` 为下载所有作品 | +| `-w` | `--keyword` | `TEXT` | 搜索关键字，用于搜索作品 | +| `-e` | `--timeout` | `INTEGER` | 网络请求超时时间 | +| `-r` | `--max_retries` | `INTEGER` | 网络请求超时重试数 | +| `-x` | `--max-connections` | `INTEGER` | 网络请求并发连接数 | +| `-t` | `--max-tasks` | `INTEGER` | 异步的任务数 | +| `-o` | `--max-counts` | `INTEGER` | 最大作品下载数。`0` 表示无限制 | +| `-s` | `--page-counts` | `INTEGER` | 从接口每页可获取作品数，不建议超过 `20` | +| `-l` | `--languages` | `[zh_CN\|en_US]` | 显示语言。默认为 `zh_CN`，可选：`zh_CN`、`en_US`，不支持配置文件修改 | +| `-P` | `--proxies` | `TEXT...` | 代理服务器，最多 2 个参数，`http://`与`https://`。空格区分 2 个参数，例如：`http://x.x.x.x https://x.x.x.x` | +| | `--update-config` | `BOOLEAN` | 使用命令行选项更新配置文件。需要先使用`-c`选项提供一个配置文件路径 | +| | `--init-config` | `TEXT` | 初始化配置文件。不能同时初始化和更新配置文件 | +| | `--auto-cookie` | `[chrome\|firefox\|edge\|opera\|opera_gx\|safari\|chromium\|brave\|vivaldi\|librewolf]` | 自动从浏览器获取cookie，使用该命令前请确保关闭所选的浏览器 | +| `-h` | | `FLAG` | 显示富文本帮助 | +| | `--help` | `FLAG` | 显示帮助信息并退出 | + +### 详细说明 + +#### `--config` + +配置文件的路径，最低优先。默认配置文件路径为 `f2/conf/app.yaml`。支持绝对路径与相对路径。 + +#### `--url` + +根据模式提供相应的链接。例如：主页、点赞、收藏作品填入主页链接，单作品填入作品链接，合集与直播同上。 + +#### `--mode` + +下载模式： +- `one`：单个作品 +- `post`：主页作品 +- `like`：点赞作品 +- `collect`：收藏作品 +- `mix`：合集播放列表 +- `search`：搜索 +- `live`：直播 + +#### `--naming` + +全局作品文件命名方式。默认为 `{create}_{desc}`，支持的变量有：`{nickname}`，`{create}`，`{aweme_id}`，`{desc}`，`{uid}`。支持的分割符有：`_`，`-`。 + +- `{nickname}`：作者昵称 +- `{create}`：作品创建时间 +- `{aweme_id}`：作品ID +- `{desc}`：作品文案 +- `{uid}`：作者ID + +#### `--interval` + +下载日期区间发布的作品，格式：`年-月-日` 如：`2022-01-01|2023-01-01`，设置`all` 为下载所有作品。 + +#### `--languages` + +显示语言。默认为 `zh_CN`，可选：`zh_CN`、`en_US`，不支持配置文件修改。 + +#### `--proxies` + +代理服务器，最多 2 个参数，`http://`与`https://`。空格区分 2 个参数，例如：`http://x.x.x.x https://x.x.x.x`。如果你的代理不支持`出口HTTPS`，那么请使用`http://x.x.x.x http://x.x.x.x`。 + +#### `--auto-cookie` + +自动从浏览器获取cookie，使用该命令前请确保关闭所选的浏览器。支持的浏览器有： +- `chrome` +- `firefox` +- `edge` +- `opera` +- `opera_gx` +- `safari` +- `chromium` +- `brave` +- `vivaldi` +- `librewolf` + +不支持切换浏览器用户配置。 diff --git a/docs/guide/apps/weibo/cli.md b/docs/guide/apps/weibo/cli.md new file mode 100644 index 00000000..82a1905e --- /dev/null +++ b/docs/guide/apps/weibo/cli.md @@ -0,0 +1,71 @@ +## CLI 帮助 - 微博 + +### 参数列表 + +| 短参数 | 长参数 | 类型 | 说明 | +| ------ | ------ | ---- | ---- | +| `-c` | `--config` | `FILE` | 配置文件的路径，最低优先 | +| `-u` | `--url` | `TEXT` | 根据模式提供相应的链接 | +| `-p` | `--path` | `TEXT` | 作品保存位置，支持绝对与相对路径 | +| `-f` | `--folderize` | `BOOLEAN` | 是否将作品保存到单独的文件夹 | +| `-M` | `--mode` | `[one\|post\|like]` | 下载模式：单个微博(one)，主页微博(post)，点赞微博(like) | +| `-n` | `--naming` | `TEXT` | 全局微博文件命名方式，前往文档查看更多帮助 | +| `-k` | `--cookie` | `TEXT` | 登录后的cookie | +| `-e` | `--timeout` | `INTEGER` | 网络请求超时时间 | +| `-r` | `--max_retries` | `INTEGER` | 网络请求超时重试数 | +| `-x` | `--max-connections` | `INTEGER` | 网络请求并发连接数 | +| `-t` | `--max-tasks` | `INTEGER` | 异步的任务数 | +| `-o` | `--max-counts` | `INTEGER` | 最大微博下载数。`0` 表示无限制 | +| `-s` | `--page-counts` | `INTEGER` | 从接口每页可获取微博数，不建议超过 `20` | +| `-l` | `--languages` | `[zh_CN\|en_US]` | 显示语言。默认为 `zh_CN`，可选：`zh_CN`、`en_US`，不支持配置文件修改 | +| `-P` | `--proxies` | `TEXT...` | 代理服务器，最多 2 个参数，`http://`与`https://`。空格区分 2 个参数，例如：`http://x.x.x.x https://x.x.x.x` | +| | `--update-config` | `BOOLEAN` | 使用命令行选项更新配置文件。需要先使用`-c`选项提供一个配置文件路径 | +| | `--init-config` | `TEXT` | 初始化配置文件。不能同时初始化和更新配置文件 | +| | `--auto-cookie` | `[chrome\|firefox\|edge\|opera\|opera_gx\|safari\|chromium\|brave\|vivaldi\|librewolf]` | 自动从浏览器获取cookie，使用该命令前请确保关闭所选的浏览器 | +| `-h` | `--help` | `FLAG` | 显示富文本帮助 | +| | `--help` | `FLAG` | 显示帮助信息并退出 | + +### 详细说明 + +#### `--config` + +配置文件的路径，最低优先。默认配置文件路径为 `f2/conf/app.yaml`。支持绝对路径与相对路径。 + +#### `--url` + +根据模式提供相应的链接。 + +#### `--mode` + +下载模式： +- `one`：单个微博 +- `post`：主页微博 +- `like`：点赞微博 + +#### `--interval` + +下载日期区间发布的微博，格式：`2022-01-01|2023-01-01`，`all` 为下载所有作品。 + +#### `--languages` + +显示语言。默认为 `zh_CN`，可选：`zh_CN`、`en_US`，不支持配置文件修改。 + +#### `--proxies` + +代理服务器，最多 2 个参数，`http://`与`https://`。空格区分 2 个参数，例如：`http://x.x.x.x https://x.x.x.x`。如果你的代理不支持`出口HTTPS`，那么请使用`http://x.x.x.x http://x.x.x.x`。 + +#### `--auto-cookie` + +自动从浏览器获取cookie，使用该命令前请确保关闭所选的浏览器。支持的浏览器有： +- `chrome` +- `firefox` +- `edge` +- `opera` +- `opera_gx` +- `safari` +- `chromium` +- `brave` +- `vivaldi` +- `librewolf` + +不支持切换浏览器用户配置。 diff --git a/docs/guide/apps/x/cli.md b/docs/guide/apps/x/cli.md new file mode 100644 index 00000000..38006d10 --- /dev/null +++ b/docs/guide/apps/x/cli.md @@ -0,0 +1,69 @@ +## CLI 帮助 - 推特 + +### 参数列表 + +| 短参数 | 长参数 | 类型 | 说明 | +| ------ | ------ | ---- | ---- | +| `-c` | `--config` | `FILE` | 配置文件的路径，最低优先 | +| `-u` | `--url` | `TEXT` | 根据模式提供相应的链接 | +| `-p` | `--path` | `TEXT` | 作品保存位置，支持绝对与相对路径 | +| `-f` | `--folderize` | `BOOLEAN` | 是否将作品保存到单独的文件夹 | +| `-M` | `--mode` | `[one\|post\|retweet\|like\|bookmark]` | 下载模式：单个推文(one)，主页推文(post)，转推(retweet)，点赞(like)，书签(bookmark) | +| `-n` | `--naming` | `TEXT` | 全局推文文件命名方式，前往文档查看更多帮助 | +| `-k` | `--cookie` | `TEXT` | 登录后的cookie | +| `-e` | `--timeout` | `INTEGER` | 网络请求超时时间 | +| `-r` | `--max_retries` | `INTEGER` | 网络请求超时重试数 | +| `-x` | `--max-connections` | `INTEGER` | 网络请求并发连接数 | +| `-t` | `--max-tasks` | `INTEGER` | 异步的任务数 | +| `-o` | `--max-counts` | `INTEGER` | 最大推文下载数。`0` 表示无限制 | +| `-s` | `--page-counts` | `INTEGER` | 从接口每页可获取推文数，不建议超过 `20` | +| `-l` | `--languages` | `[zh_CN\|en_US]` | 显示语言。默认为 `zh_CN`，可选：`zh_CN`、`en_US`，不支持配置文件修改 | +| `-P` | `--proxies` | `TEXT...` | 代理服务器，最多 2 个参数，`http://`与`https://`。空格区分 2 个参数，例如：`http://x.x.x.x https://x.x.x.x` | +| | `--update-config` | `BOOLEAN` | 使用命令行选项更新配置文件。需要先使用`-c`选项提供一个配置文件路径 | +| | `--init-config` | `TEXT` | 初始化配置文件。不能同时初始化和更新配置文件 | +| | `--auto-cookie` | `[chrome\|firefox\|edge\|opera\|opera_gx\|safari\|chromium\|brave\|vivaldi\|librewolf]` | 自动从浏览器获取cookie，使用该命令前请确保关闭所选的浏览器 | +| `-h` | `--help` | `FLAG` | 显示富文本帮助 | +| | `--help` | `FLAG` | 显示帮助信息并退出 | + +### 详细说明 + +#### `--config` + +配置文件的路径，最低优先。默认配置文件路径为 `f2/conf/app.yaml`。支持绝对路径与相对路径。 + +#### `--url` + +根据模式提供相应的链接。 + +#### `--mode` + +下载模式： +- `one`：单个推文 +- `post`：主页推文 +- `retweet`：转推 +- `like`：点赞 +- `bookmark`：书签 + +#### `--languages` + +显示语言。默认为 `zh_CN`，可选：`zh_CN`、`en_US`，不支持配置文件修改。 + +#### `--proxies` + +代理服务器，最多 2 个参数，`http://`与`https://`。空格区分 2 个参数，例如：`http://x.x.x.x https://x.x.x.x`。如果你的代理不支持`出口HTTPS`，那么请使用`http://x.x.x.x http://x.x.x.x`。 + +#### `--auto-cookie` + +自动从浏览器获取cookie，使用该命令前请确保关闭所选的浏览器。支持的浏览器有： +- `chrome` +- `firefox` +- `edge` +- `opera` +- `opera_gx` +- `safari` +- `chromium` +- `brave` +- `vivaldi` +- `librewolf` + +不支持切换浏览器用户配置。 From e93528079d95fc67ce45eb73e9a1aada00f84f8b Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 22:30:15 +0800 Subject: [PATCH 291/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0x=E5=B8=AE?= =?UTF-8?q?=E5=8A=A9=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/twitter/help.py | 66 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 f2/apps/twitter/help.py diff --git a/f2/apps/twitter/help.py b/f2/apps/twitter/help.py new file mode 100644 index 00000000..72cc8388 --- /dev/null +++ b/f2/apps/twitter/help.py @@ -0,0 +1,66 @@ +# path: f2/apps/twitter/help.py + +from rich.console import Console +from rich.panel import Panel +from rich.table import Table + +from f2.i18n.translator import _ + + +def help() -> None: + # 真彩 + console = Console(color_system="truecolor") + table = Table(highlight=True, box=None, show_header=False) + table.add_column("OPTIONS", no_wrap=True, justify="left", style="bold") + table.add_column("Type", no_wrap=True, justify="left", style="bold") + table.add_column("Description", no_wrap=True) + + options = [ + ("-c --config", "[dark_cyan]Path", _("配置文件的路径，最低优先")), + ("-u --url", "[dark_cyan]str", _("除了单个推文外，其他URL都需要用户主页URL")), + ("-p --path", "[dark_cyan]str", _("推文保存位置，默认为 'Download'")), + ( + "-f --folderize", + "[dark_cyan]Choice", + _("是否将推文保存到单独的文件夹，默认为 'yes'"), + ), + ( + "-M --mode", + "[dark_cyan]Choice", + _( + "下载模式：单个推文[one]、用户推文[post]、用户转推[retweet]、喜欢推文[like]、用户收藏[bookmark]" + ), + ), + ("-n --naming", "[dark_cyan]str", _("全局推文文件命名方式")), + ( + "--auto-cookie", + "[dark_cyan]Choice", + _( + "自动从浏览器获取[yellow]cookie[/yellow]，使用该命令前请确保关闭所选的浏览器" + ), + ), + ("-k --cookie", "[dark_cyan]str", _("登录后的cookie")), + ("-e --timeout", "[dark_cyan]int", _("网络请求超时时间，默认为 10")), + ("-r --max-retries", "[dark_cyan]int", _("网络请求超时重试数，默认为 5")), + ("-x --max-connections", "[dark_cyan]int", _("网络请求并发连接数，默认为 5")), + ("-t --max-tasks", "[dark_cyan]int", _("异步的任务数，默认为 10")), + ("-o --max-counts", "[dark_cyan]int", _("最大推文下载数 默认为 0，表示无限制")), + ("-s --page-counts", "[dark_cyan]int", _("每页推文数，默认为 20个推文/页")), + ("-l --languages", "[dark_cyan]Choice", _("语言设置，默认为 'zh_CN'")), + ( + "-P --proxies", + "[dark_cyan]str", + _( + "代理服务器，最多 2 个参数，http://与https://。空格区分 2 个参数 http://x.x.x.x https://x.x.x.x" + ), + ), + ("--update-config", "[dark_cyan]Flag", _("使用命令行选项更新配置文件")), + ("--init-config", "[dark_cyan]Flag", _("初始化配置文件")), + ] + + for option in options: + table.add_row(*option) + + console.print( + Panel(table, border_style="bold", title="[Twitter]", title_align="left") + ) From edd6f521e9fd79640d00828829d3eb13089dea95 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 22:30:20 +0800 Subject: [PATCH 292/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0weibo?= =?UTF-8?q?=E5=B8=AE=E5=8A=A9=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/weibo/help.py | 64 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 f2/apps/weibo/help.py diff --git a/f2/apps/weibo/help.py b/f2/apps/weibo/help.py new file mode 100644 index 00000000..3c842c49 --- /dev/null +++ b/f2/apps/weibo/help.py @@ -0,0 +1,64 @@ +# path: f2/apps/weibo/help.py + +from rich.console import Console +from rich.panel import Panel +from rich.table import Table + +from f2.i18n.translator import _ + + +def help() -> None: + # 真彩 + console = Console(color_system="truecolor") + table = Table(highlight=True, box=None, show_header=False) + table.add_column("OPTIONS", no_wrap=True, justify="left", style="bold") + table.add_column("Type", no_wrap=True, justify="left", style="bold") + table.add_column("Description", no_wrap=True) + + options = [ + ("-c --config", "[dark_cyan]Path", _("配置文件的路径，最低优先")), + ("-u --url", "[dark_cyan]str", _("除了单个微博外，其他URL都需要用户主页URL")), + ("-p --path", "[dark_cyan]str", _("微博保存位置，默认为 'Download'")), + ( + "-f --folderize", + "[dark_cyan]Choice", + _("是否将微博保存到单独的文件夹，默认为 'yes'"), + ), + ( + "-M --mode", + "[dark_cyan]Choice", + _("下载模式：单个微博(one)，主页微博(post)"), + ), + ("-n --naming", "[dark_cyan]str", _("全局微博文件命名方式")), + ( + "--auto-cookie", + "[dark_cyan]Choice", + _( + "自动从浏览器获取[yellow]cookie[/yellow]，使用该命令前请确保关闭所选的浏览器" + ), + ), + ("-k --cookie", "[dark_cyan]str", _("登录后的cookie")), + ("-e --timeout", "[dark_cyan]int", _("网络请求超时时间，默认为 10")), + ("-r --max-retries", "[dark_cyan]int", _("网络请求超时重试数，默认为 5")), + ("-x --max-connections", "[dark_cyan]int", _("网络请求并发连接数，默认为 5")), + ("-t --max-tasks", "[dark_cyan]int", _("异步的任务数，默认为 10")), + ("-o --max-counts", "[dark_cyan]int", _("最大微博下载数 默认为 0，表示无限制")), + ("-s --page-counts", "[dark_cyan]int", _("每页微博数，默认为 20个微博/页")), + ("-l --languages", "[dark_cyan]Choice", _("语言设置，默认为 'zh_CN'")), + ( + "-P --proxies", + "[dark_cyan]str", + _( + "代理服务器，最多 2 个参数，http://与https://。空格区分 2 个参数 http://x.x.x.x https://x.x.x.x" + ), + ), + ("--update-config", "[dark_cyan]Flag", _("使用命令行选项更新配置文件")), + ("--init-config", "[dark_cyan]Flag", _("初始化配置文件")), + ] + + for option in options: + table.add_row(*option) + + console.print( + Panel(table, border_style="bold", title="[WeiBo]", title_align="left") + ) From 3570d1073dc6507dfa44ec9792ce844aaa83b34e Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 23:13:26 +0800 Subject: [PATCH 293/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E5=8C=96=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/tiktok/handler.py | 2 +- f2/dl/base_downloader.py | 10 +++++----- f2/languages/en_US/LC_MESSAGES/en_US.mo | Bin 34741 -> 52114 bytes f2/languages/zh_CN/LC_MESSAGES/zh_CN.mo | Bin 32992 -> 49561 bytes 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/f2/apps/tiktok/handler.py b/f2/apps/tiktok/handler.py index 8ef19c3a..b261bc6a 100644 --- a/f2/apps/tiktok/handler.py +++ b/f2/apps/tiktok/handler.py @@ -808,7 +808,7 @@ async def fetch_search_videos( if videos_collected >= max_counts: logger.info( - _("关键词：{0} 已达到最大下载数量 {} 个").format( + _("关键词：{0} 已达到最大下载数量 {1} 个").format( keyword, max_counts ) ) diff --git a/f2/dl/base_downloader.py b/f2/dl/base_downloader.py index bf6e1cab..bec09485 100644 --- a/f2/dl/base_downloader.py +++ b/f2/dl/base_downloader.py @@ -287,7 +287,7 @@ async def download_m3u8_stream( if not segments: await self.progress.update( task_id, - description=_("[ 丢失 ]:"), + description=_("[ 丢失 ]："), filename=trim_filename(full_path.name, 45), state="completed", ) @@ -371,7 +371,7 @@ async def download_m3u8_stream( logger.warning(_("m3u8文件或ts文件未找到，可能直播结束")) await self.progress.update( task_id, - description=_("[ 丢失 ]:"), + description=_("[ 丢失 ]："), filename=trim_filename(full_path.name, 45), state="completed", ) @@ -380,7 +380,7 @@ async def download_m3u8_stream( logger.error(_("HTTP错误: {0}").format(e)) await self.progress.update( task_id, - description=_("[ 失败 ]:"), + description=_("[ 失败 ]："), filename=trim_filename(full_path.name, 45), state="completed", ) @@ -400,7 +400,7 @@ async def download_m3u8_stream( logger.error(traceback.format_exc()) await self.progress.update( task_id, - description=_("[ 失败 ]:"), + description=_("[ 失败 ]："), filename=trim_filename(full_path.name, 45), state="completed", ) @@ -411,7 +411,7 @@ async def download_m3u8_stream( logger.error(traceback.format_exc()) await self.progress.update( task_id, - description=_("[ 失败 ]:"), + description=_("[ 失败 ]："), filename=trim_filename(full_path.name, 45), state="completed", ) diff --git a/f2/languages/en_US/LC_MESSAGES/en_US.mo b/f2/languages/en_US/LC_MESSAGES/en_US.mo index 55aebf4f5eb21f9126ab3a08c08f4d4826a9aac1..b4ddd8029212f1fbb7317c9415a256d4be65737d 100644 GIT binary patch literal 52114 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 delta 9720 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 flEV~Q^CabkE_9SGJG<31MHu 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 literal 32992 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 Date: Thu, 27 Jun 2024 23:24:44 +0800 Subject: [PATCH 294/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0readme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 201 +++++++++++++++++++++++++++++++++++---------------- README.md | 167 ++++++++++++++++++++++++++++++------------ 2 files changed, 260 insertions(+), 108 deletions(-) diff --git a/README.en.md b/README.en.md index 9eeb3d6c..00672aa7 100644 --- a/README.en.md +++ b/README.en.md @@ -60,6 +60,11 @@ When downloading or upgrading to a different version of `F2`, please note the fo
📡 v0.0.1.6-pw2 + - The configuration file format has been updated. If you are using an old configuration file, please migrate accordingly. + - The default timezone for all timestamps is now (`UTC/GMT+08:00`). + - The `douyin` live stream filenames have been adjusted to `flv`, and albums have been reverted to `webp`. + - The 403 error for `tiktok` video URLs has been fixed. [Solution for TikTok video URL 403](https://johnserf-seed.github.io/f2/question-answer/qa.html#tiktok-403-forbidden) + - `douyin` now defaults to using the `ab` algorithm for requests. (The full-powered ab algorithm will be open-sourced later). - For more changes, see [ChangeLog](https://github.com/Johnserf-Seed/f2/blob/main/CHANGELOG.md#0015---2024-04-04).
@@ -89,9 +94,9 @@ Many features are not fully developed in the `preview` version. If you find any ## 🗓️ Todo -- Support for `weibo` and `x` will be added in version `0.0.1.6`. -- More `douyin` and `tiktok` interfaces will be added in version `0.0.1.6`. -- Known issues from previous versions will be fixed in version `0.0.1.6`. +- Local forwarding functionality will be added in version `0.0.1.7`. +- More interfaces for `douyin`, `tiktok`, `weibo`, and `x` will be added in version `0.0.1.7`. +- Known issues with `x` will be fixed in version `0.0.1.7`. ## 🐛 Updates @@ -110,37 +115,62 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores - 🟣 Indicates that login is required to download works that are only visible to oneself, favorited works, works in collection folders, or liked works. (After login, ignores own privacy settings and obtains personalized content) - ⚫ Indicates that login is not required to download public works, works in collection folders, liked works, etc. (Only downloads works visible to others and pages) - | Feature | Account Status | Interface | Feature Status | + | Feature | Account Status | API | Status | | --- | --- | --- | --- | | User Information | 🟣⚫ | `fetch_user_profile` | 🟢 | - | Single Work (Video, Album, Daily) | 🟣⚫ | `fetch_one_video` | 🟢 | - | Home Page Works | 🟣⚫ | `fetch_user_post_videos` | 🟢 | - | Liked Works | 🟣⚫ | `fetch_user_like_videos` | 🟢 | - | Favorite Works | 🟣 | `fetch_user_collects_videos` | 🟢 | - | Collection Works | 🟣 | `fetch_user_collection_videos` | 🟢 | - | Collected Original Sound | 🟣 | `fetch_user_music_collection` | 🟢 | - | Collected Collections | 🟣 | `fetch_user_mix_collection` | 🔵 | - | Collected Short Films | 🟣 | `fetch_user_series_collection` | 🟤 | - | Collection Works | ⚫ | `fetch_user_mix_videos` | 🟢 | - | Home Page Recommended Works | 🟣⚫ | `fetch_user_feed_videos` | 🟡 | - | Similar Recommended Works | ⚫ | `fetch_related_videos` | 🟢 | + | Single Video (Video, Album, Daily) | 🟣⚫ | `fetch_one_video` | 🟢 | + | Homepage Videos | 🟣⚫ | `fetch_user_post_videos` | 🟢 | + | Liked Videos | 🟣⚫ | `fetch_user_like_videos` | 🟢 | + | Collection Folder Videos | 🟣⚫ | `fetch_user_collects_videos` | 🟢 | + | Collected Videos | 🟣 | `fetch_user_collection_videos` | 🟢 | + | Collected Music | 🟣 | `fetch_user_music_collection` | 🟢 | + | Collected Playlist | 🟣 | `fetch_user_mix_collection` | 🔵 | + | Collected Series | 🟣 | `fetch_user_series_collection` | 🟤 | + | Playlist Videos | ⚫ | `fetch_user_mix_videos` | 🟢 | + | Recommended Videos | 🟣⚫ | `fetch_user_feed_videos` | 🟢 | + | Related Videos | ⚫ | `fetch_related_videos` | 🟢 | | Live Room Information (Stream Download) | ⚫ | `fetch_user_live_videos`, `fetch_user_live_videos_by_room_id` | 🟢 | - | Live Room Danmaku | ⚫ | `fetch_user_live_danmu` | 🔵 | - | Following Users' Live Broadcasts | 🟣⚫ | `fetch_user_following_lives` | 🟢 | - | Following User Information | 🟣⚫ | `fetch_user_following` | 🟢 | - | Fan User Information | 🟣⚫ | `fetch_user_follower` | 🟢 | - | Following User Works | 🟣⚫ | `fetch_user_following_videos` | 🟤 | - | Fan User Works | 🟣⚫ | `fetch_user_follower_videos` | 🟤 | - | Friend's Works | 🟣 | `fetch_friend_feed_videos` | 🟢 | + | Live Room Load | ⚫ | `fetch_live_im` | 🟢 | + | Live Room Danmaku | ⚫ | `fetch_user_live_danmu` | 🟢 | + | Followed Users Live | 🟣⚫ | `fetch_user_following_lives` | 🟢 | + | Followed Users Information | 🟣⚫ | `fetch_user_following` | 🟢 | + | Followers Information | 🟣⚫ | `fetch_user_follower` | 🟢 | + | Followed Users Videos | 🟣⚫ | `fetch_user_following_videos` | 🟤 | + | Followers Videos | 🟣⚫ | `fetch_user_follower_videos` | 🟤 | + | Friends' Videos | 🟣 | `fetch_friend_feed_videos` | 🟢 | | Search Videos | ⚫ | `fetch_search_videos` | 🔵 | | Search Users | ⚫ | `fetch_search_users` | 🔵 | - | Search Lives | ⚫ | `fetch_search_lives` | 🔵 | - | Guess What You Want to Search (Related Search) | ⚫ | `fetch_search_suggest` | 🟤 | - | DouYin Hotspot | ⚫ | `fetch_hot_search` | 🟤 | - | Work Comments | 🟣⚫ | `fetch_video_comments` | 🔵 | - | Viewing History | 🟣 | `fetch_user_history_read` | 🟤 | + | Search Live | ⚫ | `fetch_search_lives` | 🔵 | + | Search Suggestions | ⚫ | `fetch_search_suggest` | 🟤 | + | Douyin Hot Search | ⚫ | `fetch_hot_search` | 🟤 | + | Video Comments | 🟣⚫ | `fetch_video_comments` | 🔵 | + | Watch History | 🟣 | `fetch_user_history_read` | 🟤 | | Watch Later | 🟣 | `fetch_user_watch_later` | 🟤 | | ... | ... | ... | ... | + + | Tool | Class | API | Status | + | --- | --- | --- | --- | + | Manage Client Configuration | `ClientConfManager` | | 🟢 | + | Generate Real msToken | `TokenManager` | `gen_real_msToken` | 🟢 | + | Generate Fake msToken | `TokenManager` | `gen_false_msToken` | 🟢 | + | Generate ttwid | `TokenManager` | `gen_ttwid` | 🟢 | + | Generate webid | `TokenManager` | `gen_webid` | 🟢 | + | Generate verify_fp | `VerifyFpManager` | `gen_verify_fp` | 🟢 | + | Generate s_v_web_id | `VerifyFpManager` | `gen_s_v_web_id` | 🟢 | + | Generate Live Signature | `DouyinWebcastSignature` | `get_signature` | 🟢 | + | Generate wss Signature Parameters from API Model | `WebcastSignatureManager` | `model_2_endpoint` | 🟢 | + | Generate Xb Parameters from API URL | `XBogusManager` | `str_2_endpoint` | 🟢 | + | Generate Xb Parameters from API Model | `XBogusManager` | `model_2_endpoint` | 🟢 | + | Generate Ab Parameters from API URL | `ABogusManager` | `str_2_endpoint` | 🟢 | + | Generate Ab Parameters from API Model | `ABogusManager` | `model_2_endpoint` | 🟢 | + | Extract Single User ID | `SecUserIdFetcher` | `get_sec_user_id` | 🟢 | + | Extract User IDs from List | `SecUserIdFetcher` | `get_all_sec_user_id` | 🟢 | + | Extract Single Video ID | `AwemeIdFetcher` | `get_aweme_id` | 🟢 | + | Extract Video IDs from List | `AwemeIdFetcher` | `get_all_aweme_id` | 🟢 | + | Extract Single Playlist ID | `MixIdFetcher` | `get_mix_id` | 🟢 | + | Extract Playlist IDs from List | `MixIdFetcher` | `get_all_mix_id` | 🟢 | + | Extract Single Live Room ID | `WebCastIdFetcher` | `get_webcast_id` | 🟢 | + | Extract Live Room IDs from List | `WebCastIdFetcher` | `get_all_webcast_id` | 🟢 |
@@ -156,8 +186,10 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores | Home Page Works | 🟣⚫ | `fetch_user_post_videos` | 🟢 | | Liked Works | 🟣⚫ | `fetch_user_like_videos` | 🟢 | | Favorite Works | 🟣⚫ | `fetch_user_collect_videos` | 🟢 | + | Playlist | 🟣⚫ | `fetch_play_list` | 🟢 | | Playlist Works | 🟣⚫ | `fetch_user_mix_videos` | 🟢 | | Post Search|🟣⚫|`fetch_search_videos`|🟢| + | Live Room Information (Stream Download) |⚫|`fetch_user_live_videos`|🟢| | Check If The webcast Is Alive|🟣⚫|`fetch_check_live_alive`|🟢| | ... | ... | ... | ... |
@@ -220,6 +252,10 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores + ### DouYin Webcast Danmaku + + https://github.com/Johnserf-Seed/f2/assets/40727745/500d1eaf-59ba-44ba-849b-666c0ddf8469 +
@@ -262,17 +298,6 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores ```bash . - ├── .github - │   ├── ISSUE_TEMPLATE - │   │   ├── ask-question.md - │   │   ├── bug-report.md - │   │   └── feature_request.md - │   └── workflows - │   └── Codecov.yml - │   └── deploy.yml - ├── .gitignore - ├── .vscode - │   └── settings.json ├── CHANGELOG.md ├── CODE_OF_CONDUCT.md ├── CONTRIBUTING.md @@ -281,13 +306,9 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores ├── README.en.md ├── README.md ├── SECURITY.md + ├── babel.cfg + ├── coverage.xml ├── docs - │   ├── .vitepress - │   │   ├── config.mts - │   │   └── theme - │   │   ├── index.ts - │   │   └── styles - │   │   └── vars.css │   ├── advance-guide.md │   ├── cli.md │   ├── en @@ -306,11 +327,14 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores │   │   ├── apps │   │   │   ├── douyin │   │   │   │   └── index.md - │   │   │   └── tiktok + │   │   │   ├── tiktok + │   │   │   │   └── index.md + │   │   │   ├── weibo + │   │   │   │   └── index.md + │   │   │   └── x │   │   │   └── index.md │   │   └── what-is-f2.md │   ├── index.md - │   ├── install.md │   ├── package-lock.json │   ├── package.json │   ├── public @@ -342,11 +366,17 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores │   ├── snippets │   │   ├── QA.md │   │   ├── douyin + │   │   │   ├── abogus.py │   │   │   ├── aweme-id.py + │   │   │   ├── aweme-related.py + │   │   │   ├── client-config.py │   │   │   ├── format-file-name.py + │   │   │   ├── json-2-lrc.py + │   │   │   ├── mix-id.py │   │   │   ├── mstoken-false.py │   │   │   ├── mstoken-real.py │   │   │   ├── one-video.py + │   │   │   ├── query-user.py │   │   │   ├── s_v_web_id.py │   │   │   ├── sec-user-id.py │   │   │   ├── show-qrcode.py @@ -355,24 +385,32 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores │   │   │   ├── ttwid.py │   │   │   ├── user-collection.py │   │   │   ├── user-collects.py + │   │   │   ├── user-feed.py │   │   │   ├── user-folder.py + │   │   │   ├── user-follow-live.py │   │   │   ├── user-follower.py │   │   │   ├── user-following.py + │   │   │   ├── user-friend.py │   │   │   ├── user-get-add.py │   │   │   ├── user-like.py + │   │   │   ├── user-live-im-fetch.py │   │   │   ├── user-live-room-id.py │   │   │   ├── user-live.py │   │   │   ├── user-mix.py - │   │   │   ├── user-nickname.py │   │   │   ├── user-post.py │   │   │   ├── user-profile.py │   │   │   ├── verify_fp.py │   │   │   ├── video-get-add.py │   │   │   ├── webcast-id.py + │   │   │   ├── webcast-signature.py + │   │   │   ├── webid.py │   │   │   └── xbogus.py │   │   ├── set-debug.py │   │   ├── tiktok │   │   │   ├── aweme-id.py + │   │   │   ├── check-live-alive.py + │   │   │   ├── client-config.py + │   │   │   ├── device-id.py │   │   │   ├── format-file-name.py │   │   │   ├── one-video.py │   │   │   ├── sec-uid.py @@ -384,13 +422,16 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores │   │   │   ├── user-get-add.py │   │   │   ├── user-like.py │   │   │   ├── user-mix.py - │   │   │   ├── user-nickname.py │   │   │   ├── user-playlist.py │   │   │   ├── user-post.py │   │   │   ├── user-profile.py │   │   │   ├── video-get-add.py │   │   │   └── xbogus.py - │   │   └── user-profile.py + │   │   ├── twitter + │   │   └── weibo + │   │   ├── user-profile.py + │   │   └── user-weibo.py + │   └── vite-.zip ├── f2 │   ├── __init__.py │   ├── __main__.py @@ -398,6 +439,9 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores │   │   ├── __apps__.py │   │   ├── __init__.py │   │   ├── douyin + │   │   │   ├── algorithm + │   │   │   │   ├── webcast_signature.js + │   │   │   │   └── webcast_signature.py │   │   │   ├── api.py │   │   │   ├── cli.py │   │   │   ├── crawler.py @@ -407,15 +451,20 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores │   │   │   ├── handler.py │   │   │   ├── help.py │   │   │   ├── model.py + │   │   │   ├── proto + │   │   │   │   ├── douyin_webcast.proto + │   │   │   │   └── douyin_webcast_pb2.py │   │   │   ├── test - │   │   │   │   ├── test_apps_model.py - │   │   │   │   ├── test_aweme_id.py - │   │   │   │   ├── test_crawler.py - │   │   │   │   ├── test_handler.py - │   │   │   │   ├── test_lrc.py - │   │   │   │   ├── test_room_id.py - │   │   │   │   ├── test_sec_user_id.py - │   │   │   │   └── test_webcast_id.py + │   │   │   │   ├── test_douyin_apps_model.py + │   │   │   │   ├── test_douyin_aweme_id.py + │   │   │   │   ├── test_douyin_crawler.py + │   │   │   │   ├── test_douyin_handler.py + │   │   │   │   ├── test_douyin_lrc.py + │   │   │   │   ├── test_douyin_room_id.py + │   │   │   │   ├── test_douyin_sec_user_id.py + │   │   │   │   ├── test_douyin_token.py + │   │   │   │   ├── test_douyin_webcast_id.py + │   │   │   │   └── test_douyin_webcast_signature.py │   │   │   └── utils.py │   │   ├── tiktok │   │   │   ├── api.py @@ -427,6 +476,10 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores │   │   │   ├── handler.py │   │   │   ├── help.py │   │   │   ├── model.py + │   │   │   ├── test + │   │   │   │   ├── test_tiktok_crawler.py + │   │   │   │   ├── test_tiktok_device_id.py + │   │   │   │   └── test_tiktok_token.py │   │   │   └── utils.py │   │   ├── twitter │   │   │   ├── api.py @@ -438,7 +491,27 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores │   │   │   ├── handler.py │   │   │   ├── help.py │   │   │   ├── model.py + │   │   │   ├── test + │   │   │   │   ├── test_model.py + │   │   │   │   ├── test_tweet_id.py + │   │   │   │   └── ttt.py │   │   │   └── utils.py + │   │   └── weibo + │   │   ├── api.py + │   │   ├── cli.py + │   │   ├── crawler.py + │   │   ├── db.py + │   │   ├── dl.py + │   │   ├── filter.py + │   │   ├── handler.py + │   │   ├── help.py + │   │   ├── model.py + │   │   ├── test + │   │   │   ├── test_gen_visitor.py + │   │   │   ├── test_handler.py + │   │   │   ├── test_weibo_id.py + │   │   │   └── test_weibo_uid.py + │   │   └── utils.py │   ├── cli │   │   ├── __init__.py │   │   ├── cli_commands.py @@ -476,17 +549,19 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores │   ├── _dl.py │   ├── _signal.py │   ├── _singleton.py + │   ├── abogus.py + │   ├── abogus_async.py + │   ├── abogus_full.py │   ├── conf_manager.py + │   ├── decorators.py │   ├── json_filter.py - │   ├── mode_handler.py │   ├── utils.py │   └── xbogus.py - │   ├── app.yaml - │   ├── conf.yaml - │   └── defaults.yaml + ├── messages.pot ├── package-lock.json ├── package.json ├── pyproject.toml + ├── pytest.ini ├── tests │   ├── test_cli_console.py │   ├── test_desc_limit.py @@ -496,6 +571,7 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores │   ├── test_logger.py │   ├── test_signal.py │   ├── test_singleton.py + │   ├── test_timestamp.py │   ├── test_utils.py │   └── test_xbogus.py @@ -526,6 +602,9 @@ If you are interested in extending new applications for `F2`, please refer to th - [pydantic](https://github.com/samuelcolvin/pydantic) - [qrcode](https://github.com/lincolnloop/python-qrcode) - [vitepress](https://github.com/vuejs/vitepress) +- [websockets](https://github.com/python-websockets/websockets) +- [protobuf](https://github.com/protocolbuffers/protobuf) +- [PyExecJS](https://github.com/doloopwhile/PyExecJS) Without these libraries and programs, `F2` would not be able to achieve these functionalities. Sincere thanks for their contributions and efforts. diff --git a/README.md b/README.md index 11f64df4..aed9d437 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,12 @@
📡 v0.0.1.6-pw2 - - 更多变化查看[ChangeLog](https://github.com/Johnserf-Seed/f2/blob/main/CHANGELOG.md#0015---2024-04-04)。 + - 配置文件格式已经更新，如果你使用了旧的配置文件，请注意迁移。 + - 所有时间戳的默认时区为（`UTC/GMT+08:00`）。 + - `douyin`直播流文件名调整为`flv`，图集调整回`webp`。 + - `tiktok`视频地址`403`的错误已经修复。[TikTok视频地址403解决办法](https://johnserf-seed.github.io/f2/question-answer/qa.html#tiktok-403-forbidden) + - 现在`douyin`默认会使用`ab`算法来请求。（满血版ab算法待时开源）。 + - 更多变化查看[ChangeLog](https://github.com/Johnserf-Seed/f2/blob/main/CHANGELOG.md#0016---2024-05-04)。
@@ -90,9 +95,9 @@ ## 🗓️ Todo -- 将在`0.0.1.6`版本中添加对`weibo`，`x`的支持。 -- 将在`0.0.1.6`版本中添加更多`douyin`，`tiktok`的接口。 -- 将在`0.0.1.6`版本中修复旧版本已知的问题。 +- 将在`0.0.1.7`版本中添加本地转发功能。 +- 将在`0.0.1.7`版本中添加更多`douyin`，`tiktok`，`weibo`，`x`的接口。 +- 将在`0.0.1.7`版本中修复`x`已知的问题。 ## 🐛 更新 @@ -123,10 +128,11 @@ |收藏合集|🟣|`fetch_user_mix_collection`|🔵| |收藏短剧|🟣|`fetch_user_series_collection`|🟤| |合集作品|⚫|`fetch_user_mix_videos`|🟢| - |首页推荐作品|🟣⚫|`fetch_user_feed_videos`|🟡| + |首页推荐作品|🟣⚫|`fetch_user_feed_videos`|🟢| |相似推荐作品|⚫|`fetch_related_videos`|🟢| |直播间信息（流下载）|⚫|`fetch_user_live_videos`、`fetch_user_live_videos_by_room_id`|🟢| - |直播间弹幕|⚫|`fetch_user_live_danmu`|🔵| + |直播间弹幕负载|⚫|`fetch_live_im`|🟢| + |直播间弹幕|⚫|`fetch_user_live_danmu`|🟢| |关注用户开播|🟣⚫|`fetch_user_following_lives`|🟢| |关注用户信息|🟣⚫|`fetch_user_following`|🟢| |粉丝用户信息|🟣⚫|`fetch_user_follower`|🟢| @@ -142,6 +148,30 @@ |观看历史|🟣|`fetch_user_history_read`|🟤| |稍后再看|🟣|`fetch_user_watch_later`|🟤| |...|...|...|...| + + |工具类|类名|接口|功能状态| + |---|---|---|---| + | 管理客户端配置 | `ClientConfManager` | | 🟢 | + | 生成真实msToken | `TokenManager` | `gen_real_msToken` | 🟢 | + | 生成虚假msToken | `TokenManager` | `gen_false_msToken` | 🟢 | + | 生成ttwid | `TokenManager` | `gen_ttwid` | 🟢 | + | 生成webid | `TokenManager` | `gen_webid` | 🟢 | + | 生成verify_fp | `VerifyFpManager` | `gen_verify_fp` | 🟢 | + | 生成s_v_web_id | `VerifyFpManager` | `gen_s_v_web_id` | 🟢 | + | 生成直播signature | `DouyinWebcastSignature` | `get_signature` | 🟢 | + | 使用接口模型生成直播wss签名参数 | `WebcastSignatureManager` | `model_2_endpoint` | 🟢 | + | 使用接口地址生成Xb参数 | `XBogusManager` | `str_2_endpoint` | 🟢 | + | 使用接口模型生成Xb参数 | `XBogusManager` | `model_2_endpoint` | 🟢 | + | 使用接口地址生成Ab参数 | `ABogusManager` | `str_2_endpoint` | 🟢 | + | 使用接口模型生成Ab参数 | `ABogusManager` | `model_2_endpoint` | 🟢 | + | 提取单个用户id | `SecUserIdFetcher` | `get_sec_user_id` | 🟢 | + | 提取列表用户id | `SecUserIdFetcher` | `get_all_sec_user_id` | 🟢 | + | 提取单个作品id | `AwemeIdFetcher` | `get_aweme_id` | 🟢 | + | 提取列表作品id | `AwemeIdFetcher` | `get_all_aweme_id` | 🟢 | + | 提取单个合集id | `MixIdFetcher` | `get_mix_id` | 🟢 | + | 提取列表合集id | `MixIdFetcher` | `get_all_mix_id` | 🟢 | + | 提取单个直播间号 | `WebCastIdFetcher` | `get_webcast_id` | 🟢 | + | 提取列表直播间号 | `WebCastIdFetcher` | `get_all_webcast_id` | 🟢 |
@@ -157,8 +187,10 @@ |主页作品|🟣⚫|`fetch_user_post_videos`|🟢| |点赞作品|🟣⚫|`fetch_user_like_videos`|🟢| |收藏作品|🟣⚫|`fetch_user_collect_videos`|🟢| + |播放列表|🟣⚫|`fetch_play_list`|🟢| |播放列表作品|🟣⚫|`fetch_user_mix_videos`|🟢| |作品搜索|🟣⚫|`fetch_search_videos`|🟢| + |直播间信息（流下载）|⚫|`fetch_user_live_videos`|🟢| |检查开播|🟣⚫|`fetch_check_live_alive`|🟢| |...|...|...|...|
@@ -201,9 +233,6 @@ 合集链接解析 - **ps. 0.0.1.5 relase版本需要拉取这2个提交补丁来修复 [4b81457](https://github.com/Johnserf-Seed/f2/commit/4b81457a66f629eb8e1bf5c79b96445e9f6f0f9e) [eb763eb](https://github.com/Johnserf-Seed/f2/commit/eb763ebe67d9b71e597b95959416c149b7d67d88)** - **ps. 从main分支安装的不需要更新** - ### 抖音直播录制 @@ -216,7 +245,11 @@ -
+ ### 抖音直播弹幕 + + https://github.com/Johnserf-Seed/f2/assets/40727745/500d1eaf-59ba-44ba-849b-666c0ddf8469 + +
🎬 TikTok @@ -241,9 +274,6 @@ - **ps. 0.0.1.5 relase版本需要拉取这个提交补丁来修复 [05ee1c4](https://github.com/Johnserf-Seed/f2/commit/05ee1c4293d1fb9f01c25739372a2fbac18454cd)** - **ps. 从main分支安装的不需要更新** - ### TikTok作品搜索 @@ -257,17 +287,6 @@ ```bash . - ├── .github - │   ├── ISSUE_TEMPLATE - │   │   ├── ask-question.md - │   │   ├── bug-report.md - │   │   └── feature_request.md - │   └── workflows - │   └── Codecov.yml - │   └── deploy.yml - ├── .gitignore - ├── .vscode - │   └── settings.json ├── CHANGELOG.md ├── CODE_OF_CONDUCT.md ├── CONTRIBUTING.md @@ -276,13 +295,9 @@ ├── README.en.md ├── README.md ├── SECURITY.md + ├── babel.cfg + ├── coverage.xml ├── docs - │   ├── .vitepress - │   │   ├── config.mts - │   │   └── theme - │   │   ├── index.ts - │   │   └── styles - │   │   └── vars.css │   ├── advance-guide.md │   ├── cli.md │   ├── en @@ -301,11 +316,14 @@ │   │   ├── apps │   │   │   ├── douyin │   │   │   │   └── index.md - │   │   │   └── tiktok + │   │   │   ├── tiktok + │   │   │   │   └── index.md + │   │   │   ├── weibo + │   │   │   │   └── index.md + │   │   │   └── x │   │   │   └── index.md │   │   └── what-is-f2.md │   ├── index.md - │   ├── install.md │   ├── package-lock.json │   ├── package.json │   ├── public @@ -337,11 +355,17 @@ │   ├── snippets │   │   ├── QA.md │   │   ├── douyin + │   │   │   ├── abogus.py │   │   │   ├── aweme-id.py + │   │   │   ├── aweme-related.py + │   │   │   ├── client-config.py │   │   │   ├── format-file-name.py + │   │   │   ├── json-2-lrc.py + │   │   │   ├── mix-id.py │   │   │   ├── mstoken-false.py │   │   │   ├── mstoken-real.py │   │   │   ├── one-video.py + │   │   │   ├── query-user.py │   │   │   ├── s_v_web_id.py │   │   │   ├── sec-user-id.py │   │   │   ├── show-qrcode.py @@ -350,24 +374,32 @@ │   │   │   ├── ttwid.py │   │   │   ├── user-collection.py │   │   │   ├── user-collects.py + │   │   │   ├── user-feed.py │   │   │   ├── user-folder.py + │   │   │   ├── user-follow-live.py │   │   │   ├── user-follower.py │   │   │   ├── user-following.py + │   │   │   ├── user-friend.py │   │   │   ├── user-get-add.py │   │   │   ├── user-like.py + │   │   │   ├── user-live-im-fetch.py │   │   │   ├── user-live-room-id.py │   │   │   ├── user-live.py │   │   │   ├── user-mix.py - │   │   │   ├── user-nickname.py │   │   │   ├── user-post.py │   │   │   ├── user-profile.py │   │   │   ├── verify_fp.py │   │   │   ├── video-get-add.py │   │   │   ├── webcast-id.py + │   │   │   ├── webcast-signature.py + │   │   │   ├── webid.py │   │   │   └── xbogus.py │   │   ├── set-debug.py │   │   ├── tiktok │   │   │   ├── aweme-id.py + │   │   │   ├── check-live-alive.py + │   │   │   ├── client-config.py + │   │   │   ├── device-id.py │   │   │   ├── format-file-name.py │   │   │   ├── one-video.py │   │   │   ├── sec-uid.py @@ -379,13 +411,16 @@ │   │   │   ├── user-get-add.py │   │   │   ├── user-like.py │   │   │   ├── user-mix.py - │   │   │   ├── user-nickname.py │   │   │   ├── user-playlist.py │   │   │   ├── user-post.py │   │   │   ├── user-profile.py │   │   │   ├── video-get-add.py │   │   │   └── xbogus.py - │   │   └── user-profile.py + │   │   ├── twitter + │   │   └── weibo + │   │   ├── user-profile.py + │   │   └── user-weibo.py + │   └── vite-.zip ├── f2 │   ├── __init__.py │   ├── __main__.py @@ -393,6 +428,9 @@ │   │   ├── __apps__.py │   │   ├── __init__.py │   │   ├── douyin + │   │   │   ├── algorithm + │   │   │   │   ├── webcast_signature.js + │   │   │   │   └── webcast_signature.py │   │   │   ├── api.py │   │   │   ├── cli.py │   │   │   ├── crawler.py @@ -402,15 +440,20 @@ │   │   │   ├── handler.py │   │   │   ├── help.py │   │   │   ├── model.py + │   │   │   ├── proto + │   │   │   │   ├── douyin_webcast.proto + │   │   │   │   └── douyin_webcast_pb2.py │   │   │   ├── test - │   │   │   │   ├── test_apps_model.py - │   │   │   │   ├── test_aweme_id.py - │   │   │   │   ├── test_crawler.py - │   │   │   │   ├── test_handler.py - │   │   │   │   ├── test_lrc.py - │   │   │   │   ├── test_room_id.py - │   │   │   │   ├── test_sec_user_id.py - │   │   │   │   └── test_webcast_id.py + │   │   │   │   ├── test_douyin_apps_model.py + │   │   │   │   ├── test_douyin_aweme_id.py + │   │   │   │   ├── test_douyin_crawler.py + │   │   │   │   ├── test_douyin_handler.py + │   │   │   │   ├── test_douyin_lrc.py + │   │   │   │   ├── test_douyin_room_id.py + │   │   │   │   ├── test_douyin_sec_user_id.py + │   │   │   │   ├── test_douyin_token.py + │   │   │   │   ├── test_douyin_webcast_id.py + │   │   │   │   └── test_douyin_webcast_signature.py │   │   │   └── utils.py │   │   ├── tiktok │   │   │   ├── api.py @@ -422,6 +465,10 @@ │   │   │   ├── handler.py │   │   │   ├── help.py │   │   │   ├── model.py + │   │   │   ├── test + │   │   │   │   ├── test_tiktok_crawler.py + │   │   │   │   ├── test_tiktok_device_id.py + │   │   │   │   └── test_tiktok_token.py │   │   │   └── utils.py │   │   ├── twitter │   │   │   ├── api.py @@ -433,7 +480,27 @@ │   │   │   ├── handler.py │   │   │   ├── help.py │   │   │   ├── model.py + │   │   │   ├── test + │   │   │   │   ├── test_model.py + │   │   │   │   ├── test_tweet_id.py + │   │   │   │   └── ttt.py │   │   │   └── utils.py + │   │   └── weibo + │   │   ├── api.py + │   │   ├── cli.py + │   │   ├── crawler.py + │   │   ├── db.py + │   │   ├── dl.py + │   │   ├── filter.py + │   │   ├── handler.py + │   │   ├── help.py + │   │   ├── model.py + │   │   ├── test + │   │   │   ├── test_gen_visitor.py + │   │   │   ├── test_handler.py + │   │   │   ├── test_weibo_id.py + │   │   │   └── test_weibo_uid.py + │   │   └── utils.py │   ├── cli │   │   ├── __init__.py │   │   ├── cli_commands.py @@ -471,17 +538,19 @@ │   ├── _dl.py │   ├── _signal.py │   ├── _singleton.py + │   ├── abogus.py + │   ├── abogus_async.py + │   ├── abogus_full.py │   ├── conf_manager.py + │   ├── decorators.py │   ├── json_filter.py - │   ├── mode_handler.py │   ├── utils.py │   └── xbogus.py - │   ├── app.yaml - │   ├── conf.yaml - │   └── defaults.yaml + ├── messages.pot ├── package-lock.json ├── package.json ├── pyproject.toml + ├── pytest.ini ├── tests │   ├── test_cli_console.py │   ├── test_desc_limit.py @@ -491,6 +560,7 @@ │   ├── test_logger.py │   ├── test_signal.py │   ├── test_singleton.py + │   ├── test_timestamp.py │   ├── test_utils.py │   └── test_xbogus.py @@ -521,6 +591,9 @@ - [pydantic](https://github.com/samuelcolvin/pydantic) - [qrcode](https://github.com/lincolnloop/python-qrcode) - [vitepress](https://github.com/vuejs/vitepress) +- [websockets](https://github.com/python-websockets/websockets) +- [protobuf](https://github.com/protocolbuffers/protobuf) +- [PyExecJS](https://github.com/doloopwhile/PyExecJS) 没有这些库和程序，`F2`将无法实现这些功能，对于他们的贡献和努力，表示由衷的感谢。 From 87d842f86f869c84bcaf9c5a67ac807ac71e82ef Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 23:26:55 +0800 Subject: [PATCH 295/299] release: v0.0.1.6-pw2 Resolve https://github.com/Johnserf-Seed/f2/issues/103 https://github.com/Johnserf-Seed/f2/issues/102 https://github.com/Johnserf-Seed/f2/issues/99 https://github.com/Johnserf-Seed/f2/issues/98 https://github.com/Johnserf-Seed/f2/issues/88 https://github.com/Johnserf-Seed/TikTokDownload/issues/703 https://github.com/Johnserf-Seed/TikTokDownload/issues/718 # tk 403 https://github.com/Johnserf-Seed/f2/issues/95 https://github.com/Johnserf-Seed/f2/issues/79 https://github.com/Johnserf-Seed/f2/issues/78 https://github.com/Johnserf-Seed/TikTokDownload/issues/711 https://github.com/Johnserf-Seed/TikTokDownload/issues/702 --- docs/.vitepress/config.mts | 2 +- f2/__init__.py | 2 +- f2/helps.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts index 2e20b2be..c37464a1 100644 --- a/docs/.vitepress/config.mts +++ b/docs/.vitepress/config.mts @@ -6,7 +6,7 @@ const require = createRequire(import.meta.url) const pkg = require('vitepress/package.json') -const version = "v0.0.1.5-pw.2" +const version = "v0.0.1.6-pw.2" // https://vitepress.dev/reference/site-config export default defineConfig({ diff --git a/f2/__init__.py b/f2/__init__.py index fd6d52c2..1dedceae 100644 --- a/f2/__init__.py +++ b/f2/__init__.py @@ -1,7 +1,7 @@ # path: f2/__init__.py __author__ = "JohnserfSeed " -__version__ = "0.0.1.5" +__version__ = "0.0.1.6" __description_cn__ = "基于[red]异步[/red]的[green]全平台下载工具." __description_en__ = "[yellow]Asynchronous based [/yellow]full-platform download tool." __reponame__ = "f2" diff --git a/f2/helps.py b/f2/helps.py index b18a830c..afed0acc 100644 --- a/f2/helps.py +++ b/f2/helps.py @@ -4,7 +4,7 @@ @Description:helps.py @Date :2023/02/06 17:36:41 @Author :JohnserfSeed -@version :0.0.1.5 +@version :0.0.1.6 @License :Apache License 2.0 @Github :https://github.com/johnserf-seed @Mail :johnserf-seed@foxmail.com From 772579c24132581c7b05296a973073c2b3442353 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Thu, 27 Jun 2024 23:56:08 +0800 Subject: [PATCH 296/299] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ddouyin?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=96=B0=E5=AF=BC=E8=87=B4=E7=9A=84?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/apps/douyin/filter.py | 54 ++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/f2/apps/douyin/filter.py b/f2/apps/douyin/filter.py index a90d78ce..6b109267 100644 --- a/f2/apps/douyin/filter.py +++ b/f2/apps/douyin/filter.py @@ -245,18 +245,19 @@ def video_play_addr(self): def video_bit_rate(self): bit_rate_data = self._get_list_attr_value("$.aweme_list[*].video.bit_rate") - return [ - ( - [aweme["bit_rate"]] - if isinstance(aweme, dict) - else ( - [aweme[0]["bit_rate"]] - if len(aweme) == 1 - else [item["bit_rate"] for item in aweme] - ) - ) - for aweme in bit_rate_data - ] + def extract_bit_rate(aweme): + if not aweme: + return [] + + if isinstance(aweme, dict): + return [aweme.get("bit_rate", 0)] + + if isinstance(aweme, list): + return [item.get("bit_rate", 0) for item in aweme] + + return [] + + return [extract_bit_rate(aweme) for aweme in bit_rate_data] @property def video_duration(self): @@ -1388,22 +1389,21 @@ def cover(self): @property def video_bit_rate(self): - bit_rate_data = self._get_list_attr_value( - "$.aweme_detail.video.bit_rate", - ) + bit_rate_data = self._get_list_attr_value("$.aweme_detail.video.bit_rate") - return [ - ( - [aweme["bit_rate"]] - if isinstance(aweme, dict) - else ( - [aweme[0]["bit_rate"]] - if len(aweme) == 1 - else [item["bit_rate"] for item in aweme] - ) - ) - for aweme in bit_rate_data - ] + def extract_bit_rate(aweme): + if not aweme: + return [] + + if isinstance(aweme, dict): + return [aweme.get("bit_rate", 0)] + + if isinstance(aweme, list): + return [item.get("bit_rate", 0) for item in aweme] + + return [] + + return [extract_bit_rate(aweme) for aweme in bit_rate_data] @property def video_play_addr(self): From cb58ffce25efab94446b66292f8cc71412d66c60 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Fri, 28 Jun 2024 01:34:14 +0800 Subject: [PATCH 297/299] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0=E4=B8=AD?= =?UTF-8?q?=E6=96=87=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f2/languages/zh_CN/LC_MESSAGES/zh_CN.mo | Bin 49561 -> 49566 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/f2/languages/zh_CN/LC_MESSAGES/zh_CN.mo b/f2/languages/zh_CN/LC_MESSAGES/zh_CN.mo index fe736a5c929eeb588fdac493d2d37f9cd2593e30..cc587695546dd17a58be9dfe56c2404c639fc046 100644 GIT binary patch delta 3631 zcmXZec~DkW7{~GBR->a5uYiy&uegf~N`Z=r;x^Kl8=0aqnqz6M<5F&TQ!JNILvann zTric4#5F~76t~9FvdKwJorKg;qjZdNrl#+YbN>3A=eg&eGcDf8sn;zY6S!;R|iQ@z|HR z0DI!2g&vd8XrEzBFPws{aX$v)HJpeKa2gI>WX#KW3RQ`ls0}YRnLP8@0fLNZvDNXw)JR^pQ2x8IH}#`*AGxMedC$z^%%E%ph2b+S%-7*1gEF zn>(nIk6zCG&~sFU^HCK(j)^+23K}YL(-qbPj3ge2TEG-%HtJFxc0P7CU&*e?k3yaK zWsJdpQI%`+i9O;Gs54)I>Q{n&nBP2fiP$VVak?`Dr}8`(TVcIb#*D+xs5_H`Ds>qq zVHIlO39D^992IYH@gWyKLv1W*4fWT+U1?}#+W#3}d! zPIOL3mH2(aPylNXSwQ!dotWikiT;)*6Owi2WFYDOf!r z`ia+~HdKsy?*?k8zoLG&FRruSmuPH6oV1Sm*QYUzgf7uoR4F%L7yJn|U_g$oKmuyQ z!Ppe1pq{UG&ktiW;>+&&Q2_b$-T1W&Lr25quu+zx%j{V*6uqWVool``8| zh+615)DhmrD6F~J-l=HR^WoSQXJSjtL&o9vPoo`)+ZcfLx7dNgQD>cqp*X?i7ojSY zhkV9Onad}CW{+$fYQbAjcccilk(;OuRAL7V%+-9He@_~kXfSG``KU^)!!EcFb=%8P zm#Su-U0_|*S++(kXdr5wIj9NqQ58Aho_~*8z(3don{4IR#r!6LMmWw#t!yJk;#p?} z>V?|*Ht$C*GzmN62-L!sqb6R1D)DyII2TY0y^n*i!8U&KI0iipw2_7^!dSfE;^!`I z^tpZB2laf6i&vx0bT{fd@dI|p;O*9-7*D(gbtGp|^W4PO@Y#0ipH3rg2cJ(|i+r5S z@2FB{?6j9?H!8m2;ySx*+|@ZALwLRlb>=%!JHLY6uoC-Y+XDOdeT}Iz!&z9&m>GDzKE(oy*)Och{?pcs0nXlQ~VG4bQu3$V;bT?)DfIUeQ)lg zAD?+Nbao;8>;MtY?x+vRD2zeRxes+Yuc0QYbOsjMqlm)@^6Acn*oJru>Q0=&cKFcg zg??!heNi1}x;Pj0!UY%q;f&aC|8Yn`Ej$DDvt5e1d^s3~yPc;{m-hztz$(-NKrEEBTT{OMfOrnM@>+OdhaZ%^yR3_RqJc}emJUMFI1&QVJpl) z_1lG!`u(4zp$UIMy-@Rj{UnED3~@4cz-ca@=i<{CMg9ru=j$uBN7fPN5f4KjUc$HV z4ys~Z4jR)NlQ5L|O(qSkEElztGuQ&}ssq+NWX$UrjXI)fs7tpAt4oX8VHIjYVTbLv zzAI{Dqn(RUcd7v6@gjOEVT~j9QbnP5oPd5Dk6PGL)I^1-1)fJOwwZNHVM@$<0ya$^MXBag-;8ud!;z_T%!I158?J9flls23k#BsTok zevsOuHZT>tVz%=;)K2T1vOBGhdM^<*PMV8rc*S86Gl$oRE6$pAzP7KtWLw3qlFAcV Uq5c7ak zGV{a?$v6xfN6RKBC3R9vN6pe9%9)xndwrnb;ZkU^6_2v+xGa$5CmrgXa2GYv-xz{J7`Gd~h)ppI z18@gMV=>0!9gjv28X<2P6NE_^fpeYNsENu@6P?Edyzb(#w{1QOeaI)EN<0E}gvr<% z(@+)6b@5q@A@**&M9^~Eu_uP|Aj!oGFp4-GRheQJUvoBHVV@5~O*9|1!!`IEmS7V4 zt~6#0zJOZb0VMC4G8*+s_^q zM&h5S%5`|x9`RVznXg3kE5@PBZ*ICoWTu@s*_nd#c%Fluu;E%R6m~=1nJiSP%W)vq zq81*r&c8V%>xo zM!Xiaq5Y`$E}(Y$BkE`S$R_)J3C0%0eK%2m9~z@c=n_4TD&+?3jo+aLZ2X?BKn!Za zk=PDrqMoO_=ZCO8@oD$`p367QwwEyiwV=VMiq7z8gwy!nUBnvj3~Hj^Q4{&SZ}ZWp zBT9BIckXq5?|gt!^y`>o`;W&biPN0$}P&;j~)t+U0)Pjbi##xA(Fb~ylpL_l_Y5{*>5c+SkeP!nz--&N90h<{!?j0eaKG_*Wx<- z8CA-Zo%RwHpyCTIHoI&b=bVcEJYR!4^X;gepTWL(2Zv$!Zu|Ft9wrkP?e=WLw~$?t zn295>9Mz%mNA{1;D>#t&B&q@p_t<CbwsmKmu?f*l@_(bTGWDC9<|^4 zIMl`_I+vmDR6fSzN%U00e`x4ZwfW5MI0nOrr=k|-p(ZLsE$~a!LViLm(5Kiw4@dPM z?Bdy|{;N>^cVZ7bi_`I8G4&ruWBM`Mu>>{IMdy8tC2m$???NIrBYqPDFblh3Ar8g! zs2#TX++OMdsPX6Gcq~U9f&X!Pq`}9jzg~EjgjTo^$6y|Y;jcIueZR1GV-{-S<*2jG zbMC`v;&RlH*1G(nQrmA8YW!T(k(|I_yyelDO`~C%9e4q@B3_ODxD~tO5!8z}Fa#ej zw;!a=s13}*KA7qJ3bj*HVRzaH^ Date: Fri, 28 Jun 2024 17:43:06 +0800 Subject: [PATCH 298/299] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=B5=9E?= =?UTF-8?q?=E5=8A=A9=E5=95=86ad?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 16 ++++++++++++++++ README.md | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/README.en.md b/README.en.md index 00672aa7..ba923bdb 100644 --- a/README.en.md +++ b/README.en.md @@ -7,6 +7,7 @@ [![Dev Branch](https://badgen.net/badge/branch/v0.0.1.6-pw2/blue)](https://github.com/Johnserf-Seed/f2/tree/v0.0.1.6-pw2) [![Discord](https://img.shields.io/discord/1146473603450282004?label=Discord)](https://discord.gg/3PhtPmgHf8) [![codecov](https://codecov.io/gh/Johnserf-Seed/f2/graph/badge.svg?token=T9DH4QPZSS)](https://codecov.io/gh/Johnserf-Seed/f2) +[![TikHub](https://img.shields.io/badge/Sponsor-TikHub-orange?style=flat-square&logo=tiktok)](https://beta-web.tikhub.io/users/signup?referral_code=6hLcGD94) [![APACHE-2.0](https://img.shields.io/github/license/johnserf-seed/f2)](https://github.com/Johnserf-Seed/f2/blob/main/LICENSE) @@ -580,6 +581,21 @@ Account status: ⚪ Represents unknown, 🟣 Represents login required (ignores
+## 💰 Sponsor + + + +[TikHub](https://tikhub.io/) is a provider of premium data interface services. You can get free credits by signing up daily. You can use my signup invite link: [https://beta-web.tikhub.io/users/signup?referral_code=6hLcGD94](https://beta-web.tikhub.io/users/signup?referral_code=6hLcGD94) or Invitation code: `6hLcGD94` to get `$2` credit by signing up and recharging. + +[TikHub](https://tikhub.io/) offers the following services: + +- Rich data interface +- Sign up daily to get free credits +- High quality API service +- Official website: https://tikhub.io/ +- Project address: https://github.com/TikHubIO/ + + ## 👨‍💻 Contributions If you are interested in extending new applications for `F2`, please refer to the [contribution guidelines](https://github.com/Johnserf-Seed/f2/blob/main/.github/CONTRIBUTING.md). diff --git a/README.md b/README.md index aed9d437..4cd06a11 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ [![Dev Branch](https://badgen.net/badge/branch/v0.0.1.6-pw2/blue)](https://github.com/Johnserf-Seed/f2/tree/v0.0.1.6-pw2) [![Discord](https://img.shields.io/discord/1146473603450282004?label=Discord)](https://discord.gg/3PhtPmgHf8) [![codecov](https://codecov.io/gh/Johnserf-Seed/f2/graph/badge.svg?token=T9DH4QPZSS)](https://codecov.io/gh/Johnserf-Seed/f2) +[![TikHub](https://img.shields.io/badge/%E8%B5%9E%E5%8A%A9%E5%95%86-TikHub-orange?style=flat-square&logo=tiktok)](https://beta-web.tikhub.io/users/signup?referral_code=6hLcGD94) [![APACHE-2.0](https://img.shields.io/github/license/johnserf-seed/f2)](https://github.com/Johnserf-Seed/f2/blob/main/LICENSE) @@ -569,6 +570,21 @@ +## 💰 赞助商 + + + +[TikHub](https://tikhub.io/) 是一家提供优质数据接口服务的供应商。通过每日签到，可以获取免费额度。可以使用我的注册邀请链接：[https://beta-web.tikhub.io/users/signup?referral_code=6hLcGD94](https://beta-web.tikhub.io/users/signup?referral_code=6hLcGD94) 或 邀请码：`6hLcGD94`，注册并充值即可获得`$2`额度。 + +[TikHub](https://tikhub.io/) 提供以下服务： + +- 丰富的数据接口 +- 每日签到免费获取额度 +- 高质量的API服务 +- 官网：https://tikhub.io/ +- 项目地址：https://github.com/TikHubIO/ + + ## 👨‍💻 贡献 如果你有兴趣为`F2`做拓展新应用，请查看[贡献指南](https://github.com/Johnserf-Seed/f2/blob/main/.github/CONTRIBUTING.md)。 From 467b49ff692fb6df145239ecd4b925c17d819c91 Mon Sep 17 00:00:00 2001 From: JohnserfSeed Date: Fri, 28 Jun 2024 18:19:47 +0800 Subject: [PATCH 299/299] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d2d2326..a863e552 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -97,6 +97,7 @@ ### Fixed +- 修复`douyin`接口更新导致的错误 #104 - 修复`_dl`日志输出 - 修复`douyin`下载合集时合集链接无法识别的情况 - 修复`tiktok`下载播放列表（合集）的错误