entari-plugin-server 0.8.0__tar.gz → 0.8.2__tar.gz

{entari_plugin_server-0.8.0 → entari_plugin_server-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: entari-plugin-server
-Version: 0.8.0
+Version: 0.8.2
 Summary: Entari plugin for running Satori Server
 Keywords: server,adapters,satori,entari,plugin
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>
@@ -8,8 +8,10 @@ License: MIT
 Project-URL: homepage, https://github.com/ArcletProject/entari-plugin-server
 Project-URL: repository, https://github.com/ArcletProject/entari-plugin-server
 Requires-Python: >=3.11
-Requires-Dist: arclet-entari>=0.19.0rc1
-Requires-Dist: satori-python-server<1.4.0,>=1.3.0
+Requires-Dist: arclet-entari>=0.19.0.post2
+Requires-Dist: satori-python-server<1.4.0,>=1.3.11
+Requires-Dist: satori-python-core<1.4.0,>=1.3.11
+Requires-Dist: satori-python-client<1.4.0,>=1.3.11
 Provides-Extra: fastapi
 Requires-Dist: fastapi>=0.116.1; extra == "fastapi"
 Description-Content-Type: text/markdown

{entari_plugin_server-0.8.0 → entari_plugin_server-0.8.2}/pyproject.toml

@@ -1,13 +1,15 @@
 [project]
 name = "entari-plugin-server"
-version = "0.8.0"
+version = "0.8.2"
 description = "Entari plugin for running Satori Server"
 authors = [
     { name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com" },
 ]
 dependencies = [
-    "arclet-entari>=0.19.0rc1",
-    "satori-python-server<1.4.0,>=1.3.0",
+    "arclet-entari>=0.19.0.post2",
+    "satori-python-server<1.4.0,>=1.3.11",
+    "satori-python-core<1.4.0,>=1.3.11",
+    "satori-python-client<1.4.0,>=1.3.11",
 ]
 requires-python = ">=3.11"
 readme = "README.md"
@@ -45,8 +47,8 @@ typeCheckingMode = "basic"
 
 [dependency-groups]
 dev = [
-    "arclet-entari[dotenv,reload,yaml]>=0.17.0",
-    "satori-python-adapter-onebot11>=0.4.4",
+    "arclet-entari[dotenv,reload,yaml]>=0.19.2.post2",
+    "satori-python-adapter-onebot11>=0.5.2",
     "satori-python-adapter-console>=0.5.3",
     "fastapi>=0.116.1",
     "graia-amnesia>=0.11.5",

{entari_plugin_server-0.8.0 → entari_plugin_server-0.8.2}/src/entari_plugin_server/__init__.py

@@ -33,7 +33,7 @@ plugin.metadata(
     "server",
     PluginRole.LIBRARY,
     [{"name": "RF-Tar-Railt", "email": "rf_tar_railt@qq.com"}],
-    "0.8.0",
+    "0.8.2",
     description="为 Entari 提供 Satori 服务器支持，基于此为 Entari 提供 ASGI 服务、适配器连接等功能",
     urls={
         "homepage": "https://github.com/ArcletProject/entari-plugin-server",

{entari_plugin_server-0.8.0 → entari_plugin_server-0.8.2}/src/entari_plugin_server/_adapter.py

@@ -6,11 +6,10 @@ from launart.status import Phase
 from starlette.datastructures import FormData
 from starlette.responses import JSONResponse, Response
 
-from satori import Api
+from satori import Api, Login
 from satori.exception import ActionFailed
 from satori.server import Adapter as BaseAdapter
 from satori.server import Request
-from satori.server.adapter import LoginType
 
 
 class EntariAdapter(BaseAdapter):
@@ -67,7 +66,7 @@ class EntariAdapter(BaseAdapter):
         async with self.server.session.get(path) as resp:
             return Response(await resp.read())
 
-    async def get_logins(self) -> list[LoginType]:
+    async def get_logins(self) -> list[Login]:
         return [acc.self_info for acc in self.app.accounts.values()]
 
     @property

{entari_plugin_server-0.8.0 → entari_plugin_server-0.8.2}/src/entari_plugin_server/patch.py

@@ -1,10 +1,12 @@
 from io import BytesIO
+from typing import TYPE_CHECKING
 
 from arclet.entari import Entari
 from arclet.entari.logger import log
 from arclet.entari.session import EntariProtocol
 from arclet.letoderea.utils import add_task
-from satori import Api, Event
+from satori import Api, Event, EventType, LoginStatus
+from satori import event as events
 from satori.client import Account, ApiInfo
 from satori.exception import (
     ActionFailed,
@@ -96,18 +98,68 @@ class DirectAdapterServer(Server):
         for provider in self.providers:
             proxy_urls.extend(provider.proxy_urls())
         await super().post(event)
-        login_sn = f"{event.login.platform}_{event.login.user.id}@{id(self):x}"
-        if login_sn not in app.accounts:
-            acc = Account(
-                event.login,
-                ApiInfo(self.host, self.port, self.path, self.token),  # type: ignore
-                proxy_urls,
-                DirectAdapterProtocol
+        config = ApiInfo(self.host, self.port, self.path, self.token)
+        if event.type in (EventType.LOGIN_ADDED, EventType.LOGIN_UPDATED):
+            if TYPE_CHECKING:
+                assert isinstance(event, events.LoginEvent)
+            login = event.login
+            if not login.user:
+                logger.warning(f"Received login-updated event without user info: {login}")
+                return
+            login_sn = login.identifier
+            if login_sn not in app.accounts:
+                account = Account(
+                    login,
+                    config,
+                    proxy_urls,
+                    DirectAdapterProtocol,
+                )
+                logger.info(f"account added: {account}")
+            else:
+                account = app.accounts[login_sn].custom(protocol_cls=DirectAdapterProtocol)
+                account.self_info = login
+                account.config = config
+                logger.info(f"account updated: {account} to {login.status.name}")
+            app.accounts[login_sn] = account
+            account.protocol.server = self
+            (
+                account.connected.set()
+                if login.status in (LoginStatus.ONLINE, LoginStatus.CONNECT)
+                else account.connected.clear()
             )
-            acc.protocol.server = self
-            app.accounts[login_sn] = acc
-            logger.debug(f"account added: {acc}")
+            await app.account_update(account, login.status)
+        elif event.type == EventType.LOGIN_REMOVED:
+            if TYPE_CHECKING:
+                assert isinstance(event, events.LoginEvent)
+            login = event.login
+            if not login.user:
+                logger.warning(f"Received login-removed event without user info: {login}")
+                return
+            login_sn = login.identifier
+            if login_sn not in app.accounts:
+                logger.warning(f"Received event for unknown account: {event}")
+                return
+            account = app.accounts[login_sn].custom(protocol_cls=DirectAdapterProtocol)
+            app.accounts[login_sn] = account
+            account.protocol.server = self
+            account.config = config
+            account.self_info = login
         else:
-            acc = app.accounts[login_sn].custom(protocol_cls=DirectAdapterProtocol)
-            acc.protocol.server = self
-        add_task(app.handle_event(acc, event))
+            login_sn = event.login.identifier
+            if login_sn not in app.accounts:
+                logger.warning(f"Received event for unknown account: {event}")
+                return
+            account = app.accounts[login_sn].custom(protocol_cls=DirectAdapterProtocol)
+            app.accounts[login_sn] = account
+            account.protocol.server = self
+            account.config = config
+
+        if app.event_callbacks:
+            for callback in app.event_callbacks:
+                add_task(callback(account, event))  # type: ignore
+
+        if event.type == EventType.LOGIN_REMOVED:
+            logger.info(f"account removed: {account}")
+            account.connected.clear()
+            await app.account_update(account, event.login.status)
+            del app.accounts[login_sn]