fix: pack zip route shadowing (zip before file, 404 -> 403), manual ZernPrologue specify NeoForge 21.1.228 with warning

server/main.py

@@ -1310,6 +1310,32 @@ async def get_pack_manifest(pack_name: str, request: Request, current_user: dict
     )
 
 
+@app.get("/pack/{pack_name}/zip")
+async def download_pack_zip(pack_name: str, request: Request, current_user: dict = Depends(get_current_user)):
+    """Download whole pack as zip for manual installation (requires pass)"""
+    if not has_permission(current_user["role"], Permissions.DOWNLOAD_PACK):
+        raise HTTPException(403, "Requires active pass")
+    if is_pack_disabled(pack_name):
+        raise HTTPException(403, "Pack is disabled")
+    pack_path = PACKS_DIR / pack_name
+    if not pack_path.exists() or not pack_path.is_dir():
+        raise HTTPException(404, "Pack not found")
+    import tempfile, zipfile
+    tmp = Path(tempfile.gettempdir()) / f"{pack_name}.zip"
+    # re-use if fresh (<5 min)
+    if tmp.exists() and (datetime.utcnow().timestamp() - tmp.stat().st_mtime) < 300:
+        return await send_file_async(tmp, request, content_type="application/zip", cache=False)
+    # create zip
+    def _zip():
+        with zipfile.ZipFile(tmp, 'w', zipfile.ZIP_DEFLATED) as zf:
+            for f in pack_path.rglob("*"):
+                if f.is_file():
+                    zf.write(f, f.relative_to(pack_path))
+    loop = asyncio.get_running_loop()
+    await loop.run_in_executor(None, _zip)
+    return await send_file_async(tmp, request, content_type="application/zip", cache=False)
+
+
 @app.get("/pack/{pack_name}/file/{file_path:path}")
 async def get_pack_file(pack_name: str, file_path: str, request: Request, current_user: dict = Depends(get_current_user), preset: Optional[str] = None):
     """Get a file from a pack. If preset is specified, try preset dir first, fall back to base."""
@@ -1364,32 +1390,6 @@ async def get_pack_file(pack_name: str, file_path: str, request: Request, curren
     return await send_file_async(full_path, request, cache=True)
 
 
-@app.get("/pack/{pack_name}/zip")
-async def download_pack_zip(pack_name: str, request: Request, current_user: dict = Depends(get_current_user)):
-    """Download whole pack as zip for manual installation (requires pass)"""
-    if not has_permission(current_user["role"], Permissions.DOWNLOAD_PACK):
-        raise HTTPException(403, "Requires active pass")
-    if is_pack_disabled(pack_name):
-        raise HTTPException(403, "Pack is disabled")
-    pack_path = PACKS_DIR / pack_name
-    if not pack_path.exists() or not pack_path.is_dir():
-        raise HTTPException(404, "Pack not found")
-    import tempfile, zipfile
-    tmp = Path(tempfile.gettempdir()) / f"{pack_name}.zip"
-    # re-use if fresh (<5 min)
-    if tmp.exists() and (datetime.utcnow().timestamp() - tmp.stat().st_mtime) < 300:
-        return await send_file_async(tmp, request, content_type="application/zip", cache=False)
-    # create zip
-    def _zip():
-        with zipfile.ZipFile(tmp, 'w', zipfile.ZIP_DEFLATED) as zf:
-            for f in pack_path.rglob("*"):
-                if f.is_file():
-                    zf.write(f, f.relative_to(pack_path))
-    loop = asyncio.get_running_loop()
-    await loop.run_in_executor(None, _zip)
-    return await send_file_async(tmp, request, content_type="application/zip", cache=False)
-
-
 # ====================== ЭНДПОИНТЫ ДЛЯ ЛАУНЧЕРА ======================
 
 def get_current_launcher_version() -> str: