satori-python 0.16.2__tar.gz → 0.16.3__tar.gz

{satori_python-0.16.2 → satori_python-0.16.3}/PKG-INFO

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

{satori_python-0.16.2 → satori_python-0.16.3}/pyproject.toml

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

{satori_python-0.16.2 → satori_python-0.16.3}/src/satori/__init__.py

@@ -41,4 +41,4 @@ from .model import Role as Role
 from .model import Upload as Upload
 from .model import User as User
 
-__version__ = "0.16.2"
+__version__ = "0.16.3"

{satori_python-0.16.2 → satori_python-0.16.3}/src/satori/client/__init__.py

@@ -189,32 +189,37 @@ class App(Service):
     async def post(self, event: Event, conn: BaseNetwork):
         if not self.event_callbacks:
             return
-        login_sn = f"{event.login.sn}@{id(conn)}"
-        if login_sn not in self.accounts:
-            if event.type == EventType.LOGIN_ADDED:
-                if TYPE_CHECKING:
-                    assert isinstance(event, events.LoginEvent)
-                account = Account(
-                    event.login,
-                    conn.config,
-                    conn.proxy_urls,
-                    self.default_api_cls,
-                )
-                logger.info(f"account added: {account}")
-                (
-                    account.connected.set()
-                    if event.login.status == LoginStatus.ONLINE
-                    else account.connected.clear()
-                )
-                self.accounts[login_sn] = account
-                conn.accounts[login_sn] = account
-                await self.account_update(account, event.login.status)
-            elif event.type == EventType.LOGIN_UPDATED:
-                if TYPE_CHECKING:
-                    assert isinstance(event, events.LoginEvent)
-                if event.login.status == LoginStatus.ONLINE:
+        if event.type == EventType.LOGIN_ADDED:
+            if TYPE_CHECKING:
+                assert isinstance(event, events.LoginEvent)
+            login = event.login
+            if not login.user:
+                logger.warning(f"Received login-added event without user info: {login}")
+                return
+            login_sn = f"{login.user.id}@{id(conn)}"
+            account = Account(
+                login,
+                conn.config,
+                conn.proxy_urls,
+                self.default_api_cls,
+            )
+            logger.info(f"account added: {account}")
+            (account.connected.set() if login.status == LoginStatus.ONLINE else account.connected.clear())
+            self.accounts[login_sn] = account
+            conn.accounts[login_sn] = account
+            await self.account_update(account, login.status)
+        elif event.type == EventType.LOGIN_UPDATED:
+            if TYPE_CHECKING:
+                assert isinstance(event, events.LoginEvent)
+            login = event.login
+            if not login.user:
+                logger.warning(f"Received login-updated event without user info: {login}")
+                return
+            login_sn = f"{login.user.id}@{id(conn)}"
+            if login_sn not in self.accounts:
+                if login.status == LoginStatus.ONLINE:
                     account = Account(
-                        event.login,
+                        login,
                         conn.config,
                         conn.proxy_urls,
                         self.default_api_cls,
@@ -228,27 +233,37 @@ class App(Service):
                     logger.warning(f"Received event for unknown account: {event}")
                     return
             else:
-                logger.warning(f"Received event for unknown account: {event}")
-                return
-        else:
-            account = self.accounts[login_sn]
-            account.self_info = event.login
-        if event.type == EventType.LOGIN_UPDATED:
-            if TYPE_CHECKING:
-                assert isinstance(event, events.LoginEvent)
+                account = self.accounts[login_sn]
+                account.self_info = login
             logger.info(f"account updated: {account}")
             (
                 account.connected.set()
-                if event.login.status in (LoginStatus.ONLINE, LoginStatus.CONNECT)
+                if login.status in (LoginStatus.ONLINE, LoginStatus.CONNECT)
                 else account.connected.clear()
             )
-            await self.account_update(account, event.login.status)
+            await self.account_update(account, login.status)
+        elif event.type == EventType.LOGIN_REMOVED:
+            if TYPE_CHECKING:
+                assert isinstance(event, events.LoginEvent)
+            login = event.login
+            if not login.user:
+                logger.warning(f"Received login-removed event without user info: {login}")
+                return
+            login_sn = f"{login.user.id}@{id(conn)}"
+            if login_sn not in self.accounts:
+                logger.warning(f"Received event for unknown account: {event}")
+                return
+            account = self.accounts[login_sn]
+        else:
+            login_sn = f"{event.login.user.id}@{id(conn)}"
+            if login_sn not in self.accounts:
+                logger.warning(f"Received event for unknown account: {event}")
+                return
+            account = self.accounts[login_sn]
 
         await asyncio.gather(*(callback(account, event) for callback in self.event_callbacks))
 
         if event.type == EventType.LOGIN_REMOVED:
-            if TYPE_CHECKING:
-                assert isinstance(event, events.LoginEvent)
             logger.info(f"account removed: {account}")
             account.connected.clear()
             await self.account_update(account, LoginStatus.OFFLINE)

{satori_python-0.16.2 → satori_python-0.16.3}/src/satori/client/account.py

@@ -38,7 +38,6 @@ class Account(Generic[TP]):
         proxy_urls: list[str],
         protocol_cls: type[TP] = ApiProtocol,
     ):
