🔧 更新默认UA为Windows平台

* ✨ feat(ISSUE_TEMPLATE): 修改问题报告模板 

 ✨ feat(ISSUE_TEMPLATE): 修改问题报告模板

* 💄 auto fix by pre-commit hooks

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

.devcontainer/devcontainer.json

@@ -4,7 +4,7 @@
   "features": {
     "ghcr.io/devcontainers-contrib/features/poetry:2": {}
   },
-  "postCreateCommand": "poetry config virtualenvs.in-project true && poetry install -E all && poetry run pre-commit install && yarn install",
+  "postCreateCommand": "poetry config virtualenvs.in-project true && poetry install -E all && poetry run pre-commit install && npm install -g pnpm && pnpm install",
   "customizations": {
     "vscode": {
       "settings": {

.github/ISSUE_TEMPLATE/issue.yml

@@ -0,0 +1,61 @@
+name: 问题报告
+description: 我遇到了问题
+
+body:
+  - type: markdown
+    id: environment
+    attributes:
+      value: |
+        ## 环境
+
+  - type: input
+    id: nonebot_bison_version
+    attributes:
+      label: nonebot-bison 版本
+      description: 请填写 nonebot-bison 的版本
+
+  - type: input
+    id: nonebot_version
+    attributes:
+      label: nonebot 版本
+      description: 请填写 nonebot 的版本
+
+  - type: dropdown
+    id: installation_method
+    attributes:
+      label: 安装方式
+      description: 请选择安装方式
+      options:
+        - 通过 nb-cli 安装
+        - 使用 poetry/pdm 等现代包管理器安装
+        - 通过 pip install 安装
+        - 克隆或下载项目直接使用
+
+  - type: input
+    id: operating_system
+    attributes:
+      label: 操作系统
+      description: 请填写操作系统
+
+  - type: textarea
+    id: issue_description
+    attributes:
+      label: 问题
+      description: 请在这里描述你遇到的问题
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: 日志
+      description: 请在这里粘贴你的日志
+      render: shell
+
+  - type: checkboxes
+    id: confirmations
+    attributes:
+      label: 确认
+      options:
+        - label: 我搜索过了 issue，但是并没有发现过与我类似的问题
+          required: true
+        - label: 我确认在日志中去掉了敏感信息
+          required: true

.github/ISSUE_TEMPLATE/问题报告.md

@@ -1,31 +0,0 @@
----
-name: 问题报告
-about: 我遇到了问题
-title: ""
-labels: ""
-assignees: ""
----
-
-## 环境
-
-- nonebot-bison 版本：
-- nonebot 版本：
-- 安装方式：（以下方式的一种或者其他方式）
-  1. 通过 nb-cli 安装
-  2. 使用 poetry/pdm 等现代包管理器安装
-  3. 通过 pip install 安装
-  4. 克隆或下载项目直接使用
-- 操作系统：
-
-## 问题
-
-请在这里描述你遇到的问题
-
-## 日志
-
-```
-请在这里粘贴你的日志
-```
-
-- [ ] 我搜索过了 issue，但是并没有发现过与我类似的问题
-- [ ] 我确认在日志中去掉了敏感信息

.github/actions/build-docs/action.yml

@@ -10,5 +10,5 @@ runs:
     - name: Build Frontend
       shell: bash
       run: |
-        yarn install
-        yarn docs:build
+        pnpm install
+        pnpm docs:build

.github/actions/build-frontend/action.yml

@@ -11,5 +11,5 @@ runs:
       shell: bash
       working-directory: ./admin-frontend
       run: |
-        yarn install
-        yarn build
+        pnpm install
+        pnpm build

.github/actions/setup-node/action.yml

@@ -8,11 +8,16 @@ runs:
       with:
         node-version: "20"
 
-    - id: yarn-cache-dir-path
-      run: echo "::set-output name=dir::$(yarn cache dir)"
+    - name: Set Up Pnpm
+      uses: pnpm/action-setup@v4
+      with:
+        version: 9
+
+    - id: pnpm-cache-dir-path
+      run: echo "::set-output name=dir::$(pnpm store path)"
       shell: bash
 
     - uses: actions/cache@v4
       with:
-        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+        path: ${{ steps.pnpm-cache-dir-path.outputs.dir }}
+        key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}

.pre-commit-config.yaml

@@ -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.6.0
+    rev: v0.6.3
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
@@ -34,7 +34,7 @@ repos:
         stages: [commit]
 
   - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v9.8.0
+    rev: v9.9.1
     hooks:
       - id: eslint
         additional_dependencies:

CHANGELOG.md

@@ -2,8 +2,15 @@
 
 ## 最近更新
 
+### 文档
+
+- 📝 小刻食堂剪彩文档 [@phidiaLam](https://github.com/phidiaLam) ([#636](https://github.com/MountainDash/nonebot-bison/pull/636))
+
+## v0.9.4
+
 ### Bug 修复
 
+- FSM 内部执行外部函数出现异常时不应崩溃 [@AzideCupric](https://github.com/AzideCupric) ([#616](https://github.com/MountainDash/nonebot-bison/pull/616))
 - 无权限用户尝试添加订阅时返回提示信息 [@suyiiyii](https://github.com/suyiiyii) ([#617](https://github.com/MountainDash/nonebot-bison/pull/617))
 - B站请求策略阶段行为优化 [@AzideCupric](https://github.com/AzideCupric) ([#610](https://github.com/MountainDash/nonebot-bison/pull/610))
 - Rss 不再删除格式化字符 [@suyiiyii](https://github.com/suyiiyii) ([#615](https://github.com/MountainDash/nonebot-bison/pull/615))

admin-frontend/package.json

@@ -5,26 +5,26 @@
   "homepage": "bison",
   "proxy": "http://127.0.0.1:8080",
   "dependencies": {
-    "@arco-design/web-react": "^2.63.1",
-    "@babel/core": "^7.24.7",
+    "@arco-design/web-react": "^2.64.0",
+    "@babel/core": "^7.25.2",
     "@babel/plugin-syntax-flow": "^7.24.7",
-    "@babel/plugin-transform-react-jsx": "^7.24.7",
+    "@babel/plugin-transform-react-jsx": "^7.25.2",
     "@reduxjs/toolkit": "^1.9.7",
     "@testing-library/dom": "^10.4.0",
-    "@testing-library/react": "^16.0.0",
+    "@testing-library/react": "^16.0.1",
     "@testing-library/user-event": "^14.5.2",
-    "@types/jest": "^29.5.12",
-    "@types/node": "^20.14.10",
-    "@types/react": "^18.3.3",
+    "@types/jest": "^29.5.13",
+    "@types/node": "^20.16.5",
+    "@types/react": "^18.3.7",
     "@types/react-dom": "^18.3.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-redux": "^9.1.2",
-    "react-router-dom": "^6.24.1",
+    "react-router-dom": "^6.26.2",
     "react-scripts": "5.0.1",
     "redux": "^5.0.1",
     "redux-persist": "^6.0.0",
-    "typescript": "^5.5.4",
+    "typescript": "^5.6.2",
     "web-vitals": "^3.5.2"
   },
   "scripts": {
@@ -53,17 +53,17 @@
     ]
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^6.4.6",
-    "@typescript-eslint/eslint-plugin": "^8.0.0",
-    "@typescript-eslint/parser": "^8.0.0",
-    "eslint": "^9.6.0",
+    "@testing-library/jest-dom": "^6.5.0",
+    "@typescript-eslint/eslint-plugin": "^8.6.0",
+    "@typescript-eslint/parser": "^8.6.0",
+    "eslint": "^8.57.1",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^18.0.0",
-    "eslint-import-resolver-typescript": "^3.6.1",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jsx-a11y": "^6.9.0",
-    "eslint-plugin-react": "^7.34.3",
+    "eslint-import-resolver-typescript": "^3.6.3",
+    "eslint-plugin-import": "^2.30.0",
+    "eslint-plugin-jsx-a11y": "^6.10.0",
+    "eslint-plugin-react": "^7.36.1",
     "eslint-plugin-react-hooks": "^4.6.2",
-    "eslint-plugin-react-redux": "^4.1.0"
+    "eslint-plugin-react-redux": "^4.2.0"
   }
 }

docker.env.prod

@@ -22,7 +22,7 @@ BISON_SKIP_BROWSER_CHECK=false
 BISON_USE_PIC_MERGE=0
 BISON_RESEND_TIMES=0
 BISON_PROXY=
-BISON_UA=Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36
+BISON_UA=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 Edg/130.0.0.0
 BISON_SHOW_NETWORK_WARNING=true
 BISON_PLATFORM_THEME='{}'
 

docker/Dockerfile

@@ -1,7 +1,8 @@
-FROM node:20.15.1 as frontend
+FROM node:20.17.0 as frontend
 ADD . /app
 WORKDIR /app/admin-frontend
-RUN yarn && yarn build
+RUN npm install -g pnpm
+RUN pnpm install && pnpm build
 
 FROM python:3.11
 RUN python3 -m pip install poetry && poetry config virtualenvs.create false

docker/Dockerfile_with_frontend

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.8
+# syntax=docker/dockerfile:1.10
 FROM python:3.11-slim-bullseye as base
 
 FROM base as builder

docker/Dockerfile_with_frontend_sentry

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.8
+# syntax=docker/dockerfile:1.10
 FROM python:3.11-slim-bullseye as base
 
 FROM base as builder

docs/README.md

@@ -70,7 +70,7 @@ highlights:
         details: 一个由玩家创造的幻想世界
         link: https://adsrff.web.sdo.com/web1/
 
-      - title: 小刻食堂 (即将支持)
+      - title: 小刻食堂
         details: 实时获取鹰角发的动态
         link: https://www.ceobecanteen.top
 

nonebot_bison/platform/bilibili/fsm.py

@@ -2,10 +2,24 @@ import sys
 import asyncio
 import inspect
 from enum import Enum
+from functools import wraps
 from dataclasses import dataclass
 from collections.abc import Set as AbstractSet
 from collections.abc import Callable, Sequence, Awaitable, AsyncGenerator
-from typing import TYPE_CHECKING, Any, Generic, TypeVar, Protocol, TypeAlias, TypedDict, NamedTuple, runtime_checkable
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Generic,
+    TypeVar,
+    Protocol,
+    ParamSpec,
+    TypeAlias,
+    TypedDict,
+    NamedTuple,
+    Concatenate,
+    overload,
+    runtime_checkable,
+)
 
 from nonebot import logger
 
@@ -17,6 +31,7 @@ TAddon = TypeVar("TAddon", contravariant=True)
 TState = TypeVar("TState", contravariant=True)
 TEvent = TypeVar("TEvent", contravariant=True)
 TFSM = TypeVar("TFSM", bound="FSM", contravariant=True)
+P = ParamSpec("P")
 
 
 class StateError(Exception): ...
@@ -163,6 +178,52 @@ class FSM(Generic[TState, TEvent, TAddon]):
         self.started = False
 
         del self.machine
+        self.current_state = self.graph["initial"]
         self.machine = self._core()
 
         logger.trace("FSM closed")
+
+
+@overload
+def reset_on_exception(
+    func: Callable[Concatenate[TFSM, P], Awaitable[ActionReturn]],
+) -> Callable[Concatenate[TFSM, P], Awaitable[ActionReturn]]:
+    """自动在发生异常后重置 FSM"""
+
+
+@overload
+def reset_on_exception(
+    auto_start: bool = False,
+) -> Callable[
+    [Callable[Concatenate[TFSM, P], Awaitable[ActionReturn]]], Callable[Concatenate[TFSM, P], Awaitable[ActionReturn]]
+]:
+    """自动在异常后重置 FSM，当 auto_start 为 True 时，自动启动 FSM"""
+
+
+# 参考自 dataclasses.dataclass 的实现
+def reset_on_exception(func=None, /, *, auto_start=False):  # pyright: ignore[reportInconsistentOverload]
+    def warp(func: Callable[Concatenate[TFSM, P], Awaitable[ActionReturn]]):
+        return __reset_clear_up(func, auto_start)
+
+    # 判断调用的是 @reset_on_exception 还是 @reset_on_exception(...)
+    if func is None:
+        # 调用的是带括号的
+        return warp
+
+    # 调用的是不带括号的
+    return warp(func)
+
+
+def __reset_clear_up(func: Callable[Concatenate[TFSM, P], Awaitable[ActionReturn]], auto_start: bool):
+    @wraps(func)
+    async def wrapper(fsm_self: TFSM, *args: P.args, **kwargs: P.kwargs) -> ActionReturn:
+        try:
+            return await func(fsm_self, *args, **kwargs)
+        except Exception as e:
+            logger.error(f"Exception in {func.__name__}: {e}")
+            await fsm_self.reset()
+            if auto_start and not fsm_self.started:
+                await fsm_self.start()
+            raise e
+
+    return wrapper

nonebot_bison/platform/bilibili/retry.py

@@ -14,7 +14,7 @@ from httpx import URL as HttpxURL
 from nonebot_bison.types import Target
 
 from .models import DynRawPost
-from .fsm import FSM, Condition, StateGraph, Transition, ActionReturn
+from .fsm import FSM, Condition, StateGraph, Transition, ActionReturn, reset_on_exception
 
 if TYPE_CHECKING:
     from .platforms import Bilibili
@@ -218,6 +218,11 @@ class RetryFSM(FSM[RetryState, RetryEvent, RetryAddon[TBilibili]]):
         self.addon.reset_all()
         await super().reset()
 
+    @override
+    @reset_on_exception
+    async def emit(self, event: RetryEvent):
+        await super().emit(event)
+
 
 # FIXME: 拿出来是方便测试了，但全局单例会导致所有被装饰的函数共享状态，有待改进
 _retry_fsm = RetryFSM(RETRY_GRAPH, RetryAddon["Bilibili"]())

nonebot_bison/plugin_config.py

@@ -36,7 +36,8 @@ class PlugConfig(BaseModel):
     bison_resend_times: int = 0
     bison_proxy: str | None = None
     bison_ua: str = Field(
-        "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko)"
+        " Chrome/130.0.0.0 Safari/537.36 Edg/130.0.0.0",
         description="默认UA",
     )
     bison_show_network_warning: bool = True

package.json

@@ -11,9 +11,9 @@
     "docs:update-package": "pnpm dlx vp-update"
   },
   "devDependencies": {
-    "@vuepress/bundler-vite": "2.0.0-rc.14",
-    "vue": "^3.4.31",
-    "vuepress": "2.0.0-rc.14",
-    "vuepress-theme-hope": "2.0.0-rc.50"
+    "@vuepress/bundler-vite": "2.0.0-rc.15",
+    "vue": "^3.5.6",
+    "vuepress": "2.0.0-rc.15",
+    "vuepress-theme-hope": "2.0.0-rc.52"
   }
 }

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nonebot-bison"
-version = "0.9.3"
+version = "0.9.4"
 description = "Subscribe message from social medias"
 authors = ["felinae98 <felinae225@qq.com>"]
 license = "MIT"
@@ -24,40 +24,40 @@ classifiers = [
 python = ">=3.10,<4.0.0"
 beautifulsoup4 = ">=4.12.3"
 feedparser = "^6.0.11"
-httpx = ">=0.27.0"
-nonebot2 = { extras = ["fastapi"], version = "^2.3.2" }
-nonebot-adapter-onebot = "^2.4.4"
-nonebot-plugin-htmlrender = ">=0.3.3"
+httpx = ">=0.27.2"
+nonebot2 = { extras = ["fastapi"], version = "^2.3.3" }
+nonebot-adapter-onebot = "^2.4.5"
+nonebot-plugin-htmlrender = ">=0.3.5"
 nonebot-plugin-datastore = ">=1.3.0,<2.0.0"
 nonebot-plugin-apscheduler = ">=0.5.0"
-nonebot-plugin-send-anything-anywhere = ">=0.6.1,<0.7.0"
-pillow = ">=8.4.0,<11.0"
-pyjwt = "^2.8.0"
-python-socketio = "^5.11.3"
+nonebot-plugin-send-anything-anywhere = ">=0.7.1,<0.7.2"
+pillow = ">=10.4.0,<11.0"
+pyjwt = "^2.9.0"
+python-socketio = "^5.11.4"
 tinydb = "^4.8.0"
 qrcode = "^7.4.2"
-pydantic = ">=1.10.17,<3.0.0,!=2.5.0,!=2.5.1"
-lxml = ">=5.2.2"
-yarl = ">=1.9.4"
-hishel = "^0.0.20"
-expiringdictx = "^1.0.1"
-rapidfuzz = "^3.9.3"
+pydantic = ">=2.9.2,<3.0.0,!=2.5.0,!=2.5.1"
+lxml = ">=5.3.0"
+yarl = ">=1.11.1"
+hishel = "^0.0.30"
+expiringdictx = "^1.1.0"
+rapidfuzz = "^3.9.7"
 
 [tool.poetry.group.dev.dependencies]
-black = ">=23.12.1,<25.0"
+black = ">=24.8.0,<25.0"
 ipdb = "^0.13.13"
 isort = "^5.13.2"
 nonemoji = "^0.1.4"
-nb-cli = "^1.4.1"
-pre-commit = "^3.7.1"
-ruff = "^0.6.0"
+nb-cli = "^1.4.2"
+pre-commit = "^3.8.0"
+ruff = "^0.6.5"
 
 [tool.poetry.group.test.dependencies]
 flaky = "^3.8.1"
 nonebug = "^0.3.7"
 nonebug-saa = "^0.4.1"
-pytest = ">=7.4.4,<9.0.0"
-pytest-asyncio = ">=0.23.7,<0.24.0"
+pytest = ">=8.3.3,<9.0.0"
+pytest-asyncio = ">=0.24.0,<0.24.1"
 pytest-cov = ">=5.0.0,<6"
 pytest-mock = "^3.14.0"
 pytest-xdist = { extras = ["psutil"], version = "^3.6.1" }
@@ -68,10 +68,10 @@ freezegun = "^1.5.1"
 optional = true
 
 [tool.poetry.group.docker.dependencies]
-nb-cli = "^1.4.1"
-nonebot2 = { extras = ["fastapi", "aiohttp"], version = "^2.3.2" }
+nb-cli = "^1.4.2"
+nonebot2 = { extras = ["fastapi", "aiohttp"], version = "^2.3.3" }
 nonebot-adapter-red = "^0.9.0"
-nonebot-adapter-qq = "^1.4.4"
+nonebot-adapter-qq = "^1.5.1"
 poetry-core = "^1.9.0"
 
 [tool.poetry.extras]

tests/platforms/test_bilibili.py

@@ -58,6 +58,92 @@ def without_dynamic(app: App):
     )
 
 
+@pytest.mark.asyncio
+async def test_reset_on_exception(app: App):
+    from strenum import StrEnum
+
+    from nonebot_bison.platform.bilibili.fsm import FSM, StateGraph, Transition, ActionReturn, reset_on_exception
+
+    class State(StrEnum):
+        A = "A"
+        B = "B"
+        C = "C"
+
+    class Event(StrEnum):
+        A = "A"
+        B = "B"
+        C = "C"
+
+    class Addon:
+        pass
+
+    async def raction(from_: State, event: Event, to: State, addon: Addon) -> ActionReturn:
+        logger.info(f"action: {from_} -> {to}")
+        raise RuntimeError("test")
+
+    async def action(from_: State, event: Event, to: State, addon: Addon) -> ActionReturn:
+        logger.info(f"action: {from_} -> {to}")
+
+    graph: StateGraph[State, Event, Addon] = {
+        "transitions": {
+            State.A: {
+                Event.A: Transition(raction, State.B),
+                Event.B: Transition(action, State.C),
+            },
+            State.B: {
+                Event.B: Transition(action, State.C),
+            },
+            State.C: {
+                Event.C: Transition(action, State.A),
+            },
+        },
+        "initial": State.A,
+    }
+
+    addon = Addon()
+
+    class AFSM(FSM[State, Event, Addon]):
+        @reset_on_exception(auto_start=True)
+        async def emit(self, event: Event):
+            return await super().emit(event)
+
+    fsm = AFSM(graph, addon)
+
+    await fsm.start()
+    with pytest.raises(RuntimeError):
+        await fsm.emit(Event.A)
+
+    assert fsm.started is True
+    await fsm.emit(Event.B)
+    await fsm.emit(Event.C)
+
+    class BFSM(FSM[State, Event, Addon]):
+        @reset_on_exception
+        async def emit(self, event: Event):
+            return await super().emit(event)
+
+    fsm = BFSM(graph, addon)
+    await fsm.start()
+    with pytest.raises(RuntimeError):
+        await fsm.emit(Event.A)
+
+    assert fsm.started is False
+    with pytest.raises(TypeError, match="can't send non-None value to a just-started async generator"):
+        await fsm.emit(Event.B)
+
+    class CFSM(FSM[State, Event, Addon]): ...
+
+    fsm = CFSM(graph, addon)
+    await fsm.start()
+    with pytest.raises(RuntimeError):
+        await fsm.emit(Event.A)
+
+    assert fsm.started is True
+
+    with pytest.raises(StopAsyncIteration):
+        await fsm.emit(Event.B)
+
+
 @pytest.mark.asyncio
 async def test_retry_for_352(app: App, mocker: MockerFixture):
     from nonebot_bison.post import Post

tests/test_context.py

@@ -17,7 +17,8 @@ async def test_http_error(app: App):
 
     assert ctx.gen_req_records() == [
         "https://example.com Headers({'host': 'example.com', 'accept': '*/*', 'accept-encoding': 'gzip, deflate',"
-        " 'connection': 'keep-alive', 'user-agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like"
-        " Gecko) Chrome/51.0.2704.103 Safari/537.36'}) | [403] Headers({'content-length': '15', 'content-type':"
+        " 'connection': 'keep-alive', 'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36"
+        " (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 Edg/130.0.0.0'}) | [403] Headers({'content-length': '"
+        "15', 'content-type':"
         ' \'application/json\'}) {"error": "gg"}'
     ]