Fix Reader proxy and route state bugs

app.py

@@ -153,8 +153,7 @@ async def get_reader_assets() -> dict:
             reader_assets_cache_at = now
         except Exception as exc:
             print(f"reader assets refresh failed: {exc}")
-            if not reader_assets_cache_at:
-                reader_assets_cache_at = now
+            reader_assets_cache_at = now
         finally:
             if response is not None:
                 response.release()
@@ -1458,11 +1457,12 @@ async def api_reader_content(request: Request, url: str = Query(...)):
         return JSONResponse({"error": str(exc)}, status_code=403)
     forwarded_headers = {
         name: request.headers[name]
-        for name in ("Range", "If-Range")
+        for name in ("Range", "If-Range", "If-None-Match", "If-Modified-Since")
         if name in request.headers
     }
     semaphore = app.state.upstream_semaphore
     await semaphore.acquire()
+    release_semaphore = True
     try:
         upstream = await open_download_response(
             app.state.http_session,
@@ -1471,10 +1471,14 @@ async def api_reader_content(request: Request, url: str = Query(...)):
             method=request.method,
             request_headers=forwarded_headers,
         )
+    except asyncio.CancelledError:
+        raise
     except Exception as exc:
-        semaphore.release()
         print(f"阅读代理异常: {exc}")
         return JSONResponse({"error": str(exc) or "上游阅读文件加载失败"}, status_code=502)
+    finally:
+        if release_semaphore and "upstream" not in locals():
+            semaphore.release()
     headers = {name: upstream.headers[name] for name in READER_UPSTREAM_RESPONSE_HEADERS if name in upstream.headers}
     headers.setdefault("Cache-Control", "public, max-age=300")
     headers["Content-Encoding"] = "identity"
@@ -1499,6 +1503,7 @@ async def api_reader_content(request: Request, url: str = Query(...)):
         finally:
             semaphore.release()
 
+    release_semaphore = False
     return StreamingResponse(stream_reader_content(), status_code=status, headers=headers)
 
 
@@ -1513,16 +1518,21 @@ async def api_download(file: str = Query(...), link: str = Query(...)):
     session = app.state.http_session
     semaphore = app.state.upstream_semaphore
     await semaphore.acquire()
+    release_semaphore = True
     try:
         upstream = await open_download_response(
             session,
             target_url,
             aiohttp.ClientTimeout(total=120, connect=15, sock_read=30),
         )
+    except asyncio.CancelledError:
+        raise
     except Exception as e:
-        semaphore.release()
         print(f"下载代理异常: {e}")
         return JSONResponse({"error": str(e) or "上游下载失败"}, status_code=502)
+    finally:
+        if release_semaphore and "upstream" not in locals():
+            semaphore.release()
     if upstream.status != 200:
         status = upstream.status
         upstream.release()
@@ -1541,6 +1551,7 @@ async def api_download(file: str = Query(...), link: str = Query(...)):
             raise
         finally:
             semaphore.release()
+    release_semaphore = False
     return StreamingResponse(
         stream_response(),
         media_type="application/octet-stream",
@@ -1712,7 +1723,7 @@ async def serve_spa(rest_of_path: str):
     if index_path.exists():
         repo_short = rest_of_path.strip("/").split("/")[0] if rest_of_path.strip("/") else None
         if repo_short and f"VoiceOfML/{repo_short}" not in repo_counts:
-            repo_short = None
+            return PlainTextResponse("Repository not found", status_code=404)
         cache_key = f"VoiceOfML/{repo_short}" if repo_short else None
         html = injected_html_cache.get(cache_key)
         if html is not None:

static/app.js

@@ -1082,6 +1082,10 @@ function syncStateToURL(replace = true) {
   if (STATE.mode !== "global" && STATE.browserPath) {
     params.set("path", STATE.browserPath);
   }
+  if (STATE.mode !== "global") {
+    STATE.filterFolderSelfs.forEach(folder => params.append("folder_self", folder));
+    STATE.filterFolderSubtrees.forEach(folder => params.append("folder_subtree", folder));
+  }
   if (DOM.leftSidebar.classList.contains("expanded-wide")) {
     params.set("wide", "1");
   }
@@ -1158,10 +1162,6 @@ function syncURLToState() {
       STATE.filterFolderSelfs = urlSelfs;
       STATE.filterFolderSubtrees = urlSubtrees;
       STATE.filterFolders = mergeFolderFilters(STATE.filterFolderSelfs, STATE.filterFolderSubtrees);
-      params.delete("folder_self");
-      params.delete("folder_subtree");
-      const cleanUrl = params.toString() ? `${window.location.pathname}?${params.toString()}` : window.location.pathname;
-      history.replaceState(null, "", cleanUrl);
     } else {
       STATE.filterFolderSelfs = [];
       STATE.filterFolderSubtrees = [];