-        self.sn = login.sn
         self.adapter = login.adapter
         self.self_info = login
         self.config = config
@@ -52,7 +51,7 @@ class Account(Generic[TP]):
 
     @property
     def self_id(self):
-        return self.self_info.id
+        return self.self_info.user.id
 
     def custom(
         self, config: ApiInfo | None = None, protocol_cls: type[TP1] = ApiProtocol, **kwargs

{satori_python-0.16.2 → satori_python-0.16.3}/src/satori/client/account.pyi

@@ -11,6 +11,7 @@ from satori.model import (
     Direction,
     Event,
     Guild,
+    IterablePageResult,
     Login,
     Member,
     MessageObject,
@@ -18,7 +19,6 @@ from satori.model import (
     Meta,
     Order,
     PageDequeResult,
-    PageResult,
     Role,
     Upload,
     User,
@@ -41,7 +41,6 @@ class ApiInfo(Api):
     ): ...
 
 class Account(Generic[TP]):
-    sn: str
     adapter: str
     self_info: Login
     proxy_urls: list[str]
@@ -211,7 +210,7 @@ class Account(Generic[TP]):
             Channel: `Channel` 对象
         """
 
-    async def channel_list(self, guild_id: str, next_token: str | None = None) -> PageResult[Channel]:
+    def channel_list(self, guild_id: str, next_token: str | None = None) -> IterablePageResult[Channel]:
         """获取群组中的全部频道。返回一个 Channel 的分页列表。
 
         Args:
@@ -219,7 +218,7 @@ class Account(Generic[TP]):
             next_token (str | None, optional): 分页令牌，默认为空
 
         Returns:
-            PageResult[Channel]: `Channel` 的分页列表
+            IterablePageResult[Channel]: `Channel` 的分页列表
         """
 
     async def channel_create(self, guild_id: str, data: Channel) -> Channel:
@@ -291,14 +290,14 @@ class Account(Generic[TP]):
             Guild: `Guild` 对象
         """
 
-    async def guild_list(self, next_token: str | None = None) -> PageResult[Guild]:
+    def guild_list(self, next_token: str | None = None) -> IterablePageResult[Guild]:
         """获取当前用户加入的全部群组。返回一个 Guild 的分页列表。
 
         Args:
             next_token (str | None, optional): 分页令牌，默认为空
 
         Returns:
-            PageResult[Guild]: `Guild` 的分页列表
+            IterablePageResult[Guild]: `Guild` 的分页列表
         """
 
     async def guild_approve(self, request_id: str, approve: bool, comment: str) -> None:
@@ -313,7 +312,7 @@ class Account(Generic[TP]):
             None: 该方法无返回值
         """
 
-    async def guild_member_list(self, guild_id: str, next_token: str | None = None) -> PageResult[Member]:
+    def guild_member_list(self, guild_id: str, next_token: str | None = None) -> IterablePageResult[Member]:
         """获取群组成员列表。返回一个 Member 的分页列表。
 
         Args:
@@ -321,7 +320,7 @@ class Account(Generic[TP]):
             next_token (str | None, optional): 分页令牌，默认为空
 
         Returns:
-            PageResult[Member]: `Member` 的分页列表
+            IterablePageResult[Member]: `Member` 的分页列表
         """
 
     async def guild_member_get(self, guild_id: str, user_id: str) -> Member:
@@ -397,7 +396,7 @@ class Account(Generic[TP]):
             None: 该方法无返回值
         """
 
-    async def guild_role_list(self, guild_id: str, next_token: str | None = None) -> PageResult[Role]:
+    def guild_role_list(self, guild_id: str, next_token: str | None = None) -> IterablePageResult[Role]:
         """获取群组角色列表。返回一个 Role 的分页列表。
 
         Args:
@@ -405,7 +404,7 @@ class Account(Generic[TP]):
             next_token (str | None, optional): 分页令牌，默认为空
 
         Returns:
-            PageResult[Role]: `Role` 的分页列表
+            IterablePageResult[Role]: `Role` 的分页列表
         """
 
     async def guild_role_create(self, guild_id: str, role: Role) -> Role:
@@ -485,9 +484,9 @@ class Account(Generic[TP]):
             None: 该方法无返回值
         """
 
-    async def reaction_list(
+    def reaction_list(
         self, channel_id: str, message_id: str, emoji: str, next_token: str | None = None
-    ) -> PageResult[User]:
+    ) -> IterablePageResult[User]:
         """获取添加特定消息的特定表态的用户列表。返回一个 User 的分页列表。
 
         Args:
@@ -497,7 +496,7 @@ class Account(Generic[TP]):
             next_token (str | None, optional): 分页令牌，默认为空
 
         Returns:
-            PageResult[User]: `User` 的分页列表
+            IterablePageResult[User]: `User` 的分页列表
         """
 
     async def login_get(self) -> Login:
@@ -517,14 +516,14 @@ class Account(Generic[TP]):
             User: `User` 对象
         """
 
-    async def friend_list(self, next_token: str | None = None) -> PageResult[User]:
+    def friend_list(self, next_token: str | None = None) -> IterablePageResult[User]:
         """获取好友列表。返回一个 User 的分页列表。
 
         Args:
             next_token (str | None, optional): 分页令牌，默认为空
 
         Returns:
-            PageResult[User]: `User` 的分页列表
+            IterablePageResult[User]: `User` 的分页列表
         """
 
     async def friend_approve(self, request_id: str, approve: bool, comment: str) -> None:

{satori_python-0.16.2 → satori_python-0.16.3}/src/satori/client/network/base.py

@@ -8,7 +8,7 @@ from launart import Service
 from ..config import Config as Config
 
 if TYPE_CHECKING:
-    from .. import App
+    from .. import Account, App
 
 TConfig = TypeVar("TConfig", bound=Config)
 
@@ -21,7 +21,7 @@ class BaseNetwork(Generic[TConfig], Service):
         super().__init__()
         self.app = app
         self.config = config
-        self.accounts = {}
+        self.accounts: dict[str, Account] = {}
         self.close_signal = asyncio.Event()
         self.sequence = -1
         self.proxy_urls = []

{satori_python-0.16.2 → satori_python-0.16.3}/src/satori/client/network/webhook.py

@@ -3,14 +3,16 @@ from __future__ import annotations
 import asyncio
 
 from aiohttp import web
+from graia.amnesia.builtins.aiohttp import AiohttpClientService
 from launart.manager import Launart
 from loguru import logger
 
-from satori.model import Event, LoginStatus, MetaPayload, Opcode
+from satori.model import Event, LoginStatus, Meta, MetaPayload, Opcode
 
 from ..account import Account
 from ..config import WebhookInfo as WebhookInfo
 from .base import BaseNetwork
+from .util import validate_response
 
 
 class WebhookNetwork(BaseNetwork[WebhookInfo]):
@@ -35,6 +37,8 @@ class WebhookNetwork(BaseNetwork[WebhookInfo]):
         if op_code == Opcode.META:
             payload = MetaPayload.parse(body)
             self.proxy_urls = payload.proxy_urls
+            for account in self.accounts.values():
+                account.proxy_urls = payload.proxy_urls
             return web.Response()
         if op_code != Opcode.EVENT:
             return web.Response(status=202)
@@ -61,18 +65,6 @@ class WebhookNetwork(BaseNetwork[WebhookInfo]):
         else:
             logger.trace(f"Received event: {event}")
             self.sequence = event.sn
-        login_sn = f"{event.login.sn}@{id(self)}"
-        if login_sn in self.app.accounts:
-            account = self.app.accounts[login_sn]
-            account.connected.set()
-            account.config = self.config
-        else:
-            account = Account(event.login, self.config, self.proxy_urls)
-            logger.info(f"account registered: {account}")
-            account.connected.set()
-            self.app.accounts[login_sn] = account
-            self.accounts[login_sn] = account
-            await self.app.account_update(account, LoginStatus.ONLINE)
         asyncio.create_task(self.app.post(event, self))
         return web.Response()
 
@@ -94,12 +86,37 @@ class WebhookNetwork(BaseNetwork[WebhookInfo]):
             site = web.TCPSite(runner, self.config.host, self.config.port)
 
         async with self.stage("blocking"):
+            endpoint = self.config.api_base / "meta"
+            headers = {
+                "Content-Type": "application/json",
+            }
+            aio = Launart.current().get_component(AiohttpClientService)
+
+            async with aio.session.request(
+                "POST",
+                endpoint,
+                json={},
+                headers=headers,
+            ) as resp:
+                data = await validate_response(resp)
+                meta = Meta.parse(data)
+            self.proxy_urls = meta.proxy_urls
+            for login in meta.logins:
+                if not login.user:
+                    continue
+                login_sn = f"{login.user.id}@{id(self)}"
+                account = Account(login, self.config, meta.proxy_urls, self.app.default_api_cls)
+                logger.info(f"account registered: {account}")
+                (account.connected.set() if login.status == LoginStatus.ONLINE else account.connected.clear())
+                self.app.accounts[login_sn] = account
+                self.accounts[login_sn] = account
+                await self.app.account_update(account, LoginStatus.ONLINE)
             await site.start()
             await manager.status.wait_for_sigexit()
             logger.info(f"{self.id} Webhook server exiting...")
             self.close_signal.set()
             for v in list(self.app.accounts.values()):
-                if (identity := f"{v.sn}@{id(self)}") in self.accounts:
+                if (identity := f"{v.self_id}@{id(self)}") in self.accounts:
                     v.connected.clear()
                     await self.app.account_update(v, LoginStatus.OFFLINE)
                     del self.app.accounts[identity]

{satori_python-0.16.2 → satori_python-0.16.3}/src/satori/client/network/websocket.py

@@ -10,7 +10,7 @@ from launart.manager import Launart
 from launart.utilles import any_completed
 from loguru import logger
 
-from satori.model import Event, Identify, LoginStatus, Opcode, Ready
+from satori.model import Event, Identify, LoginStatus, MetaPayload, Opcode, Ready
 
 from ..account import Account
 from ..config import WebsocketsInfo as WebsocketsInfo
@@ -60,6 +60,11 @@ class WsNetwork(BaseNetwork[WebsocketsInfo]):
                 logger.trace(f"Received payload: {data}")
                 if data["op"] == Opcode.EVENT:
                     self.post_event(data["body"])
+                elif data["op"] == Opcode.META:
+                    payload = MetaPayload.parse(data["body"])
+                    self.proxy_urls = payload.proxy_urls
+                    for account in self.accounts.values():
+                        account.proxy_urls = payload.proxy_urls.copy()
                 elif data["op"] > 5:
                     logger.warning(f"Received unknown event: {data}")
                 continue
@@ -103,7 +108,9 @@ class WsNetwork(BaseNetwork[WebsocketsInfo]):
         ready = Ready.parse(data["body"])
         self.proxy_urls = ready.proxy_urls
         for login in ready.logins:
-            login_sn = f"{login.sn}@{id(self)}"
+            if not login.user:
+                continue
+            login_sn = f"{login.user.id}@{id(self)}"
             if login_sn in self.app.accounts:
                 account = self.app.accounts[login_sn]
                 self.accounts[login_sn] = account
@@ -121,7 +128,7 @@ class WsNetwork(BaseNetwork[WebsocketsInfo]):
             await self.app.account_update(account, LoginStatus.ONLINE)
         if not self.accounts:
             logger.warning(f"No account available for {self.config}")
-            return False
+            # return False
         return True
 
     async def _heartbeat(self):
@@ -158,7 +165,7 @@ class WsNetwork(BaseNetwork[WebsocketsInfo]):
                         self.close_signal.set()
                         self.connection = None
                         for v in list(self.app.accounts.values()):
-                            if (identity := f"{v.sn}@{id(self)}") in self.accounts:
+                            if (identity := f"{v.self_id}@{id(self)}") in self.accounts:
                                 v.connected.clear()
                                 await self.app.account_update(v, LoginStatus.OFFLINE)
                                 del self.app.accounts[identity]

{satori_python-0.16.2 → satori_python-0.16.3}/src/satori/client/protocol.py

@@ -15,7 +15,9 @@ from satori.model import (
     Direction,
     Event,
     Guild,
+    IterablePageResult,
     Login,
+    LoginPartial,
     Member,
     MessageObject,
     MessageReceipt,
@@ -278,7 +280,7 @@ class ApiProtocol:
         )
         return Channel.parse(res)
 
-    async def channel_list(self, guild_id: str, next_token: str | None = None) -> PageResult[Channel]:
+    def channel_list(self, guild_id: str, next_token: str | None = None) -> IterablePageResult[Channel]:
         """获取群组中的全部频道。返回一个 Channel 的分页列表。
 
         Args:
@@ -286,13 +288,17 @@ class ApiProtocol:
             next_token (str | None, optional): 分页令牌，默认为空
 
         Returns:
-            PageResult[Channel]: `Channel` 的分页列表
+            IterablePageResult[Channel]: `Channel` 的分页列表
         """
-        res = await self.call_api(
-            Api.CHANNEL_LIST,
-            {"guild_id": guild_id, "next": next_token},
-        )
-        return PageResult.parse(res, Channel.parse)
+
+        async def _(token: str | None):
+            res = await self.call_api(
+                Api.CHANNEL_LIST,
+                {"guild_id": guild_id, "next": token},
+            )
+            return PageResult.parse(res, Channel.parse)
+
+        return IterablePageResult(_, next_token)
 
     async def channel_create(self, guild_id: str, data: Channel) -> Channel:
         """创建群组频道。返回一个 Channel 对象。
@@ -393,20 +399,24 @@ class ApiProtocol:
         )
         return Guild.parse(res)
 
-    async def guild_list(self, next_token: str | None = None) -> PageResult[Guild]:
+    def guild_list(self, next_token: str | None = None) -> IterablePageResult[Guild]:
         """获取当前用户加入的全部群组。返回一个 Guild 的分页列表。
 
         Args:
             next_token (str | None, optional): 分页令牌，默认为空
 
         Returns:
-            PageResult[Guild]: `Guild` 的分页列表
+            IterablePageResult[Guild]: `Guild` 的分页列表
         """
-        res = await self.call_api(
-            Api.GUILD_LIST,
-            {"next": next_token},
-        )
-        return PageResult.parse(res, Guild.parse)
+
+        async def _(token: str | None):
+            res = await self.call_api(
+                Api.GUILD_LIST,
+                {"next": token},
+            )
+            return PageResult.parse(res, Guild.parse)
+
+        return IterablePageResult(_, next_token)
 
     async def guild_approve(self, request_id: str, approve: bool, comment: str) -> None:
         """处理来自群组的邀请。
@@ -424,7 +434,7 @@ class ApiProtocol:
             {"message_id": request_id, "approve": approve, "comment": comment},
         )
 
-    async def guild_member_list(self, guild_id: str, next_token: str | None = None) -> PageResult[Member]:
+    def guild_member_list(self, guild_id: str, next_token: str | None = None) -> IterablePageResult[Member]:
         """获取群组成员列表。返回一个 Member 的分页列表。
 
         Args:
@@ -432,13 +442,17 @@ class ApiProtocol:
             next_token (str | None, optional): 分页令牌，默认为空
 
         Returns:
-            PageResult[Member]: `Member` 的分页列表
+            IterablePageResult[Member]: `Member` 的分页列表
         """
-        res = await self.call_api(
-            Api.GUILD_MEMBER_LIST,
-            {"guild_id": guild_id, "next": next_token},
-        )
-        return PageResult.parse(res, Member.parse)
+
+        async def _(token: str | None):
+            res = await self.call_api(
+                Api.GUILD_MEMBER_LIST,
+                {"guild_id": guild_id, "next": token},
+            )
+            return PageResult.parse(res, Member.parse)
+
+        return IterablePageResult(_, next_token)
 
     async def guild_member_get(self, guild_id: str, user_id: str) -> Member:
         """获取群成员信息。返回一个 `Member` 对象。
@@ -538,7 +552,7 @@ class ApiProtocol:
             {"guild_id": guild_id, "user_id": user_id, "role_id": role_id},
         )
 
-    async def guild_role_list(self, guild_id: str, next_token: str | None = None) -> PageResult[Role]:
+    def guild_role_list(self, guild_id: str, next_token: str | None = None) -> IterablePageResult[Role]:
         """获取群组角色列表。返回一个 Role 的分页列表。
 
         Args:
@@ -546,13 +560,17 @@ class ApiProtocol:
             next_token (str | None, optional): 分页令牌，默认为空
 
         Returns:
-            PageResult[Role]: `Role` 的分页列表
+            IterablePageResult[Role]: `Role` 的分页列表
         """
-        res = await self.call_api(
-            Api.GUILD_ROLE_LIST,
-            {"guild_id": guild_id, "next": next_token},
-        )
-        return PageResult.parse(res, Role.parse)
+
+        async def _(token: str | None):
+            res = await self.call_api(
+                Api.GUILD_ROLE_LIST,
+                {"guild_id": guild_id, "next": token},
+            )
+            return PageResult.parse(res, Role.parse)
+
+        return IterablePageResult(_, next_token)
 
     async def guild_role_create(self, guild_id: str, role: Role) -> Role:
         """创建群组角色。返回一个 Role 对象。
@@ -662,9 +680,9 @@ class ApiProtocol:
             data,
         )
 
-    async def reaction_list(
+    def reaction_list(
         self, channel_id: str, message_id: str, emoji: str, next_token: str | None = None
-    ) -> PageResult[User]:
+    ) -> IterablePageResult[User]:
         """获取添加特定消息的特定表态的用户列表。返回一个 User 的分页列表。
 
         Args:
@@ -674,18 +692,22 @@ class ApiProtocol:
             next_token (str | None, optional): 分页令牌，默认为空
 
         Returns:
-            PageResult[User]: `User` 的分页列表
+            IterablePageResult[User]: `User` 的分页列表
         """
-        res = await self.call_api(
-            Api.REACTION_LIST,
-            {
-                "channel_id": channel_id,
-                "message_id": message_id,
-                "emoji": emoji,
-                "next": next_token,
-            },
-        )
-        return PageResult.parse(res, User.parse)
+
+        async def _(token: str | None):
+            res = await self.call_api(
+                Api.REACTION_LIST,
+                {
+                    "channel_id": channel_id,
+                    "message_id": message_id,
+                    "emoji": emoji,
+                    "next": token,
+                },
+            )
+            return PageResult.parse(res, User.parse)
+
+        return IterablePageResult(_, next_token)
 
     async def login_get(self) -> Login:
         """获取当前登录信息。返回一个 `Login` 对象。
@@ -708,17 +730,21 @@ class ApiProtocol:
         res = await self.call_api(Api.USER_GET, {"user_id": user_id})
         return User.parse(res)
 
-    async def friend_list(self, next_token: str | None = None) -> PageResult[User]:
+    def friend_list(self, next_token: str | None = None) -> IterablePageResult[User]:
         """获取好友列表。返回一个 User 的分页列表。
 
         Args:
             next_token (str | None, optional): 分页令牌，默认为空
 
         Returns:
