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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python
-Version: 0.14.4
+Version: 0.15.0
 Summary: Satori Protocol SDK for python
 Home-page: https://github.com/RF-Tar-Railt/satori-python
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>
@@ -46,6 +46,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-0.14.4 → satori_python-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-0.14.4 → satori_python-0.15.0}/pyproject.toml

@@ -29,7 +29,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
 ]
-version = "0.14.4"
+version = "0.15.0"
 
 [project.license]
 text = "MIT"
@@ -41,6 +41,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-0.14.4 → satori_python-0.15.0}/src/satori/__init__.py

@@ -43,4 +43,4 @@ from .model import Role as Role
 from .model import Upload as Upload
 from .model import User as User
 
-__version__ = "0.14.4"
+__version__ = "0.15.0"

{satori_python-0.14.4 → satori_python-0.15.0}/src/satori/client/__init__.py

@@ -185,14 +185,14 @@ class App(Service):
     async def post(self, event: Event, conn: BaseNetwork):
         if not self.event_callbacks:
             return
-        identity = f"{event.platform}/{event.self_id}"
+        identity = f"{event.platform_}/{event.self_id_}"
         if identity not in self.accounts:
             if event.type == EventType.LOGIN_ADDED:
                 if TYPE_CHECKING:
                     assert isinstance(event, events.LoginEvent)
                 account = Account(
-                    event.platform,
-                    event.self_id,
+                    event.platform_,
+                    event.self_id_,
                     event.login,
                     conn.config,
                 )
@@ -204,8 +204,27 @@ class App(Service):
                 )
                 self.accounts[identity] = account
                 conn.accounts[identity] = account
-                await self.account_update(account, LoginStatus.ONLINE)
                 await self.account_update(account, LoginStatus.CONNECT)
+                await self.account_update(account, LoginStatus.ONLINE)
+            elif event.type == EventType.LOGIN_UPDATED:
+                if TYPE_CHECKING:
+                    assert isinstance(event, events.LoginEvent)
+                if event.login.status == LoginStatus.ONLINE:
+                    account = Account(
+                        event.platform_,
+                        event.self_id_,
+                        event.login,
+                        conn.config,
+                    )
+                    logger.info(f"account added: {account}")
+                    account.connected.set()
+                    self.accounts[identity] = account
+                    conn.accounts[identity] = account
+                    await self.account_update(account, LoginStatus.CONNECT)
+                    await self.account_update(account, LoginStatus.ONLINE)
+                else:
+                    logger.warning(f"Received event for unknown account: {event}")
+                    return
             else:
                 logger.warning(f"Received event for unknown account: {event}")
                 return

{satori_python-0.14.4 → satori_python-0.15.0}/src/satori/client/account.py

@@ -6,7 +6,7 @@ from typing import Generic, TypeVar
 
 from yarl import URL
 
-from satori.model import Login
+from satori.model import LoginType
 
 from .protocol import ApiProtocol
 
@@ -35,7 +35,7 @@ class Account(Generic[TP]):
         self,
         platform: str,
         self_id: str,
-        self_info: Login,
+        self_info: LoginType,
         config: ApiInfo,
         protocol_cls: type[TP] = ApiProtocol,
     ):

{satori_python-0.14.4 → satori_python-0.15.0}/src/satori/client/account.pyi

@@ -10,9 +10,10 @@ from satori.model import (
     Direction,
     Event,
     Guild,
-    Login,
+    LoginType,
     Member,
     MessageObject,
+    MessageReceipt,
     Order,
     PageDequeResult,
     PageResult,
@@ -40,7 +41,7 @@ class ApiInfo(Api):
 class Account(Generic[TP]):
     platform: str
     self_id: str
-    self_info: Login
+    self_info: LoginType
     config: Api
     protocol: TP
     connected: asyncio.Event
@@ -49,7 +50,7 @@ class Account(Generic[TP]):
         self,
         platform: str,
         self_id: str,
-        self_info: Login,
+        self_info: LoginType,
         config: Api,
         protocol_cls: type[TP] = ApiProtocol,
     ): ...
@@ -71,7 +72,7 @@ class Account(Generic[TP]):
             - 链接开头出现在 self_info.proxy_urls 中的某一项
         """
 
-    async def send(self, event: Event, message: str | Iterable[str | Element]) -> list[MessageObject]:
+    async def send(self, event: Event, message: str | Iterable[str | Element]) -> list[MessageReceipt]:
         """发送消息。返回一个 `MessageObject` 对象构成的数组。
 
         Args:
@@ -87,7 +88,7 @@ class Account(Generic[TP]):
 
     async def send_message(
         self, channel: str | Channel, message: str | Iterable[str | Element]
-    ) -> list[MessageObject]:
+    ) -> list[MessageReceipt]:
         """发送消息。返回一个 `MessageObject` 对象构成的数组。
 
         Args:
@@ -100,7 +101,7 @@ class Account(Generic[TP]):
 
     async def send_private_message(
         self, user: str | User, message: str | Iterable[str | Element]
-    ) -> list[MessageObject]:
+    ) -> list[MessageReceipt]:
         """发送私聊消息。返回一个 `MessageObject` 对象构成的数组。
 
         Args:
@@ -125,7 +126,7 @@ class Account(Generic[TP]):
             None: 该方法无返回值
         """
 
-    async def message_create(self, channel_id: str, content: str) -> list[MessageObject]:
+    async def message_create(self, channel_id: str, content: str) -> list[MessageReceipt]:
         """发送消息。返回一个 `MessageObject` 对象构成的数组。
 
         Args:
@@ -495,7 +496,7 @@ class Account(Generic[TP]):
             PageResult[User]: `User` 的分页列表
         """
 
-    async def login_get(self) -> Login:
+    async def login_get(self) -> LoginType:
         """获取当前登录信息。返回一个 `Login` 对象。
 
         Returns:
@@ -542,7 +543,7 @@ class Account(Generic[TP]):
             **kwargs: 参数
         """
 
-    async def admin_login_list(self) -> list[Login]:
+    async def admin_login_list(self) -> list[LoginType]:
         """获取登录信息列表。返回一个 `Login` 对象构成的数组。
 
         Returns:

{satori_python-0.14.4 → satori_python-0.15.0}/src/satori/client/network/base.py

@@ -40,8 +40,16 @@ class BaseNetwork(Generic[TConfig], Service):
             try:
                 event = Event.parse(raw)
             except Exception as e:
-                logger.warning(f"Failed to parse event: {raw}\nCaused by {e!r}")
+                if (
+                    "self_id" in raw
+                    or ("login" in raw and "self_id" in raw["login"])
+                    or ("login" in raw and "user" in raw["login"] and "self_id" in raw["login"]["user"])
+                ):
+                    logger.warning(f"Failed to parse event: {raw}\nCaused by {e!r}")
+                else:
+                    logger.trace(f"Failed to parse event: {raw}\nCaused by {e!r}")
             else:
+                logger.trace(f"Received event: {event}")
                 self.sequence = event.id
                 await self.app.post(event, self)
 

{satori_python-0.14.4 → satori_python-0.15.0}/src/satori/client/network/webhook.py

@@ -9,7 +9,7 @@ from launart.utilles import any_completed
 from loguru import logger
 
 from satori.config import WebhookInfo as WebhookInfo
-from satori.model import Login, LoginStatus, Opcode
+from satori.model import Login, LoginPreview, LoginStatus, Opcode
 
 from ..account import Account
 from .base import BaseNetwork
@@ -33,8 +33,14 @@ class WebhookNetwork(BaseNetwork[WebhookInfo]):
         token = auth.split(" ", 1)[1]
         if self.config.token and self.config.token != token:
             return web.Response(status=401)
-        platform = header["X-Platform"]
-        self_id = header["X-Self-ID"]
+        if "X-Platform" in header and "X-Self-ID" in header:
+            platform = header["X-Platform"]
+            self_id = header["X-Self-ID"]
+        elif "Satori-Platform" in header and "Satori-Login-ID" in header:
+            platform = header["Satori-Platform"]
+            self_id = header["Satori-Login-ID"]
+        else:
+            return web.Response(status=400)
         identity = f"{platform}/{self_id}"
         if identity in self.app.accounts:
             account = self.app.accounts[identity]
@@ -45,9 +51,12 @@ class WebhookNetwork(BaseNetwork[WebhookInfo]):
             assert self.manager
             aio = self.manager.get_component(AiohttpClientService)
             async with aio.session.post(self.config.api_base / "admin/login.list") as resp:
-                logins = [Login.parse(i) for i in await validate_response(resp)]
+                logins = [
+                    LoginPreview.parse(i) if "user" in i else Login.parse(i)
+                    for i in await validate_response(resp)
+                ]
             login = next(
-                (i for i in logins if i.self_id == self_id and i.platform == platform),
+                (i for i in logins if i.id == self_id and i.platform == platform),
                 Login(LoginStatus.CONNECT, self_id=self_id, platform=platform),
             )
             account = Account(platform, self_id, login, self.config)
@@ -55,8 +64,8 @@ class WebhookNetwork(BaseNetwork[WebhookInfo]):
             account.connected.set()
             self.app.accounts[identity] = account
             self.accounts[identity] = account
-            await self.app.account_update(account, LoginStatus.ONLINE)
             await self.app.account_update(account, LoginStatus.CONNECT)
+            await self.app.account_update(account, LoginStatus.ONLINE)
         data = await req.json()
         op = data["op"]
         if op != Opcode.EVENT:

{satori_python-0.14.4 → satori_python-0.15.0}/src/satori/client/network/websocket.py

@@ -11,7 +11,7 @@ from launart.utilles import any_completed
 from loguru import logger
 
 from satori.config import WebsocketsInfo as WebsocketsInfo
-from satori.model import Login, LoginStatus, Opcode
+from satori.model import Login, LoginPreview, LoginStatus, Opcode
 
 from ..account import Account
 from .base import BaseNetwork
@@ -86,31 +86,32 @@ class WsNetwork(BaseNetwork[WebsocketsInfo]):
             logger.error(f"Received unexpected payload: {data}")
             return False
         for login in data["body"]["logins"]:
-            if "self_id" not in login:
+            obj = LoginPreview.parse(login) if "user" in login else Login.parse(login)
+            if obj.id is None:
                 continue
-            platform = login.get("platform", "satori")
-            self_id = login["self_id"]
+            platform = obj.platform or "satori"
+            self_id = obj.id
             identity = f"{platform}/{self_id}"
             if identity in self.app.accounts:
                 account = self.app.accounts[identity]
                 self.accounts[identity] = account
-                if login["status"] == LoginStatus.ONLINE:
+                if not obj.status or obj.status == LoginStatus.ONLINE:
                     account.connected.set()
                 else:
                     account.connected.clear()
                 account.config = self.config
             else:
-                account = Account(platform, self_id, Login.parse(login), self.config)
+                account = Account(platform, self_id, obj, self.config)
                 logger.info(f"account registered: {account}")
                 (
                     account.connected.set()
-                    if login["status"] == LoginStatus.ONLINE
+                    if not obj.status or obj.status == LoginStatus.ONLINE
                     else account.connected.clear()
                 )
                 self.app.accounts[identity] = account
                 self.accounts[identity] = account
-                await self.app.account_update(account, LoginStatus.ONLINE)
-            await self.app.account_update(account, LoginStatus.CONNECT)
+                await self.app.account_update(account, LoginStatus.CONNECT)
+            await self.app.account_update(account, LoginStatus.ONLINE)
         if not self.accounts:
             logger.warning(f"No account available for {self.config}")
             return False

{satori_python-0.14.4 → satori_python-0.15.0}/src/satori/client/protocol.py

@@ -15,8 +15,11 @@ from satori.model import (
     Event,
     Guild,
     Login,
+    LoginPreview,
+    LoginType,
     Member,
     MessageObject,
+    MessageReceipt,
     Order,
     PageDequeResult,
     PageResult,
@@ -50,6 +53,8 @@ class ApiProtocol:
             "Authorization": f"Bearer {self.account.config.token or ''}",
             "X-Platform": self.account.platform,
             "X-Self-ID": self.account.self_id,
+            "Satori-Platform": self.account.platform,
+            "Satori-Login-ID": self.account.self_id,
         }
         aio = Launart.current().get_component(AiohttpClientService)
         if multipart:
@@ -75,15 +80,15 @@ class ApiProtocol:
         ) as resp:
             return await validate_response(resp)
 
-    async def send(self, event: Event, message: str | Iterable[str | Element]) -> list[MessageObject]:
-        """发送消息。返回一个 `MessageObject` 对象构成的数组。
+    async def send(self, event: Event, message: str | Iterable[str | Element]) -> list[MessageReceipt]:
+        """发送消息。返回一个 `MessageReceipt` 对象构成的数组。
 
         Args:
             event (Event): 当前事件(上下文)
             message (str | Iterable[str | Element]): 要发送的消息
 
         Returns:
-            list[MessageObject]: `MessageObject` 对象构成的数组
+            list[MessageReceipt]: `MessageReceipt` 对象构成的数组
 
         Raises:
             RuntimeError: 传入的事件缺少 `channel` 对象
@@ -94,15 +99,15 @@ class ApiProtocol:
 
     async def send_message(
         self, channel: str | Channel, message: str | Iterable[str | Element]
-    ) -> list[MessageObject]:
-        """发送消息。返回一个 `MessageObject` 对象构成的数组。
+    ) -> list[MessageReceipt]:
+        """发送消息。返回一个 `MessageReceipt` 对象构成的数组。
 
         Args:
             channel (str | Channel): 要发送的频道 ID
             message (str | Iterable[str | Element]): 要发送的消息
 
         Returns:
-            list[MessageObject]: `MessageObject` 对象构成的数组
+            list[MessageReceipt]: `MessageReceipt` 对象构成的数组
         """
         channel_id = channel.id if isinstance(channel, Channel) else channel
         msg = message if isinstance(message, str) else "".join(str(i) for i in message)
@@ -110,15 +115,15 @@ class ApiProtocol:
 
     async def send_private_message(
         self, user: str | User, message: str | Iterable[str | Element]
-    ) -> list[MessageObject]:
-        """发送私聊消息。返回一个 `MessageObject` 对象构成的数组。
+    ) -> list[MessageReceipt]:
+        """发送私聊消息。返回一个 `MessageReceipt` 对象构成的数组。
 
         Args:
             user (str | User): 要发送的用户 ID
             message (str | Iterable[str | Element]): 要发送的消息
 
         Returns:
-            list[MessageObject]: `MessageObject` 对象构成的数组
+            list[MessageReceipt]: `MessageReceipt` 对象构成的数组
         """
         user_id = user.id if isinstance(user, User) else user
         channel = await self.user_channel_create(user_id=user_id)
@@ -145,22 +150,22 @@ class ApiProtocol:
             content=msg,
         )
 
-    async def message_create(self, channel_id: str, content: str) -> list[MessageObject]:
-        """发送消息。返回一个 `MessageObject` 对象构成的数组。
+    async def message_create(self, channel_id: str, content: str) -> list[MessageReceipt]:
+        """发送消息。返回一个 `MessageReceipt` 对象构成的数组。
 
         Args:
             channel_id (str): 频道 ID
             content (str): 消息内容
 
         Returns:
-            list[MessageObject]: `MessageObject` 对象构成的数组
+            list[MessageReceipt]: `MessageReceipt` 对象构成的数组
         """
         res = await self.call_api(
             Api.MESSAGE_CREATE,
             {"channel_id": channel_id, "content": content},
         )
         res = cast("list[dict]", res)
-        return [MessageObject.parse(i) for i in res]
+        return [MessageReceipt.parse(i) for i in res]
 
     async def message_get(self, channel_id: str, message_id: str) -> MessageObject:
         """获取特定消息。返回一个 `MessageObject` 对象。
@@ -672,14 +677,14 @@ class ApiProtocol:
         )
         return PageResult.parse(res, User.parse)
 
-    async def login_get(self) -> Login:
+    async def login_get(self) -> LoginType:
         """获取当前登录信息。返回一个 `Login` 对象。
 
         Returns:
             Login: `Login` 对象
         """
         res = await self.call_api(Api.LOGIN_GET, {})
-        return Login.parse(res)
+        return LoginPreview.parse(res) if "user" in res else Login.parse(res)
 
     async def user_get(self, user_id: str) -> User:
         """获取用户信息。返回一个 `User` 对象。
@@ -730,14 +735,14 @@ class ApiProtocol:
         """
         return await self.call_api(f"internal/{action}", kwargs)
 
-    async def admin_login_list(self) -> list[Login]:
+    async def admin_login_list(self) -> list[LoginType]:
         """获取登录信息列表。返回一个 `Login` 对象构成的数组。
 
         Returns:
             list[Login]: `Login` 对象构成的数组
         """
         res = await self.call_api("admin/login.list")
-        return [Login.parse(i) for i in res]
+        return [LoginPreview.parse(i) if "user" in i else Login.parse(i) for i in res]
 
     @overload
     async def upload_create(self, *uploads: Upload) -> list[str]: ...

{satori_python-0.14.4 → satori_python-0.15.0}/src/satori/element.py

@@ -44,7 +44,7 @@ class Element:
                         raise TypeError(f.name, attr)
                     setattr(self, f.name, attr.lower() == "true")
                 else:
-                    setattr(self, f.name, _type(attr))
+                    setattr(self, f.name, _type(attr))  # type: ignore
             self._attrs[f.name] = getattr(self, f.name)
         self._attrs = {k: v for k, v in self._attrs.items() if v is not None}
 

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

@@ -160,6 +160,39 @@ class Login(ModelBase):
             res["platform"] = self.platform
         return res
 
+    @property
+    def id(self) -> Optional[str]:
+        return self.self_id or (self.user.id if self.user else None)
+
+
+@dataclass
+class LoginPreview(ModelBase):
+    user: User
+    platform: str
+    status: Optional[LoginStatus] = None
+    features: list[str] = field(default_factory=list)
+    proxy_urls: list[str] = field(default_factory=list)
+
+    __converter__ = {"user": User.parse, "status": LoginStatus}
+
+    def dump(self):
+        res: dict[str, Any] = {
+            "user": self.user.dump(),
+            "platform": self.platform,
+            "features": self.features,
+            "proxy_urls": self.proxy_urls,
+        }
+        if self.status:
+            res["status"] = self.status.value
+        return res
+
+    @property
+    def id(self) -> str:
+        return self.user.id
+
+
+LoginType = Union[Login, LoginPreview]
+
 
 @dataclass
 class ArgvInteraction(ModelBase):
@@ -260,18 +293,49 @@ class MessageObject(ModelBase):
         return res
 
 
+@dataclass
+class MessageReceipt(ModelBase):
+    id: str
+    content: Optional[str] = None
+
+    @classmethod
+    def from_elements(
+        cls,
+        id: str,
+        content: Optional[list[Element]] = None,
+    ):
+        return cls(id, "".join(str(i) for i in content) if content else None)
+
+    @property
+    def message(self) -> Optional[list[Element]]:
+        return transform(parse(self.content)) if self.content else None
+
+    @classmethod
+    def parse(cls, raw: dict):
+        if "elements" in raw and "content" not in raw:
+            content = [RawElement(*item.values()) for item in raw["elements"]]
+            raw["content"] = "".join(str(i) for i in content)
+        return super().parse(raw)
+
+    def dump(self):
+        res = {"id": self.id}
+        if self.content:
+            res["content"] = self.content
+        return res
+
+
 @dataclass
 class Event(ModelBase):
     id: int
     type: str
-    platform: str
-    self_id: str
     timestamp: datetime
+    platform: Optional[str] = None
+    self_id: Optional[str] = None
     argv: Optional[ArgvInteraction] = None
     button: Optional[ButtonInteraction] = None
     channel: Optional[Channel] = None
     guild: Optional[Guild] = None
-    login: Optional[Login] = None
+    login: Optional[LoginType] = None
     member: Optional[Member] = None
     message: Optional[MessageObject] = None
     operator: Optional[User] = None
@@ -287,7 +351,13 @@ class Event(ModelBase):
         "button": ButtonInteraction.parse,
         "channel": Channel.parse,
         "guild": Guild.parse,
-        "login": Login.parse,
+        "login": lambda raw: (
+            LoginPreview.parse(
+                raw if raw["user"] else {**raw, "user": {"id": raw["self_id"]}} if "self_id" in raw else raw
+            )
+            if "user" in raw
+            else Login.parse(raw)
+        ),
         "member": Member.parse,
         "message": MessageObject.parse,
         "operator": User.parse,
@@ -295,12 +365,32 @@ class Event(ModelBase):
         "user": User.parse,
     }
 
+    @property
+    def platform_(self):
+        if self.platform:
+            return self.platform
+        if self.login and self.login.platform:
+            return self.login.platform
+        raise ValueError("platform not found")
+
+    @property
+    def self_id_(self):
+        if self.self_id:
+            return self.self_id
+        if self.login and self.login.id:
+            return self.login.id
+        raise ValueError("self_id not found")
+
+    def __post_init__(self):
+        _ = self.platform_
+        _ = self.self_id_
+
     def dump(self):
         res = {
             "id": self.id,
             "type": self.type,
-            "platform": self.platform,
-            "self_id": self.self_id,
+            "platform": self.platform_,
+            "self_id": self.self_id_,
             "timestamp": int(self.timestamp.timestamp() * 1000),
         }
         if self.argv:
@@ -341,7 +431,7 @@ class PageResult(ModelBase, Generic[T]):
     @classmethod
     def parse(cls, raw: dict, parser: Optional[Callable[[dict], T]] = None) -> "PageResult[T]":
         data = [(parser or ModelBase.parse)(item) for item in raw["data"]]
-        return cls(data, raw.get("next"))
+        return cls(data, raw.get("next"))  # type: ignore
 
     def dump(self):
         res: dict = {"data": [item.dump() for item in self.data]}
@@ -357,7 +447,7 @@ class PageDequeResult(PageResult[T]):
     @classmethod
     def parse(cls, raw: dict, parser: Optional[Callable[[dict], T]] = None) -> "PageDequeResult[T]":
         data = [(parser or ModelBase.parse)(item) for item in raw["data"]]
-        return cls(data, raw.get("next"), raw.get("prev"))
+        return cls(data, raw.get("next"), raw.get("prev"))  # type: ignore
 
     def dump(self):
         res: dict = {"data": [item.dump() for item in self.data]}

{satori_python-0.14.4 → satori_python-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-0.14.4 → satori_python-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-0.14.4 → satori_python-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-0.14.4 → satori_python-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-0.14.4/src/satori/server/deque.py → satori_python-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)