satori-python 0.13.3__tar.gz → 0.14.0__tar.gz

{satori_python-0.13.3 → satori_python-0.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python
-Version: 0.13.3
+Version: 0.14.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>

{satori_python-0.13.3 → satori_python-0.14.0}/pyproject.toml

@@ -29,7 +29,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
 ]
-version = "0.13.3"
+version = "0.14.0"
 
 [project.license]
 text = "MIT"
@@ -86,7 +86,7 @@ extra_standard_library = [
 
 [tool.ruff]
 line-length = 110
-target-version = "py38"
+target-version = "py39"
 exclude = [
     "exam.py",
 ]
@@ -111,7 +111,7 @@ ignore = [
 
 [tool.pyright]
 pythonPlatform = "All"
-pythonVersion = "3.8"
+pythonVersion = "3.9"
 typeCheckingMode = "basic"
 reportShadowedImports = false
 disableBytesTypePromotions = true

{satori_python-0.13.3 → satori_python-0.14.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.13.3"
+__version__ = "0.14.0"

{satori_python-0.13.3 → satori_python-0.14.0}/src/satori/client/__init__.py

@@ -4,8 +4,9 @@ import asyncio
 import functools
 import signal
 import threading
+from collections.abc import Awaitable, Iterable
 from functools import wraps
-from typing import TYPE_CHECKING, Any, Awaitable, Callable, Iterable, Literal, TypeVar, overload
+from typing import TYPE_CHECKING, Any, Callable, Literal, TypeVar, overload
 
 from creart import it
 from graia.amnesia.builtins.aiohttp import AiohttpClientService

{satori_python-0.13.3 → satori_python-0.14.0}/src/satori/client/account.pyi

@@ -1,5 +1,6 @@
 import asyncio
-from typing import Any, Generic, Iterable, Protocol, TypeVar, overload
+from collections.abc import Iterable
+from typing import Any, Generic, Protocol, TypeVar, overload
 
 from yarl import URL
 

{satori_python-0.13.3 → satori_python-0.14.0}/src/satori/client/network/websocket.py

@@ -119,9 +119,8 @@ class WsNetwork(BaseNetwork[WebsocketsInfo]):
     async def _heartbeat(self):
         """心跳"""
         while True:
-            if self.sequence:
-                with suppress(Exception):
-                    await self.send({"op": 1})
+            with suppress(Exception):
+                await self.send({"op": 1})
             await asyncio.sleep(9)
 
     async def daemon(self, manager: Launart, session: aiohttp.ClientSession):

{satori_python-0.13.3 → satori_python-0.14.0}/src/satori/client/protocol.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Iterable, cast, overload
+from collections.abc import Iterable
+from typing import TYPE_CHECKING, Any, cast, overload
 
 from aiohttp import FormData
 from graia.amnesia.builtins.aiohttp import AiohttpClientService

{satori_python-0.13.3 → satori_python-0.14.0}/src/satori/element.py

@@ -2,7 +2,7 @@ from base64 import b64encode
 from dataclasses import InitVar, dataclass, field, fields
 from io import BytesIO
 from pathlib import Path
-from typing import Any, ClassVar, Dict, List, Optional, Tuple, Type, TypeVar, Union, get_args, overload
+from typing import Any, ClassVar, Optional, TypeVar, Union, get_args, overload
 from typing_extensions import override
 
 from .parser import Element as RawElement
@@ -14,13 +14,13 @@ TE = TypeVar("TE", bound="Element")
 
 @dataclass(repr=False)
 class Element:
-    _attrs: Dict[str, Any] = field(init=False, default_factory=dict)
-    _children: List["Element"] = field(init=False, default_factory=list)
+    _attrs: dict[str, Any] = field(init=False, default_factory=dict)
+    _children: list["Element"] = field(init=False, default_factory=list)
 
-    __names__: ClassVar[Tuple[str, ...]]
+    __names__: ClassVar[tuple[str, ...]]
 
     @property
-    def children(self) -> List["Element"]:
+    def children(self) -> list["Element"]:
         return self._children
 
     @property
@@ -28,7 +28,7 @@ class Element:
         return self.__class__.__name__.lower()
 
     @classmethod
-    def unpack(cls, attrs: Dict[str, Any]):
+    def unpack(cls, attrs: dict[str, Any]):
         obj = cls(**{k: v for k, v in attrs.items() if k in cls.__names__})  # type: ignore
         obj._attrs.update({k: v for k, v in attrs.items() if k not in cls.__names__})
         return obj
@@ -166,7 +166,7 @@ class Link(Element):
 class Resource(Element):
     src: str
     title: Optional[str] = None
-    extra: InitVar[Optional[Dict[str, Any]]] = None
+    extra: InitVar[Optional[dict[str, Any]]] = None
     cache: Optional[bool] = None
     timeout: Optional[int] = None
 
@@ -181,19 +181,19 @@ class Resource(Element):
         mime: Optional[str] = None,
         name: Optional[str] = None,
         poster: Optional[str] = None,
-        extra: Optional[Dict[str, Any]] = None,
+        extra: Optional[dict[str, Any]] = None,
         cache: Optional[bool] = None,
         timeout: Optional[int] = None,
         **kwargs,
     ):
-        data: Dict[str, Any] = {"extra": extra}
+        data: dict[str, Any] = {"extra": extra or kwargs}
         if url is not None:
-            data = {"src": url}
+            data |= {"src": url}
         elif path:
-            data = {"src": Path(path).as_uri()}
+            data |= {"src": Path(path).as_uri()}
         elif raw and mime:
             bd = raw.getvalue() if isinstance(raw, BytesIO) else raw
-            data = {"src": f"data:{mime};base64,{b64encode(bd).decode('utf-8')}"}
+            data |= {"src": f"data:{mime};base64,{b64encode(bd).decode('utf-8')}"}
         else:
             raise ValueError(f"{cls} need at least one of url, path and raw")
         if name is not None:
@@ -206,7 +206,7 @@ class Resource(Element):
             data["timeout"] = timeout
         return cls(**data)
 
-    def __post_init__(self, extra: Optional[Dict[str, Any]] = None):
+    def __post_init__(self, extra: Optional[dict[str, Any]] = None):
         super().__post_init__()
         if extra:
             self._attrs.update(extra)
@@ -380,7 +380,7 @@ class Message(Element):
         self,
         id: Optional[str] = None,
         forward: Optional[bool] = None,
-        content: Optional[List[Union[str, Element]]] = None,
+        content: Optional[list[Union[str, Element]]] = None,
     ):
         self.id = id
         self.forward = forward
@@ -464,8 +464,8 @@ class Custom(Element):
     def __init__(
         self,
         type: str,
-        attrs: Optional[Dict[str, Any]] = None,
-        children: Optional[List[Union[str, Element]]] = None,
+        attrs: Optional[dict[str, Any]] = None,
+        children: Optional[list[Union[str, Element]]] = None,
     ):
         self.type = type
         super().__init__()
@@ -536,7 +536,7 @@ STYLE_TYPE_MAP = {
 }
 
 
-def transform(elements: List[RawElement]) -> List[Element]:
+def transform(elements: list[RawElement]) -> list[Element]:
     msg = []
     for elem in elements:
         tag = elem.tag()
@@ -568,14 +568,14 @@ def transform(elements: List[RawElement]) -> List[Element]:
 
 
 @overload
-def select(elements: Union[Element, List[Element]], query: Type[TE]) -> List[TE]: ...
+def select(elements: Union[Element, list[Element]], query: type[TE]) -> list[TE]: ...
 
 
 @overload
-def select(elements: Union[Element, List[Element]], query: str) -> List[Element]: ...
+def select(elements: Union[Element, list[Element]], query: str) -> list[Element]: ...
 
 
-def select(elements: Union[Element, List[Element]], query: Union[Type[TE], str]):
+def select(elements: Union[Element, list[Element]], query: Union[type[TE], str]):
     if not elements:
         return []
     if isinstance(elements, Element):

{satori_python-0.13.3 → satori_python-0.14.0}/src/satori/model.py

@@ -4,7 +4,7 @@ from datetime import datetime
 from enum import IntEnum
 from os import PathLike
 from pathlib import Path
-from typing import IO, Any, Callable, ClassVar, Dict, Generic, List, Literal, Optional, TypeVar, Union
+from typing import IO, Any, Callable, ClassVar, Generic, Literal, Optional, TypeVar, Union
 from typing_extensions import TypeAlias
 
 from .element import Element, transform
@@ -14,7 +14,7 @@ from .parser import parse
 
 @dataclass
 class ModelBase:
-    __converter__: ClassVar[Dict[str, Callable[[Any], Any]]] = {}
+    __converter__: ClassVar[dict[str, Callable[[Any], Any]]] = {}
 
     @classmethod
     def parse(cls, raw: dict):
@@ -81,7 +81,7 @@ class User(ModelBase):
     is_bot: Optional[bool] = None
 
     def dump(self):
-        res: Dict[str, Any] = {"id": self.id}
+        res: dict[str, Any] = {"id": self.id}
         if self.name:
             res["name"] = self.name
         if self.nick:
@@ -141,13 +141,13 @@ class Login(ModelBase):
     user: Optional[User] = None
     self_id: Optional[str] = None
     platform: Optional[str] = None
-    features: List[str] = field(default_factory=list)
-    proxy_urls: List[str] = field(default_factory=list)
+    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] = {
+        res: dict[str, Any] = {
             "status": self.status.value,
             "features": self.features,
             "proxy_urls": self.proxy_urls,
@@ -195,7 +195,7 @@ class Identify(ModelBase):
 
 @dataclass
 class Ready(ModelBase):
-    logins: List[Login]
+    logins: list[Login]
 
 
 @dataclass
@@ -213,7 +213,7 @@ class MessageObject(ModelBase):
     def from_elements(
         cls,
         id: str,
-        content: List[Element],
+        content: list[Element],
         channel: Optional[Channel] = None,
         guild: Optional[Guild] = None,
         member: Optional[Member] = None,
@@ -224,7 +224,7 @@ class MessageObject(ModelBase):
         return cls(id, "".join(str(i) for i in content), channel, guild, member, user, created_at, updated_at)
 
     @property
-    def message(self) -> List[Element]:
+    def message(self) -> list[Element]:
         return transform(parse(self.content))
 
     @classmethod
@@ -244,7 +244,7 @@ class MessageObject(ModelBase):
     }
 
     def dump(self):
-        res: Dict[str, Any] = {"id": self.id, "content": self.content}
+        res: dict[str, Any] = {"id": self.id, "content": self.content}
         if self.channel:
             res["channel"] = self.channel.dump()
         if self.guild:
@@ -335,7 +335,7 @@ T = TypeVar("T", bound=ModelBase)
 
 @dataclass
 class PageResult(ModelBase, Generic[T]):
-    data: List[T]
+    data: list[T]
     next: Optional[str] = None
 
     @classmethod

{satori_python-0.13.3 → satori_python-0.14.0}/src/satori/parser.py

@@ -1,7 +1,8 @@
 import re
+from collections.abc import Iterable
 from dataclasses import dataclass, field
 from enum import IntEnum
-from typing import Any, Callable, Dict, Iterable, List, Literal, Optional, TypedDict, TypeVar, Union, cast
+from typing import Any, Callable, Literal, Optional, TypedDict, TypeVar, Union, cast
 from typing_extensions import TypeAlias
 
 T = TypeVar("T")
@@ -39,13 +40,13 @@ def snake_case(source: str) -> str:
     )
 
 
-def ensure_list(value: Union[T, List[T], None]) -> List[T]:
+def ensure_list(value: Union[T, list[T], None]) -> list[T]:
     return value if isinstance(value, list) else [value] if value else []
 
 
 S = TypeVar("S")
-Fragment: TypeAlias = Union[str, "Element", List[Union[str, "Element"]]]
-Render: TypeAlias = Callable[[dict, List["Element"], S], T]
+Fragment: TypeAlias = Union[str, "Element", list[Union[str, "Element"]]]
+Render: TypeAlias = Callable[[dict, list["Element"], S], T]
 Visitor: TypeAlias = Callable[["Element", S], T]
 
 
@@ -60,7 +61,7 @@ def make_element(content: Union[str, bool, int, float, "Element"]) -> Optional["
         raise ValueError(f"Invalid content: {content!r}")
 
 
-def make_elements(content: Fragment) -> List["Element"]:
+def make_elements(content: Fragment) -> list["Element"]:
     if isinstance(content, list):
         res = [make_element(c) for c in content]
     else:
@@ -70,14 +71,14 @@ def make_elements(content: Fragment) -> List["Element"]:
 
 class Element:
     type: str
-    attrs: Dict[str, Any]
-    children: List["Element"]
+    attrs: dict[str, Any]
+    children: list["Element"]
     source: Optional[str] = None
 
     def __init__(
         self,
         type: Union[str, Render[Fragment, Any]],
-        attrs: Optional[Dict[str, Any]] = None,
+        attrs: Optional[dict[str, Any]] = None,
         *children: Fragment,
     ) -> None:
         self.attrs = {}
@@ -154,8 +155,8 @@ class Selector:
 comb_pat = re.compile(" *([ >+~]) *")
 
 
-def parse_selector(input: str) -> List[List[Selector]]:
-    def _quert(query: str) -> List[Selector]:
+def parse_selector(input: str) -> list[list[Selector]]:
+    def _quert(query: str) -> list[Selector]:
         selectors = []
         combinator = " "
         while mat := comb_pat.search(query):
@@ -173,7 +174,7 @@ def parse_selector(input: str) -> List[List[Selector]]:
     return [_quert(q) for q in input.split(",")]
 
 
-def select(source: Union[str, List[Element]], query: Union[str, List[List[Selector]]]) -> List[Element]:
+def select(source: Union[str, list[Element]], query: Union[str, list[list[Selector]]]) -> list[Element]:
     if not source or not query:
         return []
     if isinstance(source, str):
@@ -182,10 +183,10 @@ def select(source: Union[str, List[Element]], query: Union[str, List[List[Select
         query = parse_selector(query)
     if not query:
         return []
-    adjacent: List[List[Selector]] = []
+    adjacent: list[list[Selector]] = []
     results = []
     for index, elem in enumerate(source):
-        inner: List[List[Selector]] = []
+        inner: list[list[Selector]] = []
         local = [*query, *adjacent]
         adjacent = []
         matched = False
@@ -255,7 +256,7 @@ class Token:
     positon: Position
     source: str
     extra: str
-    children: Dict[str, List[Union[str, "Token"]]] = field(default_factory=dict)
+    children: dict[str, list[Union[str, "Token"]]] = field(default_factory=dict)
 
 
 class StackItem(TypedDict):
@@ -263,8 +264,8 @@ class StackItem(TypedDict):
     slot: str
 
 
-def fold_tokens(tokens: List[Union[str, Token]]) -> List[Union[str, Token]]:
-    stack: List[StackItem] = [
+def fold_tokens(tokens: list[Union[str, Token]]) -> list[Union[str, Token]]:
+    stack: list[StackItem] = [
         {
             "token": Token(
                 type="angle",
@@ -301,8 +302,8 @@ def fold_tokens(tokens: List[Union[str, Token]]) -> List[Union[str, Token]]:
     return stack[-1]["token"].children["default"]
 
 
-def parse_tokens(tokens: List[Union[str, Token]], context: Optional[dict] = None) -> List[Element]:
-    result: List[Element] = []
+def parse_tokens(tokens: list[Union[str, Token]], context: Optional[dict] = None) -> list[Element]:
+    result: list[Element] = []
     for token in tokens:
         if isinstance(token, str):
             result.append(Element(type="text", attrs={"text": token}))
@@ -348,7 +349,7 @@ def parse_tokens(tokens: List[Union[str, Token]], context: Optional[dict] = None
 
 
 def parse(src: str, context: Optional[dict] = None):
-    tokens: List[Union[str, Token]] = []
+    tokens: list[Union[str, Token]] = []
 
     def push_text(text: str):
         if text:

{satori_python-0.13.3 → satori_python-0.14.0}/src/satori/server/__init__.py

@@ -7,11 +7,12 @@ import secrets
 import signal
 import threading
 import urllib.parse
+from collections.abc import Iterable
 from contextlib import suppress
 from pathlib import Path
 from tempfile import TemporaryDirectory
 from traceback import print_exc
-from typing import Any, Iterable, cast
+from typing import Any, cast
 
 import aiohttp
 from creart import it
@@ -32,6 +33,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 .model import Provider as Provider
 from .model import Request as Request
@@ -99,6 +101,8 @@ class Server(Service, RouterMixin):
         self.webhooks = webhooks or []
         self._tempdir = TemporaryDirectory()
         self.proxy_url_mapping = {}
+        self._sequence = 0
+        self._event_cache = Deque(maxlen=100)
         super().__init__()
 
     def apply(self, item: Provider | Router | Adapter):
@@ -117,6 +121,9 @@ class Server(Service, RouterMixin):
             raise TypeError(f"Unknown config type: {item}")
 
     async def event_callback(self, event: Event):
+        event.id = self._sequence
+        self._event_cache.append(event)
+        self._sequence += 1
         for connection in self.connections:
             try:
                 await connection.send({"op": Opcode.EVENT, "body": event.dump()})
@@ -146,16 +153,22 @@ class Server(Service, RouterMixin):
         identity = await ws.receive_json()
         if not isinstance(identity, dict) or identity.get("op") != Opcode.IDENTIFY:
             return await ws.close(code=3000, reason="Unauthorized")
-        token = identity["body"]["token"]
+        body = identity["body"]
+        token = identity["body"].get("token")
         logins = []
         for provider in self.providers:
             if not provider.authenticate(token):
                 return await ws.close(code=3000, reason="Unauthorized")
             logins.extend(await provider.get_logins())
+        sequence = body.get("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)}")
         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())
         finally:
             self.connections.remove(connection)

{satori_python-0.13.3 → satori_python-0.14.0}/src/satori/server/adapter.py

@@ -1,5 +1,6 @@
 from abc import abstractmethod
-from typing import AsyncIterator, List
+from collections.abc import AsyncIterator
+from typing import Optional
 
 from launart import Service
 
@@ -18,17 +19,17 @@ class Adapter(Service, RouterMixin):
     def ensure(self, platform: str, self_id: str) -> bool: ...
 
     @abstractmethod
-    def authenticate(self, token: str) -> bool: ...
+    def authenticate(self, token: Optional[str]) -> bool: ...
 
     @staticmethod
-    def proxy_urls() -> List[str]:
+    def proxy_urls() -> list[str]:
         return []
 
     @abstractmethod
     async def download_uploaded(self, platform: str, self_id: str, path: str) -> bytes: ...
 
     @abstractmethod
-    async def get_logins(self) -> List[Login]: ...
+    async def get_logins(self) -> list[Login]: ...
 
     def __init__(self):
         super().__init__()

satori_python-0.14.0/src/satori/server/conection.py

@@ -0,0 +1,44 @@
+from __future__ import annotations
+
+import asyncio
+
+from loguru import logger
+from starlette.websockets import WebSocket, WebSocketDisconnect
+
+from satori.model import Opcode
+
+
+class WebsocketConnection:
+    connection: WebSocket
+
+    def __init__(self, connection: WebSocket):
+        self.connection = connection
+        self.close_signal: asyncio.Event = asyncio.Event()
+
+    @property
+    def alive(self) -> bool:
+        return not self.close_signal.is_set()
+
+    async def heartbeat(self):
+        while True:
+            try:
+                msg = await asyncio.wait_for(self.connection.receive_json(), timeout=10)
+                if not isinstance(msg, dict) or msg.get("op") != Opcode.PING:
+                    continue
+                await self.connection.send_json({"op": Opcode.PONG})
+            except asyncio.TimeoutError:
+                logger.warning(f"Connection {id(self)} heartbeat timeout, closing connection.")
+                await self.connection.close()
+                await self.connection_closed()
+                break
+            except WebSocketDisconnect:
+                return
+
+    async def connection_closed(self):
+        self.close_signal.set()
+
+    async def wait_for_available(self):
+        return
+
+    async def send(self, payload: dict) -> None:
+        return await self.connection.send_json(payload)

satori_python-0.14.0/src/satori/server/deque.py

@@ -0,0 +1,33 @@
+from collections import deque
+
+
+class Deque:
+    def __init__(self, maxlen: int):
+        self.data = deque(maxlen=maxlen)
+        self.offset = 0
+
+    def append(self, x):
+        if len(self.data) == self.data.maxlen:
+            self.offset += 1
+        self.data.append(x)
+
+    def __getitem__(self, i: int):
+        index = i - self.offset
+        if index < 0 or index >= len(self.data):
+            return
+        return self.data[index]
+
+    def after(self, i: int):
+        if i < self.offset:
+            i = self.offset - 1
+        return list(self.data)[i + 1 - self.offset :]
+
+
+if __name__ == "__main__":
+    d = Deque(3)
+    d.append(0)
+    d.append(1)
+    d.append(2)
+    d.append(3)
+    d.append(4)
+    d.append(5)

{satori_python-0.13.3 → satori_python-0.14.0}/src/satori/server/model.py

@@ -1,7 +1,6 @@
-from __future__ import annotations
-
+from collections.abc import AsyncIterator
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, AsyncIterator, Generic, Protocol, TypeVar, Union, runtime_checkable
+from typing import TYPE_CHECKING, Any, Generic, Optional, Protocol, TypeVar, Union, runtime_checkable
 
 from satori.const import Api
 from satori.model import Event, Login
@@ -25,7 +24,7 @@ class Request(Generic[TP]):
 class Provider(Protocol):
     def publisher(self) -> AsyncIterator[Event]: ...
 
-    def authenticate(self, token: str) -> bool: ...
+    def authenticate(self, token: Optional[str]) -> bool: ...
 
     async def get_logins(self) -> list[Login]: ...
 
@@ -39,4 +38,4 @@ class Provider(Protocol):
 
 @runtime_checkable
 class Router(Protocol):
-    routes: dict[str, RouteCall[Any, Any]]
+    routes: dict[str, "RouteCall[Any, Any]"]

{satori_python-0.13.3 → satori_python-0.14.0}/src/satori/server/route.py

@@ -1,4 +1,5 @@
-from typing import Any, Awaitable, Callable, Dict, List, Literal, Protocol, TypeVar, Union, overload
+from collections.abc import Awaitable
+from typing import Any, Callable, Literal, Protocol, TypeVar, Union, overload
 from typing_extensions import NotRequired, TypeAlias, TypedDict
 
 from starlette.datastructures import FormData
@@ -30,7 +31,7 @@ class RouteCall(Protocol[T, R]):
 
 
 INTERAL: TypeAlias = RouteCall[
-    Any, Union[ModelBase, List[ModelBase], Dict[str, Any], List[Dict[str, Any]], None]
+    Any, Union[ModelBase, list[ModelBase], dict[str, Any], list[dict[str, Any]], None]
 ]
 
 
@@ -39,7 +40,7 @@ class MessageParam(TypedDict):
     content: str
 
 
-MESSAGE_CREATE: TypeAlias = RouteCall[MessageParam, Union[List[MessageObject], List[Dict[str, Any]]]]
+MESSAGE_CREATE: TypeAlias = RouteCall[MessageParam, Union[list[MessageObject], list[dict[str, Any]]]]
 
 
 class MessageOpParam(TypedDict):
@@ -47,7 +48,7 @@ class MessageOpParam(TypedDict):
     message_id: str
 
 
-MESSAGE_GET: TypeAlias = RouteCall[MessageOpParam, Union[MessageObject, Dict[str, Any]]]
+MESSAGE_GET: TypeAlias = RouteCall[MessageOpParam, Union[MessageObject, dict[str, Any]]]
 MESSAGE_DELETE: TypeAlias = RouteCall[MessageOpParam, None]
 
 
@@ -68,14 +69,14 @@ class MessageListParam(TypedDict):
     order: NotRequired[Order]
 
 
-MESSAGE_LIST: TypeAlias = RouteCall[MessageListParam, Union[PageDequeResult[MessageObject], Dict[str, Any]]]
+MESSAGE_LIST: TypeAlias = RouteCall[MessageListParam, Union[PageDequeResult[MessageObject], dict[str, Any]]]
 
 
 class ChannelParam(TypedDict):
     channel_id: str
 
 
-CHANNEL_GET: TypeAlias = RouteCall[ChannelParam, Union[Channel, Dict[str, Any]]]
+CHANNEL_GET: TypeAlias = RouteCall[ChannelParam, Union[Channel, dict[str, Any]]]
 CHANNEL_DELETE: TypeAlias = RouteCall[ChannelParam, None]
 
 
@@ -84,7 +85,7 @@ class ChannelListParam(TypedDict):
     next: NotRequired[str]
 
 
-CHANNEL_LIST: TypeAlias = RouteCall[ChannelListParam, Union[PageResult[Channel], Dict[str, Any]]]
+CHANNEL_LIST: TypeAlias = RouteCall[ChannelListParam, Union[PageResult[Channel], dict[str, Any]]]
 
 
 class ChanneCreateParam(TypedDict):
@@ -92,7 +93,7 @@ class ChanneCreateParam(TypedDict):
     data: dict
 
 
-CHANNEL_CREATE: TypeAlias = RouteCall[ChanneCreateParam, Union[Channel, Dict[str, Any]]]
+CHANNEL_CREATE: TypeAlias = RouteCall[ChanneCreateParam, Union[Channel, dict[str, Any]]]
 
 
 class ChanneUpdateParam(TypedDict):
@@ -116,21 +117,21 @@ class UserChannelCreateParam(TypedDict):
     guild_id: NotRequired[str]
 
 
-ROUTE_USER_CHANNEL_CREATE: TypeAlias = RouteCall[UserChannelCreateParam, Union[Channel, Dict[str, Any]]]
+ROUTE_USER_CHANNEL_CREATE: TypeAlias = RouteCall[UserChannelCreateParam, Union[Channel, dict[str, Any]]]
 
 
 class GuildGetParam(TypedDict):
     guild_id: str
 
 
-GUILD_GET: TypeAlias = RouteCall[GuildGetParam, Union[Guild, Dict[str, Any]]]
+GUILD_GET: TypeAlias = RouteCall[GuildGetParam, Union[Guild, dict[str, Any]]]
 
 
 class GuildListParam(TypedDict):
     next: NotRequired[str]
 
 
-GUILD_LIST: TypeAlias = RouteCall[GuildListParam, Union[PageResult[Guild], Dict[str, Any]]]
+GUILD_LIST: TypeAlias = RouteCall[GuildListParam, Union[PageResult[Guild], dict[str, Any]]]
 
 
 class GuildMemberGetParam(TypedDict):
@@ -138,7 +139,7 @@ class GuildMemberGetParam(TypedDict):
     user_id: str
 
 
-GUILD_MEMBER_GET: TypeAlias = RouteCall[GuildMemberGetParam, Union[Member, Dict[str, Any]]]
+GUILD_MEMBER_GET: TypeAlias = RouteCall[GuildMemberGetParam, Union[Member, dict[str, Any]]]
 
 
 class GuildXXXListParam(TypedDict):
@@ -146,7 +147,7 @@ class GuildXXXListParam(TypedDict):
     next: NotRequired[str]
 
 
-GUILD_MEMBER_LIST: TypeAlias = RouteCall[GuildXXXListParam, Union[PageResult[Member], Dict[str, Any]]]
+GUILD_MEMBER_LIST: TypeAlias = RouteCall[GuildXXXListParam, Union[PageResult[Member], dict[str, Any]]]
 
 
 class GuildMemberKickParam(TypedDict):
@@ -176,7 +177,7 @@ class GuildMemberRoleParam(TypedDict):
 GUILD_MEMBER_ROLE_SET: TypeAlias = RouteCall[GuildMemberRoleParam, None]
 GUILD_MEMBER_ROLE_UNSET: TypeAlias = RouteCall[GuildMemberRoleParam, None]
 
-GUILD_ROLE_LIST: TypeAlias = RouteCall[GuildXXXListParam, Union[PageResult[Role], Dict[str, Any]]]
+GUILD_ROLE_LIST: TypeAlias = RouteCall[GuildXXXListParam, Union[PageResult[Role], dict[str, Any]]]
 
 
 class GuildRoleCreateParam(TypedDict):
@@ -184,7 +185,7 @@ class GuildRoleCreateParam(TypedDict):
     role: dict
 
 
-GUILD_ROLE_CREATE: TypeAlias = RouteCall[GuildRoleCreateParam, Union[Role, Dict[str, Any]]]
+GUILD_ROLE_CREATE: TypeAlias = RouteCall[GuildRoleCreateParam, Union[Role, dict[str, Any]]]
 
 
 class GuildRoleUpdateParam(TypedDict):
@@ -239,22 +240,22 @@ class ReactionListParam(TypedDict):
     next: NotRequired[str]
 
 
-REACTION_LIST: TypeAlias = RouteCall[ReactionListParam, Union[PageResult[User], Dict[str, Any]]]
-LOGIN_GET: TypeAlias = RouteCall[Any, Union[Login, Dict[str, Any]]]
+REACTION_LIST: TypeAlias = RouteCall[ReactionListParam, Union[PageResult[User], dict[str, Any]]]
+LOGIN_GET: TypeAlias = RouteCall[Any, Union[Login, dict[str, Any]]]
 
 
 class UserGetParam(TypedDict):
     user_id: str
 
 
-USER_GET: TypeAlias = RouteCall[UserGetParam, Union[User, Dict[str, Any]]]
+USER_GET: TypeAlias = RouteCall[UserGetParam, Union[User, dict[str, Any]]]
 
 
 class FriendListParam(TypedDict):
     next: NotRequired[str]
 
 
-FRIEND_LIST: TypeAlias = RouteCall[FriendListParam, Union[PageResult[User], Dict[str, Any]]]
+FRIEND_LIST: TypeAlias = RouteCall[FriendListParam, Union[PageResult[User], dict[str, Any]]]
 
 
 class ApproveParam(TypedDict):
@@ -266,11 +267,11 @@ class ApproveParam(TypedDict):
 APPROVE: TypeAlias = RouteCall[ApproveParam, None]
 
 
-UPLOAD_CREATE: TypeAlias = RouteCall[FormData, Dict[str, str]]
+UPLOAD_CREATE: TypeAlias = RouteCall[FormData, dict[str, str]]
 
 
 class RouterMixin:
-    routes: Dict[str, RouteCall[Any, Any]]
+    routes: dict[str, RouteCall[Any, Any]]
 
     @overload
     def route(self, path: Literal[Api.MESSAGE_CREATE]) -> Callable[[MESSAGE_CREATE], MESSAGE_CREATE]: ...

satori_python-0.13.3/src/satori/server/conection.py

@@ -1,40 +0,0 @@
-from __future__ import annotations
-
-import asyncio
-
-from starlette.websockets import WebSocket
-
-from satori.model import Opcode
-
-
-class WebsocketConnection:
-    connection: WebSocket
-
-    def __init__(self, connection: WebSocket):
-        self.connection = connection
-        self.close_signal: asyncio.Event = asyncio.Event()
-
-    @property
-    def id(self):
-        return self.connection.headers["X-Self-ID"]
-
-    @property
-    def alive(self) -> bool:
-        return not self.close_signal.is_set()
-
-    async def heartbeat(self):
-        async for msg in self.connection.iter_json():
-            if not isinstance(msg, dict) or msg.get("op") != Opcode.PING:
-                continue
-            await self.connection.send_json({"op": Opcode.PONG})
-        else:
-            await self.connection_closed()
-
-    async def connection_closed(self):
-        self.close_signal.set()
-
-    async def wait_for_available(self):
-        return
-
-    async def send(self, payload: dict) -> None:
-        return await self.connection.send_json(payload)