nonebot-plugin-l4d2-server 1.0.2__py3-none-any.whl → 1.0.3__py3-none-any.whl

nonebot_plugin_l4d2_server/__main__.py

@@ -105,17 +105,27 @@ async def _(
 async def _(
     args: Message = CommandArg(),
 ):
+    # 以后有时间补img格式
     msg: str = args.extract_plain_text().strip()
     tag_list: List[str] = msg.split(" ", maxsplit=1)
-    if len(tag_list) < 2:
-        return await UniMessage.text("格式错误，正确格式：/l4find 组名 玩家名").finish()
-    group, name = tag_list
-    out: List[OutServer] = await get_server_detail(group, is_img=False)  # type: ignore
-    out_msg = "未找到玩家"
-    for one in out:
-        for player in one["player"]:
-            if name in player.name:
-                out_msg = await get_ip_server(f"{one['host']}:{one['port']}")
+    if len(tag_list) == 1:
+        await UniMessage.text("未设置组，正在全服查找，时间较长").send()
+        name = tag_list[0]
+        out: List[OutServer] = await get_server_detail(is_img=False)  # type: ignore
+        out_msg = "未找到玩家"
+        for one in out:
+            for player in one["player"]:
+                if name in player.name:
+                    out_msg = await get_ip_server(f"{one['host']}:{one['port']}")
+    if len(tag_list) == 2:
+        group, name = tag_list
+        await UniMessage.text(f"正在查询{group}组").send()
+        out: List[OutServer] = await get_server_detail(group, is_img=False)  # type: ignore
+        out_msg = "未找到玩家"
+        for one in out:
+            for player in one["player"]:
+                if name in player.name:
+                    out_msg = await get_ip_server(f"{one['host']}:{one['port']}")
 
     return await UniMessage.text(out_msg).finish()
 

nonebot_plugin_l4d2_server/config.py

@@ -1,10 +1,14 @@
 from pathlib import Path
 
 from nonebot import get_plugin_config
+from nonebot.log import logger
 from pydantic import BaseModel
 
 DATAPATH = Path(__file__).parent.joinpath("data")
 DATAOUT = Path("data/L4D2")
+if not Path(DATAOUT / "l4d2.json").exists():
+    logger.info("文件 l4d2.json 不存在，已创建并初始化为 {}")
+    Path(DATAOUT / "l4d2.json").write_text("{}", encoding="utf-8")
 print(DATAOUT.absolute())
 server_all_path = DATAOUT / "l4d2"
 server_all_path.mkdir(parents=True, exist_ok=True)

nonebot_plugin_l4d2_server/l4_help/__init__.py

@@ -10,7 +10,7 @@ from ..l4_image.convert import core_font
 from ..l4_image.model import PluginHelp
 from .draw import get_help
 
-__version__ = "1.0.2"
+__version__ = "1.0.3"
 TEXT_PATH = Path(__file__).parent / "texture2d"
 HELP_DATA = Path(__file__).parent / "Help.json"
 

nonebot_plugin_l4d2_server/l4_request/__init__.py

@@ -23,6 +23,16 @@ COMMAND = set()
 
 
 async def get_all_server_detail():
+    """
+    获取所有服务器的详细信息。
+
+    Args:
+        无
+
+    Returns:
+        str: 包含所有服务器详细信息的字符串。
+
+    """
     out_list: List[AllServer] = []
     for group in ALLHOST:
         msg_list = await get_group_detail(group)
@@ -58,11 +68,30 @@ async def get_all_server_detail():
 
 
 async def get_server_detail(
-    command: str,
+    command: str = "",
     _id: Optional[str] = None,
     is_img: bool = True,
 ):
-    server_json = ALLHOST.get(command)
+    """
+    异步获取服务器详细信息。
+
+    Args:
+        command (str): 服务器组名。
+        _id (Optional[str], optional): 服务器ID。默认为None。
+        is_img (bool, optional): 是否返回图片格式的信息。默认为True。
+
+    Returns:
+        Union[bytes, List[OutServer], None]: 返回服务器详细信息。如果为图片格式，返回bytes类型；
+                                            如果不是图片格式，返回List[OutServer]类型；如果未找到服务器组，返回None。
+
+    """
+    if command:
+        server_json = ALLHOST.get(command)
+    else:
+        server_json = []
+        for servers in ALLHOST.values():
+            server_json.extend(servers)
+
     logger.info(server_json)
     if server_json is None:
         logger.warning("未找到这个组")
@@ -116,98 +145,139 @@ def reload_ip():
     # print("正在读取json文件")
     group_ip = []
     for item in server_all_path.iterdir():
-        if item.is_file():
-            if item.name.endswith("json"):
-                json_data = json.loads(item.read_text(encoding="utf-8"))
-                group_server = cast(Dict[str, List[NserverOut]], json_data)
-
-                for group, group_ip in group_server.items():
-                    # 处理ip,host,port关系
-                    for one_ip in group_ip:
-                        if one_ip.get("ip"):
-                            if one_ip.get("host") and one_ip.get("port"):
-                                pass
-                            if one_ip.get("host") and not one_ip.get("port"):
-                                one_ip["port"] = 20715
-                            if not one_ip.get("host"):
-                                one_ip["host"], one_ip["port"] = split_maohao(
-                                    one_ip.get("ip"),
-                                )
-                        else:
-                            if one_ip.get("host") and one_ip.get("port"):
-                                one_ip["ip"] = f'{one_ip["host"]}:{one_ip["port"]}'
-                            if one_ip.get("host") and not one_ip.get("port"):
-                                one_ip["ip"] = f'{one_ip["host"]}:20715'
-                            else:
-                                logger.warning(f"{one_ip} 没有ip")
+        if item.is_file() and item.name.endswith("json"):
+            json_data = json.loads(item.read_text(encoding="utf-8"))
+            group_server = cast(Dict[str, List[NserverOut]], json_data)
 
-                    ALLHOST.update({group: group_ip})
-                    COMMAND.add(group)
-                logger.success(f"成功加载 {item.name.split('.')[0]} {len(group_ip)}个")
+            for group, group_ip in group_server.items():
+                # 处理ip,host,port关系
+                for one_ip in group_ip:
+                    if one_ip.get("ip"):
+                        if one_ip.get("host") and one_ip.get("port"):
+                            pass
+                        if one_ip.get("host") and not one_ip.get("port"):
+                            one_ip["port"] = 20715
+                        if not one_ip.get("host"):
+                            one_ip["host"], one_ip["port"] = split_maohao(
+                                one_ip.get("ip"),
+                            )
+                    else:
+                        if one_ip.get("host") and one_ip.get("port"):
+                            one_ip["ip"] = f'{one_ip["host"]}:{one_ip["port"]}'
+                        if one_ip.get("host") and not one_ip.get("port"):
+                            one_ip["ip"] = f'{one_ip["host"]}:20715'
+                        else:
+                            logger.warning(f"{one_ip} 没有ip")
 
-            if item.name.endswith("txt"):
-                """to do"""
+                ALLHOST.update({group: group_ip})
+                COMMAND.add(group)
+            logger.success(f"成功加载 {item.name.split('.')[0]} {len(group_ip)}个")
 
 
 async def tj_request(command: str = "云", tj="tj"):
+    map_type = "普通药役"
     server_json = ALLHOST.get(command)
     logger.info(server_json)
     if server_json is None:
         logger.warning("未找到这个组")
         return None
-    # 返回单个
-    logger.info("正在anne电信服务器信息")
+
+    logger.info("正在获取电信服务器信息")
     player_msg = ""
     right_ip = []
-    for i in server_json:
-        ser_list = await L4API.a2s_info([(i["host"], i["port"])], is_player=True)
+
+    async def _filter_servers(servers: list, tj_mode: str) -> list:
+        """筛选符合条件的服务器
+        Args:
+            servers: 服务器列表
+            tj_mode: 筛选模式（'tj'或'zl'）
+        Returns:
+            符合条件的服务器列表
+        """
+        filtered = []
+        for i in servers:
+            ser_list = await L4API.a2s_info([(i["host"], i["port"])], is_player=True)
+            if not ser_list:
+                continue
+
+            srv = ser_list[0][0]
+            players = ser_list[0][1]
+
+            if tj_mode == "tj" and map_type in srv.map_name:
+                score = sum(p.score for p in players[:4])
+                t = srv.map_name.split("[")[-1].split("特")[0]
+                if t.isdigit() and int(t) * 50 < score:
+                    logger.info(
+                        f"符合TJ条件的服务器: {i['host']}:{i['port']}, 地图: {srv.map_name}, 分数: {score}",
+                    )
+                    filtered.append(i)
+            elif tj_mode == "zl" and map_type in srv.map_name and len(players) <= 4:
+                logger.info(
+                    f"符合ZL条件的服务器: {i['host']}:{i['port']}, 地图: {srv.map_name}, 玩家数: {len(players)}",
+                )
+                filtered.append(i)
+        return filtered
+
+    async def _format_players(player_list: list) -> str:
+        """格式化玩家信息
+        Args:
+            player_list: 玩家对象列表
+        Returns:
+            格式化后的玩家信息字符串
+        """
+        durations = [await convert_duration(p.duration) for p in player_list]
+        max_duration_len = max(len(str(d)) for d in durations)
+        max_score_len = max(len(str(p.score)) for p in player_list)
+        return "\n".join(
+            f"[{p.score:>{max_score_len}}] | {durations[i]:^{max_duration_len}} | {p.name[0]}***{p.name[-1]}"
+            for i, p in enumerate(player_list)
+        )
+
+    def _build_message(srv_info, players_msg: str, selected_srv: dict) -> str:
+        """构建服务器信息消息
+        Args:
+            srv_info: 服务器信息对象
+            players_msg: 格式化后的玩家信息
+            selected_srv: 选中的服务器信息
+        Returns:
+            完整的消息字符串
+        """
+        msg = f"""*{srv_info.server_name}*
+游戏: {srv_info.folder}
+地图: {srv_info.map_name}
+人数: {srv_info.player_count}/{srv_info.max_players}"""
+        if srv_info.ping is not None:
+            msg += f"\nping: {srv_info.ping * 1000:.0f}ms\n{players_msg}"
+        if config.l4_show_ip:
+            msg += f"\nconnect {selected_srv['host']}:{selected_srv['port']}"
+        return msg
+
+    try:
+        right_ip = await _filter_servers(server_json, tj)
+
+        if not right_ip:
+            logger.warning("没有找到符合条件的服务器")
+            return "没有符合条件的服务器"
+
+        logger.info(
+            f"符合条件的服务器列表: {[f'{ip['host']}:{ip['port']}' for ip in right_ip]}",
+        )
+        s = random.choice(right_ip)
+        logger.info(f"最终选择的服务器: {s['host']}:{s['port']}")
+        ser_list = await L4API.a2s_info([(s["host"], s["port"])], is_player=True)
+        if not ser_list:
+            return "获取服务器信息失败"
+
         one_server = ser_list[0][0]
         one_player = ser_list[0][1]
 
-        # 判断坐牢条件
-        if tj == "tj" and "普通药役" in one_server.map_name:
-            score: int = 0
-            for index, player in enumerate(one_player, 1):
-                if index > 4:
-                    break
-                score += player.score
-
-            t = one_server.map_name.split("[")[-1].split("特")[0]
-            if int(t) * 50 < score:
-                right_ip.append(i)
-        if tj == "zl" and "普通药役" in one_server.map_name and len(one_player) <= 4:
-            right_ip.append(i)
-
-    if not right_ip:
-        return "没有符合条件的服务器"
-
-    s = random.choice(right_ip)
-    ser_list = await L4API.a2s_info([(s["host"], s["port"])], is_player=True)
-    one_server = ser_list[0][0]
-    one_player = ser_list[0][1]
-    if len(one_player):
-        max_duration_len = max(
-            [len(str(await convert_duration(i.duration))) for i in one_player],
-        )
-        max_score_len = max(len(str(i.score)) for i in one_player)
-
-        for player in one_player:
-            soc = "[{:>{}}]".format(player.score, max_score_len)
-            chines_dur = await convert_duration(player.duration)
-            dur = "{:^{}}".format(chines_dur, max_duration_len)
-            name = f"{player.name[0]}***{player.name[-1]}"
-            player_msg += f"{soc} | {dur} | {name} \n"
-    else:
-        player_msg = "服务器感觉很安静啊"
-    msg = f"""*{one_server.server_name}*
-游戏: {one_server.folder}
-地图: {one_server.map_name}
-人数: {one_server.player_count}/{one_server.max_players}"""
-    if one_server.ping is not None:
-        msg += f"""
-ping: {one_server.ping * 1000:.0f}ms
-{player_msg}"""
-    if config.l4_show_ip:
-        msg += f"""
-connect {s["host"]}:{s["port"]}"""
-    return msg
+        if one_player:
+            player_msg = await _format_players(one_player)
+        else:
+            player_msg = "服务器感觉很安静啊"
+
+        return _build_message(one_server, player_msg, s)
+
+    except Exception as e:
+        logger.error(f"tj_request error: {e}")
+        return "获取服务器信息时出错"

nonebot_plugin_l4d2_server/l4_request/draw_msg.py

@@ -31,8 +31,8 @@ async def draw_one_ip(host: str, port: int):
             dur = "{:^{}}".format(chines_dur, max_duration_len)
             name_leg = len(player.name)
             if name_leg > 2:
-                # xing = "*" * (name_leg - 2)
-                name = f"{player.name[0]}xing{player.name[-1]}"
+                xing = "*" * (name_leg - 2)
+                name = f"{player.name[0]}{xing}{player.name[-1]}"
             else:
                 name = player.name
             player_msg += f"{soc} | {dur} | {name} \n"
@@ -77,6 +77,12 @@ async def get_much_server(server_json: List[NserverOut], command: str):
 
 
 async def convert_duration(duration: float) -> str:
+    """Convert duration in seconds to human-readable string format (e.g. '1h 30m 15s')
+    Args:
+        duration: Duration in seconds
+    Returns:
+        Formatted time string
+    """
     minutes, seconds = divmod(duration, 60)
     hours, minutes = divmod(minutes, 60)
     time_str = ""

{nonebot_plugin_l4d2_server-1.0.2.dist-info → nonebot_plugin_l4d2_server-1.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-l4d2-server
-Version: 1.0.2
+Version: 1.0.3
 Summary: L4D2 server related operations plugin for NoneBot2
 Keywords: steam,game,l4d2,nonebot2,plugin
 Author-Email: Agnes_Digital <Z735803792@163.com>
@@ -11,10 +11,12 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Operating System :: OS Independent
 Project-URL: homepage, https://github.com/Agnes4m/nonebot_plugin_l4d2_server
 Requires-Python: <4.0,>=3.9
 Requires-Dist: nonebot2>=2.0.0
+Requires-Dist: nonebot2[fastapi]>=2.3.3
 Requires-Dist: nonebot-plugin-htmlrender>=0.3.0
 Requires-Dist: nonebot-adapter-onebot>=2.4.4
 Requires-Dist: nonebot-plugin-alconna>=0.50.0
@@ -29,7 +31,7 @@ Requires-Dist: python-a2s>=1.4.1
 Requires-Dist: ujson>=5.10.0
 Requires-Dist: lxml>=5.2.2
 Requires-Dist: rcon>=2.1.0
-Requires-Dist: pillow>9
+Requires-Dist: pillow>10
 Requires-Dist: beautifulsoup4>=4.12.3
 Requires-Dist: rarfile>=4.2
 Requires-Dist: pyunpack>=0.3

{nonebot_plugin_l4d2_server-1.0.2.dist-info → nonebot_plugin_l4d2_server-1.0.3.dist-info}/RECORD

@@ -1,15 +1,15 @@
-nonebot_plugin_l4d2_server-1.0.2.dist-info/METADATA,sha256=XqVzrC4S7KU6SCMgUx_ztxZobhrTefaqwnhG6vFzUmU,6596
-nonebot_plugin_l4d2_server-1.0.2.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-nonebot_plugin_l4d2_server-1.0.2.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-nonebot_plugin_l4d2_server-1.0.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+nonebot_plugin_l4d2_server-1.0.3.dist-info/METADATA,sha256=po5LeZo-Nk7oQNuaxa5Ve_3AANnFc4RxG8fnBbcqeK0,6688
+nonebot_plugin_l4d2_server-1.0.3.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+nonebot_plugin_l4d2_server-1.0.3.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+nonebot_plugin_l4d2_server-1.0.3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
 nonebot_plugin_l4d2_server/__init__.py,sha256=PIufOk1bxOx-nYqdoinoB7BcntIETNFwfzqKnmu-teE,1624
-nonebot_plugin_l4d2_server/__main__.py,sha256=E33d-UIdYmBZfT0ASW8WRkqoTXcF_NWRJIcQD_NS3FA,7981
-nonebot_plugin_l4d2_server/config.py,sha256=CavZ4EGdLvooVrUeP8zGsbZ0TJNsxGl2WT9rpyJtvhw,1175
+nonebot_plugin_l4d2_server/__main__.py,sha256=AGqPjt0O6dW_E3D93hcqehtsPsvzSRC1qEtx6HqEAGo,8455
+nonebot_plugin_l4d2_server/config.py,sha256=ZLYJr9lVs1Q5en1m4EA0wF7H366EVm8-6AnN8dcyy7c,1394
 nonebot_plugin_l4d2_server/data/font/loli.ttf,sha256=Yrh-RPoCrn1-NG94DR0x20ASXYUt8g3Ep6BCt3CdOFk,11125812
 nonebot_plugin_l4d2_server/l4_anne/__init__.py,sha256=zX4kTu4LAsqm7_li0-GcihnbYI65SBPkfUCPTs79U8k,4124
 nonebot_plugin_l4d2_server/l4_anne/ranne.py,sha256=vtNQJ-74rJiwVI3IYS3ZgFk_LaCviKU1yxrGk3DFvQs,532
 nonebot_plugin_l4d2_server/l4_help/Help.json,sha256=hz_k-qmGmGJKwCa8wmkHTLzXu6C-G-E_g7xdK-t6fNk,2673
-nonebot_plugin_l4d2_server/l4_help/__init__.py,sha256=cabiFBsUVFWs6EUC2XpXhp6PBWRmdBLWEVRNJAvjN6Y,1535
+nonebot_plugin_l4d2_server/l4_help/__init__.py,sha256=YNR3eob0XvRb_-4wIP9ZcSMey0RuFS4RlHMZ217Bn0E,1535
 nonebot_plugin_l4d2_server/l4_help/draw.py,sha256=y6yDPUnoZFvwly8cf7g9HRpT1JXTxyA9DC1TuvUinTM,6448
 nonebot_plugin_l4d2_server/l4_help/icon/介绍.png,sha256=3QC6A38QC-7gDBxmtQSQdbsz7hsefU5LL-oZmJ41zTk,3806
 nonebot_plugin_l4d2_server/l4_help/icon/任务.png,sha256=nyZ4_kM21ZO95nwanCFnUfCGX-PkmJXYQf9OrJVKomY,3782
@@ -88,12 +88,12 @@ nonebot_plugin_l4d2_server/l4_image/model.py,sha256=FGsCvf_BKbRNJUVy6I5BKnArMY-3
 nonebot_plugin_l4d2_server/l4_image/vtfs.py,sha256=He_7zzEIOip8MXP55TS7aWPbzo6ac0wPf602nN3GWZM,1461
 nonebot_plugin_l4d2_server/l4_local/__init__.py,sha256=nz9KUxmuvRrryHakQQ4B30oC9jeGWZ3sON1tCKb-lS0,3603
 nonebot_plugin_l4d2_server/l4_local/file.py,sha256=hew1Y8kV3uSZvUGplmi09EGKC89-sUJWsWV7SCEstI8,3067
-nonebot_plugin_l4d2_server/l4_request/__init__.py,sha256=FRYBGRM30VoImQqAu3k90r82qkeo8wPjR93t6WLx7nk,7144
-nonebot_plugin_l4d2_server/l4_request/draw_msg.py,sha256=WjV2eEVVxsd4akNKDzVl6aRIegJ5pPbIzqziC0vBRmM,2697
+nonebot_plugin_l4d2_server/l4_request/__init__.py,sha256=ukb90pROfHtLbIRSya5pRAGSpzB9Bb5gPi3kAH2-41Y,9588
+nonebot_plugin_l4d2_server/l4_request/draw_msg.py,sha256=efmlEBqbbOozf50InPNqONGIZ0D2hI4xAGPDROIcHBY,2883
 nonebot_plugin_l4d2_server/l4_request/utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nonebot_plugin_l4d2_server/utils/api/api.py,sha256=auvDicCEKwvnm6EJYeCxCtugFby61K-zAmmaRWWEwtM,296
 nonebot_plugin_l4d2_server/utils/api/models.py,sha256=EKAAM5RsFK-hV-a80tc4r35ToNRhnCWVuQ-7imwBjwE,2386
 nonebot_plugin_l4d2_server/utils/api/request.py,sha256=hugBaPBK-gUr5Xemyk7dSHP1JlzYrEZcXPinkNX0AuU,14987
 nonebot_plugin_l4d2_server/utils/database/models.py,sha256=SLdcgwsn39r_ZkcBoqf4MLX1EfpCOjGBwWcR16u9Bqo,454
 nonebot_plugin_l4d2_server/utils/utils.py,sha256=C-QzwtUCbq7QXmHplpmo3OTKbRztE1W7V-IywvufDl0,5971
-nonebot_plugin_l4d2_server-1.0.2.dist-info/RECORD,,
+nonebot_plugin_l4d2_server-1.0.3.dist-info/RECORD,,