Fix series increaser execution

Author: middlered

README.md

@@ -121,8 +121,19 @@ async def _():
     await test.finish("pass")
 ```
 
+串联多个限制器。
+```python
+cmd = on_startswith("cmd")
+@cmd.handle(parameterless=[
+    Cooldown(UserScope(), 2, limit = 2, reject = "UserScope reject"),
+    Cooldown(GlobalScope(), 3600, limit = 4, reject = "GlobalScope reject")
+])
+async def _(): ...
+```
+
 多命令共享使用统计集合。  
-注：请确保使用相同使用统计集合的限制器限流参数一致（限制对象，限制时间，最大使用量），否则可能会有预期之外的行为。
+> [!IMPORTANT]
+> 请确保使用相同使用统计集合的限制器限流参数一致（限制对象，限制时间，最大使用量），否则可能会有预期之外的行为。
 ```python
 # 注意，不同限流算法下的使用统计集合无法共享
 cmd1 = on_startswith("cmd1")
@@ -154,7 +165,7 @@ async def _(increaser: Increaser):
         await cmd.finish("Run successed")
 ```
 
-使用固定窗口策略实现每日签到
+使用固定窗口策略实现每日签到。
 ```python
 dailysign = on_startswith("签到")
 @dailysign.handle(parameterless = [

nonebot_plugin_limiter/cooldown.py

@@ -1,6 +1,8 @@
 from collections import deque
+from collections.abc import Callable
 from dataclasses import dataclass, field
 from datetime import datetime, timedelta
+from functools import partial
 from typing import cast
 
 from apscheduler.triggers.base import BaseTrigger
@@ -33,6 +35,11 @@ def _limit_dep_wrapper(limit: int | _DependentCallable[int]) -> _DependentCallab
         limit_dep = limit
     return limit_dep
 
+def inject_increaser(state: T_State, func: Callable):
+    executors = state.setdefault("plugin_limiter:increaser", [])
+    assert isinstance(executors, list)
+    executors.append(func)
+
 # region: FixWindow
 @dataclass
 class FixWindowUsage:
@@ -139,21 +146,27 @@ async def _limiter_dependency(
             bucket[entity_id] = FixWindowUsage(now, limit)
         usage = bucket[entity_id]
 
-        if usage.available > 0:
+        def _increase_action(reset: bool = True):
+            if reset:
+                usage.start_time = now
+                usage.available = limit
             usage.available -= 1
+
+        if usage.available > 0:
+            if set_increaser:
+                inject_increaser(state, partial(_increase_action, False))
+            else:
+                _increase_action(False)
             return
 
         # Calculate reset time based on when the limitation was set
         reset_time = trigger.get_next_fire_time(usage.start_time, now)
         assert reset_time is not None, "reset_time should not be None"
 
-        def _increase_action():
-            usage.start_time = now
-            usage.available = limit - 1
-
+        # Reset
         if now >= reset_time:
             if set_increaser:
-                state["plugin_limiter:increaser"] = _increase_action
+                inject_increaser(state, _increase_action)
             else:
                 _increase_action()
             return  # Didn't exceed
@@ -273,7 +286,7 @@ def _increase_action():
 
         if len(usage.timestamps) < limit:
             if set_increaser:
-                state["plugin_limiter:increaser"] = _increase_action
+                inject_increaser(state, _increase_action)
             else:
                 _increase_action()
             return  # Didn't exceed

nonebot_plugin_limiter/handler.py

@@ -6,13 +6,15 @@
 
 
 class _FuncWrapper:
-    def __init__(self, func: Callable) -> None:
-        self._func = func
+    def __init__(self, funcs: list[Callable]) -> None:
+        self._funcs = funcs
 
     def execute(self):
-        self._func()
+        for func in self._funcs:
+            func()
 
 def get_increaser(state: T_State):
+    print(state)
     ret = state.get("plugin_limiter:increaser")
     if ret is None:
         raise KeyError("Cannot get increaser, make sure you have enabled `set_increaser` in cooldown policy.")

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-limiter"
-version = "0.2.0"
+version = "0.2.1"
 description = "通用消息冷却限制器"
 readme = "README.md"
 authors = [{ name = "MiddleRed", email = "middlered@outlook.com" }]