🍻 publish plugin Ret 2 Shell 事件播报 (#4008 )

📝 Update changelog
🍻 publish plugin Permission (#4021 )
2026-05-30 15:42:41 +00:00 · 2026-05-26 11:28:09 +08:00 · 2026-05-25 15:17:59 +00:00 · 2026-05-25 15:16:51 +00:00 · 2026-05-24 06:21:02 +00:00 · 2026-05-24 06:19:51 +00:00
11 changed files with 530 additions and 23 deletions
@@ -3,7 +3,7 @@
  "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
  "features": {
    "ghcr.io/jsburckhardt/devcontainer-features/uv:1": {},
-    "ghcr.io/devcontainers/features/node:1": {},
+    "ghcr.io/devcontainers/features/node:2": {},
    "ghcr.io/meaningful-ooo/devcontainer-features/fish:2": {}
  },
  "postCreateCommand": "corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 ./scripts/setup-envs.sh",
@@ -2,17 +2,14 @@ name: Release Drafter

 on:
  push:
-    tags:
-      - v*
-  pull_request_target:
    branches:
      - master
-    types:
-      - closed
+    tags:
+      - v*

 jobs:
  update-release-draft:
-    if: github.event_name == 'pull_request_target'
+    if: github.ref == 'refs/heads/master'
    runs-on: ubuntu-latest
    concurrency:
      group: pull-request-changelog
@@ -24,7 +24,7 @@ jobs:

    steps:
      - name: Set Commit Status
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
        with:
          script: |
            github.rest.repos.createCommitStatus({
@@ -78,7 +78,7 @@ jobs:
            :rocket: Deployed to ${{ steps.deploy.outputs.deploy-url }}

      - name: Set Commit Status
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
        if: always()
        with:
          script: |
@@ -7,7 +7,7 @@ ci:
  autoupdate_commit_msg: ":arrow_up: auto update by pre-commit hooks"
 repos:
  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.4
+    rev: v0.15.12
    hooks:
      - id: ruff-check
        args: [--fix]
@@ -353,4 +353,19 @@
    ],
    "is_official": false
  },
+  {
+    "module_name": "nonebot.adapters.wxclaw",
+    "project_link": "nonebot-adapter-wxclaw",
+    "name": "WxClaw",
+    "desc": "基于 openclaw-weixin 协议的 NoneBot2 微信智能体适配器",
+    "author_id": 51957264,
+    "homepage": "https://github.com/shoucandanghehe/nonebot-adapter-wxclaw",
+    "tags": [
+      {
+        "label": "微信",
+        "color": "#1aad19"
+      }
+    ],
+    "is_official": false
+  },
 ]
@@ -10613,4 +10613,345 @@
    ],
    "is_official": false
  },
+  {
+    "module_name": "nonebot_plugin_session_config",
+    "project_link": "nonebot-plugin-session-config",
+    "author_id": 157892771,
+    "tags": [
+      {
+        "label": "config",
+        "color": "#ea5252"
+      }
+    ],
+    "is_official": false
+  },
+  {
+    "module_name": "nonebot_plugin_12306_ticket",
+    "project_link": "nonebot-plugin-12306-ticket",
+    "author_id": 51502183,
+    "tags": [
+      {
+        "label": "中国铁路",
+        "color": "#5257ea"
+      },
+      {
+        "label": "12306",
+        "color": "#5257ea"
+      }
+    ],
+    "is_official": false
+  },
+  {
+    "module_name": "nonebot_plugin_tg_stickers_downloads",
+    "project_link": "nonebot-plugin-tg-stickers-downloads",
+    "author_id": 122811297,
+    "tags": [],
+    "is_official": false
+  },
+  {
+    "module_name": "nonebot_plugin_bot_monitor",
+    "project_link": "nonebot-plugin-bot-monitor",
+    "author_id": 62124595,
+    "tags": [
+      {
+        "label": "monitor",
+        "color": "#ea5252"
+      }
+    ],
+    "is_official": false
+  },
+  {
+    "module_name": "nonebot_plugin_dingtalk_logger",
+    "project_link": "nonebot-plugin-dingtalk-logger",
+    "author_id": 41439182,
+    "tags": [
+      {
+        "label": "DingTalk",
+        "color": "#007fff"
+      }
+    ],
+    "is_official": false
+  },
+  {
+    "module_name": "nonebot_plugin_arkguesser",
+    "project_link": "nonebot-plugin-arkguesser",
+    "author_id": 225500959,
+    "tags": [
+      {
+        "label": "明日方舟 ",
+        "color": "#ea5252"
+      },
+      {
+        "label": "猜谜",
+        "color": "#ea5252"
+      }
+    ],
+    "is_official": false
+  },
+  {
+    "module_name": "nonebot_plugin_quotation",
+    "project_link": "nonebot-plugin-quotation",
+    "author_id": 41883458,
+    "tags": [
+      {
+        "label": "语录",
+        "color": "#2aa7dd"
+      }
+    ],
+    "is_official": false
+  },
+  {
+    "module_name": "nonebot_plugin_dancecube",
+    "project_link": "nonebot-plugin-dancecube",
+    "author_id": 25610914,
+    "tags": [
+      {
+        "label": "音游",
+        "color": "#ea5252"
+      },
+      {
+        "label": "舞立方",
+        "color": "#377aba"
+      }
+    ],
+    "is_official": false
+  },
+  {
+    "module_name": "nonebot_plugin_suda_electricity",
+    "project_link": "nonebot_plugin_suda_electricity",
+    "author_id": 78413699,
+    "tags": [
+      {
+        "label": "苏州大学",
+        "color": "#e13667"
+      },
+      {
+        "label": "电费",
+        "color": "#243b83"
+      }
+    ],
+    "is_official": false
+  },
+  {
+    "module_name": "nonebot_plugin_amrita",
+    "project_link": "nonebot-plugin-amrita",
+    "author_id": 67693593,
+    "tags": [
+      {
+        "label": "agent",
+        "color": "#ea5252"
+      },
+      {
+        "label": "ai",
+        "color": "#ea5252"
+      },
+      {
+        "label": "LLM",
+        "color": "#1313e6"
+      }
+    ],
+    "is_official": false
+  },
+  {
+    "module_name": "nonebot_plugin_osumania_toolkit",
+    "project_link": "nonebot-plugin-osumania-toolkit",
+    "author_id": 95923342,
+    "tags": [
+      {
+        "label": "osu!mania",
+        "color": "#ea5252"
+      },
+      {
+        "label": "func",
+        "color": "#ea5252"
+      },
+      {
+        "label": "tool",
+        "color": "#ea5252"
+      }
+    ],
+    "is_official": false
+  },
+  {
+    "module_name": "nonebot_plugin_kuwo",
+    "project_link": "nonebot-plugin-kuwo",
+    "author_id": 144674902,
+    "tags": [
+      {
+        "label": "music",
+        "color": "#52e7ea"
+      },
+      {
+        "label": "kuwo",
+        "color": "#ddf106"
+      }
+    ],
+    "is_official": false
+  },
+  {
+    "module_name": "nonebot_plugin_hermes",
+    "project_link": "nonebot-plugin-hermes",
+    "author_id": 1080807,
+    "tags": [
+      {
+        "label": "hermes",
+        "color": "#cf3131"
+      }
+    ],
+    "is_official": false
+  },
+  {
+    "module_name": "nonebot_plugin_uma",
+    "project_link": "nonebot-plugin-umamusume",
+    "author_id": 30062345,
+    "tags": [],
+    "is_official": false
+  },
+  {
+    "module_name": "nonebot_plugin_namepy",
+    "project_link": "nonebot-plugin-namepy",
+    "author_id": 175370943,
+    "tags": [
+      {
+        "label": "命名工具",
+        "color": "#5fa8d3"
+      }
+    ],
+    "is_official": false
+  },
+  {
+    "module_name": "nonebot_plugin_dotcharacter",
+    "project_link": "nonebot-plugin-dotcharacter",
+    "author_id": 86188856,
+    "tags": [
+      {
+        "label": "ai",
+        "color": "#ea5252"
+      }
+    ],
+    "is_official": false
+  },
+  {
+    "module_name": "nonebot_plugin_bililive",
+    "project_link": "nonebot-plugin-bililive",
+    "author_id": 271566727,
+    "tags": [
+      {
+        "label": "bilibili",
+        "color": "#ea5252"
+      }
+    ],
+    "is_official": false
+  },
+  {
+    "module_name": "nonebot_plugin_b50_analysis",
+    "project_link": "nonebot-plugin-b50-analysis",
+    "author_id": 145742863,
+    "tags": [
+      {
+        "label": "maimai",
+        "color": "#ea5252"
+      }
+    ],
+    "is_official": false
+  },
+  {
+    "module_name": "nonebot_plugin_picstatus_ng",
+    "project_link": "nonebot-plugin-picstatus-ng",
+    "author_id": 72241996,
+    "tags": [
+      {
+        "label": "server",
+        "color": "#8bff00"
+      },
+      {
+        "label": "PicStatus",
+        "color": "#ea5252"
+      }
+    ],
+    "is_official": false
+  },
+  {
+    "module_name": "nonebot_plugin_catcake",
+    "project_link": "nonebot-plugin-catcake",
+    "author_id": 191975746,
+    "tags": [
+      {
+        "label": "崩坏:星穹铁道",
+        "color": "#d01b7a"
+      }
+    ],
+    "is_official": false
+  },
+  {
+    "module_name": "nonebot_plugin_onebot2tg",
+    "project_link": "nonebot-plugin-onebot2tg",
+    "author_id": 50368309,
+    "tags": [
+      {
+        "label": "telegram",
+        "color": "#ea5252"
+      },
+      {
+        "label": "qq",
+        "color": "#ea5252"
+      },
+      {
+        "label": "QQ群",
+        "color": "#ea5252"
+      }
+    ],
+    "is_official": false
+  },
+  {
+    "module_name": "nonebot_plugin_set_essence_msg",
+    "project_link": "nonebot-plugin-set-essence-msg",
+    "author_id": 32678715,
+    "tags": [
+      {
+        "label": "精华消息",
+        "color": "#ea5252"
+      },
+      {
+        "label": "群管理",
+        "color": "#ea5252"
+      }
+    ],
+    "is_official": false
+  },
+  {
+    "module_name": "nonebot_plugin_maimai_raking",
+    "project_link": "nonebot-plugin-maimai-raking",
+    "author_id": 72530683,
+    "tags": [
+      {
+        "label": "maimai",
+        "color": "#ea5252"
+      },
+      {
+        "label": "舞萌",
+        "color": "#ea5252"
+      }
+    ],
+    "is_official": false
+  },
+  {
+    "module_name": "nonebot_plugin_permission",
+    "project_link": "nonebot-plugin-permission",
+    "author_id": 42648639,
+    "tags": [
+      {
+        "label": "权限控制",
+        "color": "#1e5d58"
+      }
+    ],
+    "is_official": false
+  },
+  {
+    "module_name": "nonebot_plugin_ret2shell",
+    "project_link": "nonebot-plugin-ret2shell",
+    "author_id": 53389305,
+    "tags": [],
+    "is_official": false
+  },
 ]
@@ -46,6 +46,7 @@ from nonebot.internal.driver import (
    Timeout,
    TimeoutTypes,
 )
+from nonebot.log import logger
 from nonebot.utils import UNSET, UnsetType, exclude_unset

 try:
@@ -324,6 +325,16 @@ class Mixin(HTTPClientMixin, WebSocketClientMixin):
                )
            )

+        heartbeat = None
+        if setup.ping_interval is not UNSET:
+            heartbeat = setup.ping_interval
+
+        if isinstance(setup.timeout, Timeout) and setup.timeout.ping is not UNSET:
+            logger.warning(
+                "aiohttp driver does not expose a separate ping timeout; "
+                "the configured ping timeout will be ignored."
+            )
+
        async with aiohttp.ClientSession(version=version, trust_env=True) as session:
            async with session.ws_connect(
                setup.url,
@@ -331,6 +342,8 @@ class Mixin(HTTPClientMixin, WebSocketClientMixin):
                timeout=timeout,
                headers=setup.headers,
                proxy=setup.proxy,
+                autoping=heartbeat is not None,
+                heartbeat=heartbeat,
            ) as ws:
                yield WebSocket(request=setup, session=session, websocket=ws)

@@ -36,7 +36,7 @@ from nonebot.drivers import WebSocket as BaseWebSocket
 from nonebot.drivers.none import Driver as NoneDriver
 from nonebot.exception import WebSocketClosed
 from nonebot.log import LoguruHandler
