修复已知问题

Author: tianxiu2b2t

bmclapi_dashboard/static/js/index.min.js

@@ -1337,6 +1337,10 @@ class SocketData {
             }, 30000)
             const xhr = new XMLHttpRequest()
             xhr.onload = async (event) => {
+                if (!this.$opened) {
+                    this.$opened = true
+                    window.dispatchEvent(new Event("mainsocket_connect"))
+                }
                 if (event.target.readyState == 4) {
                     var header = event.target.getResponseHeader("X-Encoding") 
                     if (header == "binary") {
@@ -1348,6 +1352,11 @@ class SocketData {
                     }
                 }
             }
+            xhr.error = async (event) => {
+                if (!this.$opened) return;
+                this.$opened = false
+                window.dispatchEvent(new Event("mainsocket_disconnect"))
+            }
             xhr.open("POST", `${this.$url}?key=${key}&namespace=${encodeURIComponent(namespace)}`, true)
             xhr.setRequestHeader("Content-Type", "application/json")
             xhr.setRequestHeader("X-Accept-Encoding", "json")

core/cluster.py

@@ -764,11 +764,18 @@ async def _list_all(self, force=False):
         if not self.fetch:
             self.lock.acquire()
         self.fetch = True
+        def stop(tqdm: Optional[tqdm] = None):
+            if tqdm is not None:
+                del tqdm
+            self.lock.acquire()
+            self.fetch = False
+            raise asyncio.CancelledError
         try:
             await self._mkdir(self._download_endpoint())
             r = await self._execute(self.session.list(self._download_endpoint()))
             if r is asyncio.CancelledError:
                 self.lock.acquire()
+                self.fetch = False
                 raise asyncio.CancelledError
             dirs = r[1:]
             with tqdm(
@@ -778,9 +785,7 @@ async def _list_all(self, force=False):
                 await dashboard.set_status_by_tqdm("storage.webdav", pbar)
                 r = await self._execute(self.session.list(self._download_endpoint()))
                 if r is asyncio.CancelledError:
-                    self.lock.acquire()
-                    del pbar
-                    raise asyncio.CancelledError
+                    return stop(pbar)
                 for dir in r[1:]:
                     pbar.update(1)
                     files: dict[str, File] = {}
@@ -793,9 +798,7 @@ async def _list_all(self, force=False):
                         )
                     )
                     if r is asyncio.CancelledError:
-                        self.lock.acquire()
-                        del pbar
-                        raise asyncio.CancelledError
+                        return stop(pbar)
                     for file in r[1:]:
                         if file["isdir"]:
                             continue
@@ -807,9 +810,7 @@ async def _list_all(self, force=False):
                         try:
                             await asyncio.sleep(0)
                         except asyncio.CancelledError:
-                            self.lock.acquire()
-                            del pbar
-                            raise asyncio.CancelledError
+                            return stop(pbar)
                         except Exception as e:
                             raise e
                     for remove in set(
@@ -864,7 +865,7 @@ async def get(self, hash: str, offset: int = 0) -> File:
                             f.expiry = time.time() + CACHE_TIME
                             self.cache[hash] = f
                     elif resp.status // 100 == 3:
-                        f.size = self.get_size(hash)
+                        f.size = await self.get_size(hash)
                         f.path = resp.headers.get("Location")
                         expiry = re.search(r"max-age=(\d+)", resp.headers.get("Cache-Control", "")) or 0
                         if expiry == 0: