feat: 完善 /download 路由

Author: SilianZ

core/types.py renamed to core/classes.py

@@ -1,7 +1,8 @@
 from dataclasses import dataclass
-from typing import List
+from typing import List, Dict, Any
 from abc import ABC, abstractmethod
 import io
+from aiohttp import web
 import tqdm
 
 
@@ -42,3 +43,7 @@ async def writeFile(
     @abstractmethod
     async def getMissingFiles(files: FileList, pbar: tqdm) -> FileList:
         pass
+
+    @abstractmethod
+    async def express(hash: str, request: web.Request, response: web.StreamResponse) -> Dict[str, Any]:
+        pass

core/cluster.py

@@ -3,8 +3,10 @@
 from core.scheduler import *
 from core.exceptions import ClusterIdNotSetError, ClusterSecretNotSetError
 from core.storages import getStorages
-from core.types import FileInfo, FileList, AgentConfiguration
+from core.classes import FileInfo, FileList, AgentConfiguration
+from core.router import Router
 from core.i18n import locale
+from aiohttp import web
 from tqdm import tqdm
 import toml
 import zstandard as zstd
@@ -233,8 +235,10 @@ async def downloadFile(
             self.failed_filelist.files.append(file)
 
     async def setupExpress(self, https: bool) -> None:
-        # todo
-        pass
+        logger.tinfo("cluster.info.router.creating")
+        app = web.Application
+        Router(https, app)
+        
 
     async def init(self) -> None:
         await asyncio.gather(*(storage.init() for storage in self.storages))

core/web.py renamed to core/router.py

@@ -1,14 +1,17 @@
 from functools import wraps
 from core.config import Config
+from core.classes import Storage
+from typing import Any, List
+from aiohttp import web
+import random
 import aiohttp
-import aiohttp.web
 import asyncio
 import base64
 import hashlib
 import time
 
 class Router:
-    def __init__(self, https: bool, app: aiohttp.web.Application) -> None:
+    def __init__(self, https: bool, app: web.Application) -> None:
         self.https = https
         self.app = app
         self.secret = Config.get('cluster.secret')
@@ -27,16 +30,20 @@ async def _():
         pass
 
     @route("/download/{hash}")
-    async def _(self, request: aiohttp.web.Request) -> aiohttp.web.Response:
-        response = aiohttp.web.Response
+    async def _(self, request: web.Request, storages: List[Storage]) -> web.Response | web.StreamResponse:
         def check_sign(hash: str, secret: str, query: dict) -> bool:
             if not (s := query.get('s')) or not (e := query.get('e')): return False
             sign = base64.urlsafe_b64encode(hashlib.sha1(f"{secret}{hash}{e}".encode('utf-8')).digest()).decode('utf-8').rstrip('=')
             return sign == s and time.time() < int(e, 36)
 
         hash = request.match_info.get('hash').lower()
-        async with aiohttp.ClientSession() as session:
-            valid = check_sign(hash, self.secret, request.query)
-            if not valid:
-                return response(text="invalid sign", status=403)
-            response.
+        valid = check_sign(hash, self.secret, request.query)
+        if not valid:
+            return web.Response(text="invalid sign", status=403)
+        response = web.StreamResponse(status=200)
+        response.headers['x-bmclapi-hash'] = hash
+        storage = random.randint(0, len(storages) - 1)
+        data = storages[storage].express(hash, request, response)
+        return response
+
+            

core/storages/__init__.py

@@ -1,4 +1,4 @@
-from core.types import Storage
+from core.classes import Storage
 from core.storages.local import LocalStorage
 from core.config import Config
 from typing import List

core/storages/local.py

@@ -1,6 +1,8 @@
-from core.types import Storage, FileInfo, FileList
+from core.classes import Storage, FileInfo, FileList
 from core.logger import logger
 from core.i18n import locale
+from aiohttp import web
+from typing import Any, Dict
 from tqdm import tqdm
 import os
 import io
@@ -75,3 +77,24 @@ async def check_file(file: FileInfo, pbar: tqdm) -> bool:
             file for file, is_missing in zip(files.files, results) if is_missing
         ]
         return FileList(files=missing_files)
+    
+    async def express(self, hash: str, request: web.Request, response: web.StreamResponse) -> Dict[str, Any]:
+        path = os.path.join(self.path, hash[:2], hash)
+        if not os.path.exists(path):
+            response.set_status(404, 'File not found')
+            return {'bytes': 0, 'hits': 0}
+        file_size = os.path.getsize(path)
+        response.content_length = file_size
+        response.content_type = 'application/octet-stream'
+        response.headers['Cache-Control'] = 'max-age=2592000'
+        response.prepare(request)
+
+        try:
+            transport = request.transport
+            socket = transport.get_extra_info('socket')
+            with open(path, 'rb') as f:
+                await asyncio.get_event_loop().sendfile(socket, f, 0, file_size)
+            return {'bytes': file_size, 'hits': 1}
+
+        except Exception:
+            return {'bytes': 0, 'hits': 0}

i18n/zh_cn.json

@@ -20,6 +20,7 @@
     "cluster.success.sync_files.downloaded": "成功下载所有文件！",
     "cluster.error.sync_files.retry": "无法下载所有文件，将在 ${retry}s 后重试。",
     "cluster.error.sync_files.failed": "无法下载所有文件，已达到最高重试次数。",
+    "cluster.info.router.creating": "正在创建路由……",
     "cluster.tqdm.desc.get_missing": "获取缺失文件中",
     "cluster.tqdm.desc.sync_files": "同步文件中",
     "cluster.tqdm.unit.files": " 个文件",