Merge pull request #481 from Koyomi781/update

[update] 调整代码结构，增加一些接口

Author: Evil0ctal

README.md

@@ -223,6 +223,7 @@ TikHub的部分源代码会开源在Github上，并且会赞助一些开源项
     - [x] 获取列表unique_id
   - 哔哩哔哩网页版API
     - [x] 获取单个视频详情信息
+    - [x] 获取视频流地址
     - [x] 获取用户发布视频作品数据
     - [x] 获取用户所有收藏夹信息
     - [x] 获取指定收藏夹内视频数据
@@ -231,8 +232,12 @@ TikHub的部分源代码会开源在Github上，并且会赞助一些开源项
     - [x] 获取指定视频的评论
     - [x] 获取视频下指定评论的回复
     - [x] 获取指定用户动态
+    - [x] 获取视频实时弹幕
     - [x] 获取指定直播间信息
+    - [x] 获取直播间视频流
+    - [x] 获取指定分区正在直播的主播
     - [x] 获取所有直播分区列表
+    - [x] 通过bv号获得视频分p信息
 ---
 
 ## 📦调用解析库（已废弃需要更新）:

app/api/endpoints/bilibili_web.py

@@ -46,6 +46,48 @@ async def fetch_one_video(request: Request,
         raise HTTPException(status_code=status_code, detail=detail.dict())
 
 
+# 获取视频流地址
+@router.get("/fetch_video_playurl", response_model=ResponseModel, summary="获取视频流地址/Get video playurl")
+async def fetch_one_video(request: Request,
+                          bv_id: str = Query(example="BV1y7411Q7Eq", description="作品id/Video id"),
+                          cid:str = Query(example="171776208", description="作品cid/Video cid")):
+    """
+    # [中文]
+    ### 用途:
+    - 获取视频流地址
+    ### 参数:
+    - bv_id: 作品id
+    - cid: 作品cid
+    ### 返回:
+    - 视频流地址
+
+    # [English]
+    ### Purpose:
+    - Get video playurl
+    ### Parameters:
+    - bv_id: Video id
+    - cid: Video cid
+    ### Return:
+    - Video playurl
+
+    # [示例/Example]
+    bv_id = "BV1y7411Q7Eq"
+    cid = "171776208"
+    """
+    try:
+        data = await BilibiliWebCrawler.fetch_video_playurl(bv_id, cid)
+        return ResponseModel(code=200,
+                             router=request.url.path,
+                             data=data)
+    except Exception as e:
+        status_code = 400
+        detail = ErrorResponseModel(code=status_code,
+                                    router=request.url.path,
+                                    params=dict(request.query_params),
+                                    )
+        raise HTTPException(status_code=status_code, detail=detail.dict())
+
+
 # 获取用户发布视频作品数据
 @router.get("/fetch_user_post_videos", response_model=ResponseModel,
             summary="获取用户主页作品数据/Get user homepage video data")
@@ -385,6 +427,44 @@ async def fetch_collect_folders(request: Request,
         raise HTTPException(status_code=status_code, detail=detail.dict())
 
 
+# 获取视频实时弹幕
+@router.get("/fetch_video_danmaku", response_model=ResponseModel, summary="获取视频实时弹幕/Get Video Danmaku")
+async def fetch_one_video(request: Request,
+                          cid: str = Query(example="1639235405", description="作品cid/Video cid")):
+    """
+    # [中文]
+    ### 用途:
+    - 获取视频实时弹幕
+    ### 参数:
+    - cid: 作品cid
+    ### 返回:
+    - 视频实时弹幕
+
+    # [English]
+    ### Purpose:
+    - Get Video Danmaku
+    ### Parameters:
+    - cid: Video cid
+    ### Return:
+    - Video Danmaku
+
+    # [示例/Example]
+    cid = "1639235405"
+    """
+    try:
+        data = await BilibiliWebCrawler.fetch_video_danmaku(cid)
+        return ResponseModel(code=200,
+                             router=request.url.path,
+                             data=data)
+    except Exception as e:
+        status_code = 400
+        detail = ErrorResponseModel(code=status_code,
+                                    router=request.url.path,
+                                    params=dict(request.query_params),
+                                    )
+        raise HTTPException(status_code=status_code, detail=detail.dict())
+
+
 # 获取指定直播间信息
 @router.get("/fetch_live_room_detail", response_model=ResponseModel,
             summary="获取指定直播间信息/Get information of specified live room")
@@ -424,43 +504,86 @@ async def fetch_collect_folders(request: Request,
         raise HTTPException(status_code=status_code, detail=detail.dict())
 
 
-# # 获取指定直播间视频流
-# @router.get("/fetch_live_videos", response_model=ResponseModel,
-#             summary="获取直播间视频流/Get live video data of specified room")
-# async def fetch_collect_folders(request: Request,
-#                                 room_id: str = Query(example="22816111", description="直播间ID/Live room ID")):
-#     """
-#     # [中文]
-#     ### 用途:
-#     - 获取指定直播间视频流
-#     ### 参数:
-#     - room_id: 直播间ID
-#     ### 返回:
-#     - 指定直播间视频流
-#
-#     # [English]
-#     ### Purpose:
-#     - Get live video data of specified room
-#     ### Parameters:
-#     - room_id: Live room ID
-#     ### Return:
-#     - live video data of specified room
-#
-#     # [示例/Example]
-#     room_id = "22816111"
-#     """
-#     try:
-#         data = await BilibiliWebCrawler.fetch_live_videos(room_id)
-#         return ResponseModel(code=200,
-#                              router=request.url.path,
-#                              data=data)
-#     except Exception as e:
-#         status_code = 400
-#         detail = ErrorResponseModel(code=status_code,
-#                                     router=request.url.path,
-#                                     params=dict(request.query_params),
-#                                     )
-#         raise HTTPException(status_code=status_code, detail=detail.dict())
+# 获取指定直播间视频流
+@router.get("/fetch_live_videos", response_model=ResponseModel,
+            summary="获取直播间视频流/Get live video data of specified room")
+async def fetch_collect_folders(request: Request,
+                                room_id: str = Query(example="1815229528", description="直播间ID/Live room ID")):
+    """
+    # [中文]
+    ### 用途:
+    - 获取指定直播间视频流
+    ### 参数:
+    - room_id: 直播间ID
+    ### 返回:
+    - 指定直播间视频流
+
+    # [English]
+    ### Purpose:
+    - Get live video data of specified room
+    ### Parameters:
+    - room_id: Live room ID
+    ### Return:
+    - live video data of specified room
+
+    # [示例/Example]
+    room_id = "1815229528"
+    """
+    try:
+        data = await BilibiliWebCrawler.fetch_live_videos(room_id)
+        return ResponseModel(code=200,
+                             router=request.url.path,
+                             data=data)
+    except Exception as e:
+        status_code = 400
+        detail = ErrorResponseModel(code=status_code,
+                                    router=request.url.path,
+                                    params=dict(request.query_params),
+                                    )
+        raise HTTPException(status_code=status_code, detail=detail.dict())
+
+
+# 获取指定分区正在直播的主播
+@router.get("/fetch_live_streamers", response_model=ResponseModel,
+            summary="获取指定分区正在直播的主播/Get live streamers of specified live area")
+async def fetch_collect_folders(request: Request,
+                                area_id: str = Query(example="9", description="直播分区id/Live area ID"),
+                                pn: int = Query(default=1, description="页码/Page number")):
+    """
+    # [中文]
+    ### 用途:
+    - 获取指定分区正在直播的主播
+    ### 参数:
+    - area_id: 直播分区id
+    - pn: 页码
+    ### 返回:
+    - 指定分区正在直播的主播
+
+    # [English]
+    ### Purpose:
+    - Get live streamers of specified live area
+    ### Parameters:
+    - area_id: Live area ID
+    - pn: Page number
+    ### Return:
+    - live streamers of specified live area
+
+    # [示例/Example]
+    area_id = "9"
+    pn = 1
+    """
+    try:
+        data = await BilibiliWebCrawler.fetch_live_streamers(area_id, pn)
+        return ResponseModel(code=200,
+                             router=request.url.path,
+                             data=data)
+    except Exception as e:
+        status_code = 400
+        detail = ErrorResponseModel(code=status_code,
+                                    router=request.url.path,
+                                    params=dict(request.query_params),
+                                    )
+        raise HTTPException(status_code=status_code, detail=detail.dict())
 
 
 # 获取所有直播分区列表
@@ -496,3 +619,79 @@ async def fetch_collect_folders(request: Request,):
                                     params=dict(request.query_params),
                                     )
         raise HTTPException(status_code=status_code, detail=detail.dict())
+
+
+# 通过bv号获得视频aid号
+@router.get("/bv_to_aid", response_model=ResponseModel, summary="通过bv号获得视频aid号/Generate aid by bvid")
+async def fetch_one_video(request: Request,
+                          bv_id: str = Query(example="BV1M1421t7hT", description="作品id/Video id")):
+    """
+    # [中文]
+    ### 用途:
+    - 通过bv号获得视频aid号
+    ### 参数:
+    - bv_id: 作品id
+    ### 返回:
+    - 视频aid号
+
+    # [English]
+    ### Purpose:
+    - Generate aid by bvid
+    ### Parameters:
+    - bv_id: Video id
+    ### Return:
+    - Video aid
+
+    # [示例/Example]
+    bv_id = "BV1M1421t7hT"
+    """
+    try:
+        data = await BilibiliWebCrawler.bv_to_aid(bv_id)
+        return ResponseModel(code=200,
+                             router=request.url.path,
+                             data=data)
+    except Exception as e:
+        status_code = 400
+        detail = ErrorResponseModel(code=status_code,
+                                    router=request.url.path,
+                                    params=dict(request.query_params),
+                                    )
+        raise HTTPException(status_code=status_code, detail=detail.dict())
+
+
+# 通过bv号获得视频分p信息
+@router.get("/fetch_video_parts", response_model=ResponseModel, summary="通过bv号获得视频分p信息/Get Video Parts By bvid")
+async def fetch_one_video(request: Request,
+                          bv_id: str = Query(example="BV1vf421i7hV", description="作品id/Video id")):
+    """
+    # [中文]
+    ### 用途:
+    - 通过bv号获得视频分p信息
+    ### 参数:
+    - bv_id: 作品id
+    ### 返回:
+    - 视频分p信息
+
+    # [English]
+    ### Purpose:
+    - Get Video Parts By bvid
+    ### Parameters:
+    - bv_id: Video id
+    ### Return:
+    - Video Parts
+
+    # [示例/Example]
+    bv_id = "BV1vf421i7hV"
+    """
+    try:
+        data = await BilibiliWebCrawler.fetch_video_parts(bv_id)
+        return ResponseModel(code=200,
+                             router=request.url.path,
+                             data=data)
+    except Exception as e:
+        status_code = 400
+        detail = ErrorResponseModel(code=status_code,
+                                    router=request.url.path,
+                                    params=dict(request.query_params),
+                                    )
+        raise HTTPException(status_code=status_code, detail=detail.dict())

crawlers/bilibili/web/config.yaml

@@ -5,7 +5,7 @@ TokenManager:
       'origin': https://www.bilibili.com
       'referer': https://space.bilibili.com/
       'origin_2': https://space.bilibili.com
-      'cookie': buvid3=D6E58E7B-E3A9-7CD3-7BE5-B5F255788A3020034infoc; b_nut=1723702120; _uuid=6E10D69A10-A711-9DA8-6833-1010262296C24B21337infoc; buvid_fp=6cf2ea8e143bbc49f3b7c0dcb2465fc2; buvid4=748EC8F0-82E2-1672-A286-8445DDB2A80C06110-023112304-; bili_ticket=eyJhbGciOiJIUzI1NiIsImtpZCI6InMwMyIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MjM5NjEzMjIsImlhdCI6MTcyMzcwMjA2MiwicGx0IjotMX0.IWOEMLCDKqWAX24rePU-1Qgm9Isf5CU8Tz0O-j6GHfo; bili_ticket_expires=1723961262; CURRENT_FNVAL=4048; rpdid=|(JluY|JJ|RR0J'u~kJ~|kkuY; b_lsid=E10B83DC4_191552166D6; header_theme_version=CLOSE; enable_web_push=DISABLE; home_feed_column=5; browser_resolution=1488-714; sid=873ujj7i
+      'cookie': buvid4=748EC8F0-82E2-1672-A286-8445DDB2A80C06110-023112304-; buvid3=73EF1E2E-B7A9-78DD-F2AE-9AB2B476E27638524infoc; b_nut=1727075638; _uuid=77AA4910F-5C8F-9647-7DA3-F583C8108BD7942063infoc; buvid_fp=75b22e5d0c3dbc642b1c80956c62c7da; bili_ticket=eyJhbGciOiJIUzI1NiIsImtpZCI6InMwMyIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MjczNDI1NTYsImlhdCI6MTcyNzA4MzI5NiwicGx0IjotMX0.G3pvk6OC4FDWBL7GNgKkkVtUMl29UtNdgok_cANoKsw; bili_ticket_expires=1727342496; header_theme_version=CLOSE; enable_web_push=DISABLE; home_feed_column=5; browser_resolution=1488-712; b_lsid=5B4EDF8A_1921EAA1BDA
       'user-agent': Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.212 Safari/537.36
 
     proxies:

crawlers/bilibili/web/endpoints.py

@@ -11,8 +11,11 @@ class BilibiliAPIEndpoints:
     # 作品信息 (Post Detail)
     POST_DETAIL = f"{BILIAPI_DOMAIN}/x/web-interface/view"
 
-    # 用户播放列表 (用于爬取用户所有视频数据)
-    USER_POST = f"{BILIAPI_DOMAIN}/x/v2/medialist/resource/list"
+    # 作品视频流
+    VIDEO_PLAYURL = f"{BILIAPI_DOMAIN}/x/player/wbi/playurl"
+
+    # 用户发布视频作品数据
+    USER_POST = f"{BILIAPI_DOMAIN}/x/space/wbi/arc/search"
 
     # 收藏夹列表
     COLLECT_FOLDERS = f"{BILIAPI_DOMAIN}/x/v3/fav/folder/created/list-all"
@@ -35,9 +38,15 @@ class BilibiliAPIEndpoints:
     # 视频评论
     VIDEO_COMMENTS = f"{BILIAPI_DOMAIN}/x/v2/reply"
 
+    # 用户动态
+    USER_DYNAMIC = f"{BILIAPI_DOMAIN}/x/polymer/web-dynamic/v1/feed/space"
+
     # 评论的回复
     COMMENT_REPLY = f"{BILIAPI_DOMAIN}/x/v2/reply/reply"
 
+    # 视频分p信息
+    VIDEO_PARTS = f"{BILIAPI_DOMAIN}/x/player/pagelist"
+
     # 直播间信息
     LIVEROOM_DETAIL = f"{LIVE_DOMAIN}/room/v1/Room/get_info"
 
@@ -47,4 +56,7 @@ class BilibiliAPIEndpoints:
     # 直播间视频流
     LIVE_VIDEOS = f"{LIVE_DOMAIN}/room/v1/Room/playUrl"
 
+    # 正在直播的主播
+    LIVE_STREAMER = f"{LIVE_DOMAIN}/xlive/web-interface/v1/second/getList"
+