fix: 重构 cluster.py，优化部分逻辑

feat: 准备下个版本支持多数据库类型
feat: 更新 socketio 的 debug
fix: 修复统计的 UserAgent 和 IP 地址的覆盖为默认值
feat: 更新 dashboard 的登陆面板（暂未支持实现）
feat: 版本更新至 1.1.0

Author: tianxiu2b2t

VERSION

@@ -1 +1 @@
-v1.0.25
+v1.1.0

bmclapi_dashboard/static/js/index.min.js

@@ -1497,14 +1497,15 @@ class SocketData {
             this.$opened = false
             this.$key = 1
             this.$callback = {}
+            this.$creating = false
             this.create_ws()
         }
     }
     send_http(namespace, data) {
         return new Promise(async (resolve, reject) => {
             const resp = await fetch(`${this.$url}?namespace=${encodeURIComponent(namespace)}`, {
                 method: "POST",
-                data: data
+                body: JSON.stringify(data)
             })
             var resp_data = [null, null]
             if (resp.ok) {
@@ -1522,9 +1523,9 @@ class SocketData {
             resolve(resp_data)
         })
     }
-    create_ws() {
+    async create_ws() {
         if (!this.$support) throw "Unable to send websocket data."
-        if (this.$ws == null) this.$ws = new WebSocketClient("ws" + (this.$url.slice(4)), {
+        if (this.$ws == null && !this.$creating) this.$ws = new WebSocketClient("ws" + (this.$url.slice(4)), {
             "onmessage": (msg) => {
                 var data = JSON.parse(msg.data)
                 this.recv(
@@ -1546,6 +1547,7 @@ class SocketData {
                 }
                 this.$cache = {}
                 window.dispatchEvent(new Event("mainsocket_connect"))
+                this.$creating = false
             },
             "onclose": () => {
                 this.$opened = false
@@ -2394,14 +2396,16 @@ class Authentication {
         this._main = []
         this._input = {
             username: app.createElement("input"),
-            password: app.createElement("input"),
+            password: app.createElement("input").setAttribute("type", "password"),
             captcha: {
                 image: app.createElement("img"),
                 input: app.createElement("input")
             },
             label: app.createElement("p"),
-            auth: app.createElement("button").setI18N("dashboard.auth.login"),
-            forever: app.createElement("button").setAttribute("type", "checkbox")
+            auth: app.createElement("button").class("submit").setI18N("dashboard.auth.login").event("click", async () => {
+                await this.login("a", "a", false)
+            }),
+            forever: app.createElement("input").setAttribute("type", "checkbox")
         }
         this._captcha = app.createElement("div")
         this._container = app.createElement("div").class("panel-auth").append(
@@ -2410,7 +2414,10 @@ class Authentication {
             this._captcha,
             this._input.label,
             this._input.auth,
-            this._input.forever,
+            /*app.createElement("div").class("flex", "panel-auth-root").append(
+                app.createElement("span").setText("Forever"),
+                this._input.forever,
+            ),*/
         )
         this._Styles = {
             ".panel-auth": `
@@ -2419,6 +2426,10 @@ class Authentication {
                 justify-content: center;
                 align-items: stretch;
             `,
+            '.panel-auth-root': [
+                'margin: 8px',
+                'padding: 8px'
+            ],
             '.panel-auth input, .panel-auth button': [
                 'margin: 4px',
                 'padding: 8px'
@@ -2443,7 +2454,7 @@ class Authentication {
                 margin: 0px;
                 color: var(--color);
                 -webkit-tap-highlight-color: transparent;
-                width: 100%;
+                width: 98%;
                 padding: 8.5px 0px 8.5px 14px;`
             ],
             '.panel-auth .label-input label': [
@@ -2481,14 +2492,13 @@ class Authentication {
                 border-width: 1px;
                 overflow: hidden;
                 color: var(--color);
-                border-color: var(--shadow);`
+                border-color: var(--dark-color);`
             ],
             '.panel-auth .label-input:hover fieldset': [
                 'border-color: var(--main-shadow)'
             ],
             '.panel-auth .label-input.active fieldset': [
                 'border-color: var(--none-color-shadow)',
-                'border-width: 1.25px;'
             ],
             '.panel-auth .label-input legend': [
                 `float: unset;
@@ -2516,6 +2526,27 @@ class Authentication {
                 `font-size: 0.75em;
                 visibility: visible;
                 white-space: nowrap;`
+            ],
+            '.panel-auth .submit': [
+                `background-color: transparent;
+                border: none;
+                border-radius: 100px;
+                color: var(--color);
+                margin: 8px;
+                padding: 8px;
+                transition: background-color 0.3s ease, color 0.3s ease;
+                `
+            ],
+            '.panel-auth .submit::before': [
+                `filter: blur(10px);`
+            ],
+            '.panel-auth .submit:hover': [
+                `background-color: var(--main-shadow);
+                transition: background-color 0.3s ease, color 0.3s ease;`
+            ],
+            '.panel-auth .submit:active': [
+                `background-color: var(--main-color);
+                transition: background-color 0.3s ease, color 0.3s ease;`
             ]
         }
         this.refreshToken = $config.get("refreshToken") || null
@@ -2563,14 +2594,16 @@ class Authentication {
     async login(username, password, forever = false) {
         var [err, ack] = await $MainSocket.send("auth", {
             "username": username,
-            "password": atob(password)
-        })
+            "password": btoa(password)
+        }, true)
         if (ack && ack.success) {
             this.username = ack.username
             this.avatar = ack.avatar
             this.token = ack.token
             this.refreshToken = ack.refreshToken
+            return true
         }
+        return false
     }
     open() {
         modal.title_i18n("dashboard.auth").open().setConfirm(false).body(
@@ -3796,9 +3829,7 @@ app.$Menu.add("dashboard", new class {
         window.addEventListener("lang", refresh)
         await $MainSocket.send("status", (new Date().valueOf())).then((data) => {
             var [err, ack] = data
-            var ping = (new Date().valueOf()) - ack.timestamp || ack.time.current * 1000
-            console.log(ack)
-            this.uptime = ack.uptime - ping / 1000 + ((new Date().valueOf()) - ack.time.current * 1000) / 1000
+            this.uptime = ack.uptime + (ack.time.current - (new Date().valueOf() / 1000.0))
             this.status = ack
         })
         await $MainSocket.send("statistics", (this.storages[this.switch_storage.selected - 1])).then((data) => {
@@ -3817,7 +3848,7 @@ app.$Menu.add("dashboard", new class {
             window.addEventListener("mainsocket_status", (data) => {
                 var [err, ack] = data.detail
                 this.status = ack
-                this.uptime = ack.uptime + ((new Date().valueOf()) - ack.time.current * 1000) / 1000
+                this.uptime = ack.uptime + (ack.time.current - (new Date().valueOf()) / 1000.0)
                 this.setStatus()
             })  
         } else {
@@ -3826,7 +3857,7 @@ app.$Menu.add("dashboard", new class {
                 $MainSocket.send("status", (new Date().valueOf())).then((data) => {
                     var [err, ack] = data
                     var ping = (new Date().valueOf()) - ack.timestamp || ack.time.current * 1000
-                    this.uptime = ack.uptime - ping / 1000 + ((new Date().valueOf()) - ack.time.current * 1000) / 1000
+                    this.uptime = ack.uptime + (ack.time.current - (new Date().valueOf()) / 1000.0)
                     this.status = ack
                     this.setStatus()
                 })
@@ -3835,6 +3866,13 @@ app.$Menu.add("dashboard", new class {
         window.addEventListener("mainsocket_disconnect", (data) => {
             this.uptime = null
         })
+        window.addEventListener("mainsocket_connect", () => {
+            $MainSocket.send("status", (new Date().valueOf())).then((data) => {
+                var [err, ack] = data
+                this.uptime = ack.uptime + (ack.time.current - (new Date().valueOf() / 1000.0))
+                this.status = ack
+            })
+        })
         this.initBasic()
         this.switch.select(0)
     }

core/__init__.py

@@ -3,7 +3,7 @@
 import time
 from .env import env as env
 import atexit
-from .logger import logger
+from .logger import logger, socketio_logger
 from .scheduler import init as scheduler_init
 from .scheduler import exit as scheduler_exit
 from .utils import WaitLock
@@ -28,13 +28,13 @@ def init():
         if wait_exit.locked:
             wait_exit.release()
 
-
 async def async_init():
     # first init
     await scheduler_init()
     # load modules
     from .network import init as network_init
-    from .network import close as network_exit
+    from .network import exit as network_exit
+    from .database import init as database_init
     from .cluster import init as cluster_init
     from .cluster import exit as cluster_exit
     from .statistics import init as stats_init
@@ -43,6 +43,7 @@ async def async_init():
     from .system import init as system_init
     import plugins 
 
+    database_init()
     update_init()
     scheduler.delay(network_init)
     stats_init()
@@ -56,12 +57,12 @@ async def async_init():
 
     await wait_exit.wait()
     env["EXIT"] = True
-    network_exit()
     await cluster_exit()
     for plugin in plugins.get_enable_plugins():
         await plugin.disable()
-    scheduler_exit()
+    network_exit()
     stats_exit()
+    scheduler_exit()
 
 
 def exit():

core/api.py

@@ -1,12 +1,13 @@
 import abc
 import asyncio
+from collections import defaultdict, deque
 from dataclasses import dataclass
 from enum import Enum
 import hashlib
 import io
 from pathlib import Path
 import time
-from typing import Optional
+from typing import Callable, Optional, TypeVar
 import pyzstd as zstd
 import aiofiles
 
@@ -40,7 +41,7 @@ class DownloadReason(Enum):
 class BMCLAPIFile:
     path: str
     hash: str
-    size: int
+    size: Optional[int] = None
     mtime: int = 0
 
     def __hash__(self):
@@ -88,7 +89,7 @@ def set_data(self, data: io.BytesIO | str | Path):
             self.data = data
             self.type = FileContentType.PATH
 
-    def get_data(self):
+    def get_data(self) -> io.BytesIO:
         if self.compressed:
             return io.BytesIO(zstd.decompress(self.data.getbuffer()))
         else:
@@ -97,7 +98,7 @@ def is_url(self):
         return self.type == FileContentType.URL
     def is_path(self):
         return self.type == FileContentType.PATH
-    def get_path(self) -> Path:
+    def get_path(self) -> Path | str:
         return self.data
 @dataclass
 class StatsCache:
@@ -116,6 +117,13 @@ def __init__(self, name, type: str, width: int) -> None:
         self.cache_timer = scheduler.repeat(
             self.clear_cache, delay=CHECK_CACHE, interval=CHECK_CACHE
         )
+    
+    def __repr__(self) -> str:
+        return f"{self.__class__.__name__}(name='{self.name}', type='{self.type}', width='{self.width}', disabled={self.disabled})"
+    
+    def __str__(self) -> str:
+        return f"{self.__class__.__name__}(name='{self.name}', type='{self.type}', width='{self.width}', disabled={self.disabled})"
+
     def get_name(self):
         return self.name
 
@@ -169,7 +177,7 @@ def get_cache_stats(self) -> StatsCache:
         return stat
 
     @abc.abstractmethod
-    async def get(self, file: str, start: int = 0, end: Optional[int] = None) -> File:
+    async def get(self, file: str) -> File:
         """
         get file metadata.
         return File
@@ -245,6 +253,60 @@ class ResponseRedirects:
     status: int 
     url: str
 
+@dataclass
+class StoragesInfo:
+    total: int = 0
+    file: int = 0
+    webdav: int = 0
+
+@dataclass
+class StorageWidth:
+    storage: Storage
+    width: int = 0
+
+@dataclass
+class StorageData:
+    storage: Storage
+    hash: str
+    exists: bool = False
+
+class WeightedStorage:  
+    def __init__(self):  
+        self.queue: deque[StorageWidth] = deque()  
+    
+    def add(self, storage: StorageWidth):
+        self.queue.appendleft(storage)
+
+    async def get(self, hash: str) -> Optional[StorageData]:
+        async def check(cur: StorageWidth, hash_data: StorageData) -> bool:
+            if (cur.width > cur.storage.width or cur.storage.disabled) and not hash_data.exists:
+                cur.width = 0
+                return False
+            return True
+        cur = self.queue[0]
+        storage_data = StorageData(cur.storage, hash, await cur.storage.exists(hash))
+        if await check(cur, storage_data):
+            cur.width += 1
+            return storage_data
+        else:
+            self.queue.rotate(-1)
+            for _ in range(len(self.queue) - 1):
+                self.queue.rotate(-1)
+                storage = self.queue[0]
+                storage_data = StorageData(storage.storage, hash, await storage.storage.exists(hash))
+                if await check(storage, storage_data):
+                    storage.width += 1
+                    return storage_data
+        return storage_data
+
+@dataclass
+class DownloadStatistics:
+    downloaded: int = 0
+    failed: int = 0
+    size: int = 0
+    total: int = 0
+    total_size: int = 0
+
 def get_hash(org):
     if len(org) == 32:
         return hashlib.md5()
@@ -258,7 +320,7 @@ def get_hash_content(org, content: io.BytesIO):
     else:
         h = hashlib.sha1()
     h.update(content.getbuffer())
-    return org == h.hexdigest()
+    return h.hexdigest()
 
 
 async def get_file_hash(org: str, path: Path):