feat: auto select best line (#44)

* feat: auto select best line
* docs: update docs

Author: timerring

README-en.md

@@ -99,6 +99,7 @@ graph TD
   - Supports various custom parameters for uploading
   - Supports uploading videos with YAML configuration and parsing
   - Displays logs and upload progress
+  - Supports **automatic speed test and selection of the best route**
 - `bilitool append` appends videos to existing videos (multi-part)
 - `bilitool download` downloads videos
   - Supports downloading with `bvid` and `avid` identifiers

README.md

@@ -90,30 +90,31 @@ graph TD
 
 ## Major features
 
-- `bilitool login` 记忆存储登录状态
+- `bilitool login` **记忆存储登录状态**
   - 支持导出 `cookies.json` 用于其他项目
 - `bilitool logout` 退出登录
-  - 退出登录同时注销 cookies，保护隐私防止泄露
+  - 退出登录同时注销 cookies，**保护隐私防止泄露**
 - `bilitool check` 检查登录状态
 - `bilitool upload` 上传视频
   - 支持多种自定义参数上传
   - 支持上传视频的 yaml 配置与解析
   - 显示日志与上传进度
-- `bilitool append` 追加视频到已有的视频(分p投稿)
+  - 支持**自动测速并且选择最佳线路**
+- `bilitool append` 追加视频到已有的视频(**分p投稿**)
 - `bilitool download` 下载视频
   - 支持 `bvid` 和 `avid` 两种编号下载
   - 支持下载弹幕
   - 支持下载多种画质
-  - 支持下载多 p 视频
+  - **支持下载多 p 视频**
   - 显示日志与下载进度
-- `bilitool list` 查询本账号过往投稿视频状态
+- `bilitool list` **查询本账号过往投稿视频状态**
   - 支持查询多种状态的视频
   - 若视频审核未通过，同时会显示原因
 - `bilitool convert` 查询转换视频编号
   - 支持 `bvid` 和 `avid` 两种编号互转
 - `bilitool show` 显示视频详细信息
   - 支持查看视频基本信息以及互动状态数据
-- `bilitool ip` 显示请求 IP 地址
+- `bilitool ip` **显示请求 IP 地址**
   - 支持查询指定 IP 地址
 
 > 以上命令添加 `-h` 或 `--help` 参数可以查看命令帮助信息。

bilitool/controller/upload_controller.py

@@ -30,6 +30,7 @@ def package_upload_metadata(line, copyright, tid, title, desc, tag, source, cove
 
     def upload_video(self, file):
         """upload and publish video on bilibili"""
+        upos_url, cdn, probe_version = self.bili_uploader.probe()
         file = Path(file)
         assert file.exists(), f'The file {file} does not exist'
         filename = file.name
@@ -40,15 +41,15 @@ def upload_video(self, file):
 
         # upload video
         self.logger.info('Start preuploading the video')
-        pre_upload_response = self.bili_uploader.preupload(filename=filename, filesize=filesize)
+        pre_upload_response = self.bili_uploader.preupload(filename=filename, filesize=filesize, cdn=cdn, probe_version=probe_version)
         upos_uri = pre_upload_response['upos_uri'].split('//')[-1]
         auth = pre_upload_response['auth']
         biz_id = pre_upload_response['biz_id']
         chunk_size = pre_upload_response['chunk_size']
         chunks = ceil(filesize/chunk_size)
 
         self.logger.info('Start uploading the video')
-        upload_video_id_response = self.bili_uploader.get_upload_video_id(upos_uri=upos_uri, auth=auth)
+        upload_video_id_response = self.bili_uploader.get_upload_video_id(upos_uri=upos_uri, auth=auth, upos_url=upos_url)
         upload_id = upload_video_id_response['upload_id']
         key = upload_video_id_response['key']
 
@@ -63,13 +64,14 @@ def upload_video(self, file):
             fileio=fileio,
             filesize=filesize,
             chunk_size=chunk_size,
-            chunks=chunks
+            chunks=chunks,
+            upos_url=upos_url
         )
         fileio.close()
 
         # notify the all chunks have been uploaded
         self.bili_uploader.finish_upload(upos_uri=upos_uri, auth=auth, filename=filename,
-                           upload_id=upload_id, biz_id=biz_id, chunks=chunks)
+                           upload_id=upload_id, biz_id=biz_id, chunks=chunks, upos_url=upos_url)
         return bilibili_filename
 
     def publish_video(self, file):

bilitool/upload/bili_upload.py

@@ -12,12 +12,7 @@
 from bilitool.utils.parse_cookies import parse_cookies
 from bilitool.model.model import Model
 import hashlib
-
-# you can test your best cdn line https://member.bilibili.com/preupload?r=ping
-# cdn_lines = {
-#     'qn': 'upos-sz-upcdnqn.bilivideo.com',
-#     'bda2': 'upos-sz-upcdnbda2.bilivideo.com',
-# }
+import time
 
 class BiliUploader(object):
     def __init__(self, logger):
