satori-python-server 0.14.4__tar.gz → 0.15.0__tar.gz

{satori_python_server-0.14.4 → satori_python_server-0.15.0}/.mina/server.toml

@@ -1,5 +1,5 @@
 includes = ["src/satori/server"]
-raw-dependencies = ["satori-python-core >= 0.11.4"]
+raw-dependencies = ["satori-python-core >= 0.15.0"]
 
 [project]
 name = "satori-python-server"

{satori_python_server-0.14.4 → satori_python_server-0.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-server
-Version: 0.14.4
+Version: 0.15.0
 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>
@@ -23,7 +23,7 @@ Requires-Dist: graia-amnesia>=0.9.0
 Requires-Dist: starlette[python-multipart]>=0.37.2
 Requires-Dist: uvicorn[standard]>=0.28.0
 Requires-Dist: python-multipart>=0.0.9
-Requires-Dist: satori-python-core>=0.11.4
+Requires-Dist: satori-python-core>=0.15.0
 Description-Content-Type: text/markdown
 
 # satori-python
@@ -44,6 +44,7 @@ Description-Content-Type: text/markdown
 目前提供了 `satori` 协议实现的有：
 
 - [Chronocat](https://chronocat.vercel.app)
+- [nekobox](https://github.com/wyapx/nekobox)
 - Koishi （搭配 `@koishijs/plugin-server`）
 
 ### 使用该 SDK 的框架

{satori_python_server-0.14.4 → satori_python_server-0.15.0}/README.md

@@ -16,6 +16,7 @@
 目前提供了 `satori` 协议实现的有：
 
 - [Chronocat](https://chronocat.vercel.app)
+- [nekobox](https://github.com/wyapx/nekobox)
 - Koishi （搭配 `@koishijs/plugin-server`）
 
 ### 使用该 SDK 的框架

{satori_python_server-0.14.4 → satori_python_server-0.15.0}/pyproject.toml

@@ -11,7 +11,7 @@ dependencies = [
     "starlette[python-multipart]>=0.37.2",
     "uvicorn[standard]>=0.28.0",
     "python-multipart>=0.0.9",
-    "satori-python-core >= 0.11.4",
+    "satori-python-core >= 0.15.0",
 ]
 description = "Satori Protocol SDK for python, specify server part"
 readme = "README.md"
@@ -27,7 +27,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
 ]
-version = "0.14.4"
+version = "0.15.0"
 
 [project.license]
 text = "MIT"
@@ -39,6 +39,7 @@ repository = "https://github.com/RF-Tar-Railt/satori-python"
 [build-system]
 requires = [
     "mina-build<0.6,>=0.5.1",
+    "pdm-backend<2.4.0",
 ]
 build-backend = "mina.backend"
 

{satori_python_server-0.14.4 → satori_python_server-0.15.0}/src/satori/server/__init__.py

@@ -22,9 +22,10 @@ from loguru import logger
 from starlette.applications import Starlette
 from starlette.datastructures import FormData as FormData
 from starlette.requests import Request as StarletteRequest
-from starlette.responses import JSONResponse, Response, StreamingResponse
+from starlette.responses import FileResponse, JSONResponse, Response, StreamingResponse
 from starlette.routing import Route, WebSocketRoute
-from starlette.websockets import WebSocket
+from starlette.staticfiles import StaticFiles
+from starlette.websockets import WebSocket, WebSocketDisconnect
 from yarl import URL
 
 from satori.config import WebhookInfo
@@ -33,13 +34,13 @@ 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 as parse_content_disposition
 from .model import Provider as Provider
 from .model import Request as Request
 from .model import Router as Router
 from .route import RouteCall as RouteCall
 from .route import RouterMixin as RouterMixin
+from .utils import Deque
 
 
 async def _request_handler(method: str, request: StarletteRequest, func: RouteCall):
@@ -103,11 +104,11 @@ class Server(Service, RouterMixin):
         self.routes = {}
         self.webhooks = webhooks or []
         self._tempdir = TemporaryDirectory()
-        self.proxy_url_mapping = {}
         self._sequence = 0
         self._event_cache = Deque(maxlen=100)
         self.stream_threshold = stream_threshold
         self.stream_chunk_size = stream_chunk_size
+        self.resources: dict[str, Path] = {}
         super().__init__()
 
     def apply(self, item: Provider | Router | Adapter):
@@ -115,15 +116,17 @@ class Server(Service, RouterMixin):
             item.ensure_server(self)
             self._adapters.append(item)
             self.providers.append(item)
-            self.proxy_url_mapping[item.id] = item.proxy_urls()
         elif isinstance(item, Provider):
             self.providers.append(item)
-            self.proxy_url_mapping[item.id] = item.proxy_urls()
         elif isinstance(item, Router):
             self.routers.append(item)
         else:
             raise TypeError(f"Unknown config type: {item}")
 
+    def mount(self, route_path: str, file: Path):
+        """在指定路径挂载静态文件"""
+        self.resources[route_path] = file
+
     async def event_callback(self, event: Event):
         event.id = self._sequence
         self._event_cache.append(event)
@@ -131,6 +134,8 @@ class Server(Service, RouterMixin):
         for connection in self.connections:
             try:
                 await connection.send({"op": Opcode.EVENT, "body": event.dump()})
+            except WebSocketDisconnect:
+                break
             except Exception as e:
                 print_exc()
                 logger.error(e)
@@ -141,8 +146,10 @@ class Server(Service, RouterMixin):
                     headers={
                         "Content-Type": "application/json",
                         "Authorization": f"Bearer {hook.token or ''}",
-                        "X-Platform": event.platform,
-                        "X-Self-ID": event.self_id,
+                        "X-Platform": event.platform_,
+                        "Satori-Platform": event.platform_,
+                        "X-Self-ID": event.self_id_,
+                        "Satori-Login-ID": event.self_id_,
                     },
                     json={"op": Opcode.EVENT, "body": event.dump()},
                 ) as resp:
@@ -191,19 +198,22 @@ class Server(Service, RouterMixin):
     async def admin_login_list_handler(self, request: StarletteRequest):
         logins = []
         for provider in self.providers:
-            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)
         return JSONResponse(content=[lo.dump() for lo in logins])
 
     async def http_server_handler(self, request: StarletteRequest):
         if not self._adapters and not self.routes:
             return Response(status_code=404, content=request.path_params["method"])
         method = request.path_params["method"]
-        if "X-Platform" not in request.headers:
-            return Response(status_code=401, content="Missing X-Platform header")
-        platform = request.headers["X-Platform"]
-        if "X-Self-ID" not in request.headers:
-            return Response(status_code=401, content="Missing X-Self-ID header")
-        self_id = request.headers["X-Self-ID"]
+        if "X-Platform" not in request.headers and "Satori-Platform" not in request.headers:
+            return Response(status_code=401, content="Missing header X-Platform or Satori-Platform")
+        platform: str = request.headers.get("X-Platform") or request.headers.get("Satori-Platform")  # type: ignore
+        if "X-Self-ID" not in request.headers and "Satori-Login-ID" not in request.headers:
+            return Response(status_code=401, content="Missing header X-Self-ID or Satori-Login-ID")
+        self_id: str = request.headers.get("X-Self-ID") or request.headers.get("Satori-Login-ID")  # type: ignore
 
         for _router in self._adapters:
             if method not in _router.routes:
@@ -223,6 +233,8 @@ class Server(Service, RouterMixin):
         url = request.path_params["upload_url"]
         try:
             content = await self.download(url)
+            if isinstance(content, Path):
+                return FileResponse(path=content)
             # if content size > stream_limit, use streaming response
             if len(content) > self.stream_threshold:
 
@@ -243,24 +255,30 @@ class Server(Service, RouterMixin):
             return Response(status_code=500, content=repr(e))
 
     async def download(self, url: str):
-        pr = urllib.parse.urlparse(url.replace(":/", "://", 1).replace(":///", "://", 1))
+        url = url.replace(":/", "://", 1).replace(":///", "://", 1)
+        pr = urllib.parse.urlparse(url)
         if pr.scheme == "upload":
             if pr.netloc == "temp":
                 _, inst, filename = pr.path.split("/", 2)
                 if inst == f"{self.id}:{id(self)}":
                     file = Path(self._tempdir.name) / filename
                     if file.exists():
-                        return file.read_bytes()
+                        return file
                 raise FileNotFoundError(f"{filename} not found")
-            platform = pr.netloc
-            _, self_id, path = pr.path.split("/", 2)
-            for provider in self.providers:
+        for provider in self.providers:
+            if pr.scheme == "upload":
+                platform = pr.netloc
+                _, self_id, path = pr.path.split("/", 2)
                 if provider.ensure(platform, self_id):
                     return await provider.download_uploaded(platform, self_id, path)
-        for provider in self.providers:
-            for proxy_url_pf in self.proxy_url_mapping[provider.id]:
-                if url.startswith(proxy_url_pf):
-                    return await provider.download_proxied(proxy_url_pf, url)
+
+            for proxy_url_pf in provider.proxy_urls():
+                if not url.startswith(proxy_url_pf):
+                    continue
+                resp = await provider.download_proxied(proxy_url_pf, url)
+                if resp is None:
+                    continue
+                return resp
         raise ValueError(f"Unknown proxy url: {url}")
 
     def get_local_file(self, url: str):
@@ -322,6 +340,8 @@ class Server(Service, RouterMixin):
                     ),
                 ]
             )
+            for path, file in self.resources.items():
+                app.mount(path, StaticFiles(directory=file.parent, html=file.suffix == ".html"))
             asgi_service.middleware.mounts[""] = app  # type: ignore
 
         async def event_task(_provider: Provider):

{satori_python_server-0.14.4 → satori_python_server-0.15.0}/src/satori/server/adapter.py

@@ -4,8 +4,9 @@ from typing import TYPE_CHECKING, Optional
 
 from launart import Service
 
-from ..model import Event, Login
+from ..model import Event, LoginType
 from .route import RouterMixin
+from .utils import ctx
 
 if TYPE_CHECKING:
     from . import Server
@@ -34,11 +35,11 @@ class Adapter(Service, RouterMixin):
     async def download_uploaded(self, platform: str, self_id: str, path: str) -> bytes: ...
 
     async def download_proxied(self, prefix: str, url: str) -> bytes:
-        async with self.server.session.get(url) as resp:
+        async with self.server.session.get(url, ssl=ctx) as resp:
             return await resp.read()
 
     @abstractmethod
-    async def get_logins(self) -> list[Login]: ...
+    async def get_logins(self) -> list[LoginType]: ...
 
     def __init__(self):
         super().__init__()

{satori_python_server-0.14.4 → satori_python_server-0.15.0}/src/satori/server/model.py

