解决返回内容过小也会压缩的问题

Author: tianxiu2b2t

core/cluster.py

@@ -1420,7 +1420,7 @@ async def _(request: web.Request, size: int, config: web.ResponseConfiguration):
             request.get_url_params().get("s") or "",
             request.get_url_params().get("e") or "",
         ):
-            yield web.Response(status_code=403)
+            yield web.Response("Forbidden", status_code=403)
             return
         config.length = size * 1024 * 1024
         for _ in range(size):
@@ -1444,14 +1444,14 @@ async def _(request: web.Request, hash: str, config: web.ResponseConfiguration):
                 size = 0,
                 type = FileContentType.EMPTY
             ), 0, request.get_ip(), request.get_user_agent(), statistics.Status.FORBIDDEN)
-            return web.Response(status_code=403)
+            return web.Response("Forbidden", status_code=403)
         if not storages.available_width:
             statistics.hit(None, File(
                 hash = hash,
                 size = 0,
                 type = FileContentType.EMPTY
             ), 0, request.get_ip(), request.get_user_agent(), statistics.Status.ERROR)
-            return web.Response(status_code=503)
+            return web.Response("No available storage", status_code=503)
         start_bytes, end_bytes = 0, None
         range_str = await request.get_headers("range", "")
         range_match = re.search(r"bytes=(\d+)-(\d+)", range_str, re.S) or re.search(
@@ -1470,7 +1470,7 @@ async def _(request: web.Request, hash: str, config: web.ResponseConfiguration):
             hash, start_bytes, end_bytes, request.get_ip(), request.get_user_agent()
         )
         if not data:
-            return web.Response(status_code=404)
+            return web.Response("Not Found", status_code=404)
         config.access_log = DOWNLOAD_ACCESS_LOG
         if data.is_url() and isinstance(data.get_path(), str):
             return web.RedirectResponse(str(data.get_path()), response_configuration=config).set_headers(name)
@@ -1539,12 +1539,12 @@ async def _(request: web.Request):
         try:
             info = json.loads(base64.b64decode(auth))
         except:
-            return web.Response(status_code=401)
+            return web.Response("Unauthorized", status_code=401)
         if (
             info["username"] != DASHBOARD_USERNAME
             or info["password"] != DASHBOARD_PASSWORD
         ):
-            return web.Response(status_code=401)
+            return web.Response("Unauthorized", status_code=401)
         token = dashboard.generate_token(request)
         return web.Response(
             DASHBOARD_USERNAME,

core/const.py

@@ -60,6 +60,7 @@
 DOWNLOAD_CONFIGURATION: bool = True
 RESPONSE_DATE = "%a, %d %b %Y %H:%M:%S GMT"
 RESPONSE_COMPRESSION_IGNORE_SIZE_THRESHOLD: int = 16777216
+RESPONSE_COMPRESSION_MIN_THRESHOLD: int = 1024
 SKIP_FILE_CHECK: bool = False
 STATUS_CODES: dict[int, str] = {
     100: "Continue",

core/web.py

@@ -769,6 +769,7 @@ def _get_content_type(self, content):
 
     async def _iter(self):
         if isinstance(self.content, (str, int, float)):
+            self.content_type = "text/plain"
             yield str(self.content).encode("utf-8")
         elif isinstance(self.content, (dict, list, tuple, bool)):
             self.content_type = "application/json"
@@ -783,8 +784,10 @@ async def _iter(self):
             yield b""
 
     async def raw(self):
-        if isinstance(self.content, Coroutine):
+        if isinstance(self.content, Coroutine) or asyncio.iscoroutinefunction(self.content):
             self.content = await self.content
+        if asyncio.iscoroutine(self.content):
+            self.content = await self.content()
         if isinstance(self.content, Response):
             self.status_code = self.content.status_code
             self.content_type = self.content.content_type
@@ -793,7 +796,7 @@ async def raw(self):
             self._kwargs = self.content._kwargs
             self._response_configuration = self.content._response_configuration
             self.content = self.content.content
-        if isinstance(self.content, (Coroutine, Response)):
+        if isinstance(self.content, (Coroutine, Response)) or asyncio.iscoroutinefunction(self.content) or asyncio.iscoroutine(self.content):
             await self.raw()
 
     async def __call__(
@@ -822,7 +825,7 @@ async def __call__(
         if isinstance(content, Path):
             self.content_type = self.content_type or self._get_content_type(content)
             length = content.stat().st_size
-            if length <= RESPONSE_COMPRESSION_IGNORE_SIZE_THRESHOLD:
+            if RESPONSE_COMPRESSION_MIN_THRESHOLD <= length <= RESPONSE_COMPRESSION_IGNORE_SIZE_THRESHOLD:
                 async with aiofiles.open(content, "rb") as r:
                     content = io.BytesIO(await r.read())
         elif isinstance(content, io.BytesIO):
@@ -852,7 +855,7 @@ async def __call__(
             )
             self.status_code = 206 if start_bytes > 0 else 200
             length = length - start_bytes
-        if isinstance(content, io.BytesIO) and len(content.getbuffer()) != 0:
+        if isinstance(content, io.BytesIO) and len(content.getbuffer()) != 0 and RESPONSE_COMPRESSION_MIN_THRESHOLD <= len(content.getbuffer()) <= RESPONSE_COMPRESSION_IGNORE_SIZE_THRESHOLD:
             self.content_type = self.content_type or self._get_content_type(content)
             compression: Compressor = compressor(
                 await request.get_headers("Accept-Encoding", ""),