nonebot-plugin-werewolf 1.1.1__py3-none-any.whl → 1.1.2__py3-none-any.whl

nonebot_plugin_werewolf/__init__.py

@@ -8,7 +8,7 @@ require("nonebot_plugin_waiter")
 from . import matchers as matchers
 from .config import Config
 
-__version__ = "1.1.1"
+__version__ = "1.1.2"
 __plugin_meta__ = PluginMetadata(
     name="狼人杀",
     description="适用于 Nonebot2 的狼人杀插件",

nonebot_plugin_werewolf/_timeout.py

@@ -0,0 +1,110 @@
+import asyncio
+import enum
+import sys
+from types import TracebackType
+from typing import final
+
+if sys.version_info >= (3, 11):
+    from asyncio.timeouts import timeout as timeout
+
+else:
+    # ruff: noqa: S101
+
+    class _State(enum.Enum):
+        CREATED = "created"
+        ENTERED = "active"
+        EXPIRING = "expiring"
+        EXPIRED = "expired"
+        EXITED = "finished"
+
+    @final
+    class Timeout:
+        def __init__(self, when: float | None) -> None:
+            self._state = _State.CREATED
+            self._timeout_handler: asyncio.Handle | None = None
+            self._task: asyncio.Task | None = None
+            if when is not None:
+                when = asyncio.get_running_loop().time() + when
+            self._when = when
+
+        def when(self) -> float | None:
+            return self._when
+
+        def reschedule(self, when: float | None) -> None:
+            if self._state is not _State.ENTERED:
+                if self._state is _State.CREATED:
+                    raise RuntimeError("Timeout has not been entered")
+                raise RuntimeError(
+                    f"Cannot change state of {self._state.value} Timeout",
+                )
+
+            self._when = when
+
+            if self._timeout_handler is not None:
+                self._timeout_handler.cancel()
+
+            if when is None:
+                self._timeout_handler = None
+            else:
+                loop = asyncio.get_running_loop()
+                if when <= loop.time():
+                    self._timeout_handler = loop.call_soon(self._on_timeout)
+                else:
+                    self._timeout_handler = loop.call_at(when, self._on_timeout)
+
+        def expired(self) -> bool:
+            return self._state in (_State.EXPIRING, _State.EXPIRED)
+
+        def __repr__(self) -> str:
+            info = [""]
+            if self._state is _State.ENTERED:
+                when = round(self._when, 3) if self._when is not None else None
+                info.append(f"when={when}")
+            info_str = " ".join(info)
+            return f"<Timeout [{self._state.value}]{info_str}>"
+
+        async def __aenter__(self) -> "Timeout":
+            if self._state is not _State.CREATED:
+                raise RuntimeError("Timeout has already been entered")
+            task = asyncio.current_task()
+            if task is None:
+                raise RuntimeError("Timeout should be used inside a task")
+            self._state = _State.ENTERED
+            self._task = task
+            self.reschedule(self._when)
+            return self
+
+        async def __aexit__(
+            self,
+            exc_type: type[BaseException] | None,
+            exc_val: BaseException | None,
+            exc_tb: TracebackType | None,
+        ) -> bool | None:
+            assert self._state in (_State.ENTERED, _State.EXPIRING)
+
+            if self._timeout_handler is not None:
+                self._timeout_handler.cancel()
+                self._timeout_handler = None
+
+            if self._state is _State.EXPIRING:
+                self._state = _State.EXPIRED
+
+                if exc_type is asyncio.CancelledError:
+                    raise TimeoutError from exc_val
+            elif self._state is _State.ENTERED:
+                self._state = _State.EXITED
+
+            return None
+
+        def _on_timeout(self) -> None:
+            assert self._state is _State.ENTERED
+            assert self._task is not None
+            self._task.cancel()
+            self._state = _State.EXPIRING
+            self._timeout_handler = None
+
+    def timeout(delay: float | None) -> Timeout:
+        return Timeout(delay)
+
+
+__all__ = ["timeout"]

nonebot_plugin_werewolf/config.py

@@ -1,8 +1,9 @@
-from typing import Literal, Self, overload
+from typing import Literal, overload
 
 from nonebot import get_plugin_config, logger
 from nonebot.compat import PYDANTIC_V2
 from pydantic import BaseModel, Field
+from typing_extensions import Self
 
 from .constant import (
     Role,
@@ -47,7 +48,7 @@ class PluginConfig(BaseModel):
         if isinstance(self.role_preset, list):
             for preset in self.role_preset:
                 if preset[0] != sum(preset[1:]):
-                    raise RuntimeError(
+                    raise ValueError(
                         "配置项 `role_preset` 错误: "
                         f"预设总人数为 {preset[0]}, 实际总人数为 {sum(preset[1:])} "
                         f"({', '.join(map(str, preset[1:]))})"
@@ -59,13 +60,13 @@ class PluginConfig(BaseModel):
 
         min_length = max(i[0] for i in self.role_preset.values())
         if len(self.werewolf_priority) < min_length:
-            raise RuntimeError(
+            raise ValueError(
                 f"配置项 `werewolf_priority` 错误: 应至少为 {min_length} 项"
             )
 
         min_length = max(i[1] for i in self.role_preset.values())
         if len(self.priesthood_proirity) < min_length:
-            raise RuntimeError(
+            raise ValueError(
                 f"配置项 `priesthood_proirity` 错误: 应至少为 {min_length} 项"
             )
 

nonebot_plugin_werewolf/constant.py

@@ -52,7 +52,7 @@ class GameState:
     killed: Player | None = None
     shoot: tuple[Player, Player] | tuple[None, None] = (None, None)
     antidote: set[Player] = dataclasses.field(default_factory=set)
-    poison: set[tuple[Player, Player]] = dataclasses.field(default_factory=set)
+    poison: set[Player] = dataclasses.field(default_factory=set)
     protected: set[Player] = dataclasses.field(default_factory=set)
 
 

nonebot_plugin_werewolf/exception.py

@@ -10,7 +10,7 @@ class Error(Exception):
     """插件错误类型基类"""
 
 
-class GameFinishedError(Error):
+class GameFinished(Error):  # noqa: N818
     """游戏结束时抛出，无视游戏进程进入结算"""
 
     status: GameStatus

nonebot_plugin_werewolf/game.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import asyncio
-import asyncio.timeouts
 import contextlib
 import secrets
 from typing import TYPE_CHECKING, NoReturn
@@ -9,9 +8,10 @@ from typing import TYPE_CHECKING, NoReturn
 from nonebot.log import logger
 from nonebot_plugin_alconna import At, Target, UniMessage
 
+from ._timeout import timeout
 from .config import config
 from .constant import GameState, GameStatus, KillReason, Role, RoleGroup, role_name_conv
-from .exception import GameFinishedError
+from .exception import GameFinished
 from .player import Player
 from .player_set import PlayerSet
 from .utils import InputStore
@@ -112,16 +112,16 @@ class Game:
 
         # 狼人数量大于其他职业数量
         if w.size >= p.size:
-            raise GameFinishedError(GameStatus.Werewolf)
+            raise GameFinished(GameStatus.Werewolf)
         # 屠边-村民/中立全灭
         if not p.select(Role.Civilian, RoleGroup.Others).size:
-            raise GameFinishedError(GameStatus.Werewolf)
+            raise GameFinished(GameStatus.Werewolf)
         # 屠边-神职全灭
         if not p.exclude(Role.Civilian).size:
-            raise GameFinishedError(GameStatus.Werewolf)
+            raise GameFinished(GameStatus.Werewolf)
         # 狼人全灭
         if not w.size:
-            raise GameFinishedError(GameStatus.GoodGuy)
+            raise GameFinished(GameStatus.GoodGuy)
 
     def show_killed_players(self) -> str:
         msg = ""
@@ -173,7 +173,7 @@ class Game:
                     break
 
         with contextlib.suppress(TimeoutError):
-            async with asyncio.timeouts.timeout(timeout_secs):
+            async with timeout(timeout_secs):
                 await asyncio.gather(*[wait(p) for p in players])
 
     async def interact(
@@ -372,7 +372,7 @@ class Game:
 
             # 狼人击杀目标
             if (
-                (killed := self.state.killed)  # 狼人未空刀
+                (killed := self.state.killed) is not None  # 狼人未空刀
                 and killed not in self.state.protected  # 守卫保护
                 and killed not in self.state.antidote  # 女巫使用解药
             ):
@@ -383,10 +383,12 @@ class Game:
                 )
 
             # 女巫操作目标
-            for witch, potioned in self.state.poison:
-                if potioned not in self.state.protected:  # 守卫未保护
+            for witch in self.state.poison:
+                if witch.selected is None:
+                    continue
+                if witch.selected not in self.state.protected:  # 守卫未保护
                     # 女巫毒杀玩家
-                    await potioned.kill(KillReason.Poison, witch)
+                    await witch.selected.kill(KillReason.Poison, witch)
 
             day_count += 1
             msg = UniMessage.text(f"『第{day_count}天』天亮了...\n")
@@ -456,7 +458,7 @@ class Game:
                 game_task.result()
             except asyncio.CancelledError:
                 logger.warning(f"{self.group.id} 的狼人杀游戏进程被取消")
-            except GameFinishedError as result:
+            except GameFinished as result:
                 await self.handle_game_finish(result.status)
                 logger.info(f"{self.group.id} 的狼人杀游戏进程正常退出")
             except Exception as err:

nonebot_plugin_werewolf/matchers.py

@@ -1,5 +1,3 @@
-import asyncio
-import asyncio.timeouts
 from typing import Annotated
 
 from nonebot import on_command, on_message
@@ -9,6 +7,7 @@ from nonebot.rule import to_me
 from nonebot_plugin_alconna import MsgTarget, UniMessage, UniMsg
 from nonebot_plugin_userinfo import EventUserInfo, UserInfo
 
+from ._timeout import timeout
 from .game import Game
 from .ob11_ext import ob11_ext_enabled
 from .utils import InputStore, is_group, prepare_game, rule_in_game, rule_not_in_game
@@ -52,7 +51,7 @@ async def handle_start(
     players = {admin_id: admin_info.user_name}
 
     try:
-        async with asyncio.timeouts.timeout(5 * 60):
+        async with timeout(5 * 60):
             await prepare_game(event, players)
     except FinishedException:
         raise

nonebot_plugin_werewolf/player.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import asyncio
-import asyncio.timeouts
+import weakref
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, ClassVar, TypeVar, final
 
@@ -10,7 +10,7 @@ from nonebot_plugin_alconna.uniseg import Receipt, Target, UniMessage
 from typing_extensions import override
 
 from .constant import GameStatus, KillReason, Role, RoleGroup, role_name_conv
-from .exception import GameFinishedError
+from .exception import GameFinished
 from .utils import InputStore, check_index
 
 if TYPE_CHECKING:
@@ -47,7 +47,7 @@ class Player:
     role_group: ClassVar[RoleGroup]
 
     bot: Bot
-    game: Game
+    _game_ref: weakref.ReferenceType[Game]
     user: Target
     name: str
     alive: bool = True
@@ -58,7 +58,7 @@ class Player:
     @final
     def __init__(self, bot: Bot, game: Game, user: Target, name: str) -> None:
         self.bot = bot
-        self.game = game
+        self._game_ref = weakref.ref(game)
         self.user = user
         self.name = name
         self.killed = asyncio.Event()
@@ -81,6 +81,12 @@ class Player:
     def __repr__(self) -> str:
         return f"<{self.role_name}: user={self.name!r} alive={self.alive}>"
 
+    @property
+    def game(self) -> Game:
+        if game := self._game_ref():
+            return game
+        raise ValueError("Game not exist")
+
     @property
     def user_id(self) -> str:
         return self.user.id
@@ -95,7 +101,7 @@ class Player:
         logger.opt(colors=True).info(
             f"<b><e>{self.game.group.id}</e></b> | "
             f"[<b><m>{self.role_name}</m></b>] "
-            f"<y>{self.name}</y>(<e>{self.user_id}</e>) | "
+            f"<y>{self.name}</y>(<b><e>{self.user_id}</e></b>) | "
             f"{text}",
         )
 
@@ -325,6 +331,7 @@ class Witch(Player):
             text = await self.receive_text()
             if text == "1":
                 self.antidote = 0
+                self.selected = killed
                 self.game.state.antidote.add(killed)
                 await self.send(f"你对 {killed.name} 使用了解药，回合结束")
                 return True
@@ -362,9 +369,9 @@ class Witch(Player):
             await self.send("输入错误: 请发送玩家编号或 “/stop”")
 
         self.poison = 0
-        player = players[selected]
-        self.game.state.poison.add((self, player))
-        await self.send(f"当前回合选择对玩家 {player.name} 使用毒药\n回合结束")
+        self.selected = players[selected]
+        self.game.state.poison.add(self)
+        await self.send(f"当前回合选择对玩家 {self.selected.name} 使用毒药\n回合结束")
 
 
 @register_role(Role.Hunter, RoleGroup.GoodGuy)
@@ -446,7 +453,7 @@ class Joker(Player):
         await super().kill(reason, *killers)
         if reason == KillReason.Vote:
             self.game.killed_players.append(self)
-            raise GameFinishedError(GameStatus.Joker)
+            raise GameFinished(GameStatus.Joker)
         return True
 
 

nonebot_plugin_werewolf/player_set.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
 import asyncio
-import asyncio.timeouts
 from typing import TYPE_CHECKING
 
+from ._timeout import timeout
 from .player import Player
 
 if TYPE_CHECKING:
@@ -54,13 +54,13 @@ class PlayerSet(set[Player]):
         return sorted(self, key=lambda p: p.user_id)
 
     async def interact(self, timeout_secs: float = 60) -> None:
-        async with asyncio.timeouts.timeout(timeout_secs):
+        async with timeout(timeout_secs):
             await asyncio.gather(*[p.interact() for p in self.alive()])
 
     async def vote(self, timeout_secs: float = 60) -> dict[Player, list[Player]]:
         async def vote(player: Player) -> tuple[Player, Player] | None:
             try:
-                async with asyncio.timeouts.timeout(timeout_secs):
+                async with timeout(timeout_secs):
                     return await player.vote(self)
             except TimeoutError:
                 await player.send("投票超时，将视为弃票")

nonebot_plugin_werewolf/utils.py

@@ -1,5 +1,4 @@
 import asyncio
-import asyncio.timeouts
 import re
 from collections import defaultdict
 from typing import Annotated, Any, ClassVar

{nonebot_plugin_werewolf-1.1.1.dist-info → nonebot_plugin_werewolf-1.1.2.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-werewolf
-Version: 1.1.1
+Version: 1.1.2
 Summary: 适用于 Nonebot2 的狼人杀插件
 Author-email: wyf7685 <wyf7685@163.com>
 License: MIT
-Requires-Python: >=3.11
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: nonebot2 >=2.3.3
@@ -14,7 +14,7 @@ Requires-Dist: nonebot-plugin-waiter >=0.7.1
 
 <div align="center">
   <a href="https://v2.nonebot.dev/store">
-    <img src="https://github.com/wyf7685/wyf7685/blob/main/assets/NoneBotPlugin.svg" width="300" alt="logo">
+    <img src="https://raw.githubusercontent.com/wyf7685/wyf7685/main/assets/NoneBotPlugin.svg" width="300" alt="logo">
   </a>
 </div>
 
@@ -26,14 +26,14 @@ _✨ 简单的狼人杀插件 ✨_
 
 [![license](https://img.shields.io/github/license/wyf7685/nonebot-plugin-werewolf.svg)](./LICENSE)
 [![pypi](https://img.shields.io/pypi/v/nonebot-plugin-werewolf?logo=python&logoColor=edb641)](https://pypi.python.org/pypi/nonebot-plugin-werewolf)
-[![python](https://img.shields.io/badge/python-3.11+-blue?logo=python&logoColor=edb641)](https://www.python.org/)
+[![python](https://img.shields.io/badge/python-3.10+-blue?logo=python&logoColor=edb641)](https://www.python.org/)
+
 [![uv](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/uv/main/assets/badge/v0.json)](https://github.com/astral-sh/uv)
 [![ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![isort](https://img.shields.io/badge/%20imports-isort-%231674b1)](https://pycqa.github.io/isort/)
 [![black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![pyright](https://img.shields.io/badge/types-pyright-797952.svg?logo=python&logoColor=edb641)](https://github.com/Microsoft/pyright)
 
-[![commits](https://img.shields.io/github/commit-activity/w/wyf7685/nonebot-plugin-werewolf)](https://github.com/wyf7685/nonebot-plugin-werewolf/commits)
 [![wakatime](https://wakatime.com/badge/user/b097681b-c224-44ec-8e04-e1cf71744655/project/70a7f68d-5625-4989-9476-be6877408332.svg)](https://wakatime.com/badge/user/b097681b-c224-44ec-8e04-e1cf71744655/project/70a7f68d-5625-4989-9476-be6877408332)
 [![pre-commit](https://results.pre-commit.ci/badge/github/wyf7685/nonebot-plugin-werewolf/master.svg)](https://results.pre-commit.ci/latest/github/wyf7685/nonebot-plugin-werewolf/master)
 [![pyright](https://github.com/wyf7685/nonebot-plugin-werewolf/actions/workflows/pyright.yml/badge.svg?branch=master&event=push)](https://github.com/wyf7685/nonebot-plugin-werewolf/actions/workflows/pyright.yml)
@@ -52,7 +52,7 @@ _✨ 简单的狼人杀插件 ✨_
 
 > [!note]
 > 
-> 请确保 NoneBot2 使用的 Python 解释器版本 >=3.11
+> 请确保 NoneBot2 使用的 Python 解释器版本 >=3.10
 
 <details open>
 <summary>使用 nb-cli 安装</summary>
@@ -240,6 +240,10 @@ werewolf__priesthood_proirity=[11, 12, 13, 14, 15]
 
 <!-- CHANGELOG -->
 
+- 2024.09.18 v1.1.2
+
+  - 修改 Python 需求为 `>=3.10`
+
 - 2024.09.11 v1.1.1
 
   - 修改 Python 需求为 `>=3.11`

nonebot_plugin_werewolf-1.1.2.dist-info/RECORD

@@ -0,0 +1,16 @@
+nonebot_plugin_werewolf/__init__.py,sha256=qCS-gVMiMZcF9yT3SIMe8np-wmKX2vGT5DxYJ2jRxgY,734
+nonebot_plugin_werewolf/_timeout.py,sha256=MVkA5oMoxOTV8Luc0BH2QPP8wwz4Tr9CJjeYgiPu_O4,3649
+nonebot_plugin_werewolf/config.py,sha256=a5dyF21_3T1o6AFrK6onIiwXUNyEwj5Yg-c7V9qoueI,2923
+nonebot_plugin_werewolf/constant.py,sha256=gUApZs-N3DRSwV2_B05mPi6fCmynSzVZb28fgqdLX6E,1894
+nonebot_plugin_werewolf/exception.py,sha256=YSwxeogIB0YJqH9MP1bgxojiu-I_xQE44XnSk5bC1AQ,400
+nonebot_plugin_werewolf/game.py,sha256=FqYAs8CalCRUKoyPTpqvKK5iAelV9ZQ5EmefNo5wE9E,17459
+nonebot_plugin_werewolf/matchers.py,sha256=Xnq1n4xobdr1T_8ilsQfXns_iEsNx_h_-aQ5jZwpWx0,2080
+nonebot_plugin_werewolf/ob11_ext.py,sha256=P8uc3AdN5K5MzJaK80WDK85VKFg_CK5avDHu7ueMkho,2418
+nonebot_plugin_werewolf/player.py,sha256=2jWlJOIWNK3JVVKNaqROfvKPRQfopDXv7KAXGtXNmh4,14973
+nonebot_plugin_werewolf/player_set.py,sha256=7f4GHklp-wBGROddVqGUQAMeMzKlN2iec_w5UJQXvz0,2726
+nonebot_plugin_werewolf/utils.py,sha256=LiNitH3UYNqXnCOOAzjKifVpJNhurIt4wYgWVBUW1Zo,6811
+nonebot_plugin_werewolf-1.1.2.dist-info/LICENSE,sha256=B_WbEqjGr6GYVNfEJPY31T1Opik7OtgOkhRs4Ig3e2M,1064
+nonebot_plugin_werewolf-1.1.2.dist-info/METADATA,sha256=0W7Nb6qqwJvW7xVdLHxM4643DuJ3YN9683owdDoUOhs,10363
+nonebot_plugin_werewolf-1.1.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+nonebot_plugin_werewolf-1.1.2.dist-info/top_level.txt,sha256=wLTfg8sTKbH9lLT9LtU118C9cTspEBJareLsrYM52YA,24
+nonebot_plugin_werewolf-1.1.2.dist-info/RECORD,,

{nonebot_plugin_werewolf-1.1.1.dist-info → nonebot_plugin_werewolf-1.1.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.2)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

nonebot_plugin_werewolf-1.1.1.dist-info/RECORD

@@ -1,15 +0,0 @@
-nonebot_plugin_werewolf/__init__.py,sha256=I6lFyJgJ4Tz4t8gS2lrsx-7paN2h_PNoGjGR8ryvSeU,734
-nonebot_plugin_werewolf/config.py,sha256=gl_ujiY-8fxQ5hN9_gjL1WpJJR5UOBIRBGofbLcQzaE,2900
-nonebot_plugin_werewolf/constant.py,sha256=1XNTcTicil90WSviI2e33FX0LstWXl1aV2ugbhsDlIk,1909
-nonebot_plugin_werewolf/exception.py,sha256=Ui8rB1sBg6_p8JHSvrjCpUaXJlgrM_9XsLJ09k8F1bg,391
-nonebot_plugin_werewolf/game.py,sha256=Y9MQASaNdm2uuNw37IjdQEQzikWmbql_PWLHaL7lcB8,17414
-nonebot_plugin_werewolf/matchers.py,sha256=5FioDfARlxTEibGL1JMKUMzmTzOwljjWKAJxBnyzaYs,2106
-nonebot_plugin_werewolf/ob11_ext.py,sha256=P8uc3AdN5K5MzJaK80WDK85VKFg_CK5avDHu7ueMkho,2418
-nonebot_plugin_werewolf/player.py,sha256=ifqTBfNepQY5FCY7hZoUA6DcObkcFEiNmKEeRkitJqY,14749
-nonebot_plugin_werewolf/player_set.py,sha256=AI8v6KjH9ACtP4lvrd5IJfayan0qALmpTRLC3s_3DFw,2754
-nonebot_plugin_werewolf/utils.py,sha256=l7oNSK471SV5CaB1eEVyZm10XSBFf_TwNotvb30U6vE,6835
-nonebot_plugin_werewolf-1.1.1.dist-info/LICENSE,sha256=B_WbEqjGr6GYVNfEJPY31T1Opik7OtgOkhRs4Ig3e2M,1064
-nonebot_plugin_werewolf-1.1.1.dist-info/METADATA,sha256=5ikh-mdZTIObaFs9w7qgzrgsx31lCxB5Ag--C8stl0g,10447
-nonebot_plugin_werewolf-1.1.1.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-nonebot_plugin_werewolf-1.1.1.dist-info/top_level.txt,sha256=wLTfg8sTKbH9lLT9LtU118C9cTspEBJareLsrYM52YA,24
-nonebot_plugin_werewolf-1.1.1.dist-info/RECORD,,