nonebot-plugin-werewolf 1.1.11__py3-none-any.whl → 1.1.12__py3-none-any.whl

nonebot_plugin_werewolf/matchers/_prepare_game.py

@@ -0,0 +1,223 @@
+import re
+from collections.abc import AsyncIterator, Awaitable, Callable
+from dataclasses import dataclass
+
+import anyio
+import nonebot
+import nonebot_plugin_waiter.unimsg as waiter
+from nonebot.adapters import Event
+from nonebot.internal.matcher import current_bot
+from nonebot.matcher import Matcher
+from nonebot.permission import SuperUser
+from nonebot.rule import Rule
+from nonebot.utils import escape_tag
+from nonebot_plugin_alconna import (
+    Button,
+    MsgTarget,
+    Target,
+    UniMessage,
+    UniMsg,
+    get_target,
+)
+from nonebot_plugin_uninfo import Uninfo
+
+from ..config import PresetData
+from ..utils import SendHandler as BaseSendHandler
+from ..utils import btn, extract_session_member_nick
+from .depends import rule_not_in_game
+
+preparing_games: dict[Target, "PrepareGame"] = {}
+
+
+def solve_button(msg: UniMessage) -> UniMessage:
+    def _btn(text: str) -> Button:
+        return btn(text, text)
+
+    return (
+        msg.keyboard(_btn("当前玩家"))
+        .keyboard(_btn("加入游戏"), _btn("退出游戏"))
+        .keyboard(_btn("开始游戏"), _btn("结束游戏"))
+    )
+
+
+class SendHandler(BaseSendHandler):
+    def __init__(self) -> None:
+        self.reply_to = True
+
+    def solve_msg(self, msg: UniMessage) -> UniMessage:
+        return solve_button(msg)
+
+    async def send_finished(self) -> None:
+        msg = (
+            UniMessage.text("ℹ️已结束当前游戏")
+            .keyboard(btn("发起游戏", "werewolf"))
+            .keyboard(btn("重开上次游戏", "werewolf restart"))
+        )
+        async with anyio.create_task_group() as tg:
+            tg.start_soon(self._edit)
+            tg.start_soon(self._send, msg)
+
+
+def create_waiter(
+    event: Event, group: Target
+) -> AsyncIterator[tuple[Event | None, str, str]]:
+    async def same_group(target: MsgTarget) -> bool:
+        return group.verify(target)
+
+    @waiter.waiter(
+        waits=[event.get_type()],
+        keep_session=False,
+        rule=Rule(same_group, rule_not_in_game),
+    )
+    def wait(event: Event, msg: UniMsg, session: Uninfo) -> tuple[Event, str, str]:
+        text = msg.extract_plain_text().strip()
+        name = (
+            re.sub(r"[\u2066-\u2069]", "", (extract_session_member_nick(session) or ""))
+            or event.get_user_id()
+        )
+        return (event, text, name)
+
+    return wait(default=(None, "", ""))
+
+
+@dataclass
+class Current:
+    id: str
+    name: str
+    colored: str
+    is_admin: bool
+    is_super_user: Callable[[], Awaitable[bool]]
+
+
+class PrepareGame:
+    def __init__(self, event: Event, players: dict[str, str]) -> None:
+        self.bot = current_bot.get()
+        self.event = event
+        self.admin_id = event.get_user_id()
+        self.group = get_target(event)
+        self.stream = anyio.create_memory_object_stream[tuple[Event, str, str]](16)
+        self.players = players
+        self.send_handler = SendHandler()
+        self.logger = nonebot.logger.opt(colors=True)
+        self.shoud_start_game = False
+        preparing_games[self.group] = self
+
+        self._handlers: dict[str, Callable[[], Awaitable[None]]] = {
+            "开始游戏": self._handle_start,
+            "结束游戏": self._handle_end,
+            "加入游戏": self._handle_join,
+            "退出游戏": self._handle_quit,
+            "当前玩家": self._handle_list,
+        }
+
+    async def run(self) -> None:
+        try:
+            async with anyio.create_task_group() as tg:
+                self.task_group = tg
+                async for event, text, name in create_waiter(self.event, self.group):
+                    if event is not None:
+                        tg.start_soon(self._handle, event, text, name)
+        except Exception as err:
+            await UniMessage(f"狼人杀准备阶段出现未知错误: {err!r}").finish()
+
+        del preparing_games[self.group]
+        if not self.shoud_start_game:
+            await Matcher.finish()
+
+    async def _handle(self, event: Event, text: str, name: str) -> None:
+        user_id = event.get_user_id()
+
+        # 更新用户名
+        # 当用户通过 chronoca:poke 加入游戏时, 插件无法获取用户名, 原字典值为用户ID
+        if user_id in self.players and self.players.get(user_id) != name:
+            self.logger.debug(f"更新玩家显示名称: {self.current.colored}")
+            self.players[user_id] = name
+
+        if (handler := self._handlers.get(text)) is None:
+            return
+
+        self.current = Current(
+            id=user_id,
+            name=name,
+            colored=f"<y>{escape_tag(name)}</y>(<c>{escape_tag(user_id)}</c>)",
+            is_admin=user_id == self.admin_id,
+            is_super_user=lambda: SuperUser()(self.bot, event),
+        )
+        self.send_handler.update(event, self.bot)
+        await handler()
+
+    async def _send(self, msg: str | UniMessage) -> None:
+        await self.send_handler.send(msg)
+
+    async def _send_finished(self) -> None:
+        await self.send_handler.send_finished()
+
+    def _finish(self) -> None:
+        self.task_group.cancel_scope.cancel()
+
+    async def _handle_start(self) -> None:
+        if not self.current.is_admin:
+            await self._send("⚠️只有游戏发起者可以开始游戏")
+            return
+
+        player_num = len(self.players)
+        role_preset = PresetData.get().role_preset
+        if player_num < min(role_preset):
+            await self._send(
+                f"⚠️游戏至少需要 {min(role_preset)} 人, 当前已有 {player_num} 人"
+            )
+        elif player_num > max(role_preset):
+            await self._send(
+                f"⚠️游戏最多需要 {max(role_preset)} 人, 当前已有 {player_num} 人"
+            )
+        elif player_num not in role_preset:
+            await self._send(
+                f"⚠️不存在总人数为 {player_num} 的预设, 无法开始游戏\n"
+                f"可用的预设总人数: {', '.join(map(str, role_preset))}"
+            )
+        else:
+            self.logger.info(f"游戏发起者 {self.current.colored} 开始游戏")
+            await self._send("✏️游戏即将开始...")
+            self._finish()
+            self.shoud_start_game = True
+
+    async def _handle_end(self) -> None:
+        if not (self.current.is_admin or await self.current.is_super_user()):
+            await self._send("⚠️只有游戏发起者或超级用户可以结束游戏")
+            return
+
+        prefix = "游戏发起者" if self.current.is_admin else "超级用户"
+        self.logger.info(f"{prefix} {self.current.colored} 结束游戏")
+        await self._send_finished()
+        self._finish()
+
+    async def _handle_join(self) -> None:
+        if self.current.is_admin:
+            await self._send("⚠️只有游戏发起者可以开始游戏")
+            return
+
+        if self.current.id not in self.players:
+            self.players[self.current.id] = self.current.name
+            self.logger.info(f"玩家 {self.current.colored} 加入游戏")
+            await self._send("✅成功加入游戏")
+        else:
+            await self._send("ℹ️你已经加入游戏了")
+
+    async def _handle_quit(self) -> None:
+        if self.current.is_admin:
+            await self._send("ℹ️游戏发起者无法退出游戏")
+            return
+
+        if self.current.id in self.players:
+            del self.players[self.current.id]
+            self.logger.info(f"玩家 {self.current.colored} 退出游戏")
+            await self._send("✅成功退出游戏")
+        else:
+            await self._send("ℹ️你还没有加入游戏")
+
+    async def _handle_list(self) -> None:
+        lines = (
+            f"{idx}. {self.players[user_id]}"
+            for idx, user_id in enumerate(self.players, 1)
+        )
+        await self._send("✨当前玩家:\n" + "\n".join(lines))

