✨ add hishel controller

Author: AzideCupric

nonebot_bison/platform/ceobecanteen/cache.py

@@ -3,9 +3,10 @@
 from types import MappingProxyType
 from collections.abc import Callable
 
+from nonebot import get_driver
 from expiringdictx import ExpiringDict
 from httpx import AsyncClient, AsyncHTTPTransport
-from hishel import AsyncCacheTransport, AsyncInMemoryStorage
+from hishel import Controller, AsyncCacheTransport, AsyncInMemoryStorage
 
 from .const import DATASOURCE_URL
 from .utils import process_response
@@ -14,11 +15,14 @@
 cache_transport = AsyncCacheTransport(
     AsyncHTTPTransport(),
     storage=AsyncInMemoryStorage(),
+    controller=Controller(
+        allow_heuristics=True,
+    ),
 )
 
 CeobeClient = partial(
     AsyncClient,
-    headers={"Bot": "Nonebot-Bison"},
+    headers={"Bot": f"Nonebot-Bison/{get_driver().config.nickname}", "User-Agent": "MountainDash/Nonebot-Bison"},
     transport=cache_transport,
 )
 

tests/platforms/test_ceobecanteen.py

@@ -94,15 +94,23 @@ async def test_batch_fetch_new_with_single(
     from nonebot_bison.post import Post
     from nonebot_bison.types import SubUnit
 
+    mock_respone_headers = {
+        "Content-Encoding": "br",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Thu, 08 Jul 2021 14:00:00 GMT",
+        # "Date": datetime.utcnow().strftime("%a, %d %b %Y %H:%M:%S GMT"),
+        "Vary": "origin; access-control-request-method; access-control-request-headers",
+    }
+
     targets_router = respx.get("https://server.ceobecanteen.top/api/v1/canteen/config/datasource/list")
     comb_id_router = respx.post("https://server.ceobecanteen.top/api/v1/canteen/user/getDatasourceComb")
     cookie_id_router = respx.get("http://cdn.ceobecanteen.top/datasource-comb/2")
     cookies_router = respx.get("https://server-cdn.ceobecanteen.top/api/v1/cdn/cookie/mainList/cookieList")
 
-    targets_router.mock(return_value=Response(200, json=ceobecanteen_targets))
+    targets_router.mock(return_value=Response(200, json=ceobecanteen_targets, headers=mock_respone_headers))
     comb_id_router.mock(return_value=Response(200, json=ceobecanteen_comb_id_0))
-    cookie_id_router.mock(return_value=Response(200, json=ceobecanteen_cookie_id_0))
-    cookies_router.mock(return_value=Response(200, json=ceobecanteen_cookies_0))
+    cookie_id_router.mock(return_value=Response(200, json=ceobecanteen_cookie_id_0, headers=mock_respone_headers))
+    cookies_router.mock(return_value=Response(200, json=ceobecanteen_cookies_0, headers=mock_respone_headers))
 
     assert await ceobecanteen.get_target_name(None, dummy_target) == "明日方舟-B站"
     assert await ceobecanteen.parse_target("明日方舟-B站") == dummy_target