satori-python-server 0.11.0__tar.gz → 0.11.2__tar.gz

{satori_python_server-0.11.0 → satori_python_server-0.11.2}/.mina/server.toml

@@ -1,5 +1,5 @@
 includes = ["src/satori/server"]
-raw-dependencies = ["satori-python-core >= 0.11.0"]
+raw-dependencies = ["satori-python-core >= 0.11.2"]
 
 [project]
 name = "satori-python-server"
@@ -8,6 +8,7 @@ authors = [
   {name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com"}
 ]
 dependencies = [
+    "aiohttp",
     "launart",
     "graia-amnesia",
     "starlette",

{satori_python_server-0.11.0 → satori_python_server-0.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-server
-Version: 0.11.0
+Version: 0.11.2
 Summary: Satori Protocol SDK for python, specify server part
 Home-page: https://github.com/RF-Tar-Railt/satori-python
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>
@@ -17,11 +17,12 @@ Classifier: Operating System :: OS Independent
 Project-URL: Homepage, https://github.com/RF-Tar-Railt/satori-python
 Project-URL: Repository, https://github.com/RF-Tar-Railt/satori-python
 Requires-Python: >=3.8
+Requires-Dist: aiohttp>=3.9.3
 Requires-Dist: launart>=0.8.2
 Requires-Dist: graia-amnesia>=0.9.0
 Requires-Dist: starlette>=0.37.2
 Requires-Dist: uvicorn[standard]>=0.28.0
-Requires-Dist: satori-python-core>=0.11.0
+Requires-Dist: satori-python-core>=0.11.2
 Description-Content-Type: text/markdown
 
 # satori-python

{satori_python_server-0.11.0 → satori_python_server-0.11.2}/pyproject.toml

@@ -5,11 +5,12 @@ authors = [
     { name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com" },
 ]
 dependencies = [
+    "aiohttp>=3.9.3",
     "launart>=0.8.2",
     "graia-amnesia>=0.9.0",
     "starlette>=0.37.2",
     "uvicorn[standard]>=0.28.0",
-    "satori-python-core >= 0.11.0",
+    "satori-python-core >= 0.11.2",
 ]
 description = "Satori Protocol SDK for python, specify server part"
 readme = "README.md"
@@ -25,7 +26,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
 ]
-version = "0.11.0"
+version = "0.11.2"
 
 [project.license]
 text = "MIT"

{satori_python_server-0.11.0 → satori_python_server-0.11.2}/src/satori/server/__init__.py

@@ -1,10 +1,12 @@
 from __future__ import annotations
 
 import asyncio
+import functools
 import signal
+import threading
 from contextlib import suppress
 from traceback import print_exc
-from typing import Callable, Iterable, Literal, cast, overload
+from typing import Any, Callable, Iterable, Literal, cast, overload
 
 import aiohttp
 from creart import it
@@ -383,8 +385,27 @@ class Server(Service):
         manager.add_component(self)
         manager.launch_blocking(loop=loop, stop_signal=stop_signal)
 
-    async def run_async(self, manager: Launart | None = None):
+    async def run_async(
+        self,
+        manager: Launart | None = None,
+        stop_signal: Iterable[signal.Signals] = (signal.SIGINT,),
+    ):
         if manager is None:
             manager = it(Launart)
         manager.add_component(self)
-        await manager.launch()
+        handled_signals: dict[signal.Signals, Any] = {}
+        launch_task = asyncio.create_task(manager.launch(), name="amnesia-launch")
+        signal_handler = functools.partial(manager._on_sys_signal, main_task=launch_task)
+        if threading.current_thread() is threading.main_thread():  # pragma: worst case
+            try:
+                for sig in stop_signal:
+                    handled_signals[sig] = signal.getsignal(sig)
+                    signal.signal(sig, signal_handler)
+            except ValueError:  # pragma: no cover
+                # `signal.signal` may throw if `threading.main_thread` does
+                # not support signals
+                handled_signals.clear()
+        await launch_task
+        for sig, handler in handled_signals.items():
+            if signal.getsignal(sig) is signal_handler:
+                signal.signal(sig, handler)