-            PageResult[User]: `User` 的分页列表
+            IterablePageResult[User]: `User` 的分页列表
         """
-        res = await self.call_api(Api.FRIEND_LIST, {"next": next_token})
-        return PageResult.parse(res, User.parse)
+
+        async def _(token: str | None):
+            res = await self.call_api(Api.FRIEND_LIST, {"next": token})
+            return PageResult.parse(res, User.parse)
+
+        return IterablePageResult(_, next_token)
 
     async def friend_approve(self, request_id: str, approve: bool, comment: str) -> None:
         """处理好友申请。
@@ -756,7 +782,7 @@ class ApiProtocol:
         return Meta.parse(res)
 
     @deprecated("Use `meta_get` instead")
-    async def admin_login_list(self) -> list[Login]:
+    async def admin_login_list(self) -> list[LoginPartial]:
         """获取登录信息列表。返回一个 `Login` 对象构成的数组。
 
         Returns:

{satori_python-0.16.2 → satori_python-0.16.3}/src/satori/event.py

@@ -4,7 +4,7 @@ from satori.model import (
     Channel,
     Event,
     Guild,
-    Login,
+    LoginPartial,
     Member,
     MessageObject,
     Role,
@@ -37,7 +37,7 @@ class GuildRoleEvent(GuildEvent):
 
 
 class LoginEvent(Event):
-    login: Login
+    login: LoginPartial
 
 
 class ReactionEvent(Event):

{satori_python-0.16.2 → satori_python-0.16.3}/src/satori/model.py

@@ -1,4 +1,5 @@
 import mimetypes
+from collections.abc import AsyncIterable, Awaitable
 from dataclasses import asdict, dataclass, field, fields
 from datetime import datetime
 from enum import IntEnum
@@ -145,11 +146,11 @@ class LoginStatus(IntEnum):
 
 @dataclass
 class Login(ModelBase):
-    sn: str
+    sn: int
     status: LoginStatus
     adapter: str
-    platform: Optional[str] = None
-    user: Optional[User] = None
+    platform: str
+    user: User
     features: list[str] = field(default_factory=list)
 
     __converter__ = {"user": User.parse, "status": LoginStatus}
@@ -173,7 +174,7 @@ class Login(ModelBase):
         if "self_id" in raw and "user" not in raw:
             raw["user"] = {"id": raw["self_id"]}
         if "sn" not in raw:
-            raw["sn"] = raw["user"]["id"]
+            raw["sn"] = 0
         if "adapter" not in raw:
             raw["adapter"] = "satori"
         if "status" not in raw:
@@ -182,11 +183,15 @@ class Login(ModelBase):
 
     @property
     def id(self) -> str:
-        if not self.user:
-            raise ValueError(f"Login {self.sn} has not complete yet")
         return self.user.id
 
 
+@dataclass
+class LoginPartial(Login):
+    platform: Optional[str] = None
+    user: Optional[User] = None
+
+
 @dataclass
 class ArgvInteraction(ModelBase):
     name: str
@@ -241,10 +246,10 @@ class Identify(ModelBase):
 
 @dataclass
 class Ready(ModelBase):
-    logins: list[Login]
+    logins: list[LoginPartial]
     proxy_urls: list[str] = field(default_factory=list)
 
-    __converter__ = {"logins": lambda raw: [Login.parse(login) for login in raw]}
+    __converter__ = {"logins": lambda raw: [LoginPartial.parse(login) for login in raw]}
 
     def dump(self):
         return asdict(self)
@@ -264,10 +269,10 @@ class MetaPayload(ModelBase):
 class Meta(ModelBase):
     """Meta 数据"""
 
-    logins: list[Login]
+    logins: list[LoginPartial]
     proxy_urls: list[str] = field(default_factory=list)
 
-    __converter__ = {"logins": lambda raw: [Login.parse(login) for login in raw]}
+    __converter__ = {"logins": lambda raw: [LoginPartial.parse(login) for login in raw]}
 
     def dump(self):
         return asdict(self)
@@ -414,7 +419,7 @@ class Event(ModelBase):
             raw["sn"] = raw["id"]
         if "platform" in raw and "self_id" in raw and "login" not in raw:
             raw["login"] = {
-                "sn": raw["self_id"],
+                "sn": 0,
                 "platform": raw["platform"],
                 "user": {"id": raw["self_id"]},
                 "status": LoginStatus.ONLINE,
@@ -501,6 +506,29 @@ class PageDequeResult(PageResult[T]):
         return res
 
 
+class IterablePageResult(Generic[T], AsyncIterable[T], Awaitable[PageResult[T]]):
+    def __init__(
+        self, func: Callable[[Optional[str]], Awaitable[PageResult[T]]], initial_page: Optional[str] = None
+    ):
+        self.func = func
+        self.next_page = initial_page
+
+    def __await__(self):
+        return self.func(self.next_page).__await__()
+
+    def __aiter__(self):
+        async def _gen():
+            while True:
+                result = await self.func(self.next_page)
+                for item in result.data:
+                    yield item
+                self.next_page = result.next
+                if not self.next_page:
+                    break
+
+        return _gen()
+
+
 Direction: TypeAlias = Literal["before", "after", "around"]
 Order: TypeAlias = Literal["asc", "desc"]
 

{satori_python-0.16.2 → satori_python-0.16.3}/src/satori/server/adapter.py

@@ -1,12 +1,13 @@
 from abc import abstractmethod
 from collections.abc import AsyncIterator
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING, Optional, Union
 
 from launart import Service
 from starlette.responses import Response
 from starlette.routing import BaseRoute
 
-from ..model import Event, Login
+from satori.model import Event, Login, LoginPartial
+
 from .model import Request
 from .route import RouterMixin
 from .utils import ctx
@@ -15,6 +16,9 @@ if TYPE_CHECKING:
     from . import Server
 
 
+LoginType = Union[Login, LoginPartial]
+
+
 class Adapter(Service, RouterMixin):
     server: "Server"
 
@@ -39,7 +43,7 @@ class Adapter(Service, RouterMixin):
             return Response(await resp.read())
 
     @abstractmethod
-    async def get_logins(self) -> list[Login]: ...
+    async def get_logins(self) -> list[LoginType]: ...
 
     def __init__(self):
         super().__init__()