nonebot_plugin_werewolf/matchers/depends.py

@@ -10,13 +10,13 @@ def user_in_game(self_id: str, user_id: str, group_id: str | None) -> bool:
     if group_id is None:
         return any(
             self_id == p.bot.self_id and user_id == p.user_id
-            for p in itertools.chain(*[g.players for g in get_running_games()])
+            for p in itertools.chain(*[g.players for g in get_running_games().values()])
         )
 
     def check(game: Game) -> bool:
         return self_id == game.group.self_id and group_id == game.group.id
 
-    if game := next(filter(check, get_running_games()), None):
+    if game := next(filter(check, get_running_games().values()), None):
         return any(user_id == player.user_id for player in game.players)
 
     return False

nonebot_plugin_werewolf/matchers/edit_preset.py

@@ -15,7 +15,6 @@ from nonebot_plugin_alconna import (
 )
 
 from ..config import PresetData, config
-from ..constant import ROLE_NAME_CONV
 from ..models import Role
 
 alc = Alconna(
@@ -82,7 +81,7 @@ async def finish(text: str) -> NoReturn:
 
 
 def display_roles(roles: list[Role]) -> str:
-    return ", ".join(map(ROLE_NAME_CONV.__getitem__, roles))
+    return ", ".join(role.display for role in roles)
 
 
 @edit_preset.assign("role")
@@ -164,7 +163,7 @@ async def assign_werewolf(state: T_State) -> None:
 
     data.werewolf_priority = result
     data.save()
-    await finish("设置成功: " + display_roles(result))
+    await finish(f"设置成功: {display_roles(result)}")
 
 
 @edit_preset.assign("priesthood")
@@ -213,7 +212,7 @@ async def assign_priesthood(state: T_State) -> None:
 
     data.priesthood_proirity = result
     data.save()
-    await finish("设置成功: " + display_roles(result))
+    await finish(f"设置成功: {display_roles(result)}")
 
 
 @edit_preset.assign("jester")
@@ -248,15 +247,17 @@ async def reset_preset() -> None:
 
 @edit_preset.handle()
 async def handle_default() -> None:
-    lines = ["当前游戏预设:", ""]
     data = PresetData.load()
 
-    for total, (w, p, c) in data.role_preset.items():
-        lines.append(f"{total} 人: 狼人x{w}, 神职x{p}, 平民x{c}")
-    lines.append("")
-
-    lines.append("狼人优先级: " + display_roles(data.werewolf_priority))
-    lines.append("神职优先级: " + display_roles(data.priesthood_proirity))
-    lines.append(f"小丑概率: {data.jester_probability:.0%}")
+    lines = ["当前游戏预设:\n"]
+    lines.extend(
+        f"{total} 人: 狼人x{w}, 神职x{p}, 平民x{c}"
+        for total, (w, p, c) in data.role_preset.items()
+    )
+    lines.append(
+        f"\n狼人优先级: {display_roles(data.werewolf_priority)}"
+        f"\n神职优先级: {display_roles(data.priesthood_proirity)}"
+        f"\n小丑概率: {data.jester_probability:.0%}"
+    )
 
     await finish("\n".join(lines))

nonebot_plugin_werewolf/matchers/poke/chronocat_poke.py

@@ -6,8 +6,8 @@ from nonebot_plugin_alconna import MsgTarget, UniMessage
 
 from ...config import config
 from ...constant import STOP_COMMAND
-from ...game import get_starting_games
 from ...utils import InputStore
+from .._prepare_game import preparing_games
 from ..depends import user_in_game
 
 
@@ -74,7 +74,7 @@ with contextlib.suppress(ImportError, RuntimeError):
                 user_id=user_id,
                 group_id=(event.guild and event.guild.id) or event.channel.id,
             )
-            and target in get_starting_games()
+            and target in preparing_games
         )
 
     @on_message(rule=_rule_poke_join).handle()
@@ -84,7 +84,7 @@ with contextlib.suppress(ImportError, RuntimeError):
         target: MsgTarget,
     ) -> None:
         user_id = extract_poke_tome(event) or event.get_user_id()
-        players = get_starting_games()[target]
+        players = preparing_games[target].players
 
         if user_id not in players:
             # XXX:

nonebot_plugin_werewolf/matchers/poke/ob11_poke.py

@@ -6,8 +6,8 @@ from nonebot_plugin_alconna import MsgTarget, UniMessage
 
 from ...config import config
 from ...constant import STOP_COMMAND
-from ...game import get_starting_games
 from ...utils import InputStore
+from .._prepare_game import preparing_games
 from ..depends import user_in_game
 
 
@@ -50,7 +50,7 @@ with contextlib.suppress(ImportError, RuntimeError):
         return (
             (event.target_id == event.self_id)
             and not user_in_game(bot.self_id, user_id, group_id)
-            and target in get_starting_games()
+            and target in preparing_games
         )
 
     @on_notice(rule=_rule_poke_join).handle()
@@ -60,7 +60,7 @@ with contextlib.suppress(ImportError, RuntimeError):
         target: MsgTarget,
     ) -> None:
         user_id = event.get_user_id()
-        players = get_starting_games()[target]
+        players = preparing_games[target].players
 
         if event.group_id is None or user_id in players:
             return

nonebot_plugin_werewolf/matchers/start_game.py

@@ -1,42 +1,28 @@
 import json
-import re
-from dataclasses import dataclass
-from typing import TYPE_CHECKING
 
 import anyio
-import nonebot
-import nonebot_plugin_waiter.unimsg as waiter
 from nonebot.adapters import Bot, Event
-from nonebot.internal.matcher import current_bot
-from nonebot.permission import SuperUser
-from nonebot.rule import Rule, to_me
+from nonebot.rule import to_me
 from nonebot.typing import T_State
-from nonebot.utils import escape_tag
 from nonebot_plugin_alconna import (
     Alconna,
-    Button,
     FallbackStrategy,
     MsgTarget,
     Option,
     Target,
     UniMessage,
-    UniMsg,
-    get_target,
     on_alconna,
 )
 from nonebot_plugin_localstore import get_plugin_data_file
-from nonebot_plugin_uninfo import QryItrface, Uninfo
+from nonebot_plugin_uninfo import Uninfo
 
-from ..config import GameBehavior, PresetData, config
-from ..constant import stop_command_prompt
-from ..game import Game, get_running_games, get_starting_games
-from ..utils import ObjectStream, SendHandler, extract_session_member_nick
+from ..config import GameBehavior, config, stop_command_prompt
+from ..game import Game, get_running_games
+from ..utils import extract_session_member_nick
+from ._prepare_game import PrepareGame, solve_button
 from .depends import rule_not_in_game
 from .poke import poke_enabled
 
