fix: 修复了 alist 每 10 秒发送 /api/me 的问题，修改了 web 响应时间问题；增加了存储测速

Author: tianxiu2b2t

VERSION

@@ -1 +1 @@
-3.0.14
+3.0.15

core/cluster.py

@@ -960,7 +960,7 @@ def __init__(self, hash: str, size: int, mtime: float, data: bytes) -> None:
 
 ROOT = Path(__file__).parent.parent
 
-API_VERSION = "1.12.1"
+API_VERSION = "1.13.0"
 USER_AGENT = f"openbmclapi/{API_VERSION} python-openbmclapi/{config.VERSION}"
 CHECK_FILE_CONTENT = "Python OpenBMCLAPI"
 CHECK_FILE_MD5 = hashlib.md5(CHECK_FILE_CONTENT.encode("utf-8")).hexdigest()
@@ -971,6 +971,9 @@ def __init__(self, hash: str, size: int, mtime: float, data: bytes) -> None:
     946684800000
 
 )
+MEASURES_HASH: dict[int, str] = {
+}
+MEASURE_BUFFER: bytes = b'\x00'
 
 routes = web.routes
 aweb = web.web
@@ -984,6 +987,34 @@ def convert_file_to_storage_file(file: File) -> SFile:
         file.hash
     )
 
+def init_measure_block(size: int):
+    MEASURES_HASH[size] = hashlib.md5(MEASURE_BUFFER * 1024 * 1024 * size).hexdigest()
+
+async def init_measure(maxsize: int = 50):
+    for i in range(1, maxsize, 10):
+        init_measure_block(i)
+
+async def init_measure_files():
+    for storage in clusters.storage_manager.storages:
+        for size, hash in MEASURES_HASH.items():
+            file = File(
+                hash,
+                hash,
+                size * 1024 * 1024,
+                946684800000
+            )
+            try:
+                if await storage.exists(hash) and await storage.get_size(hash) == size * 1024 * 1024:
+                    continue
+                await storage.write_file(
+                    convert_file_to_storage_file(file),
+                    MEASURE_BUFFER * 1024 * 1024 * size,
+                    file.mtime
+                )
+            except:
+                logger.terror("cluster.error.init_measure_file", storage=storage.path, type=storage.type, size=units.format_bytes(size * 1024 * 1024), hash=hash)
+                ...
+
 async def init():
     logger.tinfo("cluster.info.init", openbmclapi_version=API_VERSION, version=config.VERSION)
     # read clusters from config
@@ -1012,7 +1043,8 @@ async def init():
             logger.terror("cluster.error.unspported_storage", type=type, path=cstorage['path'])
             continue
         clusters.storage_manager.add_storage(storage)
-
+    if config.const.measure_storage:
+        logger.tinfo("cluster.info.enable.measure_storage")
     scheduler.run_later(
         clusters.start, 0
     )
@@ -1043,19 +1075,35 @@ async def _(request: aweb.Request):
         if not check_sign(f"/measure/{size}", s, e):
             return aweb.Response(status=403)
         cluster_id = get_cluster_id_from_sign(f"/measure/{size}", s, e)
-        response = aweb.StreamResponse(
-            status=200,
-            reason="OK",
-            headers={
-                "Content-Length": str(size * 1024 * 1024),
-                "Content-Type": "application/octet-stream",
-            },
-        )
-        await response.prepare(request)
-        for _ in range(size):
-            await response.write(b'\x00' * 1024 * 1024)
-        await response.write_eof()
-        return response
+        if not config.const.measure_storage:
+            response = aweb.StreamResponse(
+                status=200,
+                reason="OK",
+                headers={
+                    "Content-Length": str(size * 1024 * 1024),
+                    "Content-Type": "application/octet-stream",
+                },
+            )
+            await response.prepare(request)
+            for _ in range(size):
+                await response.write(MEASURE_BUFFER * 1024 * 1024)
+            await response.write_eof()
+            return response
+        else:
+            init_measure_block(size)
+            await init_measure_files()
+            storage = clusters.storage_manager.storages[0]
+            if isinstance(storage, storages.AlistStorage):
+                url = await storage.get_url(MEASURES_HASH[size])
+                logger.debug("Requested measure url:", url)
+                return aweb.HTTPFound(url)
+            elif isinstance(storage, storages.LocalStorage):
+                return aweb.FileResponse(
+                    Path(storage.get_path(MEASURES_HASH[size]))
+                )
+        return aweb.Response(status=400)
+    
+
         """return aweb.HTTPFound(
             f"https://speedtest1.online.sh.cn:8080/download?size={size * 1024 * 1024}&r=0.7129844570865569"
         )"""

