🐛 修复 Gateway WebSocket 空闲超时重连 (#93)

* 🐛 修复 Gateway WebSocket 空闲超时重连

* 🚨 修复 Gateway WebSocket 测试私有导入

* ⬆️ 提升 nonebot2 最低版本

* 🐛 显式禁用 Gateway 接收超时

* 🐛 保留 Gateway 关闭超时

* 🐛 保留 Gateway 连接超时

* 🚨 auto fix by pre-commit hooks

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: shoucandanghehe

nonebot/adapters/discord/adapter.py

@@ -11,7 +11,7 @@
 from nonebot.adapters import Adapter as BaseAdapter, Bot as BaseBot
 
 from nonebot.compat import type_validate_json, type_validate_python
-from nonebot.drivers import URL, Driver, ForwardDriver, Request, WebSocket
+from nonebot.drivers import URL, Driver, ForwardDriver, Request, Timeout, WebSocket
 from nonebot.exception import WebSocketClosed
 from nonebot.plugin import get_plugin_config
 from nonebot.utils import escape_tag
@@ -184,7 +184,11 @@ async def _forward_ws(  # noqa: C901
             url=ws_url,
             headers=headers,
             params=params,
-            timeout=self.discord_config.discord_api_timeout,
+            timeout=Timeout(
+                connect=self.discord_config.discord_api_timeout,
+                read=None,
+                close=10.0,
+            ),
             proxy=self.discord_config.discord_proxy,
         )
         heartbeat_task: asyncio.Task | None = None

pyproject.toml

@@ -13,7 +13,7 @@ license = "MIT"
 readme = "README.md"
 keywords = ["nonebot", "discord", "bot"]
 requires-python = ">=3.10,<4.0.0"
-dependencies = ["nonebot2>=2.4.4"]
+dependencies = ["nonebot2>=2.5.0"]
 
 [dependency-groups]
 dev = [

tests/test_outbound_transport_serialization.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import asyncio
 from collections.abc import Awaitable, Sequence
 from datetime import datetime, timezone
 import json
@@ -14,16 +15,18 @@
     InteractionResponse,
     RecurrenceRule,
     Snowflake,
+    User,
 )
 from nonebot.adapters.discord.api.types import (
     GuildScheduledEventEntityType,
     GuildScheduledEventPrivacyLevel,
     GuildScheduledEventRecurrenceRuleFrequency,
     InteractionCallbackType,
 )
+from nonebot.adapters.discord.config import BotInfo
 from tests.fake.doubles import DummyAdapter, DummyBot
 
-from nonebot.drivers import Request, WebSocket
+from nonebot.drivers import URL, Request, Timeout, WebSocket
 import pytest
 
 
@@ -283,3 +286,64 @@ async def send_bytes(self, data: bytes) -> None:
     await adapter._heartbeat(ws, bot)  # noqa: SLF001
 
     assert ws.sent == ['{"op":1,"d":42}']
+
+
+@pytest.mark.asyncio
+async def test_gateway_websocket_request_does_not_inherit_api_timeout(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    adapter = DummyAdapter()
+    adapter.discord_config.discord_api_timeout = 30.0
+    bot_info = BotInfo(token="x" * 10)
+    captured_request: Request | None = None
+
+    class StopForwardError(Exception):
+        pass
+
+    class StopWebSocket:
+        async def __aenter__(self) -> None:
+            msg = "websocket request captured"
+            raise RuntimeError(msg)
+
+        async def __aexit__(
+            self,
+            _exc_type: object,
+            _exc: object,
+            _traceback: object,
+        ) -> None:
+            return None
+
+    async def fake_get_bot_user(_bot_info: BotInfo) -> User:
+        return User(
+            id=Snowflake(1),
+            username="bot",
+            discriminator="0000",
+            avatar=None,
+        )
+
+    def fake_websocket(request: Request) -> StopWebSocket:
+        nonlocal captured_request
+        captured_request = request
+        return StopWebSocket()
+
+    async def stop_reconnect_sleep(_delay: float) -> None:
+        raise StopForwardError
+
+    monkeypatch.setattr(adapter, "_get_bot_user", fake_get_bot_user)
+    monkeypatch.setattr(adapter, "websocket", fake_websocket)
+    monkeypatch.setattr(asyncio, "sleep", stop_reconnect_sleep)
+
+    with pytest.raises(StopForwardError):
+        await adapter._forward_ws(  # noqa: SLF001
+            bot_info,
+            URL("wss://gateway.discord.gg"),
+            (0, 1),
+        )
+
+    assert captured_request is not None
+    assert isinstance(captured_request.timeout, Timeout)
+    assert (
+        captured_request.timeout.connect == adapter.discord_config.discord_api_timeout
+    )
+    assert captured_request.timeout.read is None
+    assert captured_request.timeout.close == 10.0