qq-botpy-sdk 2.0.2__tar.gz → 2.0.4__tar.gz

{qq_botpy_sdk-2.0.2 → qq_botpy_sdk-2.0.4}/PKG-INFO

@@ -1,7 +1,8 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.3
 Name: qq-botpy-sdk
-Version: 2.0.2
+Version: 2.0.4
 Summary: Community-maintained async Python SDK for the QQ Bot Open Platform
+Author: Teahouse Studios
 License: MIT License
          
          Copyright (c) 2021 Tencent
@@ -23,9 +24,6 @@ License: MIT License
          LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
          OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
          SOFTWARE.
-License-File: LICENSE
-Author: Teahouse Studios
-Requires-Python: >=3.10,<4.0
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
@@ -35,13 +33,15 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Dist: APScheduler (>=3.11.3,<4)
-Requires-Dist: PyYAML (>=6.0.3,<7)
-Requires-Dist: aiohttp (>=3.14.3,<4)
-Requires-Dist: cryptography (>=50.0.0,<51)
+Requires-Dist: httpx>=0.28.1,<1
+Requires-Dist: httpx-ws>=0.7.2,<1
+Requires-Dist: apscheduler>=3.11.3,<4
+Requires-Dist: cryptography>=50.0.0,<51
+Requires-Dist: pyyaml>=6.0.3,<7
+Requires-Python: >=3.10, <4.0
 Project-URL: Homepage, https://github.com/Teahouse-Studios/qq-botpy-sdk
-Project-URL: Issues, https://github.com/Teahouse-Studios/qq-botpy-sdk/issues
 Project-URL: Repository, https://github.com/Teahouse-Studios/qq-botpy-sdk
+Project-URL: Issues, https://github.com/Teahouse-Studios/qq-botpy-sdk/issues
 Description-Content-Type: text/markdown
 
 # qq-botpy-sdk
@@ -89,6 +89,7 @@ Description-Content-Type: text/markdown
 - 检测 Opcode 11 Heartbeat ACK，超时后主动恢复连接。
 - 支持 Identify、Resume、服务端重连指令和 Invalid Session。
 - 按关闭码选择刷新 Token、清理 Session、退避重连或停止。
+- 重连期间暂停消息发送，待所有分片 READY/RESUMED 后继续。
 - 支持 JSON 文件或自定义 Store 持久化 Gateway Session。
 - 支持 WebSocket、内置 Webhook 服务和自定义事件传输适配器。
 - Webhook 支持回调地址验证、Ed25519 验签和事件 ACK。
@@ -100,6 +101,7 @@ Description-Content-Type: text/markdown
 - 结构化 API、认证、限流和传输异常。
 - 解析 `Retry-After`，安全方法支持指数退避。
 - POST/PATCH 默认不自动重试，避免非幂等消息重复发送。
+- C2C/群聊仅带 `msg_id` 的被动回复会对不确定的传输失败重试一次。
 - 可配置 API 地址、Token 地址、User-Agent 和 SSLContext/私有 CA。
 - 通过 `client.api.request/get/post/put/patch/delete()` 调用尚未封装的 REST API。
 
@@ -161,10 +163,10 @@ import botpy
 pip install "git+https://github.com/Teahouse-Studios/qq-botpy-sdk.git"
 ```
 
-Poetry 项目可以使用：
+uv 项目可以使用：
 
 ```bash
-poetry add "git+https://github.com/Teahouse-Studios/qq-botpy-sdk.git"
+uv add "qq-botpy-sdk @ git+https://github.com/Teahouse-Studios/qq-botpy-sdk.git"
 ```
 
 > `qq-botpy-sdk` 是当前独立维护版的发布包名。历史 `qq-botpy` 包属于不同的发布来源，不代表本仓库。
@@ -174,7 +176,7 @@ poetry add "git+https://github.com/Teahouse-Studios/qq-botpy-sdk.git"
 ```bash
 git clone https://github.com/Teahouse-Studios/qq-botpy-sdk.git
 cd qq-botpy-sdk