-from nonebot.utils import UNSET, exclude_unset
+from nonebot.utils import UNSET, UnsetType, exclude_unset

 try:
    from websockets import ClientConnection, ConnectionClosed, connect
@@ -77,14 +77,17 @@ class Mixin(WebSocketClientMixin):
    @override
    @asynccontextmanager
    async def websocket(self, setup: Request) -> AsyncGenerator["WebSocket", None]:
-        timeout_kwargs: dict[str, float | None] = {}
+        timeout_kwargs: dict[str, float | None | UnsetType] = {}
        if isinstance(setup.timeout, Timeout):
            open_timeout = (
                setup.timeout.connect or setup.timeout.read or setup.timeout.total
            )
-            timeout_kwargs = exclude_unset(
-                {"open_timeout": open_timeout, "close_timeout": setup.timeout.close}
-            )
+            timeout_kwargs = {
+                "open_timeout": open_timeout,
+                "close_timeout": setup.timeout.close,
+                "ping_timeout": setup.timeout.ping,
+            }
+
        elif setup.timeout is not UNSET:
            timeout_kwargs = {
                "open_timeout": setup.timeout,
@@ -95,18 +98,24 @@ class Mixin(WebSocketClientMixin):
            open_timeout = (
                DEFAULT_TIMEOUT.connect or DEFAULT_TIMEOUT.read or DEFAULT_TIMEOUT.total
            )
-            timeout_kwargs = exclude_unset(
-                {
-                    "open_timeout": open_timeout,
-                    "close_timeout": DEFAULT_TIMEOUT.close,
-                }
-            )
+            timeout_kwargs = {
+                "open_timeout": open_timeout,
+                "close_timeout": DEFAULT_TIMEOUT.close,
+                "ping_timeout": DEFAULT_TIMEOUT.ping,
+            }
+
+        kwargs = exclude_unset(
+            {
+                **timeout_kwargs,
+                "ping_interval": setup.ping_interval,
+            }
+        )

        connection = connect(
            str(setup.url),
            additional_headers={**setup.headers, **setup.cookies.as_header(setup)},
            proxy=setup.proxy if setup.proxy is not None else True,
-            **timeout_kwargs,  # type: ignore
+            **kwargs,  # type: ignore
        )
        async with connection as ws:
            yield WebSocket(request=setup, websocket=ws)
@@ -20,9 +20,10 @@ class Timeout:
    connect: float | None | UnsetType = UNSET
    read: float | None | UnsetType = UNSET
    close: float | None | UnsetType = UNSET
+    ping: float | None | UnsetType = UNSET


-DEFAULT_TIMEOUT = Timeout(total=None, connect=5.0, read=30.0, close=10.0)
+DEFAULT_TIMEOUT = Timeout(total=None, connect=5.0, read=30.0, close=10.0, ping=20.0)


 RawURL: TypeAlias = tuple[bytes, bytes, int | None, bytes]
@@ -52,6 +53,7 @@ FileTypes: TypeAlias = (
 )
 FilesTypes: TypeAlias = dict[str, FileTypes] | list[tuple[str, FileTypes]] | None
 TimeoutTypes: TypeAlias = float | Timeout | None
+PingIntervalTypes: TypeAlias = float | None


 class HTTPVersion(Enum):
@@ -76,6 +78,7 @@ class Request:
        version: str | HTTPVersion = HTTPVersion.H11,
        timeout: TimeoutTypes | UnsetType = UNSET,
        proxy: str | None = None,
+        ping_interval: PingIntervalTypes | UnsetType = UNSET,
    ):
        # method
        self.method: str = (
@@ -89,6 +92,8 @@ class Request:
        self.timeout: TimeoutTypes | UnsetType = timeout
        # proxy
        self.proxy: str | None = proxy
+        # ping interval
+        self.ping_interval: PingIntervalTypes | UnsetType = ping_interval

        # url
        if isinstance(url, tuple):
@@ -878,6 +878,92 @@ async def test_websocket_client_timeout(driver: Driver, server_url: URL):
    await anyio.sleep(1)


+@pytest.mark.anyio
+@pytest.mark.parametrize(
+    "driver",
+    [
+        pytest.param("nonebot.drivers.websockets:Driver", id="websockets"),
+        pytest.param("nonebot.drivers.aiohttp:Driver", id="aiohttp"),
+    ],
+    indirect=True,
+)
+async def test_websocket_client_ping_timeout(driver: Driver, server_url: URL):
+    """WebSocket connections work with different ping_timeout settings."""
+    assert isinstance(driver, WebSocketClientMixin)
+
+    ws_url = server_url.with_scheme("ws")
+
+    # ping timeout not set (UNSET), falls back to DEFAULT_TIMEOUT.ping
+    request = Request("GET", ws_url, timeout=Timeout())
+    async with driver.websocket(request) as ws:
+        await ws.send("quit")
+        with pytest.raises(WebSocketClosed):
+            await ws.receive()
+
+    await anyio.sleep(1)
+
+    # ping timeout explicitly set to None (disable ping timeout)
+    request = Request("GET", ws_url, timeout=Timeout(ping=None))
+    async with driver.websocket(request) as ws:
+        await ws.send("quit")
+        with pytest.raises(WebSocketClosed):
+            await ws.receive()
+
+    await anyio.sleep(1)
+
+    # ping timeout set to a float value
+    request = Request("GET", ws_url, timeout=Timeout(ping=20.0))
+    async with driver.websocket(request) as ws:
+        await ws.send("quit")
+        with pytest.raises(WebSocketClosed):
+            await ws.receive()
+
+    await anyio.sleep(1)
+
+
+@pytest.mark.anyio
+@pytest.mark.parametrize(
+    "driver",
+    [
+        pytest.param("nonebot.drivers.websockets:Driver", id="websockets"),
+        pytest.param("nonebot.drivers.aiohttp:Driver", id="aiohttp"),
+    ],
+    indirect=True,
+)
+async def test_websocket_client_ping_interval(driver: Driver, server_url: URL):
+    """WebSocket connections work with different ping_interval settings."""
+    assert isinstance(driver, WebSocketClientMixin)
+
+    ws_url = server_url.with_scheme("ws")
+
+    # ping_interval not set (UNSET), default behavior
+    request = Request("GET", ws_url)
+    async with driver.websocket(request) as ws:
+        await ws.send("quit")
+        with pytest.raises(WebSocketClosed):
+            await ws.receive()
+
+    await anyio.sleep(1)
+
+    # ping_interval explicitly set to None (disable ping)
+    request = Request("GET", ws_url, ping_interval=None)
+    async with driver.websocket(request) as ws:
+        await ws.send("quit")
+        with pytest.raises(WebSocketClosed):
+            await ws.receive()
+
+    await anyio.sleep(1)
+
+    # ping_interval set to a float value
+    request = Request("GET", ws_url, ping_interval=20.0)
+    async with driver.websocket(request) as ws:
+        await ws.send("quit")
+        with pytest.raises(WebSocketClosed):
+            await ws.receive()
+
+    await anyio.sleep(1)
+
+
@pytest.mark.parametrize(
    ("driver", "driver_type"),
    [
@@ -5,6 +5,47 @@ toc_max_heading_level: 2

 # 更新日志

+## 最近更新
+
+### 🚀 新功能
+
+- Feature: WS 支持 ping interval/timeout 配置 [@StarHeartHunt](https://github.com/StarHeartHunt) ([#3964](https://github.com/nonebot/nonebot2/pull/3964))
+
+### 💫 杂项
+
+- CI: 移除 Pull Request Target 触发器 [@StarHeartHunt](https://github.com/StarHeartHunt) ([#3946](https://github.com/nonebot/nonebot2/pull/3946))
+
+### 🍻 插件发布
+
+- Plugin: Permission [@noneflow](https://github.com/noneflow) ([#4022](https://github.com/nonebot/nonebot2/pull/4022))
+- Plugin: 舞萌排行榜 [@noneflow](https://github.com/noneflow) ([#4013](https://github.com/nonebot/nonebot2/pull/4013))
+- Plugin: 精华消息管理 [@noneflow](https://github.com/noneflow) ([#4015](https://github.com/nonebot/nonebot2/pull/4015))
+- Plugin: nonebot-plugin-onebot2tg [@noneflow](https://github.com/noneflow) ([#4020](https://github.com/nonebot/nonebot2/pull/4020))
+- Plugin: 猫猫糕公开版 [@noneflow](https://github.com/noneflow) ([#4011](https://github.com/nonebot/nonebot2/pull/4011))
+- Plugin: PicStatus-ng [@noneflow](https://github.com/noneflow) ([#4004](https://github.com/nonebot/nonebot2/pull/4004))
+- Plugin: B50分析 [@noneflow](https://github.com/noneflow) ([#4002](https://github.com/nonebot/nonebot2/pull/4002))
+- Plugin: BiliLive [@noneflow](https://github.com/noneflow) ([#3970](https://github.com/nonebot/nonebot2/pull/3970))
+- Plugin: dot-skill 角色扮演 [@noneflow](https://github.com/noneflow) ([#3996](https://github.com/nonebot/nonebot2/pull/3996))
+- Plugin: 编程命名风格转换 [@noneflow](https://github.com/noneflow) ([#3990](https://github.com/nonebot/nonebot2/pull/3990))
+- Plugin: 赛马娘插件 [@noneflow](https://github.com/noneflow) ([#3983](https://github.com/nonebot/nonebot2/pull/3983))
+- Plugin: Hermes Agent [@noneflow](https://github.com/noneflow) ([#3988](https://github.com/nonebot/nonebot2/pull/3988))
+- Plugin: 酷我音乐 [@noneflow](https://github.com/noneflow) ([#3975](https://github.com/nonebot/nonebot2/pull/3975))
+- Plugin: osu!mania 工具箱 [@noneflow](https://github.com/noneflow) ([#3977](https://github.com/nonebot/nonebot2/pull/3977))
+- Plugin: LibAmritaCore [@noneflow](https://github.com/noneflow) ([#3942](https://github.com/nonebot/nonebot2/pull/3942))
+- Plugin: 苏大电费查询 [@noneflow](https://github.com/noneflow) ([#3966](https://github.com/nonebot/nonebot2/pull/3966))
+- Plugin: 舞立方插件 [@noneflow](https://github.com/noneflow) ([#3956](https://github.com/nonebot/nonebot2/pull/3956))
+- Plugin: 语录插件 [@noneflow](https://github.com/noneflow) ([#3963](https://github.com/nonebot/nonebot2/pull/3963))
+- Plugin: 明日方舟猜干员游戏 [@noneflow](https://github.com/noneflow) ([#3939](https://github.com/nonebot/nonebot2/pull/3939))
+- Plugin: 错误日志转发钉钉机器人 [@noneflow](https://github.com/noneflow) ([#3952](https://github.com/nonebot/nonebot2/pull/3952))
+- Plugin: Bot状态监控 [@noneflow](https://github.com/noneflow) ([#3968](https://github.com/nonebot/nonebot2/pull/3968))
+- Plugin: tg-stickers-downloads [@noneflow](https://github.com/noneflow) ([#3954](https://github.com/nonebot/nonebot2/pull/3954))
+- Plugin: 12306车票查询 [@noneflow](https://github.com/noneflow) ([#3948](https://github.com/nonebot/nonebot2/pull/3948))
+- Plugin: 会话配置 [@noneflow](https://github.com/noneflow) ([#3938](https://github.com/nonebot/nonebot2/pull/3938))
+
+### 🍻 适配器发布
+
+- Adapter: WxClaw [@noneflow](https://github.com/noneflow) ([#3944](https://github.com/nonebot/nonebot2/pull/3944))
+
 ## v2.5.0

 ### 💥 破坏性变更