diff --git a/nonebot_bison/platform/bilibili/retry.py b/nonebot_bison/platform/bilibili/retry.py index e9c1597..94d0cb0 100644 --- a/nonebot_bison/platform/bilibili/retry.py +++ b/nonebot_bison/platform/bilibili/retry.py @@ -236,15 +236,19 @@ def retry_for_352(api_func: Callable[[TBilibili, Target], Awaitable[list[DynRawP case RetryState.NROMAL | RetryState.REFRESH | RetryState.RAISE: try: res = await api_func(bls, *args, **kwargs) - except ApiCode352Error: - logger.error("API 352 错误") + except ApiCode352Error as e: + logger.warning("本次 Bilibili API 请求返回 352 错误码") await _retry_fsm.emit(RetryEvent.REQUEST_AND_RAISE) + + if _retry_fsm.current_state == RetryState.RAISE: + raise e + return [] else: await _retry_fsm.emit(RetryEvent.REQUEST_AND_SUCCESS) return res case RetryState.BACKOFF: - logger.warning("回避中,不请求") + logger.warning("本次 Bilibili 请求回避中,不请求") await _retry_fsm.emit(RetryEvent.IN_BACKOFF_TIME) return [] case _: diff --git a/nonebot_bison/platform/bilibili/scheduler.py b/nonebot_bison/platform/bilibili/scheduler.py index 2c0f2a3..0380683 100644 --- a/nonebot_bison/platform/bilibili/scheduler.py +++ b/nonebot_bison/platform/bilibili/scheduler.py @@ -68,7 +68,7 @@ class BilibiliClientManager(ClientManager): class BilibiliSite(Site): name = "bilibili.com" - schedule_setting = {"seconds": 50} + schedule_setting = {"seconds": 60} schedule_type = "interval" client_mgr = BilibiliClientManager require_browser = True diff --git a/tests/platforms/test_bilibili.py b/tests/platforms/test_bilibili.py index 0cc6534..ac54005 100644 --- a/tests/platforms/test_bilibili.py +++ b/tests/platforms/test_bilibili.py @@ -183,7 +183,7 @@ async def test_retry_for_352(app: App, mocker: MockerFixture): fakebili.set_raise352(True) - for state in test_state_list: + for state in test_state_list[:-3]: logger.info(f"\n\nnow state should be {state}") assert _retry_fsm.current_state == state @@ -194,6 +194,13 @@ async def test_retry_for_352(app: App, mocker: MockerFixture): if state == RetryState.BACKOFF: freeze_start += timedelta_length * (_retry_fsm.addon.backoff_count + 1) ** 2 + for state in test_state_list[-3:]: + logger.info(f"\n\nnow state should be {state}") + assert _retry_fsm.current_state == state + + with pytest.raises(ApiCode352Error): + await fakebili.get_sub_list(Target("t1")) # type: ignore + assert client_mgr.refresh_client_call_count == 4 * 3 + 3 # refresh + raise assert client_mgr.get_client_call_count == 2 + 4 * 3 + 3 # previous + refresh + raise