ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2025-07-28 00:31:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

✨ cqhttp support forward websocket

Browse Source
This commit is contained in:
yanyongyu
2021-07-19 23:46:29 +08:00
parent 32787fdc1e
commit 04b3fda40c
5 changed files with 46 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nonebot/adapters/_base.py
View File

@ -71,11 +71,11 @@ class Bot(abc.ABC):
raise NotImplementedError
@classmethod
def register(cls, driver: Driver, config: Config):
def register(cls, driver: Driver, config: Config, **kwargs):
"""
:说明:
`register` 方法会在 `driver.register_adapter` 时被调用，用于初始化相关配置
``register`` 方法会在 ``driver.register_adapter`` 时被调用，用于初始化相关配置
"""
cls.driver = driver
cls.config = config

4
nonebot/drivers/__init__.py
View File

@ -84,6 +84,7 @@ class Driver(abc.ABC):
* ``name: str``: 适配器名称，用于在连接时进行识别
* ``adapter: Type[Bot]``: 适配器 Class
* ``**kwargs``: 其他传递给适配器的参数
"""
if name in self._adapters:
logger.opt(
@ -195,7 +196,8 @@ class Driver(abc.ABC):
class ForwardDriver(Driver):
@abc.abstractmethod
def setup(self, adapter: str, request: "HTTPConnection") -> None:
def setup(self, adapter: str, self_id: str,
request: "HTTPConnection") -> None:
raise NotImplementedError

26
nonebot/drivers/aiohttp.py
View File

@ -24,6 +24,7 @@ AVAILABLE_REQUEST = Union[HTTPRequest, WebSocket]
@dataclass
class RequestSetup:
adapter: str
self_id: str
request: AVAILABLE_REQUEST
poll_interval: float
reconnect_interval: float
@ -61,13 +62,15 @@ class Driver(ForwardDriver):
@overrides(ForwardDriver)
def setup(self,
adapter: str,
self_id: str,
request: HTTPConnection,
poll_interval: float = 3.,
reconnect_interval: float = 3.) -> None:
if not isinstance(request, (HTTPRequest, WebSocket)):
raise TypeError(f"Request Type {type(request)!r} is not supported!")
self.requests.append(
RequestSetup(adapter, request, poll_interval, reconnect_interval))
RequestSetup(adapter, self_id, request, poll_interval,
reconnect_interval))
@overrides(ForwardDriver)
def run(self, *args, **kwargs):
@ -90,11 +93,11 @@ class Driver(ForwardDriver):
for setup in self.requests:
if isinstance(setup.request, HTTPRequest):
setups.append(
self._http_setup(setup.adapter, setup.request,
setup.poll_interval))
self._http_setup(setup.adapter, setup.self_id,
setup.request, setup.poll_interval))
else:
setups.append(
self._ws_setup(setup.adapter, setup.request,
self._ws_setup(setup.adapter, setup.self_id, setup.request,
setup.reconnect_interval))
try:
@ -142,26 +145,17 @@ class Driver(ForwardDriver):
loop.stop()
async def _http_setup(self, adapter: str, request: HTTPRequest,
poll_interval: float):
async def _http_setup(self, adapter: str, self_id: str,
request: HTTPRequest, poll_interval: float):
BotClass = self._adapters[adapter]
self_id, _ = await BotClass.check_permission(self, request)
if not self_id:
raise SetupFailed("Bot self_id get failed")
bot = BotClass(self_id, request)
self._bot_connect(bot)
asyncio.create_task(self._http_loop(bot, request, poll_interval))
async def _ws_setup(self, adapter: str, request: WebSocket,
async def _ws_setup(self, adapter: str, self_id: str, request: WebSocket,
reconnect_interval: float):
BotClass = self._adapters[adapter]
self_id, _ = await BotClass.check_permission(self, request)
if not self_id:
raise SetupFailed("Bot self_id get failed")
bot = BotClass(self_id, request)
self._bot_connect(bot)
asyncio.create_task(self._ws_loop(bot, request, reconnect_interval))