@@ -28,7 +23,38 @@ def __init__(self, logger):
         self.session.cookies = requests.utils.cookiejar_from_dict(self.config["cookies"])
         self.headers = Model().get_headers_with_cookies_and_refer()
 
-    def preupload(self, *, filename, filesize):
+    def probe(self):
+        ret = requests.get('https://member.bilibili.com/preupload?r=probe', headers=self.headers, timeout=5).json()
+        print(f"线路:{ret['lines']}")
+        data, auto_os = None, None
+        min_cost = 0
+        if ret['probe'].get('get'):
+            method = 'get'
+        else:
+            method = 'post'
+            data = bytes(int(1024 * 0.1 * 1024))
+        for line in ret['lines']:
+            start = time.perf_counter()
+            test = requests.request(method, f"https:{line['probe_url']}", data=data, timeout=30)
+            cost = time.perf_counter() - start
+            print(line['query'], cost)
+            if test.status_code != 200:
+                return
+            if not min_cost or min_cost > cost:
+                auto_os = line
+                min_cost = cost
+        auto_os['cost'] = min_cost
+        self.logger.info(f"the best cdn line is:{auto_os}")
+        upos_url = auto_os['probe_url'].rstrip('OK')
+        self.logger.info(f"the upos_url is:{upos_url}")
+        query_params = dict(param.split('=') for param in auto_os['query'].split('&'))
+        cdn = query_params.get('upcdn')
+        self.logger.info(f"the cdn is:{cdn}")
+        probe_version = query_params.get('probe_version')
+        self.logger.info(f"the probe_version is:{probe_version}")
+        return upos_url, cdn, probe_version
+
+    def preupload(self, *, filename, filesize, cdn, probe_version):
         """The preupload process to get `upos_uri` and `auth` information.
         Parameters
         ----------
@@ -60,8 +86,8 @@ def preupload(self, *, filename, filesize):
             'ssl':	0,
             'version':	'2.8.9',
             'build': '2080900',
-            'upcdn': 'bda2',
-            'probe_version': '20200810'
+            'upcdn': cdn,
+            'probe_version': probe_version
         }
         res_json = self.session.get(
             url,
@@ -73,7 +99,7 @@ def preupload(self, *, filename, filesize):
         # print(res_json)
         return res_json
 
-    def get_upload_video_id(self, *, upos_uri, auth):
+    def get_upload_video_id(self, *, upos_uri, auth, upos_url):
         """Get the `upload_id` of video.
 
         Parameters
@@ -87,14 +113,14 @@ def get_upload_video_id(self, *, upos_uri, auth):
         - upload_id: str
             the id of the video to be uploaded
         """
-        url = f'https://upos-sz-upcdnbda2.bilivideo.com/{upos_uri}?uploads&output=json'
+        url = f'https:{upos_url}{upos_uri}?uploads&output=json'
         res_json = self.session.post(url, headers={'X-Upos-Auth': auth}).json()
         assert res_json['OK'] == 1
         self.logger.info('Completed upload_id obtaining phase')
         # print(res_json)
         return res_json
 
-    def upload_video_in_chunks(self, *, upos_uri, auth, upload_id, fileio, filesize, chunk_size, chunks):
+    def upload_video_in_chunks(self, *, upos_uri, auth, upload_id, fileio, filesize, chunk_size, chunks, upos_url):
         """Upload the video in chunks.
 
         Parameters
@@ -114,7 +140,7 @@ def upload_video_in_chunks(self, *, upos_uri, auth, upload_id, fileio, filesize,
         - chunks: int
             the number of chunks to be uploaded
         """
-        url = f'https://upos-sz-upcdnbda2.bilivideo.com/{upos_uri}'
+        url = f'https:{upos_url}{upos_uri}'
         params = {
             'partNumber': None,  # start from 1
             'uploadId':	upload_id,
@@ -142,7 +168,7 @@ def upload_video_in_chunks(self, *, upos_uri, auth, upload_id, fileio, filesize,
                 pbar.update(len(batchbytes))
                 # print(res)
 
-    def finish_upload(self, *, upos_uri, auth, filename, upload_id, biz_id, chunks):
+    def finish_upload(self, *, upos_uri, auth, filename, upload_id, biz_id, chunks, upos_url):
         """Notify the all chunks have been uploaded.
 
         Parameters
@@ -160,7 +186,7 @@ def finish_upload(self, *, upos_uri, auth, filename, upload_id, biz_id, chunks):
         - chunks: int
             the number of chunks to be uploaded
         """
-        url = f'https://upos-sz-upcdnbda2.bilivideo.com/{upos_uri}'
+        url = f'https:{upos_url}{upos_uri}'
         params = {
             'output':	'json',
             'name':	filename,