satori-python 1.3.2__py3-none-any.whl → 1.3.3__py3-none-any.whl

satori/__init__.py

@@ -45,7 +45,7 @@ from .model import Role as Role
 from .model import Upload as Upload
 from .model import User as User
 
-__version__ = "1.3.2"
+__version__ = "1.3.3"
 
 
 MessageReceipt = MessageObject

satori/client/__init__.py

@@ -232,7 +232,8 @@ class App(Service):
                 task.cancel()
 
     async def post(self, event: Event, conn: BaseNetwork):
-        if event.type == EventType.LOGIN_ADDED:
+        ev_type = event.type
+        if ev_type == EventType.LOGIN_ADDED:
             if TYPE_CHECKING:
                 assert isinstance(event, events.LoginEvent)
             login = event.login
@@ -251,7 +252,7 @@ class App(Service):
             self.accounts[login_sn] = account
             conn.accounts[login_sn] = account
             await self.account_update(account, login.status)
-        elif event.type == EventType.LOGIN_UPDATED:
+        elif ev_type == EventType.LOGIN_UPDATED:
             if TYPE_CHECKING:
                 assert isinstance(event, events.LoginEvent)
             login = event.login
@@ -260,21 +261,20 @@ class App(Service):
                 return
             login_sn = f"{login.platform}_{login.user.id}@{id(conn):x}"
             if login_sn not in self.accounts:
-                if login.status == LoginStatus.ONLINE:
-                    account = Account(
-                        login,
-                        conn.config,
-                        conn.proxy_urls,
-                        self.default_api_cls,
-                    )
-                    logger.info(f"account added: {account}")
-                    account.connected.set()
-                    self.accounts[login_sn] = account
-                    conn.accounts[login_sn] = account
-                    await self.account_update(account, LoginStatus.ONLINE)
-                else:
+                if login.status != LoginStatus.ONLINE:
                     logger.warning(f"Received event for unknown account: {event}")
                     return
+                account = Account(
+                    login,
+                    conn.config,
+                    conn.proxy_urls,
+                    self.default_api_cls,
+                )
+                logger.info(f"account added: {account}")
+                account.connected.set()
+                self.accounts[login_sn] = account
+                conn.accounts[login_sn] = account
+                await self.account_update(account, LoginStatus.ONLINE)
             else:
                 account = self.accounts[login_sn]
                 account.self_info = login
@@ -285,7 +285,7 @@ class App(Service):
                 else account.connected.clear()
             )
             await self.account_update(account, login.status)
-        elif event.type == EventType.LOGIN_REMOVED:
+        elif ev_type == EventType.LOGIN_REMOVED:
             if TYPE_CHECKING:
                 assert isinstance(event, events.LoginEvent)
             login = event.login
@@ -305,12 +305,18 @@ class App(Service):
             account = self.accounts[login_sn]
 
         if self.event_callbacks:
-            task = asyncio.gather(*(callback(account, event) for callback in self.event_callbacks))
-            try:
-                await task
-            except Exception:
-                traceback.print_exc()
-                task.cancel()
+            if len(self.event_callbacks) == 1:
+                try:
+                    await self.event_callbacks[0](account, event)
+                except Exception:
+                    traceback.print_exc()
+            else:
+                task = asyncio.gather(*(callback(account, event) for callback in self.event_callbacks))
+                try:
+                    await task
+                except Exception:
+                    traceback.print_exc()
+                    task.cancel()
 
         if event.type == EventType.LOGIN_REMOVED:
             logger.info(f"account removed: {account}")

satori/client/network/websocket.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import asyncio
-from contextlib import suppress
 from typing import cast
 
 import aiohttp
@@ -47,12 +46,18 @@ class WsNetwork(BaseNetwork[WebsocketsInfo]):
         if self.connection is None:
             raise RuntimeError("connection is not established")
 
-        async for msg in self.connection:
-            if msg.type in {aiohttp.WSMsgType.CLOSE, aiohttp.WSMsgType.ERROR, aiohttp.WSMsgType.CLOSED}:
-                self.close_signal.set()
+        while True:
+            msg = await self.connection.receive()
+            if msg.type in {
+                aiohttp.WSMsgType.CLOSE,
+                aiohttp.WSMsgType.ERROR,
+                aiohttp.WSMsgType.CLOSING,
+                aiohttp.WSMsgType.CLOSED,
+            }:
+                await self.connection_closed()
                 return
             elif msg.type == aiohttp.WSMsgType.TEXT:
-                data: dict = decode(cast(str, msg.data))
+                data: dict = decode(msg.data)
                 if data["op"] == Opcode.EVENT:
                     asyncio.create_task(self.event_parse_task(data["body"]))
                 elif data["op"] == Opcode.META:
@@ -65,8 +70,6 @@ class WsNetwork(BaseNetwork[WebsocketsInfo]):
                 else:
                     logger.trace(f"Received payload: {data}")
                 continue
-        else:
-            await self.connection_closed()
 
     async def send(self, payload: dict):
         if self.connection is None:
@@ -131,8 +134,10 @@ class WsNetwork(BaseNetwork[WebsocketsInfo]):
     async def _heartbeat(self):
         """心跳"""
         while True:
-            with suppress(Exception):
+            try:
                 await self.send({"op": 1})
+            except Exception as e:
+                logger.error(f"Error while sending heartbeat: {e!r}")
             await asyncio.sleep(9)
 
     async def daemon(self, manager: Launart, session: aiohttp.ClientSession):

satori/client/protocol.py

@@ -4,7 +4,7 @@ from collections.abc import Iterable
 from typing import TYPE_CHECKING, Any, cast, overload
 from typing_extensions import deprecated
 
-from aiohttp import ClientSession, ClientTimeout, FormData
+from aiohttp import BytesPayload, ClientSession, ClientTimeout, FormData
 from graia.amnesia.builtins.aiohttp import AiohttpClientService
 from launart import Launart
 
@@ -14,6 +14,7 @@ from satori.model import (
     Channel,
     Direction,
     Event,
+    Friend,
     Guild,
     IterablePageResult,
     Login,
@@ -28,8 +29,8 @@ from satori.model import (
     Upload,
     User,
 )
+from satori.utils import encode_bytes
 
-from .. import Friend
 from .network.util import validate_response
 
 if TYPE_CHECKING:
@@ -63,7 +64,7 @@ class ApiProtocol:
     async def call_api(
         self, action: str | Api, params: dict | None = None, multipart: bool = False, method: str = "POST"
     ) -> dict:
-        endpoint = self.account.config.api_base / (action.value if isinstance(action, Api) else action)
+        endpoint = f"{self.account.config.api_base!s}/{action.value if isinstance(action, Api) else action}"
         headers = {
             "Content-Type": "application/json",
             "Authorization": f"Bearer {self.account.config.token or ''}",
@@ -93,7 +94,11 @@ class ApiProtocol:
         async with self.session.request(
             method,
             endpoint,
-            json=params or {},
+            data=BytesPayload(
+                encode_bytes(params or {}),
+                content_type="application/json",
+                encoding="utf-8",
+            ),
             headers=headers,
             timeout=self.timeout,
         ) as resp:

satori/element.py

@@ -4,7 +4,7 @@ from dataclasses import InitVar, dataclass, field
 from io import BytesIO
 from pathlib import Path
 from types import UnionType
-from typing import Any, ClassVar, Final, TypeVar, Union, final, get_args, get_origin, overload
+from typing import Any, ClassVar, Final, Literal, TypeVar, Union, final, get_args, get_origin, overload
 from typing_extensions import Self, override
 
 from ._vendor.fleep import get
@@ -17,7 +17,7 @@ TE = TypeVar("TE", bound="Element")
 
 
 def conv_bool(v: str) -> bool:
-    if v.lower() not in ("true", "false"):
+    if v.lower() not in {"true", "false"}:
         raise ValueError(v)
     return v.lower() == "true"
 
@@ -28,13 +28,17 @@ class Element:
     _children: list["Element"] = field(init=False, default_factory=list)
 
     __names__: ClassVar[tuple[str, ...]]
-    __convert_fields__: ClassVar[dict[str, Callable[[str], Any]]]
+    __convert_fields__: ClassVar[dict[str, Literal[True] | Callable[[str], Any]]]
+    __unpack_names__: ClassVar[frozenset[str]]
 
     def __init_subclass__(cls, **kwargs):
-        cls.__convert_fields__ = {}
+        convert_fields = {}
+        for base in cls.__mro__:
+            if hasattr(base, "__convert_fields__"):
+                convert_fields.update(base.__convert_fields__)
         annotations = cls.__annotations__
         for name, typ in annotations.items():
-            if name.startswith("_"):
+            if name.startswith("_") or isinstance(typ, InitVar):
                 continue
             # _type = get_args(typ)[0] if hasattr(typ, "__origin__") else typ
             orig = get_origin(typ)
@@ -46,39 +50,49 @@ class Element:
                     _type = args[0]
             else:
                 _type = typ
-            if _type is not str:
-                if _type is bool:
-                    cls.__convert_fields__[name] = conv_bool
-                elif _type in (list, dict):
-                    cls.__convert_fields__[name] = decode
+            if _type is bool:
+                convert_fields[name] = conv_bool
+            elif _type in (list, dict):
+                convert_fields[name] = decode
+            else:
+                convert_fields[name] = True if _type is str else _type
+        cls.__convert_fields__ = convert_fields
+        names = getattr(cls, "__names__", None)
+        for base in cls.__mro__:
+            if parent_names := getattr(base, "__names__", None):
+                if names is None:
+                    names = parent_names
                 else:
-                    cls.__convert_fields__[name] = _type
-
-    @property
-    def children(self) -> list["Element"]:
-        return self._children
-
-    @property
-    def tag(self) -> str:
-        return self.__class__.__name__.lower()
+                    names = names + parent_names
+        cls.__unpack_names__ = frozenset(names if names is not None else annotations.keys())
 
     @classmethod
     def unpack(cls, attrs: dict[str, Any]):
         data = {}
-        names = getattr(cls, "__names__", None)
-        for name in cls.__dataclass_fields__.keys():
+        args = {}
+        convert_fields = cls.__convert_fields__
+        names = cls.__unpack_names__
+        for name in convert_fields:
             if name not in attrs:
                 continue
-            if name in cls.__convert_fields__:
-                data[name] = cls.__convert_fields__[name](attrs[name])
-            else:
+            convert = convert_fields[name]
+            if convert is True:
                 data[name] = attrs[name]
-        obj = cls(**{k: v for k, v in data.items() if names is None or k in names})  # type: ignore
+            else:
+                data[name] = convert(attrs[name])
+            if name in names:
+                args[name] = data[name]
+        obj = cls(**args)  # type: ignore
         obj._attrs.update(data)
         return obj
 
-    def __post_init__(self):
-        self._attrs = {k: v for k, v in self.__dict__.items() if not k.startswith("_")}
+    @property
+    def children(self) -> list["Element"]:
+        return self._children
+
+    @property
+    def tag(self) -> str:
+        return self.__class__.__name__.lower()
 
     def attributes(self) -> str:
         def _attr(key: str, value: Any):
@@ -94,6 +108,8 @@ class Element:
         return "".join(_attr(k, v) for k, v in self._attrs.items())
 
     def dumps(self, strip: bool = False) -> str:
+        if not self._attrs:
+            self._attrs = {k: v for k, v in self.__dict__.items() if not k.startswith("_")}
         if self.tag == "text" and "text" in self._attrs:
             return self._attrs["text"] if strip else escape(self._attrs["text"])
         inner = "".join(c.dumps(strip) for c in self._children)
@@ -124,6 +140,9 @@ class Element:
     def __getitem__(self, key: str) -> Any:
         return self._attrs[key]
 
+    def raw(self) -> RawElement:
+        return RawElement(self.tag, self._attrs, [c.raw() for c in self._children])
+
 
 @dataclass(repr=False)
 class Text(Element):
@@ -131,6 +150,13 @@ class Text(Element):
 
     text: str
 
+    @override
+    @classmethod
+    def unpack(cls, attrs: dict[str, Any]):
+        obj = cls(attrs["text"])
+        obj._attrs["text"] = attrs["text"]
+        return obj
+
     @override
     def dumps(self, strip: bool = False) -> str:
         return self.text if strip else escape(self.text)
@@ -145,6 +171,12 @@ class At(Element):
     role: str | None = None
     type: str | None = None
 
+    @classmethod
+    def unpack(cls, attrs: dict[str, Any]):
+        obj = cls(attrs.get("id"), attrs.get("name"), attrs.get("role"), attrs.get("type"))
+        obj._attrs.update(attrs)
+        return obj
+
     @staticmethod
     def role_(
         role: str,
@@ -164,6 +196,12 @@ class Emoji(Element):
     id: str
     name: str | None = None
 
+    @classmethod
+    def unpack(cls, attrs: dict[str, Any]):
+        obj = cls(attrs["id"], attrs.get("name"))
+        obj._attrs.update(attrs)
+        return obj
+
     def to_model(self):
         from .model import EmojiObject
 
@@ -177,6 +215,12 @@ class Sharp(Element):
     id: str
     name: str | None = None
 
+    @classmethod
+    def unpack(cls, attrs: dict[str, Any]):
+        obj = cls(attrs["id"], attrs.get("name"))
+        obj._attrs.update(attrs)
+        return obj
+
 
 @dataclass(repr=False)
 class Link(Element):
@@ -184,6 +228,12 @@ class Link(Element):
 
     href: str
 
+    @classmethod
+    def unpack(cls, attrs: dict[str, Any]):
+        obj = cls(attrs["href"])
+        obj._attrs.update(attrs)
+        return obj
+
     def __post_call__(self):
         if not self._children:
             return
@@ -255,7 +305,6 @@ class Resource(Element):
         return cls(**data)
 
     def __post_init__(self, extra: dict[str, Any] | None = None):
-        super().__post_init__()
         if extra:
             self._attrs.update(extra)
 
@@ -267,7 +316,7 @@ class Image(Resource):
     width: int | None = None
     height: int | None = None
 
-    __names__ = ("src", "title", "width", "height")
+    __names__ = ("width", "height")
 
     @property
     @override
@@ -282,7 +331,7 @@ class Audio(Resource):
     duration: float | None = None
     poster: str | None = None
 
-    __names__ = ("src", "title", "duration", "poster")
+    __names__ = ("duration", "poster")
 
 
 @dataclass(repr=False)
@@ -294,7 +343,7 @@ class Video(Resource):
     duration: float | None = None
     poster: str | None = None
 
-    __names__ = ("src", "title", "width", "height", "duration", "poster")
+    __names__ = ("width", "height", "duration", "poster")
 
 
 @dataclass(repr=False)
@@ -303,7 +352,7 @@ class File(Resource):
 
     poster: str | None = None
 
-    __names__ = ("src", "title", "poster")
+    __names__ = ("poster",)
 
 
 @dataclass(init=False, repr=False)
@@ -312,6 +361,12 @@ class Style(Element):
 
     __names__ = ()
 
+    @classmethod
+    def unpack(cls, attrs: dict[str, Any]):
+        obj = cls()
+        obj._attrs.update(attrs)
+        return obj
+
     def __init__(self, *text: "str | Text | Style"):
         super().__init__()
         self.__call__(*text)
@@ -422,6 +477,12 @@ class Message(Element):
     id: str | None
     forward: bool | None
 
+    @classmethod
+    def unpack(cls, attrs: dict[str, Any]):
+        obj = cls(attrs.get("id"), conv_bool(attrs["forward"]) if "forward" in attrs else None)
+        obj._attrs.update(attrs)
+        return obj
+
     def __init__(
         self,
         id: str | None = None,
@@ -451,6 +512,12 @@ class Author(Element):
     name: str | None = None
     avatar: str | None = None
 
+    @classmethod
+    def unpack(cls, attrs: dict[str, Any]):
+        obj = cls(attrs["id"], attrs.get("name"), attrs.get("avatar"))
+        obj._attrs.update(attrs)
+        return obj
+
 
 @dataclass(repr=False)
 class Button(Element):
@@ -462,6 +529,12 @@ class Button(Element):
     text: str | None = None
     theme: str | None = None
 
+    @classmethod
+    def unpack(cls, attrs: dict[str, Any]):
+        obj = cls(attrs["type"], attrs.get("id"), attrs.get("href"), attrs.get("text"), attrs.get("theme"))
+        obj._attrs.update(attrs)
+        return obj
+
     @classmethod
     def action(cls, button_id: str, theme: str | None = None):
         return Button("action", id=button_id, theme=theme)
@@ -533,7 +606,7 @@ class Raw(Element):
 
     @override
     def dumps(self, strip: bool = False):
-        return self.content if strip else escape(self.content)
+        return self.content
 
 
 def register_element(cls: type[TE], tag: str | None = None) -> type[TE]:
@@ -547,7 +620,7 @@ def register_element(cls: type[TE], tag: str | None = None) -> type[TE]:
     return cls
 
 
-ELEMENT_TYPE_MAP = {
+COMMON_TYPE_MAP = {
     "text": Text,
     "at": At,
     "emoji": Emoji,
@@ -558,6 +631,9 @@ ELEMENT_TYPE_MAP = {
     "video": Video,
     "file": File,
     "author": Author,
+    "button": Button,
+    "a": Link,
+    "link": Link,
 }
 
 STYLE_TYPE_MAP = {
@@ -586,35 +662,32 @@ STYLE_TYPE_MAP = {
     "br": Br,
 }
 
+ELEMENT_TYPE_MAP = {**COMMON_TYPE_MAP, **STYLE_TYPE_MAP}
+
 
 def transform(elements: list[RawElement]) -> list[Element]:
     msg = []
     for elem in elements:
         tag = elem.tag()
         if tag in ELEMENT_TYPE_MAP:
-            seg_cls = ELEMENT_TYPE_MAP[tag]
-            msg.append(seg_cls.unpack(elem.attrs)(*transform(elem.children)))
-        elif tag in ("a", "link"):
-            link = Link.unpack(elem.attrs)
-            if elem.children:
-                link(*transform(elem.children))
-            msg.append(link)
-        elif tag == "button":
-            button = Button.unpack(elem.attrs)
+            seg = ELEMENT_TYPE_MAP[tag].unpack(elem.attrs)
             if elem.children:
-                button(*transform(elem.children))
-            msg.append(button)
-        elif tag in STYLE_TYPE_MAP:
-            seg_cls = STYLE_TYPE_MAP[tag]
-            msg.append(seg_cls.unpack(elem.attrs)(*transform(elem.children)))
-        elif tag in ("br", "newline"):
-            msg.append(Br())
+                seg(*transform(elem.children))
+            msg.append(seg)
         elif tag == "message":
             msg.append(Message.unpack(elem.attrs)(*transform(elem.children)))
         elif tag == "quote":
-            msg.append(Quote.unpack(elem.attrs)(*transform(elem.children)))
+            quot = Quote.unpack(elem.attrs)
+            if elem.children:
+                quot(*transform(elem.children))
+            msg.append(quot)
+        elif tag in ("br", "newline"):
+            msg.append(Br())
         else:
-            msg.append(Custom(elem.type, elem.attrs)(*transform(elem.children)))
+            custom = Custom(tag, elem.attrs)
+            if elem.children:
+                custom(*transform(elem.children))
+            msg.append(custom)
     return msg
 
 

satori/model.py

@@ -1,6 +1,6 @@
 import mimetypes
 from collections.abc import AsyncIterable, Awaitable, Callable
-from dataclasses import Field, dataclass, field
+from dataclasses import dataclass, field
 from datetime import datetime
 from enum import IntEnum
 from os import PathLike
@@ -13,16 +13,20 @@ from .parser import Element as RawElement
 from .parser import parse
 
 
-@dataclass
+@dataclass(slots=True)
 class ModelBase:
     __converter__: ClassVar[dict[str, Callable[[Any], Any]]] = {}
     _raw_data: dict[str, Any] = field(init=False, default_factory=dict, repr=False, compare=False, hash=False)
 
+    @classmethod
+    def before_parse(cls, raw: dict):
+        pass
+
     @classmethod
     def parse(cls: type[Self], raw: dict) -> Self:
-        fs: dict[str, Field] = cls.__dataclass_fields__
         data = {}
-        for name in fs.keys():
+        cls.before_parse(data)
+        for name in cls.__dataclass_fields__:
             if name in raw:
                 if name in cls.__converter__:
                     data[name] = cls.__converter__[name](raw[name])
@@ -32,6 +36,42 @@ class ModelBase:
         obj._raw_data = raw
         return obj
 
+    def __init_subclass__(cls, **kwargs):
+        has_converter = False
+        keys = set()
+        for c in cls.__mro__:
+            if c is Generic:
+                Generic.__init_subclass__.__func__(cls, **kwargs)
+            if getattr(c, "__converter__", None):
+                has_converter = True
+            keys.update(getattr(c, "__annotations__", {}).keys())
+        keys = frozenset(k for k in keys if not k.startswith("_"))
+
+        def parse1(cls_: type[Self], raw: dict, _keys=keys) -> Self:
+            data = {k: v for k, v in raw.items() if k in _keys}
+            obj = cls_(**data)  # type: ignore
+            obj._raw_data = raw
+            return obj
+
+        def parse2(cls_: type[Self], raw: dict, _keys=keys) -> Self:
+            data = {}
+            cls_.before_parse(data)
+            for name in _keys:
+                if name in raw:
+                    if name in cls_.__converter__:
+                        data[name] = cls_.__converter__[name](raw[name])
+                    else:
+                        data[name] = raw[name]
+            obj = cls_(**data)  # type: ignore
+            obj._raw_data = raw
+            return obj
+
+        if "parse" not in cls.__dict__:
+            if has_converter:
+                cls.parse = classmethod(parse2)  # type: ignore
+            else:
+                cls.parse = classmethod(parse1)  # type: ignore
+
     def dump(self) -> dict:
         raise NotImplementedError
 
@@ -43,7 +83,7 @@ class ChannelType(IntEnum):
     VOICE = 3
 
 
-@dataclass
+@dataclass(slots=True)
 class Channel(ModelBase):
     id: str
     type: ChannelType = ChannelType.TEXT
@@ -61,7 +101,7 @@ class Channel(ModelBase):
         return res
 
 
-@dataclass
+@dataclass(slots=True)
 class Guild(ModelBase):
     id: str
     name: str | None = None
@@ -76,7 +116,7 @@ class Guild(ModelBase):
         return res
 
 
-@dataclass
+@dataclass(slots=True)
 class User(ModelBase):
     id: str
     name: str | None = None
@@ -97,7 +137,7 @@ class User(ModelBase):
         return res
 
 
-@dataclass
+@dataclass(slots=True)
 class Friend(ModelBase):
     user: User | None = None
     nick: str | None = None
@@ -117,7 +157,7 @@ class Friend(ModelBase):
         return res
 
 
-@dataclass
+@dataclass(slots=True)
 class Role(ModelBase):
     id: str
     name: str | None = None
@@ -126,7 +166,7 @@ class Role(ModelBase):
     def parse(cls, raw: str | dict):
         if isinstance(raw, str):
             return cls(id=raw)
-        return super().parse(raw)
+        return cls(raw["id"], raw.get("name"))
 
     def dump(self):
         res = {"id": self.id}
@@ -135,7 +175,7 @@ class Role(ModelBase):
         return res
 
 
-@dataclass
+@dataclass(slots=True)
 class Member(ModelBase):
     user: User | None = None
     nick: str | None = None
@@ -177,11 +217,11 @@ class LoginStatus(IntEnum):
     """正在重新连接"""
 
 
-@dataclass
+@dataclass(slots=True, kw_only=True)
 class Login(ModelBase):
-    sn: int
-    status: LoginStatus
-    adapter: str
+    sn: int = 0
+    status: LoginStatus = LoginStatus.ONLINE
+    adapter: str = "satori"
     platform: str
     user: User
     features: list[str] = field(default_factory=list)
@@ -203,29 +243,22 @@ class Login(ModelBase):
         return res
 
     @classmethod
-    def parse(cls, raw: dict):
+    def before_parse(cls, raw: dict):
         if "self_id" in raw and "user" not in raw:
             raw["user"] = {"id": raw["self_id"]}
-        if "sn" not in raw:
-            raw["sn"] = 0
-        if "adapter" not in raw:
-            raw["adapter"] = "satori"
-        if "status" not in raw:
-            raw["status"] = LoginStatus.ONLINE
-        return super().parse(raw)
 
     @property
     def id(self) -> str:
         return self.user.id
 
 
-@dataclass
+@dataclass(slots=True)
 class LoginPartial(Login):
     platform: str | None = None
     user: User | None = None
 
 
-@dataclass
+@dataclass(slots=True)
 class ArgvInteraction(ModelBase):
     name: str
     arguments: list
@@ -235,7 +268,7 @@ class ArgvInteraction(ModelBase):
         return {"name": self.name, "arguments": self.arguments, "options": self.options}
 
 
-@dataclass
+@dataclass(slots=True)
 class ButtonInteraction(ModelBase):
     id: str
     data: str | None = None
@@ -262,7 +295,7 @@ class Opcode(IntEnum):
     """元信息更新 (接收)"""
 
 
-@dataclass
+@dataclass(slots=True)
 class Identify(ModelBase):
     token: str | None = None
     sn: int | None = None
@@ -271,7 +304,7 @@ class Identify(ModelBase):
     def parse(cls, raw: dict):
         if "sequence" in raw and "sn" not in raw:
             raw["sn"] = raw["sequence"]
-        return super().parse(raw)
+        return cls(token=raw.get("token"), sn=raw.get("sn"))
 
     @property
     def sequence(self) -> int | None:
@@ -281,7 +314,7 @@ class Identify(ModelBase):
         return {k: v for k, v in (("token", self.token), ("sn", self.sn)) if v is not None}
 
 
-@dataclass
+@dataclass(slots=True)
 class Ready(ModelBase):
     logins: list[LoginPartial]
     proxy_urls: list[str] = field(default_factory=list)
@@ -292,7 +325,7 @@ class Ready(ModelBase):
         return {"logins": [login.dump() for login in self.logins], "proxy_urls": self.proxy_urls}
 
 
-@dataclass
+@dataclass(slots=True)
 class MetaPayload(ModelBase):
     """Meta 信令"""
 
@@ -302,7 +335,7 @@ class MetaPayload(ModelBase):
         return {"proxy_urls": self.proxy_urls}
 
 
-@dataclass
+@dataclass(slots=True)
 class Meta(ModelBase):
     """Meta 数据"""
 
@@ -315,7 +348,7 @@ class Meta(ModelBase):
         return {"logins": [login.dump() for login in self.logins], "proxy_urls": self.proxy_urls}
 
 
-@dataclass
+@dataclass(slots=True)
 class EmojiObject(ModelBase):
     id: str
     name: str | None = None
@@ -330,7 +363,7 @@ class EmojiObject(ModelBase):
         return Emoji(self.id, self.name)
 
 
-@dataclass
+@dataclass(slots=True)
 class MessageObject(ModelBase):
     id: str
     content: str = ""
@@ -342,6 +375,8 @@ class MessageObject(ModelBase):
     updated_at: datetime | None = None
     referrer: dict | None = None
 
+    _parsed_message: list[Element] | None = field(init=False, default=None, repr=False, compare=False, hash=False)
+
     @classmethod
     def from_elements(
         cls,
@@ -361,10 +396,10 @@ class MessageObject(ModelBase):
 
     @property
     def message(self) -> list[Element]:
-        if hasattr(self, "_parsed_message"):
+        if self._parsed_message is not None:
             return self._parsed_message
-        self._parsed_message = transform(parse(self.content))
-        return self._parsed_message
+        self._parsed_message = msg = transform(parse(self.content))
+        return msg
 
     @message.setter
     def message(self, value: list[Element]):
@@ -372,11 +407,10 @@ class MessageObject(ModelBase):
         self.content = "".join(str(i) for i in value)
 
     @classmethod
-    def parse(cls, raw: dict):
+    def before_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)
 
     __converter__ = {
         "channel": Channel.parse,
@@ -406,7 +440,7 @@ class MessageObject(ModelBase):
         return res
 
 
-@dataclass
+@dataclass(slots=True)
 class Event(ModelBase):
     type: str
     timestamp: datetime
@@ -444,7 +478,7 @@ class Event(ModelBase):
     }
 
     @classmethod
-    def parse(cls, raw: dict):
+    def before_parse(cls, raw: dict):
         if "id" in raw and "sn" not in raw:
             raw["sn"] = raw["id"]
         if "platform" in raw and "self_id" in raw and "login" not in raw:
@@ -458,7 +492,6 @@ class Event(ModelBase):
             if "login" not in raw:
                 raw["login"] = {"sn": 0, "status": LoginStatus.ONLINE, "platform": raw.get("platform", "unknown")}
             raw["login"]["user"] = {"id": raw["self_id"]}
-        return super().parse(raw)
 
     @property
     def platform(self):
@@ -509,7 +542,7 @@ class Event(ModelBase):
 T = TypeVar("T", bound=ModelBase)
 
 
-@dataclass
+@dataclass(slots=True)
 class PageResult(ModelBase, Generic[T]):
     data: list[T]
     next: str | None = None
@@ -526,7 +559,7 @@ class PageResult(ModelBase, Generic[T]):
         return res
 
 
-@dataclass
+@dataclass(slots=True)
 class PageDequeResult(PageResult[T]):
     prev: str | None = None
 
@@ -569,7 +602,7 @@ Direction: TypeAlias = Literal["before", "after", "around"]
 Order: TypeAlias = Literal["asc", "desc"]
 
 
-@dataclass
+@dataclass(slots=True)
 class Upload:
     file: bytes | IO[bytes] | PathLike
     mimetype: str = "image/png"

satori/parser.py

@@ -12,27 +12,37 @@ def escape(text: str, inline: bool = False) -> str:
     return result.replace('"', """) if inline else result
 
 
+uc_escape_pat1 = re.compile(r"&#(\d+);")
+uc_escape_pat2 = re.compile(r"&#x([0-9a-f]+);")
+uc_escape_pat3 = re.compile(r"&(amp|#38|#x26);")
+
+
 def unescape(text: str) -> str:
     result = text.replace("&lt;", "<").replace("&gt;", ">").replace("&quot;", '"')
-    result = re.sub(r"&#(\d+);", lambda m: m[0] if m[1] == "38" else chr(int(m[1])), result)
-    result = re.sub(r"&#x([0-9a-f]+);", lambda m: m[0] if m[1] == "26" else chr(int(m[1], 16)), result)
-    return re.sub("&(amp|#38|#x26);", "&", result)
+    result = uc_escape_pat1.sub(lambda m: m[0] if m[1] == "38" else chr(int(m[1])), result)
+    result = uc_escape_pat2.sub(lambda m: m[0] if m[1] == "26" else chr(int(m[1], 16)), result)
+    return uc_escape_pat3.sub("&", result)
 
 
 def uncapitalize(source: str) -> str:
-    return source[0].lower() + source[1:]
+    return source[:1].lower() + source[1:]
+
+
+camel_pat = re.compile(r"[_-][a-z]")
+param_pat = re.compile(r".[A-Z]+")
+snake_pat = re.compile(r".[A-Z]")
 
 
 def camel_case(source: str) -> str:
-    return re.sub("[_-][a-z]", lambda mat: mat[0][1:].upper(), source)
+    return camel_pat.sub(lambda mat: mat[0][1:].upper(), source)
 
 
 def param_case(source: str) -> str:
-    return re.sub(".[A-Z]+", lambda mat: mat[0][0] + "-" + mat[0][1:].lower(), uncapitalize(source).replace("_", "-"))
+    return param_pat.sub(lambda mat: mat[0][0] + "-" + mat[0][1:].lower(), uncapitalize(source).replace("_", "-"))
 
 
 def snake_case(source: str) -> str:
-    return re.sub(".[A-Z]", lambda mat: mat[0][0] + "_" + mat[0][1:].lower(), uncapitalize(source).replace("-", "_"))
+    return snake_pat.sub(lambda mat: mat[0][0] + "_" + mat[0][1:].lower(), uncapitalize(source).replace("-", "_"))
 
 
 def ensure_list(value: T | list[T] | None) -> list[T]:
@@ -49,9 +59,9 @@ def make_element(content: Union[str, bool, int, float, "Element"]) -> Optional["
     if isinstance(content, Element):
         return content
     if isinstance(content, (bool, int, float)):
-        return Element(type="text", attrs={"text": str(content)})
+        return Element.parse(type="text", attrs={"text": str(content)})
     if isinstance(content, str) and content:
-        return Element(type="text", attrs={"text": content})
+        return Element.parse(type="text", attrs={"text": content})
     if content is not None:
         raise ValueError(f"Invalid content: {content!r}")
 
@@ -68,7 +78,9 @@ class Element:
     type: str
     attrs: dict[str, Any]
     children: list["Element"]
-    source: str | None = None
+    source: str | None
+
+    __slots__ = ("type", "attrs", "children", "source")
 
     def __init__(
         self,
@@ -99,6 +111,31 @@ class Element:
             elif not self.attrs:
                 self.attrs["text"] = ""
 
+    @classmethod
+    def parse(
+        cls, type: str, attrs: dict[str, Any], children: list["Element"] | None = None, source: str | None = None
+    ) -> "Element":
+        elem = cls.__new__(cls)
+        elem.type = type
+        elem.attrs = {}
+        elem.children = []
+        elem.source = source
+        for k, v in attrs.items():
+            if v is None:
+                continue
+            if k == "children":
+                elem.children.extend(ensure_list(v))
+            else:
+                elem.attrs[camel_case(k)] = v
+        if children:
+            elem.children.extend(children)
+        if type == "text":
+            if "content" in elem.attrs:
+                elem.attrs["text"] = elem.attrs.pop("content")
+            elif not elem.attrs:
+                elem.attrs["text"] = ""
+        return elem
+
     def tag(self):
         if self.type == "component":
             if is_ := self.attrs.get("is"):
@@ -234,6 +271,9 @@ tag_pat2 = re.compile(
 attr_pat1 = re.compile(r"([^\s=]+)(?:=\"(?P<value1>[^\"]*)\"|='(?P<value2>[^']*)')?", re.S)
 attr_pat2 = re.compile(r"([^\s=]+)(?:=\"(?P<value1>[^\"]*)\"|='(?P<value2>[^']*)'|=\{(?P<curly>[^\}]+)\})?", re.S)
 
+space_pat1 = re.compile(r"^\s*\n\s*", re.MULTILINE)
+space_pat2 = re.compile(r"\s*\n\s*$", re.MULTILINE)
+
 
 class Position(IntEnum):
     OPEN = 0
@@ -242,7 +282,7 @@ class Position(IntEnum):
     CONTINUE = 3
 
 
-@dataclass
+@dataclass(slots=True)
 class Token:
     type: Literal["angle", "curly"]
     name: str
@@ -299,7 +339,7 @@ def parse_tokens(tokens: list[str | Token], context: dict | None = None) -> list
     result: list[Element] = []
     for token in tokens:
         if isinstance(token, str):
-            result.append(Element(type="text", attrs={"text": token}))
+            result.append(Element.parse(type="text", attrs={"text": token}))
         elif token.type == "angle":
             attrs = {}
             attr_pat = attr_pat2 if context is not None else attr_pat1
@@ -318,10 +358,10 @@ def parse_tokens(tokens: list[str | Token], context: dict | None = None) -> list
                     attrs[key] = True
                 token.extra = token.extra[mat.end() :]
             result.append(
-                Element(
+                Element.parse(
                     token.name,
                     attrs,
-                    *parse_tokens(token.children["default"], context) if token.children else [],
+                    parse_tokens(token.children["default"], context) if token.children else [],
                 )
             )
         elif not token.name:
@@ -351,9 +391,9 @@ def parse(src: str, context: dict | None = None):
     def parse_content(source: str, _start: bool, _end: bool):
         source = unescape(source)
         if _start:
-            source = re.sub(r"^\s*\n\s*", "", source, flags=re.MULTILINE)
+            source = space_pat1.sub("", source)
         if _end:
-            source = re.sub(r"\s*\n\s*$", "", source, flags=re.MULTILINE)
+            source = space_pat2.sub("", source)
         push_text(source)
 
     tag_pat = tag_pat2 if context is not None else tag_pat1

satori/server/__init__.py

@@ -71,7 +71,7 @@ StarletteRequest.json = _json
 
 
 async def _request_handler(action: str, request: StarletteRequest, func: RouteCall, platform: str, self_id: str):
-    if action == Api.UPLOAD_CREATE.value:
+    if action == Api.UPLOAD_CREATE:
         async with request.form() as form:
             res = await func(
                 Request(
@@ -314,12 +314,10 @@ class Server(Service, RouterMixin):
         if not self._adapters and not self.routes:
             return Response(status_code=404, content=request.path_params["method"])
         action = request.path_params["action"]
-        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-User-ID" not in request.headers:
-            return Response(status_code=401, content="Missing header X-Self-ID or Satori-User-ID")
-        self_id: str = request.headers.get("X-Self-ID") or request.headers.get("Satori-User-ID")  # type: ignore
+        platform = request.headers.get("Satori-Platform")
+        self_id = request.headers.get("Satori-User-ID")
+        if platform is None or self_id is None:
+            return Response(status_code=401, content="Missing header Satori-Platform or Satori-User-ID")
 
         for _router in self._adapters:
             if action in _router.routes:
@@ -440,7 +438,7 @@ class Server(Service, RouterMixin):
         for provider in self.providers:
             logins.extend(await provider.get_logins())
             proxy_urls.extend(provider.proxy_urls())
-        return JSONResponse(content=Meta(logins, proxy_urls).dump())
+        return JSONResponse(content=Meta(logins=logins, proxy_urls=proxy_urls).dump())
 
     async def webhook_create_handler(self, request: StarletteRequest):
         body = await request.json()
@@ -556,7 +554,7 @@ class Server(Service, RouterMixin):
         stop_signal: Iterable[signal.Signals] = (signal.SIGINT,),
     ):
         if manager is None:
-            manager = it(Launart)
+            manager = manager or it(Launart)
         manager.add_component(self.asgi_service)
         manager.add_component(self)
         with suppress(ValueError):

satori/utils.py

@@ -24,10 +24,16 @@ try:
     def encode(obj):
         return encoder.encode(obj).decode()
 
+    def encode_bytes(obj):
+        return encoder.encode(obj)
+
 except ImportError:
     import json
 
     def encode(obj):
         return json.dumps(obj, separators=(",", ":"), ensure_ascii=False)
 
+    def encode_bytes(obj):
+        return json.dumps(obj, separators=(",", ":"), ensure_ascii=False).encode("utf-8")
+
     decode = json.loads

{satori_python-1.3.2.dist-info → satori_python-1.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python
-Version: 1.3.2
+Version: 1.3.3
 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>
@@ -38,11 +38,11 @@ Description-Content-Type: text/markdown
 [![PyPI](https://img.shields.io/pypi/v/satori-python)](https://pypi.org/project/satori-python)
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/satori-python)](https://www.python.org/)
 
-基于 [Satori](https://satori.chat/zh-CN/) 协议的 Python 开发工具包
+基于 [Satori](https://satori.chat/zh-CN/protocol) 协议的 Python 开发工具包
 
 ## 协议介绍
 
-[Satori Protocol](https://satori.chat/zh-CN/)
+[Satori Protocol](https://satori.chat/zh-CN/protocol)
 
 ### 协议端
 

{satori_python-1.3.2.dist-info → satori_python-1.3.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
-satori/__init__.py,sha256=jjtYn9EYbypLpVfiYn09Nn4AL3YU624qeWI2YYkiPbo,1888
+satori/__init__.py,sha256=Uo9vtxXg7Smr-CCrMc4CNzHYIoXdqE2x8w_eGmcZBhI,1888
 satori/_vendor/fleep.py,sha256=_zKP7iY3mMQr0rC5KbgkbkMorT3KVLeIsWPLIUa0Y34,16347
-satori/client/__init__.py,sha256=d1B1zjSlL_wnRAqKb4d1j1TvijB-x_1ySB2LPUpNnxo,14278
+satori/client/__init__.py,sha256=1HLiYmYZoScymOzTuOVZht99eREXMUT09F8PZzvAMPA,14484
 satori/client/account.py,sha256=HP7BJWkN69SB9ldNIjHxWlXcrmB-IPnTnYqm3lBMvl8,2742
 satori/client/account.pyi,sha256=ha632NYjlQDU65cjmYiP3eoPJnb82tMXuApLlUBwUKE,18744
 satori/client/config.py,sha256=iHBazxFDDE_-Qeyra2DVxZvQRCYqEoDrrzEVJjig93Q,1858
@@ -8,23 +8,24 @@ satori/client/network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 satori/client/network/base.py,sha256=0ajEhclVpVch-HMWLknoicexNe_keWW0dbLtboAtdtE,817
 satori/client/network/util.py,sha256=WfVTjmYxj4EjrbR8r3zm7RJZjxmGQwC7yjZtXQT6SWE,1246
 satori/client/network/webhook.py,sha256=N1zcJGx-Ijwtc0dIsPWzdnJSLi0ydQTengHBxtbbC2E,5326
-satori/client/network/websocket.py,sha256=2ApS3I5n68rsgYzv7NSkcPgud-7-sRpzJYYmFBEGLSM,8351
-satori/client/protocol.py,sha256=M7T09scA8azIbI2bv5JatfxOhCWW4TRFfbbDhJAI7zE,28388
+satori/client/network/websocket.py,sha256=oZtiFLywP_Rw-_I-hl32nShCTTQ1XKlv0BhWJj53x9Y,8476
+satori/client/protocol.py,sha256=hXrtgh-ypiF1W-dTl5I4LBWg8P2VTNKYQWFq8aRCeeo,28577
 satori/const.py,sha256=6TQAIlgNq7fHLiadxGUU-mzkffOcpRrEvq5yrWYMuGc,2738
-satori/element.py,sha256=h7x1yJa_w4FXCzSwOQq6VQS8d7GxEoYLrslHzXbgWCM,18664
+satori/element.py,sha256=Ya0iDwMpgmfdluHWEYEhbaC9fdRZuYRJfjMwLM4vb_E,20707
 satori/event.py,sha256=yC6rKaa7JbeOZ4Un1rX-Isvm3EcR7e782nxYf1j6JdM,1060
 satori/exception.py,sha256=edKeuLRZAQxyCdw1_XCgOtv5tIHkfHw0Die9B818_HM,545
-satori/model.py,sha256=qEoVYpq9DiczE_3nhp3h5PTkde_qSVdGR4JdlF9JUb4,15843
-satori/parser.py,sha256=5gk9jeFFDdPPnexslfB33dKIRM2ZDQ0NgyNoESIZ5G0,13475
-satori/server/__init__.py,sha256=7UDYFb8HLuBIQlQ_5ZW8qNpxBz1Jpuj4kKndWA-A6ME,24143
+satori/model.py,sha256=U3Ad78zjIATMgEQ-dpNtA60eungIU3L_AAJMq_EhzHU,17439
+satori/parser.py,sha256=EyKitj39OewGhZuNIvrd8nWJiL5EJAVy7mtcv8Zk6v0,14658
+satori/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+satori/server/__init__.py,sha256=qvbPHSbIiOQGJV_D3yfEKupqOqMKwzrLixkjy3AMgqs,23820
 satori/server/adapter.py,sha256=-eIkj1TvZ5LJ6jrRoobvea_MlrqksY3HiZ8sDYY3wP8,1600
 satori/server/connection.py,sha256=28sDNT9QmTJknCRQAMB1jzxcRiG3Tw_TO0AFlCMNr5g,1439
 satori/server/formdata.py,sha256=lHLTatf6117eC4U7FX77PjGvchEPiZGmVWnpe9tceh4,437
 satori/server/model.py,sha256=zzjNa3iBFkd8crZIVTrEisPaB0g8JsxV4fA2rRU0maw,1105
 satori/server/route.py,sha256=kpelAX0kYQbJncp5biWi8pWRcEIez9m9sJN8NF3sjn4,10654
 satori/server/utils.py,sha256=hMNqLzbzcwyLJO-sGncO5kuviiW5Y6k34fj4AS2iVWQ,910
-satori/utils.py,sha256=IUSCfR82lQd--NT5-aXopUafuRGNdyqqBMwblzNGXgE,641
-satori_python-1.3.2.dist-info/METADATA,sha256=mOUUTUMzQNtqW1otMVgJmlDesoVK6X3s2oTwiZ8AXUo,5495
-satori_python-1.3.2.dist-info/WHEEL,sha256=rSwsxJWe3vzyR5HCwjWXQruDgschpei4h_giTm0dJVE,90
-satori_python-1.3.2.dist-info/licenses/LICENSE,sha256=2EDswKd1M1648judap8BEEwp3Jz6IpfFP2wYVdU0Y2o,1069
-satori_python-1.3.2.dist-info/RECORD,,
+satori/utils.py,sha256=N8HEw-DOXxOBwFHmmXgqPdMh6AXjiGR0ZGa1zBPH6EI,822
+satori_python-1.3.3.dist-info/METADATA,sha256=VqEeAYKbYM1fbB1hr-ugFBSrI0VjQntpUpnKaqCVdL8,5511
+satori_python-1.3.3.dist-info/WHEEL,sha256=rSwsxJWe3vzyR5HCwjWXQruDgschpei4h_giTm0dJVE,90
+satori_python-1.3.3.dist-info/licenses/LICENSE,sha256=2EDswKd1M1648judap8BEEwp3Jz6IpfFP2wYVdU0Y2o,1069
+satori_python-1.3.3.dist-info/RECORD,,