fix: 修复主控补全文件没有加 Bearer 的问题，并且增加 cluster 当被封禁的时候自动切换下一个

Author: tianxiu2b2t

assets/js/index.js

@@ -444,6 +444,7 @@ class SideMenu extends Element {
     constructor() {
         super("aside")
         this._menus = {}
+        this._menuButtons = {}
         //
     }
     // split "." for submenu
@@ -467,7 +468,8 @@ class SideMenu extends Element {
         }
     }
     renderButtons() {
-        
+        const buttons = [];
+        foreach (k in this._menus)
     }
     clear() {
 
@@ -554,6 +556,34 @@ $style.addAll({
         "opacity": "1",
         "transition": "min-width 250ms linear, width 250ms linear, padding 250ms linear, box-shadow 250ms linear, opacity 250ms linear",
         "background": "var(--background)"
+    },
+    "aside .menu": {
+        "cursor": "pointer",
+        "user-select": "none",
+        "vertical-align": "middle",
+        "appearance": "none",
+        "color": "inherit",
+        "display": "flex",
+        "-webkit-box-flex": "1",
+        "-webkit-box-pack": "start",
+        "justify-content": "space-between",
+        "-webkit-box-align": "center",
+        "align-items": "center",
+        "position": "relative",
+        "min-width": "0px",
+        "box-sizing": "border-box",
+        "text-align": "left",
+        "height": "46px",
+        "outline": "0px",
+        "border-width": "0px",
+        "border-style": "initial",
+        "border-color": "initial",
+        "border-image": "initial",
+        "margin": "0px 0px 4px",
+        "text-decoration": "none",
+        "padding": "8px 16px",
+        "transition": "background-color 150ms cubic-bezier(0.4, 0, 0.2, 1)",
+        "border-radius": "4px",
     }
 })
 function load() {

core/cluster.py

@@ -159,29 +159,31 @@ async def get_file(self, hash: str):
         if file is None:
             async with aiohttp.ClientSession(
                 config.const.base_url,
-                headers={
-                    "User-Agent": USER_AGENT,
-                    "Authorization": await self.clusters.clusters[0].get_token()
-                }
             ) as session:
-                async with session.get(
-                    f"/openbmclapi/download/{hash}",
-                    params={
-                        "noopen": str(1)
-                    }
-                ) as resp:
-                    # check hash, if hash is not mismatch.
-                    body = await resp.content.read()
-                    utils.raise_service_error(body)
-                    got_hash = utils.get_hash_hexdigest(hash, body)
-                    if got_hash != hash:
-                        logger.terror("cluster.error.download_hash", got_hash=got_hash, hash=hash, content=body.decode("utf-8", "ignore")[:64])     
-                    file = MemoryStorageFile(
-                        hash,
-                        resp.content_length or -1,
-                        time.time(),
-                        await resp.content.read()
-                    )
+                for cluster in self.clusters.clusters:
+                    async with session.get(
+                        f"/openbmclapi/download/{hash}",
+                        params={
+                            "noopen": str(1)
+                        },
+                        headers={
+                            "User-Agent": USER_AGENT,
+                            "Authorization": f"Bearer {await cluster.get_token()}"
+                        }
+                    ) as resp:
+                        # check hash, if hash is not mismatch.
+                        body = await resp.content.read()
+                        utils.raise_service_error(body)
+                        got_hash = utils.get_hash_hexdigest(hash, body)
+                        file = MemoryStorageFile(
+                            hash,
+                            resp.content_length or -1,
+                            time.time(),
+                            await resp.content.read()
+                        )
+                        if got_hash == hash:
+                            break
+                        logger.terror("cluster.error.download_hash", got_hash=got_hash, hash=hash, content=body.decode("utf-8", "ignore")[:64])  
         return file
 
     def get_width_storage(self, c_storage: Optional[storages.iStorage] = None) -> storages.iStorage: