entari-plugin-server 0.6.2__tar.gz → 0.7.1__tar.gz

{entari_plugin_server-0.6.2 → entari_plugin_server-0.7.1}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: entari-plugin-server
-Version: 0.6.2
+Version: 0.7.1
 Summary: Entari plugin for running Satori Server
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>
 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.10
-Requires-Dist: arclet-entari<0.18.0,>=0.17.0rc1
+Requires-Dist: arclet-entari<0.19.0,>=0.18.0rc4
 Requires-Dist: satori-python-server<1.4.0,>=1.3.0
 Provides-Extra: fastapi
 Requires-Dist: fastapi>=0.116.1; extra == "fastapi"

{entari_plugin_server-0.6.2 → entari_plugin_server-0.7.1}/pyproject.toml

@@ -1,12 +1,12 @@
 [project]
 name = "entari-plugin-server"
-version = "0.6.2"
+version = "0.7.1"
 description = "Entari plugin for running Satori Server"
 authors = [
     { name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com" },
 ]
 dependencies = [
-    "arclet-entari<0.18.0,>=0.17.0rc1",
+    "arclet-entari<0.19.0,>=0.18.0rc4",
     "satori-python-server<1.4.0,>=1.3.0",
 ]
 requires-python = ">=3.10"
@@ -33,12 +33,15 @@ build-backend = "pdm.backend"
 [tool.pdm]
 distribution = true
 
+[tool.pyright]
+typeCheckingMode = "basic"
+
 [dependency-groups]
 dev = [
     "arclet-entari[dotenv,reload,yaml]>=0.17.0",
-    "satori-python-adapter-onebot11>=0.4.1",
-    "satori-python-adapter-console>=0.5.1",
+    "satori-python-adapter-onebot11>=0.4.4",
+    "satori-python-adapter-console>=0.5.3",
     "fastapi>=0.116.1",
     "graia-amnesia>=0.11.5",
-    "satori-python-adapter-qq>=0.2.0",
+    "satori-python-adapter-qq>=0.4.0rc4",
 ]

{entari_plugin_server-0.6.2 → entari_plugin_server-0.7.1}/src/entari_plugin_server/__init__.py

@@ -8,12 +8,13 @@ from typing import TYPE_CHECKING, Any, Callable, Optional, Union, cast
 from arclet.entari.config.models.default import BasicConfModel
 from typing_extensions import TypeAlias
 
-from arclet.entari import plugin
+from arclet.entari import Plugin, plugin
+from arclet.entari.plugin import PluginRole
 from arclet.entari.config import EntariConfig
 from arclet.entari.config import config_model_validate
 from arclet.entari import logger as log_m
 
-from arclet.letoderea.typing import TCallable
+from arclet.letoderea.utils import TCallable
 from graia.amnesia.builtins.asgi import uvicorn, asgitypes
 from satori.server import Adapter, Server
 from starlette.applications import Starlette
@@ -28,11 +29,13 @@ DISPOSE: TypeAlias = Callable[[], None]
 uvicorn.LoguruHandler = log_m.LoguruHandler
 
 
+plg = Plugin.current()
 plugin.declare_static()
 plugin.metadata(
     "server",
+    PluginRole.LIBRARY,
     [{"name": "RF-Tar-Railt", "email": "rf_tar_railt@qq.com"}],
-    "0.6.2",
+    "0.7.1",
     description="为 Entari 提供 Satori 服务器支持，基于此为 Entari 提供 ASGI 服务、适配器连接等功能",
     urls={
         "homepage": "https://github.com/ArcletProject/entari-plugin-server",
@@ -117,11 +120,19 @@ plugin.add_service(ASGI := server.asgi_service)
 plugin.add_service(server)
 
 
+def _remove_subsequence(seq, subseq):
+    # 找到子序列的起始索引
+    for i in range(len(seq) - len(subseq) + 1):
+        if seq[i:i + len(subseq)] == subseq:
+            return seq[:i] + seq[i + len(subseq):]
+    return seq  # 如果没找到，返回原序列
+
+
 def get_asgi() -> Any:
     return server.app
 
 
-def replace_asgi(app: Union[ASGIApp, asgitypes.ASGI3Application]) -> DISPOSE:
+def replace_asgi(app: Union[ASGIApp, asgitypes.ASGI3Application]):
     """
     替换当前的 ASGI 应用
 
@@ -132,26 +143,21 @@ def replace_asgi(app: Union[ASGIApp, asgitypes.ASGI3Application]) -> DISPOSE:
         logger.warning("Server is blocking, cannot replace ASGI app")
         return lambda: None
 
-    old_app = server.app
-    old_routes = cast(Starlette, old_app).router.routes.copy()
-    server.app = app
-    server.app.router.routes[:0] = old_routes  # type: ignore
-
-    def remove_subsequence(seq, subseq):
-        # 找到子序列的起始索引
-        for i in range(len(seq) - len(subseq) + 1):
-            if seq[i:i + len(subseq)] == subseq:
-                return seq[:i] + seq[i + len(subseq):]
-        return seq  # 如果没找到，返回原序列
-
-    def dispose(_old=old_app, _old_routes=old_routes):
-        server.app.router.routes = remove_subsequence(  # type: ignore
-            cast(Starlette, server.app).router.routes, _old_routes
-        )
-        server.app = _old
+    def _():
+        old_app = server.app
+        old_routes = cast(Starlette, old_app).router.routes.copy()
+        server.app = app
+        server.app.router.routes[:0] = old_routes  # type: ignore
 
-    plugin.collect_disposes(cast(DISPOSE, dispose))
-    return cast(DISPOSE, dispose)
+        def dispose(_old=old_app, _old_routes=old_routes):
+            server.app.router.routes = _remove_subsequence(  # type: ignore
+                cast(Starlette, server.app).router.routes, _old_routes
+            )
+            server.app = _old
+
+        return dispose
+
+    return plg.effect(_, "replace_asgi")
 
 
 def add_route(
@@ -175,12 +181,15 @@ def add_route(
     def wrapper(endpoint: TCallable, /) -> TCallable:
         app = cast(Starlette, server.app)
         fn = getattr(app.router, "add_api_route", app.router.add_route)
-        fn(
-            path, endpoint, methods=methods, name=name, include_in_schema=include_in_schema, **kwargs
-        )
-        route = app.router.routes[-1]
-        plug = plugin.get_plugin(1)
-        plug.collect(lambda: app.router.routes.remove(route))
+
+        def _():
+            fn(
+                path, endpoint, methods=methods, name=name, include_in_schema=include_in_schema, **kwargs
+            )
+            route = app.router.routes[-1]
+            return lambda: app.router.routes.remove(route)
+
+        plg.effect(_, f"add_route {path} {methods}")
         return endpoint
 
     return wrapper
@@ -203,12 +212,15 @@ def add_websocket_route(
     def wrapper(endpoint: TCallable, /) -> TCallable:
         app = cast(Starlette, server.app)
         fn = getattr(app.router, "add_api_websocket_route", app.router.add_websocket_route)
-        fn(
-            path, endpoint, name=name, **kwargs
-        )
-        route = app.router.routes[-1]
-        plug = plugin.get_plugin(1)
-        plug.collect(lambda: app.router.routes.remove(route))
+
+        def _():
+            fn(
+                path, endpoint, name=name, **kwargs
+            )
+            route = app.router.routes[-1]
+            return lambda: app.router.routes.remove(route)
+
+        plg.effect(_, f"add_websocket_route {path}")
         return endpoint
 
     return wrapper

{entari_plugin_server-0.6.2 → entari_plugin_server-0.7.1}/src/entari_plugin_server/patch.py

@@ -104,7 +104,7 @@ class DirectAdapterServer(Server):
             )
             acc.protocol.server = self
             app.accounts[login_sn] = acc
-            logger.info(f"account added: {acc}")
+            logger.debug(f"account added: {acc}")
         else:
             acc = app.accounts[login_sn].custom(protocol_cls=DirectAdapterProtocol)
             acc.protocol.server = self