🔀 merge

.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

@@ -1,9 +1,10 @@
 # Change Log
 
-## 最近更新
+## 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,22 +5,22 @@
   "homepage": "bison",
   "proxy": "http://127.0.0.1:8080",
   "dependencies": {
-    "@arco-design/web-react": "^2.63.1",
+    "@arco-design/web-react": "^2.64.0",
-    "@babel/core": "^7.24.7",
+    "@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/node": "^20.16.5",
-    "@types/react": "^18.3.3",
+    "@types/react": "^18.3.5",
     "@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.1",
     "react-scripts": "5.0.1",
     "redux": "^5.0.1",
     "redux-persist": "^6.0.0",
@@ -53,17 +53,17 @@
     ]
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^6.4.6",
+    "@testing-library/jest-dom": "^6.5.0",
-    "@typescript-eslint/eslint-plugin": "^8.0.0",
+    "@typescript-eslint/eslint-plugin": "^8.4.0",
-    "@typescript-eslint/parser": "^8.0.0",
+    "@typescript-eslint/parser": "^8.4.0",
-    "eslint": "^9.6.0",
+    "eslint": "^9.10.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^18.0.0",
-    "eslint-import-resolver-typescript": "^3.6.1",
+    "eslint-import-resolver-typescript": "^3.6.3",
-    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-import": "^2.30.0",
-    "eslint-plugin-jsx-a11y": "^6.9.0",
+    "eslint-plugin-jsx-a11y": "^6.10.0",
-    "eslint-plugin-react": "^7.34.3",
+    "eslint-plugin-react": "^7.35.2",
     "eslint-plugin-react-hooks": "^4.6.2",
-    "eslint-plugin-react-redux": "^4.1.0"
+    "eslint-plugin-react-redux": "^4.2.0"
   }
 }

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20.15.1 as frontend
+FROM node:20.17.0 as frontend
 ADD . /app
 WORKDIR /app/admin-frontend
 RUN yarn && yarn build

docker/Dockerfile_with_frontend

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.8
+# syntax=docker/dockerfile:1.9
 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.9
 FROM python:3.11-slim-bullseye as base
 
 FROM base as builder

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"]())

package.json

@@ -11,9 +11,9 @@
     "docs:update-package": "pnpm dlx vp-update"
   },
   "devDependencies": {
-    "@vuepress/bundler-vite": "2.0.0-rc.14",
+    "@vuepress/bundler-vite": "2.0.0-rc.15",
-    "vue": "^3.4.31",
+    "vue": "^3.5.3",
-    "vuepress": "2.0.0-rc.14",
+    "vuepress": "2.0.0-rc.15",
-    "vuepress-theme-hope": "2.0.0-rc.50"
+    "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"
+httpx = ">=0.27.2"
-nonebot2 = { extras = ["fastapi"], version = "^2.3.2" }
+nonebot2 = { extras = ["fastapi"], version = "^2.3.3" }
 nonebot-adapter-onebot = "^2.4.4"
-nonebot-plugin-htmlrender = ">=0.3.3"
+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"
+nonebot-plugin-send-anything-anywhere = ">=0.7.1,<0.7.2"
-pillow = ">=8.4.0,<11.0"
+pillow = ">=10.4.0,<11.0"
-pyjwt = "^2.8.0"
+pyjwt = "^2.9.0"
-python-socketio = "^5.11.3"
+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"
+pydantic = ">=2.9.0,<3.0.0,!=2.5.0,!=2.5.1"
-lxml = ">=5.2.2"
+lxml = ">=5.3.0"
-yarl = ">=1.9.4"
+yarl = ">=1.11.0"
-hishel = "^0.0.20"
+hishel = "^0.0.30"
-expiringdictx = "^1.0.1"
+expiringdictx = "^1.1.0"
-rapidfuzz = "^3.9.3"
+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"
+nb-cli = "^1.4.2"
-pre-commit = "^3.7.1"
+pre-commit = "^3.8.0"
-ruff = "^0.6.0"
+ruff = "^0.6.4"
 
 [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 = ">=8.3.2,<9.0.0"
-pytest-asyncio = ">=0.23.7,<0.24.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"
+nb-cli = "^1.4.2"
-nonebot2 = { extras = ["fastapi", "aiohttp"], version = "^2.3.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