From eea5257394c035a2631d3b6340cb6e7a3f94ed14 Mon Sep 17 00:00:00 2001
From: keep_running <82458567+KeepingRunning@users.noreply.github.com>
Date: Fri, 27 Mar 2026 11:28:05 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20Fix:=20=E4=BF=AE=E5=A4=8D=20aiohttp=20?=
 =?UTF-8?q?=E6=B5=81=E5=BC=8F=E5=93=8D=E5=BA=94=E5=88=86=E5=9D=97=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F=E4=B8=8D=E5=9B=BA=E5=AE=9A=E9=97=AE=E9=A2=98=20(#3919?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 nonebot/drivers/aiohttp.py | 17 +++++++++++++++-
 tests/test_driver.py       | 41 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/nonebot/drivers/aiohttp.py b/nonebot/drivers/aiohttp.py
index e2140217..cb9aa810 100644
--- a/nonebot/drivers/aiohttp.py
+++ b/nonebot/drivers/aiohttp.py
@@ -191,11 +191,26 @@ class Session(HTTPClientSession):
             timeout=timeout,
         ) as response:
             response_headers = response.headers.copy()
+            # aiohttp does not guarantee fixed-size chunks; re-chunk to exact size
+            buffer = bytearray()
             async for chunk in response.content.iter_chunked(chunk_size):
+                if not chunk:
+                    continue
+                buffer.extend(chunk)
+                while len(buffer) >= chunk_size:
+                    out = bytes(buffer[:chunk_size])
+                    del buffer[:chunk_size]
+                    yield Response(
+                        response.status,
+                        headers=response_headers,
+                        content=out,
+                        request=setup,
+                    )
+            if buffer:
                 yield Response(
                     response.status,
                     headers=response_headers,
-                    content=chunk,
+                    content=bytes(buffer),
                     request=setup,
                 )
 
diff --git a/tests/test_driver.py b/tests/test_driver.py
index d333166c..1b7a2a33 100644
--- a/tests/test_driver.py
+++ b/tests/test_driver.py
@@ -22,6 +22,7 @@ from nonebot.drivers import (
     WebSocketClientMixin,
     WebSocketServerSetup,
 )
+from nonebot.drivers.aiohttp import Session as AiohttpSession
 from nonebot.drivers.aiohttp import WebSocket as AiohttpWebSocket
 from nonebot.exception import WebSocketClosed
 from nonebot.params import Depends
@@ -596,6 +597,46 @@ async def test_http_client_session(driver: Driver, server_url: URL):
     await anyio.sleep(1)
 
 
+@pytest.mark.anyio
+async def test_aiohttp_stream_request_skip_empty_chunk() -> None:
+    class _FakeContent:
+        async def iter_chunked(self, _: int):
+            for chunk in (b"ab", b"", b"cd", b"e"):
+                yield chunk
+
+    class _FakeResponse:
+        def __init__(self) -> None:
+            self.status = 200
+            self.headers = {"x-test": "1"}
+            self.content = _FakeContent()
+
+    class _FakeRequestContext:
+        async def __aenter__(self) -> _FakeResponse:
+            return _FakeResponse()
+
+        async def __aexit__(self, *args: object) -> bool:
+            return False
+
+    class _FakeClient:
+        def request(self, *args: object, **kwargs: object) -> _FakeRequestContext:
+            return _FakeRequestContext()
+
+    session = AiohttpSession()
+    session._client = _FakeClient()  # type: ignore[assignment]
+
+    chunks = []
+    async for resp in session.stream_request(
+        Request("GET", "https://example.com"), chunk_size=2
+    ):
+        assert resp.status_code == 200
+        assert resp.content
+        chunks.append(resp.content)
+
+    assert chunks == [b"ab", b"cd", b"e"]
+    assert b"".join(chunks) == b"abcde"
+    assert all(len(chunk) == 2 for chunk in chunks[:-1])
+
+
 @pytest.mark.anyio
 @pytest.mark.parametrize(
     "driver",