fix: 修复 Alist 缓存日志输出的问题，更新版本至 1.13.1

Author: tianxiu2b2t

assets/js/index.js

@@ -143,9 +143,28 @@ $style.addAll({
     },
 })
 
+class Menu extends Element {
+    constructor() {
+        super("div").classes("menu-side")
+        $style.addAll({
+            ".menu-side": {
+
+            }
+        })
+    }
+    toggle() {
+        super.toggle("hidden")
+    }
+}
+
 async function load() {
     const $dom_body = new Element(document.body);
     const $main = createElement("main")
+    const $menu = new Menu();
+    const $wrapper = createElement("wrapper").append(
+        $menu,
+        $main
+    )
 
     const $app = createElement("div").classes("app")
 
@@ -157,7 +176,10 @@ async function load() {
     const $theme_change = createElement("div").append(
         $theme[$configuration.get("theme") == "light" ? "moon" : "sun"]
     )
-    const $header_content_left = createElement("div").classes("content", "padding-left").append(
+    const $header_content_left = createElement("div").classes("content").append(
+        SVGContainers.menu.addEventListener("click", () => {
+
+        }),
         createElement("h3").text($title)
     );
     const $header_content_right = createElement("div").classes("content").append(
@@ -218,10 +240,10 @@ async function load() {
     const observer = new ResizeObserver((..._) => {
         var header = calcElementHeight($header)
         var height = window.innerHeight - header
-        $main.style("height", "auto")
-        var main = calcElementHeight($main)
-        var height = Math.max(height, main)
-        $main.style("height", `${height}px`)
+        $wrapper.style("height", "auto")
+        var wrapper = calcElementHeight($wrapper)
+        var height = Math.max(height, wrapper)
+        $wrapper.style("height", `${height}px`)
     });
     observer.observe($app.origin, { childList: true, subtree: true });
 

core/cluster.py

@@ -295,40 +295,45 @@ def __init__(self, clusters: 'ClusterManager'):
         self.task = None
 
     async def _get_filelist(self, cluster: 'Cluster'):
-        async with aiohttp.ClientSession(
-            config.const.base_url,
-            headers={
-                "User-Agent": USER_AGENT,
-                "Authorization": f"Bearer {await cluster.get_token()}"
-            }
-        ) as session:
-            async with session.get(
-                f"/openbmclapi/files",
-                params={
-                    "lastModified": str(int(self.cluster_last_modified[cluster]))
+        try:
+            async with aiohttp.ClientSession(
+                config.const.base_url,
+                headers={
+                    "User-Agent": USER_AGENT,
+                    "Authorization": f"Bearer {await cluster.get_token()}"
                 }
-            ) as resp:
-                body = await resp.read()
-                if utils.is_service_error(body):
-                    utils.raise_service_error(body)
-                    return []
-                resp.raise_for_status()
-                if resp.status == 204:
-                    return []
-                stream = utils.FileStream(zstd.decompress(body))
-                filelist = [
-                    File(
-                        path=stream.read_string(),
-                        hash=stream.read_string(),
-                        size=stream.read_long(),
-                        mtime=stream.read_long()
-                    )
-                    for _ in range(stream.read_long())
-                ]
-                if filelist:
-                    mtime = max(filelist, key=lambda f: f.mtime).mtime
-                    self.cluster_last_modified[cluster] = max(mtime, self.cluster_last_modified[cluster])
-                return filelist
+            ) as session:
+                async with session.get(
+                    f"/openbmclapi/files",
+                    params={
+                        "lastModified": str(int(self.cluster_last_modified[cluster]))
+                    }
+                ) as resp:
+                    body = await resp.read()
+                    if utils.is_service_error(body):
+                        utils.raise_service_error(body)
+                        return []
+                    resp.raise_for_status()
+                    if resp.status == 204:
+                        return []
+                    stream = utils.FileStream(zstd.decompress(body))
+                    filelist = [
+                        File(
+                            path=stream.read_string(),
+                            hash=stream.read_string(),
+                            size=stream.read_long(),
+                            mtime=stream.read_long()
+                        )
+                        for _ in range(stream.read_long())
+                    ]
+                    if filelist:
+                        mtime = max(filelist, key=lambda f: f.mtime).mtime
+                        self.cluster_last_modified[cluster] = max(mtime, self.cluster_last_modified[cluster])
+                    return filelist
+        except:
+            logger.ttraceback("cluster.error.fetch_filelist", cluster=cluster.id)
+            return []
+
 
     async def fetch_filelist(self) -> set[File]:
         result_filelist = set().union(*await asyncio.gather(*(asyncio.create_task(self._get_filelist(cluster)) for cluster in self.clusters.clusters)))
@@ -503,23 +508,27 @@ async def _r(urls: tuple[URLResponse, ...]):
 
 
     async def _get_configuration(self, cluster: 'Cluster'):
-        async with aiohttp.ClientSession(
-            config.const.base_url,
-            headers={
-                "User-Agent": USER_AGENT,
-                "Authorization": f"Bearer {await cluster.get_token()}"
-            }
-        ) as session:
-            async with session.get(
-                f"/openbmclapi/configuration"
-            ) as resp:
-                body = await resp.json()
-                if utils.raise_service_error(body):
-                    return {}
-                resp.raise_for_status()
-                return {
-                    k: OpenBMCLAPIConfiguration(**v) for k, v in (body).items()
+        try:
+            async with aiohttp.ClientSession(
+                config.const.base_url,
+                headers={
+                    "User-Agent": USER_AGENT,
+                    "Authorization": f"Bearer {await cluster.get_token()}"
                 }
+            ) as session:
+                async with session.get(
+                    f"/openbmclapi/configuration"
+                ) as resp:
+                    body = await resp.json()
+                    if utils.raise_service_error(body):
+                        return {}
+                    resp.raise_for_status()
+                    return {
+                        k: OpenBMCLAPIConfiguration(**v) for k, v in (body).items()
+                    }
+        except:
+            logger.ttraceback("cluster.error.configuration", cluster=cluster.id)
+            return {}
 
 class ClusterManager:
     def __init__(self):
@@ -961,7 +970,7 @@ def __init__(self, hash: str, size: int, mtime: float, data: bytes) -> None:
 
 ROOT = Path(__file__).parent.parent
 
-API_VERSION = "1.13.0"
+API_VERSION = "1.13.1"
 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()

core/storages/__init__.py

@@ -224,10 +224,7 @@ def __init__(self, path: str, width: int, url: str, username: Optional[str], pas
         self.link_cache_timeout = utils.parse_time(link_cache_expires).to_seconds if link_cache_expires is not None else None
         self.link_cache: defaultdict[str, AlistLink] = defaultdict(lambda: AlistLink())
         scheduler.run_repeat_later(self._check_token, 0, 3600)
-        if self.link_cache_timeout is not None:
-            logger.tinfo("storage.info.alist.link_cache", raw=link_cache_expires, time=units.format_count_datetime(self.link_cache_timeout))
-        else:
-            logger.tinfo("storage.info.alist.link_cache", raw=link_cache_expires, time="disabled")
+        logger.tinfo("storage.info.alist.link_cache", url=self.url, path=self.path, raw=link_cache_expires, time="disabled" if self.link_cache_timeout is None else units.format_count_datetime(self.link_cache_timeout))
         self.session = aiohttp.ClientSession(
             self.url
         )

i18n/zh_cn.json

@@ -49,5 +49,7 @@
     "cluster.info.enable.measure_storage": "已开启 存储 测速",
     "cluster.error.init_measure_file": "无法初始化 测速文件，存储 [${path} (${type})] 大小 [${size}] 哈希 [${hash}]",
     "storage.info.alist.link_cache": "Alist 存储 [${url}] [${path}] 链接缓存状态 [${time} (${raw})]",
-    "cluster.error.get_file": "获取文件 ${hash} 出错，原因："
+    "cluster.error.get_file": "获取文件 ${hash} 出错，原因：",
+    "cluster.error.fetch_filelist": "无法获取 [${id}] 文件列表，原因：",
+    "cluster.error.configuration": "无法获取 [${id}] 下载配置，原因："
 }