satori-python-adapter-onebot11 0.3.0__tar.gz → 0.3.2__tar.gz

{satori_python_adapter_onebot11-0.3.0 → satori_python_adapter_onebot11-0.3.2}/.mina/adapter_onebot11.toml

@@ -3,7 +3,7 @@ raw-dependencies = ["satori-python-server >= 0.18.0"]
 
 [project]
 name = "satori-python-adapter-onebot11"
-version = "0.3.0"
+version = "0.3.2"
 authors = [
   {name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com"}
 ]

{satori_python_adapter_onebot11-0.3.0 → satori_python_adapter_onebot11-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-adapter-onebot11
-Version: 0.3.0
+Version: 0.3.2
 Summary: Satori Protocol SDK for python, adapter for OneBot 11
 Home-page: https://github.com/RF-Tar-Railt/satori-python
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>
@@ -76,7 +76,7 @@ pip install satori-python-server
 | OneBot V11 | `pip install satori-python-adapter-onebot11` | satori.adapters.onebot11.forward, satori.adapters.onebot11.reverse |
 | Console    | `pip install satori-python-adapter-console`  | satori.adapters.console                                            |
 | Milky      | `pip install satori-python-adapter-milky`    | satori.adapters.milky.main, satori.adapters.milky.webhook          |
-| QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.milky.main, satori.adapters.milky.websocket        |
+| QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.qq.main, satori.adapters.qq.websocket              |
 
 ### 社区适配器
 

{satori_python_adapter_onebot11-0.3.0 → satori_python_adapter_onebot11-0.3.2}/README.md

@@ -54,7 +54,7 @@ pip install satori-python-server
 | OneBot V11 | `pip install satori-python-adapter-onebot11` | satori.adapters.onebot11.forward, satori.adapters.onebot11.reverse |
 | Console    | `pip install satori-python-adapter-console`  | satori.adapters.console                                            |
 | Milky      | `pip install satori-python-adapter-milky`    | satori.adapters.milky.main, satori.adapters.milky.webhook          |
-| QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.milky.main, satori.adapters.milky.websocket        |
+| QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.qq.main, satori.adapters.qq.websocket              |
 
 ### 社区适配器
 

{satori_python_adapter_onebot11-0.3.0 → satori_python_adapter_onebot11-0.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "satori-python-adapter-onebot11"
-version = "0.3.0"
+version = "0.3.2"
 authors = [
     { name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com" },
 ]

{satori_python_adapter_onebot11-0.3.0 → satori_python_adapter_onebot11-0.3.2}/src/satori/adapters/onebot11/api.py

@@ -223,18 +223,18 @@ def apply(adapter: Adapter, net_getter: Callable[[str], OneBotNetwork], login_ge
     @adapter.route(Api.CHANNEL_LIST)
     async def channel_list(request: Request[ChannelListParam]):
         net = net_getter(request.self_id)
-        result: list[dict] = await net.call_api("get_group_list", {})  # type: ignore
-        return PageResult(
-            [
-                Channel(
-                    str(item["group_id"]),
-                    ChannelType.TEXT,
-                    item["group_name"],
-                    GROUP_AVATAR_URL.format(group=item["group_id"]),
-                )
-                for item in result
-            ]
-        )
+        result = await net.call_api("get_group_info", {"group_id": int(request.params["guild_id"])})
+        if not result:
+            raise RuntimeError(f"Failed to get group {request.params['guild_id']}")
+        channels = [
+            Channel(
+                str(result["group_id"]),
+                ChannelType.TEXT,
+                result["group_name"],
+                GROUP_AVATAR_URL.format(group=result["group_id"]),
+            )
+        ]
+        return PageResult(channels)
 
     @adapter.route(Api.GUILD_LIST)
     async def guild_list(request: Request[GuildListParam]):

{satori_python_adapter_onebot11-0.3.0 → satori_python_adapter_onebot11-0.3.2}/src/satori/adapters/onebot11/events/notice.py

@@ -89,16 +89,6 @@
 #             scene=group,
 #         )
 #
-#     @m.entity(OneBot11Capability.event_callback, raw_event="notice.friend_add")
-#     async def friend_add(self, raw_event: dict):
-#         self_id = raw_event["self_id"]
-#         account = self.connection.accounts.get(self_id)
-#         if account is None:
-#             logger.warning(f"Unknown account {self_id} received message {raw_event}")
-#             return
-#         friend = Selector().land("qq").friend(str(raw_event["user_id"]))
-#         context = Context(account, friend, friend, friend, account.route)
-#         return DirectSessionCreated(context)
 #
 #     @m.entity(OneBot11Capability.event_callback, raw_event="notice.notify.poke")
 #     async def nudge_received(self, raw_event: dict):
@@ -351,3 +341,22 @@ async def group_increase(login: Login, net: OneBotNetwork, raw: dict):
         operator=operator,
         role=Role("MEMBER", "群成员"),
     )
+
+
+@register_event("notice.friend_add")
+async def friend_add(login: Login, net: OneBotNetwork, raw: dict):
+    user_info = await net.call_api("get_stranger_info", {"user_id": raw["user_id"]})
+    user = User(
+        str(raw["user_id"]),
+        user_info["nickname"],
+        user_info.get("card"),
+        USER_AVATAR_URL.format(uin=raw["user_id"]),
+    )
+    channel = Channel(f"private:{raw['user_id']}", ChannelType.DIRECT, user_info["nickname"])
+    return Event(
+        EventType.FRIEND_ADDED,
+        datetime.now(),
+        login=login,
+        user=user,
+        channel=channel,
+    )

{satori_python_adapter_onebot11-0.3.0 → satori_python_adapter_onebot11-0.3.2}/src/satori/adapters/onebot11/forward.py

@@ -34,9 +34,11 @@ class OneBot11ForwardAdapter(BaseAdapter):
         self,
         endpoint: str | URL,
         access_token: str | None = None,
+        timeout: float = 60,
     ):
         super().__init__()
         self.endpoint = URL(endpoint)
+        self.timeout = timeout
         self.access_token = access_token
         self.close_signal = asyncio.Event()
         self.response_waiters: dict[str, asyncio.Future] = {}
@@ -154,6 +156,7 @@ class OneBot11ForwardAdapter(BaseAdapter):
                     if (access_token := self.access_token) is not None
                     else None
                 ),
+                timeout=self.timeout,
             )
             try:
                 self.connection = await ctx.__aenter__()
@@ -187,6 +190,8 @@ class OneBot11ForwardAdapter(BaseAdapter):
                 for login in self.logins.values():
                     login.status = LoginStatus.OFFLINE
                     await self.server.post(Event(EventType.LOGIN_REMOVED, datetime.now(), login))
+                for fut in self.response_waiters.values():
+                    fut.cancel()
                 await asyncio.sleep(1)
                 return
             if close_task in done:
@@ -195,6 +200,8 @@ class OneBot11ForwardAdapter(BaseAdapter):
                 for login in self.logins.values():
                     login.status = LoginStatus.RECONNECT
                     await self.server.post(Event(EventType.LOGIN_UPDATED, datetime.now(), login))
+                for fut in self.response_waiters.values():
+                    fut.cancel()
                 await asyncio.sleep(5)
                 logger.info(f"{self} Reconnecting...")
                 continue
@@ -229,7 +236,7 @@ class OneBot11ForwardAdapter(BaseAdapter):
 
         try:
             await self.connection.send_str(encode({"action": action, "params": params or {}, "echo": echo}))
-            result = await future
+            result = await asyncio.wait_for(future, timeout=self.timeout)
         finally:
             del self.response_waiters[echo]
 

{satori_python_adapter_onebot11-0.3.0 → satori_python_adapter_onebot11-0.3.2}/src/satori/adapters/onebot11/reverse.py

@@ -31,10 +31,17 @@ class _Connection:
         self.response_waiters: dict[str, asyncio.Future] = {}
 
     async def message_receive(self):
-        async for msg in self.ws.iter_text():
-            yield self, decode(msg)
-        else:
-            self.close_signal.set()
+
+        while True:
+            message = await self.ws.receive()
+
+            if message["type"] == "websocket.disconnect":
+                break
+            yield self, decode(message["text"])
+        # async for msg in self.ws.iter_text():
+        #     yield self, decode(msg)
+        # else:
+        self.close_signal.set()
 
     async def message_handle(self):
         async for connection, data in self.message_receive():
@@ -116,7 +123,7 @@ class _Connection:
 
         try:
             await self.ws.send_text(encode({"action": action, "params": params or {}, "echo": echo}))
-            result = await future
+            result = await asyncio.wait_for(future, timeout=self.adapter.timeout)
         finally:
             del self.response_waiters[echo]
 
@@ -134,12 +141,14 @@ class OneBot11ReverseAdapter(BaseAdapter):
         path: str = "onebot/v11",
         endpoint: str = "ws",
         access_token: str | None = None,
+        timeout: int = 60,
     ):
         super().__init__()
         self.endpoint = URL(prefix) / path / endpoint
         self.access_token = access_token
         self.logins: dict[str, Login] = {}
         self.connections: dict[str, _Connection] = {}
+        self.timeout = timeout
 
         apply(self, lambda _: self.connections[_], lambda _: self.logins[_])
 
@@ -180,6 +189,9 @@ class OneBot11ReverseAdapter(BaseAdapter):
         finally:
             del self.connections[account_id]
             logger.info(f"Websocket {ws} closed")
+            if connection.response_waiters:
+                for future in connection.response_waiters.values():
+                    future.cancel()
             self.logins[account_id].status = LoginStatus.OFFLINE
             await self.server.post(Event(EventType.LOGIN_REMOVED, datetime.now(), self.logins[account_id]))
             await asyncio.sleep(1)