fix: 修复统计存储的 unique_id 用的同一个问题

Author: tianxiu2b2t

VERSION

@@ -1 +1 @@
-3.0.19
+3.0.20

assets/js/index.js

@@ -8,7 +8,8 @@ import {
     createElement,
     SVGContainers,
     Modal,
-    calcElementHeight
+    calcElementHeight,
+    Utils
 } from './common.js'
 
 const $configuration = new Configuration();
@@ -149,7 +150,7 @@ class Menu extends Element {
                 "position": "absolute",
                 "width": "200px",
                 "height": "100%",
-                "background": "var(--background)",
+                "background": "black",//"var(--background)",
                 "transition": "transform 500ms cubic-bezier(0, 0, 0.2, 1)",
                 "transform": "translateX(0%)"
             },
@@ -165,13 +166,55 @@ class Menu extends Element {
             }
         })
         this.$menus = {}
+        this._render_task = null
     }
     toggle() {
         super.toggle("hidden")
     }
     add(type, icon, callback) {
         var path = type.replaceAll(".", "/")
-        $router.on()
+        $router.on(`/${path}`, callback)
+        var [main, sub] = type.split(".", 1)
+        if (!this.$menus[main]) {
+            this.$menus[main] = {
+                icon: icon,
+                children: []
+            }
+        }
+        this.$menus[main].icon = icon ? icon : this.$menus[main].icon
+        if (sub) {
+            this.$menus[main].children.push({
+                type: sub
+            })   
+        }
+        if (this._render_task) return;
+        this._render_task = requestAnimationFrame(() => {
+            this._render()
+        })
+    }
+    _render() {
+        this._render_task = null;
+        const menu = this.$menus
+        while (this.firstChild != null) this.removeChild(this.firstChild)
+        for (const [$key, $val] of Object.entries(menu)) {
+            this.append(
+                createElement("div").append(
+                    Utils.isDOM($val.icon) || $val.icon instanceof Element ? $val.icon : createElement("div"),
+                    createElement("p").i18n(`menu.${$key}`),
+                )
+            )
+            if ($val.children.length == 0) continue
+            var child = createElement("div")
+            for (const $child of $val.children) {
+                child.append(
+                    createElement("div").append(
+                        createElement("span"),
+                        createElement("p").i18n(`menu.${$key}.${$child.type}`)
+                    )
+                )
+            }
+            this.append(child)
+        }
     }
 }
 
@@ -200,6 +243,10 @@ async function load() {
     const $main = createElement("main")
     const $menu = new Menu()
 
+    $menu.add("dashboard", "a", (...args) => {
+        console.log("a")
+    })
+
     for (const $theme_key in $theme) {
         $theme[$theme_key].addEventListener("click", () => {
             $theme_change.removeChild($theme[$theme_key]);
@@ -230,6 +277,8 @@ async function load() {
     });
     observer.observe($app.origin, { childList: true, subtree: true });
 
+    $router.init()
+
 }
 window.addEventListener("DOMContentLoaded", async () => {
     await load()

core/cluster.py

@@ -1004,26 +1004,32 @@ async def init_measure(maxsize: int = 50):
     for i in range(1, maxsize, 10):
         init_measure_block(i)
 
+async def init_measure_file(
+    storage: storages.iStorage,
+    size: int,
+    hash: str
+):
+    file = File(
+        hash,
+        hash,
+        size * 1024 * 1024,
+        946684800000
+    )
+    try:
+        if await storage.exists(hash) and await storage.get_size(hash) == size * 1024 * 1024:
+            return True
+        await storage.write_file(
+            convert_file_to_storage_file(file),
+            MEASURE_BUFFER * 1024 * 1024 * size,
+            file.mtime
+        )
+        return True
+    except:
+        logger.terror("cluster.error.init_measure_file", storage=storage.path, type=storage.type, size=units.format_bytes(size * 1024 * 1024), hash=hash)
+    return False
 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)
-                ...
+    results = await asyncio.gather(*[init_measure_file(storage, size, MEASURES_HASH[size]) for storage in clusters.storage_manager.storages for size in MEASURES_HASH])
+    logger.debug(results)
 
 async def init():
     logger.tinfo("cluster.info.init", openbmclapi_version=API_VERSION, version=config.VERSION)
@@ -1074,7 +1080,7 @@ def check_sign(hash: str, s: str, e: str):
 
 def get_cluster_id_from_sign(hash: str, s: str, e: str) -> Optional[str]:
     for cluster in clusters.clusters:
-        if utils.check_sign(hash, cluster.secret, s, e):
+        if utils.check_sign_without_time(hash, cluster.secret, s, e):
             return cluster.id
     return None
 

core/storages/__init__.py

@@ -35,10 +35,13 @@ def __init__(self, path: str, weight: int) -> None:
             raise ValueError("Cannot instantiate interface")
         self.path = path
         self.weight = weight
-        self.unique_id = hashlib.md5(f"{self.type},{self.path}".encode("utf-8")).hexdigest()
         self.current_weight = 0
         self.cache_files = cache.MemoryStorage()
 
+    @property
+    def unique_id(self) -> str:
+        return hashlib.md5(f"{self.type},{self.path}".encode("utf-8")).hexdigest()
+
     def __repr__(self) -> str:
         return f"{self.type}({self.path})"
 
@@ -229,6 +232,10 @@ def __init__(self, path: str, weight: int, url: str, username: Optional[str], pa
             self.url
         )
 
+    @property
+    def unique_id(self) -> str:
+        return hashlib.md5(f"{self.type},{self.url},{self.path}".encode("utf-8")).hexdigest()
+
     async def _get_token(self):
         await self.wait_token.wait()
         return str(self.fetch_token)

core/utils.py

@@ -182,6 +182,9 @@ def to_days(self):
 
 
 def check_sign(hash: str, secret: str, s: str, e: str) -> bool:
+    return check_sign(hash, secret, s, e) and time.time() - 300 < int(e, 36)
+
+def check_sign_without_time(hash: str, secret: str, s: str, e: str):
     if not s or not e:
         return False
     sign = (
@@ -191,7 +194,7 @@ def check_sign(hash: str, secret: str, s: str, e: str) -> bool:
         .decode()
         .rstrip("=")
     )
-    return sign == s and time.time() - 300 < int(e, 36)
+    return sign == s
 
 def equals_hash(origin: str, content: bytes):
     return get_hash_hexdigest(origin, content) == origin

i18n/zh_cn.json

@@ -27,7 +27,7 @@
     "storage.error.alist": "Alist 返回出错，错误代码 [${status}]，原因 [${message}]",
     "storage.debug.error_alist": "Alist 返回出错，错误代码 [${status}]，原因 [${message}]",
     "storage.error.alist.fetch_token": "Alist 获取 Token 出错，错误代码 [${status}]，原因 [${message}]",
-    "cluster.success.keepalive": "节点 [${cluster}] 保活成功，已回原 [${hits}] 个文件，共计 [${bytes}] 流量，延迟为 [${ping}ms]",
+    "cluster.success.keepalive": "节点 [${cluster}] 保活成功，已回源 [${hits}] 个文件，共计 [${bytes}] 流量，延迟为 [${ping}ms]",
     "cluster.debug.socketio.disconnected": "SocketIO 已断开连接",
     "cluster.debug.socketio.connected": "SocketIO 已连接",
     "cluster.success.cluster.disable": "节点 [${cluster}] 已正常下线",