fix: 增加 206 统计，修复获取文件从主控获取

Author: tianxiu2b2t

VERSION

@@ -1 +1 @@
-3.0.10
+3.0.11

core/cluster.py

@@ -157,7 +157,7 @@ async def _check_hash(self, file: File, storage: storages.iStorage):
 
     async def get_file(self, hash: str):
         file = None
-        if not await self.available():
+        if await self.available():
             storage = self.get_width_storage()
             if isinstance(storage, storages.LocalStorage) and await storage.exists(hash):
                 return LocalStorageFile(
@@ -1102,7 +1102,7 @@ async def _(request: aweb.Request):
         resp = aweb.Response(status=500)
 
         start = request.http_range.start or 0
-        end = request.http_range.stop or file.size
+        end = request.http_range.stop or file.size - 1
         size = end - start + 1
 
         cluster.hit(file.storage, size)
@@ -1115,39 +1115,53 @@ async def _(request: aweb.Request):
         if name:
             headers["Content-Disposition"] = f"attachment; filename={name}"
         headers["X-BMCLAPI-Hash"] = hash
+
         if isinstance(file, LocalStorageFile):
             resp = aweb.FileResponse(
                 file.path,
-                headers=headers,
+                headers=headers
             )
         elif isinstance(file, MemoryStorageFile):
             resp = aweb.Response(
-                body=file.data
+                body=file.data[start:end + 1],
+                headers={
+                    "Content-Range": f"bytes={start}-{end}/{file.size}",
+                    "Content-Length": str(size),
+                    "Content-Type": "application/octet-stream",
+                    **headers
+                }
             )
         elif isinstance(file, URLStorageFile):
             resp = aweb.HTTPFound(
-                file.url
+                file.url,
+                headers=headers
             )
-        type = db.StatusType.ERROR
+        type = None
         if resp.status == 200:
             type = db.StatusType.SUCCESS
+        elif resp.status == 206:
+            type = db.StatusType.PARTIAL
         elif resp.status == 403:
             type = db.StatusType.FORBIDDEN
         elif resp.status == 404:
             type = db.StatusType.NOT_FOUND
         elif resp.status == 302:
             type = db.StatusType.REDIRECT
+        if (type == db.StatusType.SUCCESS or type is None) and request.http_range.stop is not None:
+            type = db.StatusType.PARTIAL
         storage_name = file.storage.unique_id if file.storage is not None else None
         db.add_file(cluster.id, storage_name, size)
         db.add_response(
             address,
-            type,
+            type or db.StatusType.ERROR,
             user_agent
         )
         return resp
     except:
+        logger.traceback()
         db.add_response(
             address,
-            db.StatusType.ERROR
+            db.StatusType.ERROR,
+            user_agent
         )
         return aweb.Response(status=500)

core/database.py

@@ -7,6 +7,7 @@
 from sqlalchemy import create_engine, Column, Integer, String, LargeBinary
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
+from sqlalchemy.orm.decl_api import DeclarativeMeta
 
 from core import logger, scheduler, utils
 
@@ -42,13 +43,14 @@ class ResponseStatistics:
     forbidden: int = 0
     error: int = 0
     redirect: int = 0
+    partial: int = 0
     ip_tables: defaultdict[str, int] = field(default_factory=lambda: defaultdict(int))
     user_agents: defaultdict[str, int] = field(default_factory=lambda: defaultdict(int))
 
 
 
 engine = create_engine('sqlite:///database.db')
-Base = declarative_base()
+Base: DeclarativeMeta = declarative_base()
 
 class ClusterStatisticsTable(Base):
     __tablename__ = 'ClusterStatistics'
@@ -71,6 +73,7 @@ class ResponseTable(Base):
     id = Column(Integer, primary_key=True)
     hour = Column(Integer, nullable=False)
     success = Column(String, nullable=False)
+    partial = Column(String, nullable=False)
     forbidden = Column(String, nullable=False)
     not_found = Column(String, nullable=False)
     error = Column(String, nullable=False)
@@ -80,6 +83,7 @@ class ResponseTable(Base):
 
 class StatusType(Enum):
     SUCCESS = "success"
+    PARTIAL = "partial"
     FORBIDDEN = "forbidden"
     NOT_FOUND = "not_found"
     ERROR = "error"
@@ -181,12 +185,12 @@ def _commit_cluster(hour: int, cluster: str, hits: int, bytes: int):
     )
     return True
 
-def _commit_response(hour: int, ip_tables: defaultdict[str, int], user_agents: defaultdict[str, int], success: int = 0, forbidden: int = 0, redirect: int = 0, not_found: int = 0, error: int = 0):
+def _commit_response(hour: int, ip_tables: defaultdict[str, int], user_agents: defaultdict[str, int], success: int = 0, forbidden: int = 0, redirect: int = 0, not_found: int = 0, error: int = 0, partial: int = 0):
     if ip_tables == {}:
         return False
     session = SESSION.get_session()
     q = session.query(ResponseTable).filter_by(hour=hour)
-    r = q.first() or ResponseTable(hour=hour, ip_tables=b'', user_agents=b'', success=str(0), forbidden=str(0), redirect=str(0), not_found=str(0), error=str(0))
+    r = q.first() or ResponseTable(hour=hour, ip_tables=b'', user_agents=b'', success=str(0), forbidden=str(0), redirect=str(0), not_found=str(0), error=str(0), partial=str(0))
     if q.count() == 0:
         session.add(r)
     origin_ip_tables: defaultdict[str, int] = defaultdict(lambda: 0)
@@ -235,7 +239,8 @@ def _commit_response(hour: int, ip_tables: defaultdict[str, int], user_agents: d
             'forbidden': str(int(r.forbidden) + forbidden), # type: ignore
             'redirect': str(int(r.redirect) + redirect), # type: ignore
             'not_found': str(int(r.not_found) + not_found), # type: ignore
-            'error': str(int(r.error) + error) # type: ignore
+            'error': str(int(r.error) + error), # type: ignore
+            'partial': str(int(r.partial) + partial) # type: ignore
         }
     )
     return True
@@ -265,7 +270,7 @@ def commit():
         _commit_cluster(cluster[0], cluster[1], value.hits, value.bytes)
 
     for hour, value in response_cache.items():
-        _commit_response(hour, value.ip_tables, value.user_agents, value.success, value.forbidden, value.redirect, value.not_found, value.error)
+        _commit_response(hour, value.ip_tables, value.user_agents, value.success, value.forbidden, value.redirect, value.not_found, value.error, value.partial)
 
     session.commit()
     old_keys = []