nonebot-plugin-werewolf 1.1.6__py3-none-any.whl → 1.1.7__py3-none-any.whl

nonebot_plugin_werewolf/__init__.py

@@ -10,7 +10,7 @@ from . import matchers as matchers
 from . import players as players
 from .config import Config
 
-__version__ = "1.1.6"
+__version__ = "1.1.7"
 __plugin_meta__ = PluginMetadata(
     name="狼人杀",
     description="适用于 Nonebot2 的狼人杀插件",

nonebot_plugin_werewolf/config.py

@@ -1,6 +1,6 @@
 import json
 
-from nonebot import get_plugin_config, logger
+import nonebot
 from nonebot.compat import model_dump, type_validate_json
 from nonebot_plugin_localstore import get_plugin_data_file
 from pydantic import BaseModel, Field
@@ -41,5 +41,5 @@ preset_data_file = get_plugin_data_file("preset.json")
 if not preset_data_file.exists():
     PresetData().save()
 
-config = get_plugin_config(Config).werewolf
-logger.debug(f"加载插件配置: {config}")
+config = nonebot.get_plugin_config(Config).werewolf
+nonebot.logger.debug(f"加载插件配置: {config}")

nonebot_plugin_werewolf/game.py

@@ -1,11 +1,12 @@
 import contextlib
+import functools
 import secrets
 from typing import ClassVar, NoReturn
 
 import anyio
 import anyio.abc
+import nonebot
 from nonebot.adapters import Bot
-from nonebot.log import logger
 from nonebot.utils import escape_tag
 from nonebot_plugin_alconna import At, Target, UniMessage
 from nonebot_plugin_alconna.uniseg.message import Receipt
@@ -20,9 +21,13 @@ from .player_set import PlayerSet
 from .players import Player
 from .utils import InputStore, ObjectStream, link
 
+logger = nonebot.logger.opt(colors=True)
+
 
 def init_players(bot: Bot, game: "Game", players: set[str]) -> PlayerSet:
-    logger.opt(colors=True).debug(f"初始化 <c>{game.group.id}</c> 的玩家职业")
+    # group.colored_name not available yet
+    logger.debug(f"初始化 <c>{game.group_id}</c> 的玩家职业")
+
     preset_data = PresetData.load()
     if (preset := preset_data.role_preset.get(len(players))) is None:
         raise ValueError(
@@ -47,7 +52,7 @@ def init_players(bot: Bot, game: "Game", players: set[str]) -> PlayerSet:
     player_set = PlayerSet(
         Player.new(_select_role(), bot, game, user_id) for user_id in players
     )
-    logger.debug(f"职业分配完成: {player_set}")
+    logger.debug(f"职业分配完成: <e>{escape_tag(str(player_set))}</e>")
 
     return player_set
 
@@ -73,7 +78,7 @@ class DeadChannel:
         await self.finished.wait()
         self.task_group.cancel_scope.cancel()
 
-    async def _handle_send(self) -> None:
+    async def _handle_send(self) -> NoReturn:
         while True:
             player, msg = await self.stream.recv()
             msg = f"玩家 {player.name}:\n" + msg
@@ -149,15 +154,19 @@ class Game:
         self._task_group = None
 
     async def _fetch_group_scene(self) -> None:
-        scene = await self.interface.get_scene(SceneType.GROUP, self.group.id)
+        scene = await self.interface.get_scene(SceneType.GROUP, self.group_id)
         if scene is None:
-            scene = await self.interface.get_scene(SceneType.GUILD, self.group.id)
+            scene = await self.interface.get_scene(SceneType.GUILD, self.group_id)
 
         self._scene = scene
 
+    @functools.cached_property
+    def group_id(self) -> str:
+        return self.group.id
+
     @property
     def colored_name(self) -> str:
-        name = f"<b><e>{escape_tag(self.group.id)}</e></b>"
+        name = f"<b><e>{escape_tag(self.group_id)}</e></b>"
         if self._scene and self._scene.name is not None:
             name = f"<y>{escape_tag(self._scene.name)}</y>({name})"
         return link(name, self._scene and self._scene.avatar)
@@ -176,7 +185,7 @@ class Game:
             else:
                 text += escape_tag(str(seg)).replace("\n", "\\n")
 
-        logger.opt(colors=True).info(text)
+        logger.info(text)
         return await message.send(self.group, self.bot)
 
     def raise_for_status(self) -> None:
@@ -218,7 +227,7 @@ class Game:
         with anyio.move_on_after(timeout_secs):
             async with anyio.create_task_group() as tg:
                 for p in players:
-                    tg.start_soon(InputStore.fetch_until_stop, p.user_id, self.group.id)
+                    tg.start_soon(InputStore.fetch_until_stop, p.user_id, self.group_id)
 
     async def interact(
         self,
@@ -241,7 +250,7 @@ class Game:
             with anyio.fail_after(timeout_secs):
                 await players.interact()
         except TimeoutError:
-            logger.opt(colors=True).debug(f"{text}交互超时 (<y>{timeout_secs}</y>s)")
+            logger.debug(f"{text}交互超时 (<y>{timeout_secs}</y>s)")
             await players.broadcast(f"⚠️{text}交互超时")
 
     async def post_kill(self, players: Player | PlayerSet) -> None:
@@ -306,27 +315,27 @@ class Game:
                 "ℹ️请等待其他玩家结束交互...",
             )
 
-            # 狼人击杀目标
-            if (
-                (killed := self.state.killed) is not None  # 狼人未空刀
-                and killed not in self.state.protected  # 守卫保护
-                and killed not in self.state.antidote  # 女巫使用解药
-            ):
-                # 狼人正常击杀玩家
-                await killed.kill(
-                    KillReason.Werewolf,
-                    *players.select(RoleGroup.Werewolf),
-                )
+        # 狼人击杀目标
+        if (
+            (killed := self.state.killed) is not None  # 狼人未空刀
+            and killed not in self.state.protected  # 守卫保护
+            and killed not in self.state.antidote  # 女巫使用解药
+        ):
+            # 狼人正常击杀玩家
+            await killed.kill(
+                KillReason.Werewolf,
+                *players.select(RoleGroup.Werewolf),
+            )
 
-            # 女巫操作目标
-            for witch in self.state.poison:
-                if witch.selected is None:
-                    continue
-                if witch.selected not in self.state.protected:  # 守卫未保护
-                    # 女巫毒杀玩家
-                    await witch.selected.kill(KillReason.Poison, witch)
+        # 女巫操作目标
+        for witch in self.state.poison:
+            if witch.selected is None:
+                continue
+            if witch.selected not in self.state.protected:  # 守卫未保护
+                # 女巫毒杀玩家
+                await witch.selected.kill(KillReason.Poison, witch)
 
-            return killed
+        return killed
 
     async def run_vote(self) -> None:
         # 筛选当前存活玩家
@@ -339,7 +348,7 @@ class Game:
         # 收集到的总票数
         total_votes = sum(map(len, vote_result.values()))
 
-        logger.debug(f"投票结果: {vote_result}")
+        logger.debug(f"投票结果: {escape_tag(str(vote_result))}")
 
         # 投票结果公示
         msg = UniMessage.text("📊投票结果:\n")
@@ -461,12 +470,12 @@ class Game:
         try:
             await self.mainloop()
         except anyio.get_cancelled_exc_class():
-            logger.warning(f"{self.group.id} 的狼人杀游戏进程被取消")
+            logger.warning(f"{self.colored_name} 的狼人杀游戏进程被取消")
         except GameFinished as result:
             await self.handle_game_finish(result.status)
-            logger.info(f"{self.group.id} 的狼人杀游戏进程正常退出")
+            logger.info(f"{self.colored_name} 的狼人杀游戏进程正常退出")
         except Exception as err:
-            msg = f"{self.group.id} 的狼人杀游戏进程出现未知错误: {err!r}"
+            msg = f"{self.colored_name} 的狼人杀游戏进程出现未知错误: {err!r}"
             logger.exception(msg)
             await self.send(f"❌狼人杀游戏进程出现未知错误: {err!r}")
         finally:
@@ -484,16 +493,16 @@ class Game:
                 tg.start_soon(self.daemon, finished)
                 tg.start_soon(dead_channel.run)
         except anyio.get_cancelled_exc_class():
-            logger.warning(f"{self.group.id} 的狼人杀游戏进程被取消")
+            logger.warning(f"{self.colored_name} 的狼人杀游戏进程被取消")
         except Exception as err:
-            msg = f"{self.group.id} 的狼人杀守护进程出现错误: {err!r}"
+            msg = f"{self.colored_name} 的狼人杀守护进程出现错误: {err!r}"
             logger.opt(exception=err).error(msg)
         finally:
             self._task_group = None
             self.running_games.discard(self)
-            InputStore.cleanup(list(self._player_map), self.group.id)
+            InputStore.cleanup(list(self._player_map), self.group_id)
 
     def terminate(self) -> None:
         if self._task_group is not None:
-            logger.warning(f"中止 {self.group.id} 的狼人杀游戏进程")
+            logger.warning(f"中止 {self.colored_name} 的狼人杀游戏进程")
             self._task_group.cancel_scope.cancel()

nonebot_plugin_werewolf/players/player.py

@@ -4,8 +4,8 @@ from collections.abc import Callable
 from typing import TYPE_CHECKING, ClassVar, Final, TypeVar, final
 
 import anyio
+import nonebot
 from nonebot.adapters import Bot
-from nonebot.log import logger
 from nonebot.utils import escape_tag
 from nonebot_plugin_alconna.uniseg import Receipt, Target, UniMessage
 from nonebot_plugin_uninfo import SceneType
@@ -21,6 +21,8 @@ if TYPE_CHECKING:
 
 _P = TypeVar("_P", bound=type["Player"])
 
+logger = nonebot.logger.opt(colors=True)
+
 
 class Player:
     __player_class: ClassVar[dict[Role, type["Player"]]] = {}
@@ -128,7 +130,7 @@ class Player:
     @final
     def _log(self, text: str) -> None:
         text = text.replace("\n", "\\n")
-        logger.opt(colors=True).info(
+        logger.info(
             f"{self.game.colored_name} | "
             f"[<b><m>{self.role_name}</m></b>] "
             f"{self.colored_name} | {text}",

nonebot_plugin_werewolf/players/werewolf.py

@@ -15,6 +15,8 @@ if TYPE_CHECKING:
 
 @Player.register_role(Role.Werewolf, RoleGroup.Werewolf)
 class Werewolf(Player):
+    stream: ObjectStream[str | UniMessage]
+
     @override
     async def notify_role(self) -> None:
         await super().notify_role()
@@ -25,11 +27,7 @@ class Werewolf(Player):
                 + "\n".join(f"  {p.role_name}: {p.name}" for p in partners)
             )
 
-    async def _handle_interact(
-        self,
-        players: "PlayerSet",
-        stream: ObjectStream[str | UniMessage],
-    ) -> None:
+    async def _handle_interact(self, players: "PlayerSet") -> None:
         self.selected = None
 
         while True:
@@ -40,25 +38,21 @@ class Werewolf(Player):
                 self.selected = players[index - 1]
                 msg = f"当前选择玩家: {self.selected.name}"
                 await self.send(f"🎯{msg}\n发送 “{STOP_COMMAND_PROMPT}” 结束回合")
-                await stream.send(f"📝队友 {self.name} {msg}")
+                await self.stream.send(f"📝队友 {self.name} {msg}")
             if text == STOP_COMMAND:
                 if self.selected is not None:
                     await self.send("✅你已结束当前回合")
-                    await stream.send(f"📝队友 {self.name} 结束当前回合")
-                    stream.close()
+                    await self.stream.send(f"📝队友 {self.name} 结束当前回合")
+                    self.stream.close()
                     return
                 await self.send("⚠️当前未选择玩家，无法结束回合")
             else:
-                await stream.send(UniMessage.text(f"💬队友 {self.name}:\n") + input_msg)
+                await self.stream.send(UniMessage(f"💬队友 {self.name}:\n") + input_msg)
 
-    async def _handle_broadcast(
-        self,
-        partners: "PlayerSet",
-        stream: ObjectStream[str | UniMessage],
-    ) -> None:
-        while not stream.closed:
+    async def _handle_broadcast(self, partners: "PlayerSet") -> None:
+        while not self.stream.closed:
             try:
-                message = await stream.recv()
+                message = await self.stream.recv()
             except anyio.EndOfStream:
                 return
 
@@ -84,8 +78,11 @@ class Werewolf(Player):
             .text("\n\n⚠️意见未统一将空刀")
         )
 
-        stream = ObjectStream[str | UniMessage](8)
+        self.stream = ObjectStream[str | UniMessage](8)
 
-        async with anyio.create_task_group() as tg:
-            tg.start_soon(self._handle_interact, players, stream)
-            tg.start_soon(self._handle_broadcast, partners, stream)
+        try:
+            async with anyio.create_task_group() as tg:
+                tg.start_soon(self._handle_interact, players)
+                tg.start_soon(self._handle_broadcast, partners)
+        finally:
+            del self.stream

nonebot_plugin_werewolf/utils.py

@@ -1,7 +1,7 @@
 import functools
 import itertools
 from collections import defaultdict
-from typing import TYPE_CHECKING, Any, ClassVar, Generic, TypeVar, cast
+from typing import TYPE_CHECKING, Any, ClassVar, Generic, TypeVar
 
 import anyio
 import anyio.streams.memory
@@ -106,7 +106,7 @@ def as_player_set(*player: "Player") -> "PlayerSet":
 
 
 class ObjectStream(Generic[T]):
-    __unset = object()
+    __unset: Any = object()
     _send: anyio.streams.memory.MemoryObjectSendStream[T]
     _recv: anyio.streams.memory.MemoryObjectReceiveStream[T]
     _closed: anyio.Event
@@ -137,7 +137,7 @@ class ObjectStream(Generic[T]):
         if result is self.__unset:
             raise anyio.EndOfStream
 
-        return cast(T, result)
+        return result
 
     def close(self) -> None:
         self._closed.set()

{nonebot_plugin_werewolf-1.1.6.dist-info → nonebot_plugin_werewolf-1.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-werewolf
-Version: 1.1.6
+Version: 1.1.7
 Summary: 适用于 Nonebot2 的狼人杀插件
 Author-email: wyf7685 <wyf7685@163.com>
 License: MIT
@@ -242,6 +242,10 @@ _✨ 简单的狼人杀插件 ✨_
 
 <!-- CHANGELOG -->
 
+- 2024.10.31 v1.1.7
+
+  - *Bug fix*
+
 - 2024.10.31 v1.1.6
 
   - 新增超级用户中止游戏 (#7)

{nonebot_plugin_werewolf-1.1.6.dist-info → nonebot_plugin_werewolf-1.1.7.dist-info}/RECORD

@@ -1,11 +1,11 @@
-nonebot_plugin_werewolf/__init__.py,sha256=ZomfjWnGRnFuh3I__spYbLRE1Z3wTUthwXzc5x8YPJw,931
-nonebot_plugin_werewolf/config.py,sha256=bMRRqNVWNsFDKyijxZZYPN7DCAf9bYf2MdfbPXE239w,1287
+nonebot_plugin_werewolf/__init__.py,sha256=CMvcf07CmixM1tCOtCNQ50ksjjU-W_HxdNQHRFXratM,931
+nonebot_plugin_werewolf/config.py,sha256=QKE_EomWI58L-LV6KvHth1C0n77jwZG9pFz_hMY4hjQ,1272
 nonebot_plugin_werewolf/constant.py,sha256=_ngw2xtXVZMTQXQ0gv4l9h4Lo1jq5v28fKLOGJ7G57o,1796
 nonebot_plugin_werewolf/exception.py,sha256=2F2kZsMaRIa7jOiIQJiM10K7Z59ouCpaZENcnEcEEXQ,398
-nonebot_plugin_werewolf/game.py,sha256=xU8IcrWQNRUjzfPIAbm1XCeshwfy8SWgxapUP1_NGOw,18925
+nonebot_plugin_werewolf/game.py,sha256=V0RBr1rP6cQOFiUBelxAysschx3HDv41PUZhf_Wi4-Y,19046
 nonebot_plugin_werewolf/models.py,sha256=ljWy6BaTVyIK4Ng-wUVRteBLZe2pQLf8l3yWFZzWXHQ,1505
 nonebot_plugin_werewolf/player_set.py,sha256=84hZOOAaPjTyZZDje6mNy7zm4G5UH2nGDq1pvDNFT9w,2538
-nonebot_plugin_werewolf/utils.py,sha256=PBgadYdF3IQbaVPjcmstmsOGddfPvj8rcbiYQllHFYY,4096
+nonebot_plugin_werewolf/utils.py,sha256=ekqyjXndl0_Ih-4pTTMXPOp7WMezlxUY7Xd6DcFjgpk,4086
 nonebot_plugin_werewolf/matchers/__init__.py,sha256=BnzEDmW8n1wkyI-un0DYXt2k_6CFv6NE8itZ2daw4zQ,174
 nonebot_plugin_werewolf/matchers/depends.py,sha256=poMQJ7Mzd3IZFvh2MvnfYdnnb2c-r6XFK_IOr50PL3o,1321
 nonebot_plugin_werewolf/matchers/edit_preset.py,sha256=gKd1csoR9u4VoeulTtxUUgxsOdgB0SDC1FMxMRdgw5I,8087
@@ -22,13 +22,13 @@ nonebot_plugin_werewolf/players/guard.py,sha256=gHPlIfBXtQ8MSoWvucIIq0XrJQx9KIIK
 nonebot_plugin_werewolf/players/hunter.py,sha256=q17IjSXt5knDAc49NbV0NCwNW7qASqODUNgC0L1zqeI,193
 nonebot_plugin_werewolf/players/idiot.py,sha256=jz13BN4BsYcmiZdTwSlXUm4yc0KR8GUmQmq2GI7_Kzo,1431
 nonebot_plugin_werewolf/players/joker.py,sha256=n_jlddGMpFJ0O0sc_1J6IybfPsPJSWeS4GC0S6IZoTk,826
-nonebot_plugin_werewolf/players/player.py,sha256=hEbGRF5vrgKYKKEC5DB3JUIG6SEyvoHTYGZUqHPjf8Q,6953
+nonebot_plugin_werewolf/players/player.py,sha256=j6m75GxYx3dpsO1frfk48D6jFdSi8orqaIVB-jvRxU0,6962
 nonebot_plugin_werewolf/players/prophet.py,sha256=wrTR8BnktiZ8aEI4VzYa5kt4GXyFnyi5wZmCO933-rE,917
-nonebot_plugin_werewolf/players/werewolf.py,sha256=jZMzYE0LiwsxO8XHMlWRk25XO5gGe24t87NqzLc3I4A,3287
+nonebot_plugin_werewolf/players/werewolf.py,sha256=qi6OLWnTWhe2O_XYEb80n9x_4j05qjWU2IwnG3vpMuA,3273
 nonebot_plugin_werewolf/players/witch.py,sha256=FOM_MMKUjO6QpOQK9JvHq9zwa4GTVCVnW7UtPgT_BTw,2360
 nonebot_plugin_werewolf/players/wolfking.py,sha256=Y_G1eDdFYGTip5Pl9Sz0OvPsP0aiiFH8NkfGiFu7r1E,438
-nonebot_plugin_werewolf-1.1.6.dist-info/LICENSE,sha256=B_WbEqjGr6GYVNfEJPY31T1Opik7OtgOkhRs4Ig3e2M,1064
-nonebot_plugin_werewolf-1.1.6.dist-info/METADATA,sha256=pBGQnG8aePnlLEcZBlF_BqrIe4Y4O8oMK5mFwPGLWwg,11954
-nonebot_plugin_werewolf-1.1.6.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-nonebot_plugin_werewolf-1.1.6.dist-info/top_level.txt,sha256=wLTfg8sTKbH9lLT9LtU118C9cTspEBJareLsrYM52YA,24
-nonebot_plugin_werewolf-1.1.6.dist-info/RECORD,,
+nonebot_plugin_werewolf-1.1.7.dist-info/LICENSE,sha256=B_WbEqjGr6GYVNfEJPY31T1Opik7OtgOkhRs4Ig3e2M,1064
+nonebot_plugin_werewolf-1.1.7.dist-info/METADATA,sha256=lF1x5SYiaOUgjmow7_Kcb_eovQZbxvbN8dAJmc2aFkA,11990
+nonebot_plugin_werewolf-1.1.7.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+nonebot_plugin_werewolf-1.1.7.dist-info/top_level.txt,sha256=wLTfg8sTKbH9lLT9LtU118C9cTspEBJareLsrYM52YA,24
+nonebot_plugin_werewolf-1.1.7.dist-info/RECORD,,