-if TYPE_CHECKING:
-    from collections.abc import Awaitable, Callable
-
 start_game = on_alconna(
     Alconna(
         "werewolf",
@@ -73,210 +59,11 @@ def load_players(target: Target) -> dict[str, str] | None:
     return None
 
 
-def solve_button(msg: UniMessage) -> UniMessage:
-    def btn(text: str) -> Button:
-        return Button("input", label=text, text=text)
-
-    return (
-        msg.keyboard(btn("当前玩家"))
-        .keyboard(btn("加入游戏"), btn("退出游戏"))
-        .keyboard(btn("开始游戏"), btn("结束游戏"))
-    )
-
-
-class PrepareGame:
-    @dataclass
-    class _Current:
-        id: str
-        name: str
-        colored: str
-        is_admin: bool
-        is_super_user: bool
-
-    class _SendHandler(SendHandler):
-        def __init__(self) -> None:
-            self.reply_to = True
-
-        def solve_msg(self, msg: UniMessage) -> UniMessage:
-            return solve_button(msg)
-
-        async def send_finished(self) -> None:
-            btn_start = Button("input", label="发起游戏", text="werewolf")
-            btn_restart = Button("input", label="重开上次游戏", text="werewolf restart")
-            msg = (
-                UniMessage.text("ℹ️已结束当前游戏")
-                .keyboard(btn_start)
-                .keyboard(btn_restart)
-            )
-            async with anyio.create_task_group() as tg:
-                tg.start_soon(self._edit)
-                tg.start_soon(self._send, msg)
-
-    def __init__(self, event: Event, players: dict[str, str]) -> None:
-        self.event = event
-        self.admin_id = event.get_user_id()
-        self.group = get_target(event)
-        self.stream = ObjectStream[tuple[Event, str, str]](16)
-        self.players = players
-        self.send_handler = self._SendHandler()
-        self.logger = nonebot.logger.opt(colors=True)
-        self.shoud_start_game = False
-        get_starting_games()[self.group] = self.players
-
-        self._handlers: dict[str, Callable[[], Awaitable[bool | None]]] = {
-            "开始游戏": self._handle_start,
-            "结束游戏": self._handle_end,
-            "加入游戏": self._handle_join,
-            "退出游戏": self._handle_quit,
-            "当前玩家": self._handle_list,
-        }
-
-    async def run(self) -> None:
-        try:
-            async with anyio.create_task_group() as tg:
-                self.task_group = tg
-                tg.start_soon(self._wait_cancel)
-                tg.start_soon(self._receive)
-                tg.start_soon(self._handle)
-        except Exception as err:
-            await UniMessage(f"狼人杀准备阶段出现未知错误: {err!r}").finish()
-
-        del get_starting_games()[self.group]
-        if not self.shoud_start_game:
-            await start_game.finish()
-
-    async def _wait_cancel(self) -> None:
-        await self.stream.wait_closed()
-        self.task_group.cancel_scope.cancel()
-
-    async def _receive(self) -> None:
-        async def same_group(target: MsgTarget) -> bool:
-            return self.group.verify(target)
-
-        @waiter.waiter(
-            waits=[self.event.get_type()],
-            keep_session=False,
-            rule=Rule(same_group) & rule_not_in_game,
-        )
-        def wait(event: Event, msg: UniMsg, session: Uninfo) -> tuple[Event, str, str]:
-            text = msg.extract_plain_text().strip()
-            name = extract_session_member_nick(session) or event.get_user_id()
-            return (event, text, re.sub(r"[\u2066-\u2069]", "", name))
-
-        async for event, text, name in wait(default=(None, "", "")):
-            if event is not None:
-                await self.stream.send((event, text, name))
-
-    async def _handle(self) -> None:
-        bot = current_bot.get()
-        superuser = SuperUser()
-
-        while not self.stream.closed:
-            event, text, name = await self.stream.recv()
-            user_id = event.get_user_id()
-            colored = f"<y>{escape_tag(name)}</y>(<c>{escape_tag(user_id)}</c>)"
-            self.current = self._Current(
-                id=user_id,
-                name=name,
-                colored=colored,
-                is_admin=user_id == self.admin_id,
-                is_super_user=await superuser(bot, event),
-            )
-            self.send_handler.update(event)
-
-            # 更新用户名
-            # 当用户通过 chronoca:poke 加入游戏时, 插件无法获取用户名, 原字典值为用户ID
-            if user_id in self.players and self.players.get(user_id) != name:
-                self.logger.debug(f"更新玩家显示名称: {self.current.colored}")
-                self.players[user_id] = name
-
-            handler = self._handlers.get(text)
-            if handler is not None and await handler():
-                return
-
-    async def _send(self, msg: str | UniMessage) -> None:
-        await self.send_handler.send(msg)
-
-    async def _send_finished(self) -> None:
-        await self.send_handler.send_finished()
-
-    async def _handle_start(self) -> bool:
-        if not self.current.is_admin:
-            await self._send("⚠️只有游戏发起者可以开始游戏")
-            return False
-
-        player_num = len(self.players)
-        role_preset = PresetData.get().role_preset
-        if player_num < min(role_preset):
-            await self._send(
-                f"⚠️游戏至少需要 {min(role_preset)} 人, 当前已有 {player_num} 人"
-            )
-        elif player_num > max(role_preset):
-            await self._send(
-                f"⚠️游戏最多需要 {max(role_preset)} 人, 当前已有 {player_num} 人"
-            )
-        elif player_num not in role_preset:
-            await self._send(
-                f"⚠️不存在总人数为 {player_num} 的预设, 无法开始游戏\n"
-                f"可用的预设总人数: {', '.join(map(str, role_preset))}"
-            )
-        else:
-            await self._send("✏️游戏即将开始...")
-            self.logger.info(f"游戏发起者 {self.current.colored} 开始游戏")
-            self.stream.close()
-            self.shoud_start_game = True
-            return True
-
-        return False
-
-    async def _handle_end(self) -> bool:
-        if self.current.is_admin or self.current.is_super_user:
-            prefix = "游戏发起者" if self.current.is_admin else "超级用户"
-            self.logger.info(f"{prefix} {self.current.colored} 结束游戏")
-            await self._send_finished()
-            self.stream.close()
-            return True
-
-        await self._send("⚠️只有游戏发起者或超级用户可以结束游戏")
-        return False
-
-    async def _handle_join(self) -> None:
-        if self.current.is_admin:
-            await self._send("⚠️只有游戏发起者可以开始游戏")
-            return
-
-        if self.current.id not in self.players:
-            self.players[self.current.id] = self.current.name
-            self.logger.info(f"玩家 {self.current.colored} 加入游戏")
-            await self._send("✅成功加入游戏")
-        else:
-            await self._send("ℹ️你已经加入游戏了")
-
-    async def _handle_quit(self) -> None:
-        if self.current.is_admin:
-            await self._send("ℹ️游戏发起者无法退出游戏")
-            return
-
-        if self.current.id in self.players:
-            del self.players[self.current.id]
-            self.logger.info(f"玩家 {self.current.colored} 退出游戏")
-            await self._send("✅成功退出游戏")
-        else:
-            await self._send("ℹ️你还没有加入游戏")
-
-    async def _handle_list(self) -> None:
-        lines = (
-            f"{idx}. {self.players[user_id]}"
-            for idx, user_id in enumerate(self.players, 1)
-        )
-        await self._send("✨当前玩家:\n" + "\n".join(lines))
-
-
 @start_game.handle()
 async def handle_notice(target: MsgTarget) -> None:
     if target.private:
         await UniMessage("⚠️请在群组中创建新游戏").finish(reply_to=True)
-    if any(target.verify(game.group) for game in get_running_games()):
+    if target in get_running_games():
         await (
             UniMessage.text("⚠️当前群组内有正在进行的游戏\n")
             .text("无法开始新游戏")
@@ -291,8 +78,10 @@ async def handle_notice(target: MsgTarget) -> None:
         "  玩家均加入后，游戏发起者请发送 “开始游戏”\n"
     )
     if poke_enabled():
-        msg.text(f"\n💫可使用戳一戳代替游戏交互中的 “{stop_command_prompt()}” 命令\n")
-    msg.text("\nℹ️游戏准备阶段限时5分钟，超时将自动结束")
+        msg.text(f"\n💫可使用戳一戳代替游戏交互中的 “{stop_command_prompt}” 命令\n")
+
+    prepare_timeout = GameBehavior.get().timeout.prepare
+    msg.text(f"\nℹ️游戏准备阶段限时{prepare_timeout / 60:.1f}分钟，超时将自动结束")
     await solve_button(msg).send(reply_to=True, fallback=FallbackStrategy.ignore)
 
 
@@ -315,22 +104,20 @@ async def handle_restart(target: MsgTarget, state: T_State) -> None:
 async def handle_start(
     bot: Bot,
     event: Event,
-    target: MsgTarget,
-    session: Uninfo,
-    interface: QryItrface,
     state: T_State,
+    session: Uninfo,
+    target: MsgTarget,
 ) -> None:
     players: dict[str, str] = state.get("players", {})
     admin_id = event.get_user_id()
     admin_name = extract_session_member_nick(session) or admin_id
     players[admin_id] = admin_name
 
-    try:
-        with anyio.fail_after(GameBehavior.get().timeout.prepare):
-            await PrepareGame(event, players).run()
-    except TimeoutError:
-        await UniMessage.text("⚠️游戏准备超时，已自动结束").finish()
+    with anyio.move_on_after(GameBehavior.get().timeout.prepare) as scope:
+        await PrepareGame(event, players).run()
+    if scope.cancelled_caught:
+        await UniMessage.text("⚠️游戏准备超时，已自动结束").finish(reply_to=True)
 
     dump_players(target, players)
-    game = await Game.new(bot, target, set(players), interface)
-    await game.start()
+    game = await Game.new(bot, target, set(players))
+    game.start()

nonebot_plugin_werewolf/matchers/superuser_ops.py

@@ -17,16 +17,12 @@ terminate = on_alconna(
 
 
 async def running_game(target: MsgTarget) -> Game:
-    for game in get_running_games():
-        if target.verify(game.group):
-            return game
-    return terminate.skip()
-
-
-RunningGame = Annotated[Game, Depends(running_game)]
+    if (game := get_running_games().get(target)) is None:
+        terminate.skip()
+    return game
 
 
 @terminate.handle()
-async def _(game: RunningGame) -> None:
+async def _(game: Annotated[Game, Depends(running_game)]) -> None:
     game.terminate()
     await UniMessage.text("已中止当前群组的游戏进程").finish(reply_to=True)