-poetry install
+uv sync
 ```
 
 ## 快速开始
@@ -234,6 +236,19 @@ client = MyClient(
 进程重启后，客户端会优先尝试 Resume，并从保存的序列号之后补发事件。失效、过期或分片数量不匹配的
 Session 会被自动清理。
 
+### 重连期间的消息发送
+
+```python
+client = MyClient(
+    intents=intents,
+    gateway_send_timeout=30.0,
+)
+```
+
+WebSocket 模式下，Gateway 正在连接或重连时，消息会等待所有已注册分片恢复，不会立即发出 HTTP
+请求。`gateway_send_timeout` 默认为 30 秒；设为 `None` 可一直等待，设为 `0` 则立即失败。首次请求前
+等待超时时，`TransportError.attempts` 为 `0`；若重试等待超时，则保留此前实际请求次数。
+
 ### Webhook 模式
 
 ```python
@@ -396,13 +411,13 @@ client = MyClient(
 安装依赖：
 
 ```bash
-poetry install
+uv sync
 ```
 
 运行纯本地测试：
 
 ```bash
-poetry run python -m unittest discover -s tests -p "test_[!a]*.py"
+uv run python -m unittest discover -s tests -p "test_[!a]*.py"
 ```
 
 `tests/test_api.py` 使用真实平台凭证，并包含创建、修改或删除线上资源的 API 测试。除非你明确准备了隔离的
@@ -411,8 +426,9 @@ poetry run python -m unittest discover -s tests -p "test_[!a]*.py"
 编译和项目元数据检查：
 
 ```bash
-poetry run python -m compileall -q botpy examples
-poetry check
+uv run python -m compileall -q botpy examples
+uv lock --check
+uv build
 ```
 
 ## 当前限制
@@ -429,4 +445,3 @@ poetry check
 贡献者提供的基础实现。
 
 本仓库继续采用 [MIT License](./LICENSE)。原始版权声明保留在许可证文件和相关源文件中。
-

{qq_botpy_sdk-2.0.2 → qq_botpy_sdk-2.0.4}/README.md

@@ -43,6 +43,7 @@
 - 检测 Opcode 11 Heartbeat ACK，超时后主动恢复连接。
 - 支持 Identify、Resume、服务端重连指令和 Invalid Session。
 - 按关闭码选择刷新 Token、清理 Session、退避重连或停止。
+- 重连期间暂停消息发送，待所有分片 READY/RESUMED 后继续。
 - 支持 JSON 文件或自定义 Store 持久化 Gateway Session。
 - 支持 WebSocket、内置 Webhook 服务和自定义事件传输适配器。
 - Webhook 支持回调地址验证、Ed25519 验签和事件 ACK。
@@ -54,6 +55,7 @@
 - 结构化 API、认证、限流和传输异常。
 - 解析 `Retry-After`，安全方法支持指数退避。
 - POST/PATCH 默认不自动重试，避免非幂等消息重复发送。
+- C2C/群聊仅带 `msg_id` 的被动回复会对不确定的传输失败重试一次。
 - 可配置 API 地址、Token 地址、User-Agent 和 SSLContext/私有 CA。
 - 通过 `client.api.request/get/post/put/patch/delete()` 调用尚未封装的 REST API。
 
@@ -115,10 +117,10 @@ import botpy
 pip install "git+https://github.com/Teahouse-Studios/qq-botpy-sdk.git"
 ```
 
-Poetry 项目可以使用：
+uv 项目可以使用：
 
 ```bash
-poetry add "git+https://github.com/Teahouse-Studios/qq-botpy-sdk.git"
+uv add "qq-botpy-sdk @ git+https://github.com/Teahouse-Studios/qq-botpy-sdk.git"
 ```
 
 > `qq-botpy-sdk` 是当前独立维护版的发布包名。历史 `qq-botpy` 包属于不同的发布来源，不代表本仓库。
@@ -128,7 +130,7 @@ poetry add "git+https://github.com/Teahouse-Studios/qq-botpy-sdk.git"
 ```bash
 git clone https://github.com/Teahouse-Studios/qq-botpy-sdk.git
 cd qq-botpy-sdk
-poetry install
+uv sync
 ```
 
 ## 快速开始
@@ -188,6 +190,19 @@ client = MyClient(
 进程重启后，客户端会优先尝试 Resume，并从保存的序列号之后补发事件。失效、过期或分片数量不匹配的
 Session 会被自动清理。
 
+### 重连期间的消息发送
+
+```python
+client = MyClient(
+    intents=intents,
+    gateway_send_timeout=30.0,
+)
+```
+
+WebSocket 模式下，Gateway 正在连接或重连时，消息会等待所有已注册分片恢复，不会立即发出 HTTP
+请求。`gateway_send_timeout` 默认为 30 秒；设为 `None` 可一直等待，设为 `0` 则立即失败。首次请求前
+等待超时时，`TransportError.attempts` 为 `0`；若重试等待超时，则保留此前实际请求次数。
+
 ### Webhook 模式
 
 ```python
@@ -350,13 +365,13 @@ client = MyClient(
 安装依赖：
 
 ```bash
-poetry install
+uv sync
 ```
 
 运行纯本地测试：
 
 ```bash
-poetry run python -m unittest discover -s tests -p "test_[!a]*.py"
+uv run python -m unittest discover -s tests -p "test_[!a]*.py"
 ```
 
 `tests/test_api.py` 使用真实平台凭证，并包含创建、修改或删除线上资源的 API 测试。除非你明确准备了隔离的
@@ -365,8 +380,9 @@ poetry run python -m unittest discover -s tests -p "test_[!a]*.py"
 编译和项目元数据检查：
 
 ```bash
-poetry run python -m compileall -q botpy examples
-poetry check
+uv run python -m compileall -q botpy examples
+uv lock --check
+uv build
 ```
 
 ## 当前限制

{qq_botpy_sdk-2.0.2 → qq_botpy_sdk-2.0.4}/botpy/api.py

@@ -4,7 +4,7 @@
 
 from io import BufferedReader
 from collections.abc import Sequence
-from typing import Any, List, Union, BinaryIO, Dict, Mapping, Optional
+from typing import Any, Awaitable, Callable, List, Union, BinaryIO, Dict, Mapping, Optional
 from urllib.parse import urlsplit
 
 from .flags import Permission
@@ -134,8 +134,7 @@ def _validate_menu(value: Mapping[str, Any]) -> Dict[str, Any]:
         else:
             sub_items = _bounded_list(item.get("sub_menu_items"), f"{name}.sub_menu_items", 5)
             item["sub_menu_items"] = [
-                _validate_sub_menu_item(sub_item, sub_index)
-                for sub_index, sub_item in enumerate(sub_items)
+                _validate_sub_menu_item(sub_item, sub_index) for sub_index, sub_item in enumerate(sub_items)
             ]
         normalized.append(item)
     result["items"] = normalized
@@ -259,12 +258,29 @@ class BotAPI:
         - API当前返回的所有自定义类型数据为字典数据，通过TypedDict进行类型提示
     """
 
-    def __init__(self, http: BotHttp):
+    def __init__(
+        self,
+        http: BotHttp,
+        message_guard: Optional[Callable[[], Awaitable[None]]] = None,
+    ):
         """
         Args:
           http (BotHttp): 用于发送请求的 http 客户端。
         """
         self._http = http
+        self._message_guard = message_guard
+
+    async def _wait_until_message_send_ready(self) -> None:
+        if self._message_guard is not None:
+            await self._message_guard()
+
+    async def _request_message(self, route: Route, **kwargs: Any) -> Any:
+        """Run the Gateway guard before the first request and every HTTP retry."""
+
+        await self._wait_until_message_send_ready()
+        if self._message_guard is not None:
+            kwargs["before_attempt"] = self._message_guard
+        return await self._http.request(route, **kwargs)
 
     async def request(
         self,
@@ -824,7 +840,7 @@ class BotAPI:
         payload.update(extra)
         payload = {key: value for key, value in payload.items() if value is not None}
         route = Route("POST", "/channels/{channel_id}/messages", channel_id=channel_id)
-        return await self._http.request(route, json=payload)
+        return await self._request_message(route, json=payload)
 
     async def recall_message(self, channel_id: str, message_id: str, hidetip: bool = False) -> str:
         """
@@ -904,7 +920,7 @@ class BotAPI:
             "/channels/{channel_id}/messages",
             channel_id=channel_id,
         )
-        return await self._http.request(route, json=payload)
+        return await self._request_message(route, json=payload)
 
     async def on_interaction_result(
         self,
@@ -1044,7 +1060,7 @@ class BotAPI:
         payload.update(extra)
         payload = {key: value for key, value in payload.items() if value is not None}
         route = Route("POST", "/dms/{guild_id}/messages", guild_id=guild_id)
-        return await self._http.request(route, json=payload)
+        return await self._request_message(route, json=payload)
 
     # 音频接口
     async def update_audio(self, channel_id: str, audio_control: audio.AudioControl) -> str:
@@ -2151,7 +2167,12 @@ class BotAPI:
         payload.update(extra)
         payload = {key: value for key, value in payload.items() if value is not None}
         route = Route("POST", "/v2/groups/{group_openid}/messages", group_openid=group_openid)
-        return await self._http.request(route, json=payload)
+        return await self._request_message(
+            route,
+            retry_time=1,
+            json=payload,
+            retry_ambiguous=bool(msg_id),
+        )
 
     async def post_c2c_message(
         self,
@@ -2211,7 +2232,12 @@ class BotAPI:
         payload.update(extra)
         payload = {key: value for key, value in payload.items() if value is not None}
         route = Route("POST", "/v2/users/{openid}/messages", openid=openid)
-        return await self._http.request(route, json=payload)
+        return await self._request_message(
+            route,
+            retry_time=1,
+            json=payload,
+            retry_ambiguous=bool(msg_id),
+        )
 
     async def post_c2c_typing(
         self,
@@ -2230,7 +2256,12 @@ class BotAPI:
         if msg_id:
             payload["msg_id"] = msg_id
         route = Route("POST", "/v2/users/{openid}/messages", openid=openid)
-        return await self._http.request(route, json=payload)
+        return await self._request_message(
+            route,
+            retry_time=1,
+            json=payload,
+            retry_ambiguous=bool(msg_id),
+        )
 
     async def post_c2c_stream_message(
         self,
@@ -2261,7 +2292,7 @@ class BotAPI:
         }
         payload = {key: value for key, value in payload.items() if value is not None}
         route = Route("POST", "/v2/users/{openid}/stream_messages", openid=openid)
-        return await self._http.request(route, json=payload)
+        return await self._request_message(route, json=payload)
 
     async def post_upload_prepare(
         self,
@@ -2377,6 +2408,8 @@ class BotAPI:
         }
         payload = {key: value for key, value in payload.items() if value is not None}
         route = Route("POST", "/v2/groups/{group_openid}/files", group_openid=group_openid)
+        if srv_send_msg:
+            return await self._request_message(route, json=payload, timeout=120)
         return await self._http.request(route, json=payload, timeout=120)
 
     async def post_c2c_file(
@@ -2408,4 +2441,6 @@ class BotAPI:
         }
         payload = {key: value for key, value in payload.items() if value is not None}
         route = Route("POST", "/v2/users/{openid}/files", openid=openid)
+        if srv_send_msg:
+            return await self._request_message(route, json=payload, timeout=120)
         return await self._http.request(route, json=payload, timeout=120)

{qq_botpy_sdk-2.0.2 → qq_botpy_sdk-2.0.4}/botpy/client.py

@@ -1,6 +1,7 @@
 import asyncio
 import base64
 import inspect
+import math
 import re
 import traceback
 from collections import OrderedDict
@@ -19,6 +20,7 @@ from .gateway import BotWebSocket
 from .http import BotHttp
 from .middleware import Middleware, MiddlewareContext, create_middleware_context, run_middleware_chain
 from .protocol.events import normalize_inbound_message
+from .protocol.errors import TransportError
 from .protocol.media import ChunkedMediaUploader, ProgressCallback
 from .protocol.message import (
     LARGE_MEDIA_THRESHOLD,
@@ -87,6 +89,7 @@ class Client:
         menu: Optional[Menu] = None,
         panels: Optional[Iterable[Panel]] = None,
         config_sync_strict: bool = False,
+        gateway_send_timeout: Optional[float] = 30.0,
     ):
         """
         Args:
@@ -106,7 +109,7 @@ class Client:
           base_url: 自定义开放平台 REST API 根地址，主要用于测试或代理。
           token_base_url: 自定义 access token 服务根地址。
           user_agent: HTTP 请求使用的 User-Agent。
-          ssl: 传给 aiohttp 的 SSLContext、Fingerprint 或布尔值。
+          ssl: 传给 httpx/httpx-ws 的 SSLContext 或布尔值。
           upload_cache: 自定义媒体上传缓存；默认每个 Client 独享一份内存缓存。
           reply_limiter: 自定义被动回复限制器；默认每条消息每小时最多 4 次。
           on_message_sent: 平台响应包含 ``ext_info.ref_idx`` 时调用的出站消息钩子。
@@ -114,6 +117,7 @@ class Client:
           menu: 可选的声明式 C2C 全局菜单；配置后在登录成功时按差异同步。
           panels: 可选的声明式指令面板集合；使用稳定 key 非破坏性同步。
           config_sync_strict: 配置同步失败时是否中止客户端启动。
+          gateway_send_timeout: Gateway 重连期间等待消息发送恢复的秒数；``None`` 表示一直等待。
         """
         self.intents: int = intents.value
         self.ret_coro: bool = False
@@ -129,7 +133,22 @@ class Client:
             raise TypeError("markdown_support must be a bool")
         if not isinstance(config_sync_strict, bool):
             raise TypeError("config_sync_strict must be a bool")
+        gateway_timeout_value = None
+        if gateway_send_timeout is not None:
+            if (
+                isinstance(gateway_send_timeout, bool)
+                or not isinstance(gateway_send_timeout, (int, float))
+                or gateway_send_timeout < 0
+            ):
+                raise ValueError("gateway_send_timeout must be a non-negative finite number or None")
+            try:
+                gateway_timeout_value = float(gateway_send_timeout)
+            except OverflowError as exc:
+                raise ValueError("gateway_send_timeout must be a non-negative finite number or None") from exc
+            if not math.isfinite(gateway_timeout_value):
+                raise ValueError("gateway_send_timeout must be a non-negative finite number or None")
         self._markdown_support = markdown_support
+        self._gateway_send_timeout = gateway_timeout_value
         self._token_base_url = token_base_url
         self._user_agent = user_agent
         self._ssl = ssl
@@ -141,7 +160,7 @@ class Client:
             user_agent=user_agent,
             ssl=ssl,
         )
-        self.api: BotAPI = BotAPI(http=self.http)
+        self.api: BotAPI = BotAPI(http=self.http, message_guard=self._wait_for_gateway_ready)
         self.configuration = ConfigurationManager(
             self.api,
             menu=menu,
@@ -150,6 +169,8 @@ class Client:
         self._config_sync_strict = config_sync_strict
 
         self._connection: Optional[ConnectionSession] = None
+        self._gateway_starting = False
+        self._gateway_connection_created = asyncio.Event()
         self._closed: bool = False
         self._listeners: Dict[str, List[Tuple[asyncio.Future, Callable[..., bool]]]] = {}
         self._ws_ap: Dict = {}
@@ -213,6 +234,58 @@ class Client:
             raise RuntimeError("机器人尚未登录")
         return self._robot
 
+    async def _wait_for_gateway_ready(self) -> None:
+        """Delay message POSTs until every Gateway shard is ready again."""
+
+        if self._closed:
+            raise RuntimeError("无法通过已关闭的 Client 发送消息")
+        if getattr(self, "_transport_mode", None) != "websocket":
+            return
+        connection = getattr(self, "_connection", None)
+        if connection is None and not self._gateway_starting:
+            return
+        if connection is not None and connection.is_ready:
+            return
+
+        timeout = self._gateway_send_timeout
+        deadline = None if timeout is None else asyncio.get_running_loop().time() + timeout
+        _log.info("[botpy] Gateway 正在连接或重连，消息发送等待恢复，timeout=%s", timeout)
+        try:
+            if connection is None:
+                if deadline is None:
+                    await self._gateway_connection_created.wait()
+                else:
+                    await asyncio.wait_for(
+                        self._gateway_connection_created.wait(),
+                        timeout=max(0.0, deadline - asyncio.get_running_loop().time()),
+                    )
+                if self._closed:
+                    raise RuntimeError("无法通过已关闭的 Client 发送消息")
+                connection = self._connection
+                if connection is None:
+                    raise TransportError("Gateway 启动未完成，消息尚未发送", method="POST", attempts=0)
+            if connection.is_ready:
+                return
+            remaining = (
+                None
+                if deadline is None
+                else max(
+                    0.0,
+                    deadline - asyncio.get_running_loop().time(),
+                )
+            )
+            await connection.wait_until_ready(timeout=remaining)
+        except asyncio.TimeoutError as exc:
+            timeout_text = "无限" if timeout is None else f"{timeout:g} 秒"
+            raise TransportError(
+                f"Gateway 在{timeout_text}内未恢复，消息尚未发送",
+                method="POST",
+                cause=exc,
+                attempts=0,
+            ) from exc
+        if self._closed:
+            raise RuntimeError("无法通过已关闭的 Client 发送消息")
+
     def use(self, *middlewares: Middleware) -> "Client":
         """追加统一消息中间件，并返回当前 Client 以便链式配置。"""
 
@@ -585,9 +658,7 @@ class Client:
             raise ValueError("media file must not be empty")
         limit = MEDIA_FILE_SIZE_LIMITS[int(file_type)]
         if size > limit:
-            raise ValueError(
-                f"media is too large for {file_type.name.lower()}; limit is {limit // (1024 * 1024)} MiB"
-            )
+            raise ValueError(f"media is too large for {file_type.name.lower()}; limit is {limit // (1024 * 1024)} MiB")
 
     @staticmethod
     def _validate_base64_upload(file_data: str) -> None:
@@ -719,6 +790,13 @@ class Client:
             return
 
         self._closed = True
+        self._gateway_starting = False
+        gateway_connection_created = getattr(self, "_gateway_connection_created", None)
+        if gateway_connection_created is not None:
+            gateway_connection_created.set()
+        connection = getattr(self, "_connection", None)
+        if connection is not None:
+            connection.mark_closed()
 
         event_transport = getattr(self, "_event_transport", None)
         if event_transport is not None:
@@ -820,6 +898,8 @@ class Client:
         ret_coro: :class:`bool`
             是否需要返回协程对象
         """
+        if getattr(self, "_closed", False):
+            raise RuntimeError("无法启动已关闭的 Client")
         # login后再进行后面的操作
         token = Token(
             appid,
@@ -835,8 +915,19 @@ class Client:
             await self._async_setup_hook()
 
         use_gateway = self._transport_mode == "websocket"
-        await self._bot_login(token, use_gateway=use_gateway)
         if use_gateway:
+            self._gateway_starting = True
+            self._gateway_connection_created.clear()
+        try:
+            await self._bot_login(token, use_gateway=use_gateway)
+        except BaseException:
+            if use_gateway:
+                self._gateway_starting = False
+                self._gateway_connection_created.set()
+            raise
+        if use_gateway:
+            if self._closed:
+                raise RuntimeError("无法启动已关闭的 Client")
             return await self._bot_init(token)
 
         if self._transport_mode == "webhook":
@@ -887,6 +978,8 @@ class Client:
 
         # 通过api获取websocket链接
         self._ws_ap = await self.api.get_ws_url()
+        if getattr(self, "_closed", False):
+            raise RuntimeError("无法启动已关闭的 Client")
 
         # 实例一个session_pool
         self._connection = ConnectionSession(
@@ -896,6 +989,12 @@ class Client:
             loop=self.loop,
             api=self.api,
         )
+        self._gateway_starting = False
+        gateway_connection_created = getattr(self, "_gateway_connection_created", None)
+        if gateway_connection_created is None:
+            gateway_connection_created = asyncio.Event()
+            self._gateway_connection_created = gateway_connection_created
+        gateway_connection_created.set()
 
         self._connection.state.robot = self._robot
 
@@ -952,21 +1051,19 @@ class Client:
         loop = self._connection.loop
         loop.set_exception_handler(_loop_exception_handler)
 
-        while not self._closed:
-            _log.debug("[botpy] 会话循环检查...")
-            try:
-                # 返回协程对象，交由开发者自行调控
-                coroutine = self._connection.multi_run(session_interval)
-                if self.ret_coro:
-                    return coroutine
-                elif coroutine:
-                    await coroutine
-                else:
-                    await self.close()
-                    _log.info("[botpy] 服务意外停止!")
-            except KeyboardInterrupt:
-                _log.info("[botpy] 服务强行停止!")
-                # cancel all tasks lingering
+        # 返回协程对象，交由开发者自行调控
+        coroutine = self._connection.multi_run(session_interval)
+        if self.ret_coro:
+            return coroutine
+        try:
+            await coroutine
+        except KeyboardInterrupt:
+            _log.info("[botpy] 服务强行停止!")
+            return None
+        if not self._closed:
+            await self.close()
+            _log.info("[botpy] 服务意外停止!")
+        return None
 
     async def _create_gateway_session(self, token: Token, shard_id: int, shard_count: int):
         session_id = ""
@@ -993,6 +1090,7 @@ class Client:
             "intent": self.intents,
             "token": token,
             "url": self._ws_ap["url"],
+            "ssl": self._ssl,
             "shards": {"shard_id": shard_id, "shard_count": shard_count},
             "session_store": self._session_store,
         }
@@ -1006,6 +1104,8 @@ class Client:
 
         param session: session对象
         """
+        if self._closed:
+            return
         _log.info("[botpy] 会话启动中...")
 
         client = BotWebSocket(session, self._connection)
@@ -1056,7 +1156,6 @@ class Client:
             else:
                 _log.debug("[botpy] 事件: %s 未注册", event)
 
-
     def _schedule_event(
         self,
         coro: Callable[..., Coroutine[Any, Any, Any]],