fix: 解决并发消息请求出现的timeout问题

Author: veehou

botpy/client.py

@@ -63,7 +63,11 @@ def __init__(
         self._ws_ap: Dict = {}
 
         logging.configure_logging(
-            config=log_config, _format=log_format, level=log_level, bot_log=bot_log, ext_handlers=ext_handlers
+            config=log_config,
+            _format=log_format,
+            level=log_level,
+            bot_log=bot_log,
+            ext_handlers=ext_handlers,
         )
 
     async def __aenter__(self):
@@ -94,8 +98,6 @@ async def close(self) -> None:
 
         self._closed = True
 
-        await self.http.close()
-
     def is_closed(self) -> bool:
         return self._closed
 
@@ -126,7 +128,6 @@ async def runner():
 
         try:
             self.loop.run_until_complete(runner())
-            self.loop.run_forever()
         except KeyboardInterrupt:
             return
 
@@ -272,6 +273,7 @@ async def _run_event(
         **kwargs: Any,
     ) -> None:
         try:
+            _log.debug("[botpy] _run_event")
             await coro(*args, **kwargs)
         except asyncio.CancelledError:
             pass

botpy/http.py

@@ -5,7 +5,7 @@
 from typing import Any, Optional, ClassVar, Union, Dict
 
 import aiohttp
-from aiohttp import ClientResponse, FormData, ClientTimeout, TCPConnector
+from aiohttp import ClientResponse, FormData, TCPConnector
 
 from . import logging
 from .errors import HttpErrorDict, ServerError
@@ -76,33 +76,27 @@ class BotHttp:
     TODO 增加并发请求的锁控制 @veehou
     """
 
-    def __init__(self, timeout: int, is_sandbox: bool = False, app_id: str = None, token: str = None):
+    def __init__(
+        self,
+        timeout: int,
+        is_sandbox: bool = False,
+        app_id: str = None,
+        token: str = None,
+    ):
         self.timeout = timeout
         self.is_sandbox = is_sandbox
 
         self._token: Optional[Token] = None if not app_id else Token(app_id=app_id, access_token=token)
-        self._session: Optional[aiohttp.ClientSession] = None
         self._global_over: Optional[asyncio.Event] = None
         self._headers: Optional[dict] = None
 
-    async def close(self) -> None:
-        if self._session:
-            await self._session.close()
-
     async def check_session(self):
         if not self._headers:
             self._headers = {
                 "Authorization": f"{self._token.get_type()} {self._token.get_string()}",
                 "User-Agent": "botpy/v1",
             }
 
-        if not self._session or self._session.closed:
-            self._session = aiohttp.ClientSession(
-                headers=self._headers,
-                timeout=ClientTimeout(self.timeout),
-                connector=TCPConnector(limit=500, ssl=SSLContext()),
-            )
-
     async def request(self, route: Route, **kwargs: Any):
         # some checking if it's a JSON request
         if "json" in kwargs:
@@ -113,7 +107,7 @@ async def request(self, route: Route, **kwargs: Any):
                 for k, v in kwargs.pop("json").items():
                     if v:
                         if isinstance(v, dict):
-                            if k == 'message_reference':
+                            if k == "message_reference":
                                 _log.error(
                                     f"[botpy] 接口参数传入异常, 请求连接: {route.url}, "
                                     f"错误原因: file_image与message_reference不能同时传入，"
@@ -126,8 +120,19 @@ async def request(self, route: Route, **kwargs: Any):
         route.is_sandbox = self.is_sandbox
         _log.debug(f"[botpy] 请求头部: {self._headers}, 请求方式: {route.method}, 请求url: {route.url}")
 
-        async with self._session.request(method=route.method, url=route.url, **kwargs) as response:
-            return await _handle_response(response)
+        async with aiohttp.ClientSession(
+            headers=self._headers, connector=TCPConnector(limit=500, ssl=SSLContext())
+        ) as session:
+            _log.debug(session)
+
+            async with session.request(
+                method=route.method,
+                url=route.url,
+                timeout=(aiohttp.ClientTimeout(total=self.timeout)),
+                **kwargs,
+            ) as response:
+                _log.debug(response)
+                return await _handle_response(response)
 
     async def login(self, token: Token) -> robot.Robot:
         """login后保存token和session"""

examples/demo_at_reply.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
+import asyncio
 import os
 
 import botpy
 from botpy import logging
-
-from botpy.message import Message
 from botpy.ext.cog_yaml import read
+from botpy.message import Message
 
 test_config = read(os.path.join(os.path.dirname(__file__), "config.yaml"))
 
@@ -18,6 +18,9 @@ async def on_ready(self):
 
     async def on_at_message_create(self, message: Message):
         _log.info(message.author.avatar)
+        if "sleep" in message.content:
+            await asyncio.sleep(10)
+        _log.info(message.author.username)
         await message.reply(content=f"机器人{self.robot.name}收到你的@消息了: {message.content}")