@@ -3,7 +3,7 @@ from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any, Generic, Optional, Protocol, TypeVar, Union, runtime_checkable
 
 from satori.const import Api
-from satori.model import Event, Login
+from satori.model import Event, Login, LoginPreview, LoginType
 
 if TYPE_CHECKING:
     from .route import RouteCall
@@ -22,14 +22,11 @@ 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: ...
 
-    async def get_logins(self) -> list[Login]: ...
+    async def get_logins(self) -> Union[list[Login], list[LoginPreview], list[LoginType]]: ...
 
     @staticmethod
     def proxy_urls() -> list[str]: ...
@@ -38,7 +35,7 @@ class Provider(Protocol):
 
     async def download_uploaded(self, platform: str, self_id: str, path: str) -> bytes: ...
 
-    async def download_proxied(self, prefix: str, url: str) -> bytes: ...
+    async def download_proxied(self, prefix: str, url: str) -> Optional[bytes]: ...
 
 
 @runtime_checkable

{satori_python_server-0.14.4 → satori_python_server-0.15.0}/src/satori/server/route.py

@@ -8,7 +8,7 @@ from satori.model import (
     Channel,
     Direction,
     Guild,
-    Login,
+    LoginType,
     Member,
     MessageObject,
     ModelBase,
@@ -241,7 +241,7 @@ class ReactionListParam(TypedDict):
 
 
 REACTION_LIST: TypeAlias = RouteCall[ReactionListParam, Union[PageResult[User], dict[str, Any]]]
-LOGIN_GET: TypeAlias = RouteCall[Any, Union[Login, dict[str, Any]]]
+LOGIN_GET: TypeAlias = RouteCall[Any, Union[LoginType, dict[str, Any]]]
 
 
 class UserGetParam(TypedDict):

satori_python_server-0.14.4/src/satori/server/deque.py → satori_python_server-0.15.0/src/satori/server/utils.py

@@ -1,3 +1,4 @@
+import ssl
 from collections import deque
 
 
@@ -23,6 +24,10 @@ class Deque:
         return list(self.data)[i + 1 - self.offset :]
 
 
+ctx = ssl.create_default_context()
+ctx.set_ciphers("DEFAULT")
+
+
 if __name__ == "__main__":
     d = Deque(3)
     d.append(0)