core/config.py

@@ -17,6 +17,7 @@
     "advanced.check_type": "size",
     "advanced.auto_sync_assets": True,
     "advanced.github_token": "",
+    "advanced.measure_storage": False,
     "web": {
         "port": -1,
         "public_port": 6543,
@@ -153,6 +154,10 @@ def auto_sync_assets(self):
     def github_token(self):
         return Config.get("advanced.github_token", None) or None
 
+    @property
+    def measure_storage(self) -> bool:
+        return Config.get("advanced.measure_storage", False)
+
 const = Const()
 
 def read_version():

core/storages/__init__.py

@@ -202,7 +202,7 @@ def __init__(self, path: str, width: int, url: str, username: Optional[str], pas
         self.tcp_connector = aiohttp.TCPConnector(limit=256)
         self.download_connector = aiohttp.TCPConnector(limit=256)
         self.cache = cache.MemoryStorage()
-        scheduler.run_repeat_later(self._check_token, 0, 10)
+        scheduler.run_repeat_later(self._check_token, 0, 3600)
 
     async def _get_token(self):
         await self.wait_token.wait()
@@ -274,7 +274,8 @@ async def _action_data(self, action: str, url: str, data: Any, headers: dict[str
                         **await resp.json()
                     )
                     if result.code != 200:
-                        logger.terror("storage.error.alist", status=result.code, message=result.message)
+                        logger.terror("storage.error.action_alist", method=action, url=url, status=result.code, message=result.message)
+                        logger.debug(data)
                         logger.debug(result)
                     else:
                         self.cache.set(hash, result, 30)

core/web.py

@@ -73,7 +73,7 @@ async def middleware(request: web.Request, handler: Any) -> web.Response:
         except:
             pass
         setattr(request, "custom_address", address)
-        start = time.monotonic_ns()
+        start = time.perf_counter_ns()
         resp = None
         try:
             resp = await handler(request)
@@ -87,7 +87,7 @@ async def middleware(request: web.Request, handler: Any) -> web.Response:
                     status = resp.status
             if request.http_range.start is not None and status == 200:
                 status = 206
-            end = time.monotonic_ns()
+            end = time.perf_counter_ns()
             logger.tdebug("web.debug.request_info", time=units.format_count_time(end - start, 4).rjust(16), host=request.host, address=(address).rjust(16), user_agent=request.headers.get("User-Agent"), real_path=request.raw_path, method=request.method.ljust(9), status=status)
     finally:
         request.match_info.current_app = old_app

i18n/zh_cn.json

@@ -23,6 +23,7 @@
     "cluster.debug.public_host": "已在 [${host}:${port}] 上开放",
     "cluster.error.socketio": "节点 [${cluster}] 发送 [${type}] 时出错，原因 [${err}]",
     "cluster.info.socketio.message": "节点 [${cluster}] 主控消息：${message}",
+    "storage.error.action_alist": "Alist 返回出错，请求方式 [${method}] url [${url}] 错误代码 [${status}]，原因 [${message}]",
     "storage.error.alist": "Alist 返回出错，错误代码 [${status}]，原因 [${message}]",
     "storage.debug.error_alist": "Alist 返回出错，错误代码 [${status}]，原因 [${message}]",
     "storage.error.alist.fetch_token": "Alist 获取 Token 出错，错误代码 [${status}]，原因 [${message}]",
@@ -44,5 +45,7 @@
     "cluster.info.init": "当前 OpenBMCLAPI 版本为 [${openbmclapi_version}] Python OpenBMCLAPI 版本为 [${version}]",
     "cluster.success.no_missing_files": "当前暂无更新的文件",
     "cluster.debug.retry_download": "文件 [${file_path} ${file_hash}(${file_size})] 在 [${start_date}] 第 [${count}] 次下载失败，将在 [${time}] 重试",
-    "database.error.write": "数据库写入出错，原因:"
+    "database.error.write": "数据库写入出错，原因:",
+    "cluster.info.enable.measure_storage": "已开启 存储 测速",
+    "cluster.error.init_measure_file": "无法初始化 测速文件，存储 [${path} (${type})] 大小 [${size}] 哈希 [${hash}]"
 }