satori-python-server 0.14.1__tar.gz → 0.14.3__tar.gz

{satori_python_server-0.14.1 → satori_python_server-0.14.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-server
-Version: 0.14.1
+Version: 0.14.3
 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>

{satori_python_server-0.14.1 → satori_python_server-0.14.3}/pyproject.toml

@@ -27,7 +27,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
 ]
-version = "0.14.1"
+version = "0.14.3"
 
 [project.license]
 text = "MIT"

{satori_python_server-0.14.1 → satori_python_server-0.14.3}/src/satori/server/__init__.py

@@ -20,7 +20,7 @@ from graia.amnesia.builtins.asgi import UvicornASGIService
 from launart import Launart, Service, any_completed
 from loguru import logger
 from starlette.applications import Starlette
-from starlette.datastructures import FormData
+from starlette.datastructures import FormData as FormData
 from starlette.requests import Request as StarletteRequest
 from starlette.responses import JSONResponse, Response
 from starlette.routing import Route, WebSocketRoute
@@ -34,7 +34,7 @@ from satori.model import Event, ModelBase, Opcode
 from .adapter import Adapter as Adapter
 from .conection import WebsocketConnection
 from .deque import Deque
-from .formdata import parse_content_disposition
+from .formdata import parse_content_disposition as parse_content_disposition
 from .model import Provider as Provider
 from .model import Request as Request
 from .model import Router as Router
@@ -94,6 +94,7 @@ class Server(Service, RouterMixin):
         self.path = path
         if self.path and not self.path.startswith("/"):
             self.path = f"/{self.path}"
+        self.url_base = f"http://{host}:{port}{self.path}/{version}"
         self._adapters = []
         self.providers = []
         self.routers = []
@@ -107,14 +108,13 @@ class Server(Service, RouterMixin):
 
     def apply(self, item: Provider | Router | Adapter):
         if isinstance(item, Adapter):
+            item.ensure_server(self)
             self._adapters.append(item)
             self.providers.append(item)
-            for proxy_url_pf in item.proxy_urls():
-                self.proxy_url_mapping[proxy_url_pf] = item
+            self.proxy_url_mapping[item.id] = item.proxy_urls()
         elif isinstance(item, Provider):
             self.providers.append(item)
-            for proxy_url_pf in item.proxy_urls():
-                self.proxy_url_mapping[proxy_url_pf] = item
+            self.proxy_url_mapping[item.id] = item.proxy_urls()
         elif isinstance(item, Router):
             self.routers.append(item)
         else:
@@ -159,20 +159,29 @@ class Server(Service, RouterMixin):
         for provider in self.providers:
             if not provider.authenticate(token):
                 return await ws.close(code=3000, reason="Unauthorized")
-            logins.extend(await provider.get_logins())
+            _logins = await provider.get_logins()
+            for _login in _logins:
+                _login.proxy_urls.extend(provider.proxy_urls())
+            logins.extend(_logins)
         sequence = body.get("sequence")
         if sequence is None:
             sequence = -1
         await connection.send({"op": Opcode.READY, "body": {"logins": [lo.dump() for lo in logins]}})
         self.connections.append(connection)
         logger.debug(f"New connection: {id(connection)}")
+        heartbeat_task = asyncio.create_task(connection.heartbeat())
+        close_task = asyncio.create_task(connection.close_signal.wait())
         try:
             if sequence > -1:
                 for event in self._event_cache.after(sequence):
                     await connection.send({"op": Opcode.EVENT, "body": event.dump()})
                     await asyncio.sleep(0.1)
-            await any_completed(connection.heartbeat(), connection.close_signal.wait())
+            await any_completed(heartbeat_task, close_task)
         finally:
+            await connection.connection_closed()
+            logger.debug(f"Connection closed: {id(connection)}")
+            heartbeat_task.cancel()
+            close_task.cancel()
             self.connections.remove(connection)
 
     async def admin_login_list_handler(self, request: StarletteRequest):
@@ -232,10 +241,11 @@ class Server(Service, RouterMixin):
             for provider in self.providers:
                 if provider.ensure(platform, self_id):
                     return await provider.download_uploaded(platform, self_id, path)
-        for proxy_url_pf, provider in self.proxy_url_mapping.items():
-            if url.startswith(proxy_url_pf):
-                async with self.session.get(url) as resp:
-                    return await resp.read()
+        for provider in self.providers:
+            for proxy_url_pf in self.proxy_url_mapping[provider.id]:
+                if url.startswith(proxy_url_pf):
+                    async with self.session.get(url) as resp:
+                        return await resp.read()
         raise ValueError(f"Unknown proxy url: {url}")
 
     def get_local_file(self, url: str):

{satori_python_server-0.14.1 → satori_python_server-0.14.3}/src/satori/server/adapter.py

@@ -1,14 +1,19 @@
 from abc import abstractmethod
 from collections.abc import AsyncIterator
-from typing import Optional
+from typing import TYPE_CHECKING, Optional
 
 from launart import Service
 
 from ..model import Event, Login
 from .route import RouterMixin
 
+if TYPE_CHECKING:
+    from . import Server
+
 
 class Adapter(Service, RouterMixin):
+    server: "Server"
+
     @abstractmethod
     def get_platform(self) -> str: ...
 
@@ -38,3 +43,6 @@ class Adapter(Service, RouterMixin):
     @property
     def id(self):
         return f"satori-python.adapter.{self.get_platform()}#{id(self)}"
+
+    def ensure_server(self, server: "Server"):
+        self.server = server

{satori_python_server-0.14.1 → satori_python_server-0.14.3}/src/satori/server/conection.py

@@ -22,7 +22,7 @@ class WebsocketConnection:
     async def heartbeat(self):
         while True:
             try:
-                msg = await asyncio.wait_for(self.connection.receive_json(), timeout=10)
+                msg = await asyncio.wait_for(self.connection.receive_json(), timeout=12)
                 if not isinstance(msg, dict) or msg.get("op") != Opcode.PING:
                     continue
                 await self.connection.send_json({"op": Opcode.PONG})

{satori_python_server-0.14.1 → satori_python_server-0.14.3}/src/satori/server/model.py

@@ -22,6 +22,9 @@ class Request(Generic[TP]):
 
 @runtime_checkable
 class Provider(Protocol):
+    @property
+    def id(self) -> str: ...
+
     def publisher(self) -> AsyncIterator[Event]: ...
 
     def authenticate(self, token: Optional[str]) -> bool: ...