nonebot-plugin-l4d2-server 1.0.6__py3-none-any.whl → 1.0.8__py3-none-any.whl

nonebot_plugin_l4d2_server/__main__.py

@@ -37,10 +37,12 @@ from .l4_request import (
     get_ip_server,
     get_server_detail,
     reload_ip,
+    server_find,
     tj_request,
 )
 from .utils.api.request import L4API
 from .utils.api.utils import out_msg_out
+from .utils.utils import split_maohao
 
 if TYPE_CHECKING:
     from .utils.api.models import OutServer
@@ -133,21 +135,30 @@ async def _(
     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: List[OutServer] = await server_find(is_img=False)  # type: ignore
+        logger.info(out)
+        logger.info(type(out))
         out_msg = "未找到玩家"
         for one in out:
+            logger.info(one)
             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=group, is_img=False)  # type: ignore
+        out: List[OutServer] = await server_find(command=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 config.l4_connect and isinstance(out_msg, bytes):
+                        out_msg = UniMessage.image(raw=out_msg) + UniMessage.text(
+                            f"\nconnect {one['host']}:{one['port']}",
+                        )
+                    else:
+                        out_msg = UniMessage.text(out_msg)
 
     return await out_msg_out(out_msg)
 
@@ -161,7 +172,13 @@ async def _():
 async def _(args: Message = CommandArg()):
     ip: Optional[str] = args.extract_plain_text()
     if ip is not None:
-        await out_msg_out(await get_ip_server(ip), is_connect=config.l4_image)
+        host, port = split_maohao(ip)
+        await out_msg_out(
+            await get_ip_server(ip),
+            is_connect=config.l4_connect,
+            host=host,
+            port=port,
+        )
 
 
 @l4_reload.handle()

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.6"
+__version__ = "1.0.8"
 TEXT_PATH = Path(__file__).parent / "texture2d"
 HELP_DATA = Path(__file__).parent / "Help.json"
 

nonebot_plugin_l4d2_server/l4_request/__init__.py

@@ -30,32 +30,32 @@ ALLHOST: Dict[str, List[NserverOut]] = {}
 COMMAND = set()
 
 
-async def get_all_server_detail():
+async def get_all_server_detail() -> str:
     """
     获取所有服务器的详细信息。
 
-    Args:
-        无
-
     Returns:
         str: 包含所有服务器详细信息的字符串。
-
     """
     out_list: List[AllServer] = []
     for group in ALLHOST:
         msg_list = await get_group_detail(group)
-        if msg_list is None:
+        if not msg_list:
             continue
-        active_server = 0
-        max_server = 0
-        active_player = 0
-        max_player = 0
-        for index, msg in enumerate(msg_list):
-            max_server = index + 1
-            if msg["server"].max_players != 0:
-                active_server += 1
-                active_player += msg["server"].player_count
-                max_player += msg["server"].max_players
+
+        active_server = sum(1 for msg in msg_list if msg["server"].max_players != 0)
+        max_server = len(msg_list)
+        active_player = sum(
+            msg["server"].player_count
+            for msg in msg_list
+            if msg["server"].max_players != 0
+        )
+        max_player = sum(
+            msg["server"].max_players
+            for msg in msg_list
+            if msg["server"].max_players != 0
+        )
+
         data = {
             "command": group,
             "active_server": active_server,
@@ -65,14 +65,12 @@ async def get_all_server_detail():
         }
         out_list.append(cast(AllServer, data))
 
-    # to do作图，先用文字凑合
-    out_msg = ""
-    for one in out_list:
-        if one["max_player"]:
-            out_msg += f"{one['command']} | 服务器{one['active_server']}/{one['max_server']} | 玩家{one['active_player']}/{one['max_player']}\n"
-        else:
-            continue
-    return out_msg
+    # 输出服务器信息文本
+    return "\n".join(
+        f"{one['command']} | 服务器{one['active_server']}/{one['max_server']} | 玩家{one['active_player']}/{one['max_player']}"
+        for one in out_list
+        if one["max_player"]
+    )
 
 
 async def get_server_detail(
@@ -87,13 +85,10 @@ async def get_server_detail(
         command (str): 服务器组名。
         _id (Optional[str], optional): 服务器ID。默认为None。
         is_img (bool, optional): 是否返回图片格式的信息。默认为True。
-        return_host_port (bool, optional): 是否返回host和port值。默认为False。
 
     Returns:
-        Union[bytes, str, None, Tuple[str, int]]:
-            如果return_host_port为True且_id不为None，返回(host, port)元组；
-            否则返回服务器详细信息(图片格式返回bytes，文本格式返回str)；
-            未找到服务器组返回None。
+        Union[UniMessage, None]:
+            返回服务器详细信息（图片或文本格式），未找到服务器组或服务器时返回None。
     """
     server_json = _get_server_json(command, ALLHOST)
     logger.info(server_json)
@@ -101,7 +96,7 @@ async def get_server_detail(
         logger.warning("未找到这个组")
         return None
 
-    # 输出组服务器
+    # 输出组服务器信息
     if _id is None:
         return await _handle_group_info(server_json, command, is_img)
 
@@ -213,3 +208,33 @@ async def tj_request(command: str = "云", tj="tj"):
     except Exception as e:
         logger.error(f"tj_request error: {e}")
         return "获取服务器信息时出错"
+
+
+async def server_find(
+    command: str = "云",
+    _id: Optional[str] = None,
+    is_img: bool = True,
+):
+    server_json = _get_server_json(command, ALLHOST)
+    logger.info(server_json)
+    if server_json is None:
+        logger.warning("未找到这个组")
+        return None
+
+    # 输出组服务器信息
+    if _id is None:
+        return await _handle_group_info(server_json, command, is_img)
+
+    _ip = await get_single_server_info(server_json, _id)
+    if _ip is None:
+        logger.warning("未找到这个服务器")
+        return None
+
+    out_msg = await _handle_single_server(server_json, _id, is_img)
+    if isinstance(out_msg, bytes):
+        return UniMessage.image(raw=out_msg) + UniMessage.text(
+            f"connect {_ip[0]}:{_ip[1]}",
+        )
+    if isinstance(out_msg, str):
+        return UniMessage.text(out_msg)
+    return None

nonebot_plugin_l4d2_server/l4_request/utils.py

@@ -34,7 +34,7 @@ async def _handle_group_info(
     server_json: list,
     command: str,
     is_img: bool,
-) -> Union[bytes, str, None]:
+):
     """
     处理服务器组信息请求
 
@@ -44,13 +44,13 @@ async def _handle_group_info(
         is_img (bool): 是否返回图片格式
 
     Returns:
-        Union[bytes, str, None]: 图片格式返回bytes，否则返回服务器列表
+        Union[bytes, list, None]: 图片格式返回bytes，否则返回服务器列表
     """
     logger.info(f"正在请求组服务器信息 {command}")
     server_dict = await get_much_server(server_json, command)
     if is_img:
         return await msg_to_image(server_dict)
-    return str(server_dict)
+    return server_dict
 
 
 async def get_single_server_info(

nonebot_plugin_l4d2_server/utils/api/request.py

@@ -313,98 +313,101 @@ class L4D2Api:
         )
         if tbody is None:
             return None
-        kill_tag = cast(BeautifulSoup, tbody).find(
+
+        def get_table_dict(table, keys):
+            trs = table.select("tr")
+            return {
+                key: trs[i].select("td")[1].text.strip() for i, key in enumerate(keys)
+            }
+
+        kill_tag = cast(Tag, tbody).find(
             "div",
             class_="card-body worldmap d-flex flex-column justify-content-center text-center",
         )
 
-        tbody_tags = tbody.find_all(
-            "table",
-            class_="table content-table-noborder text-left",
-        )
+        tbody_tags = []
+        if isinstance(tbody, Tag):
+            tbody_tags = tbody.find_all(
+                "table",
+                class_="table content-table-noborder text-left",
+            )
+        if len(tbody_tags) < 6:
+            return None
+
+        info_keys = ["name", "avatar", "steamid", "playtime", "lasttime"]
+        detail_keys = [
+            "rank",
+            "source",
+            "avg_source",
+            "kills",
+            "kills_people",
+            "headshots",
+            "avg_headshots",
+            "map_play",
+        ]
+        error_keys = [
+            "mistake_shout",
+            "kill_friend",
+            "down_friend",
+            "abandon_friend",
+            "put_into",
+            "agitate_witch",
+        ]
+        inf_avg_keys = [
+            "avg_smoker",
+            "avg_boomer",
+            "avg_hunter",
+            "avg_charger",
+            "avg_spitter",
+            "avg_jockey",
+            "avg_tank",
+        ]
+        sur_keys = [
+            "map_clear",
+            "prefect_into",
+            "get_oil",
+            "ammo_arrange",
+            "adrenaline_give",
+            "pills_give",
+            "first_aid_give",
+            "friend_up",
+            "diss_friend",
+            "save_friend",
+            "protect_friend",
+            "pro_from_smoker",
+            "pro_from_hunter",
+            "pro_from_charger",
+            "pro_from_jockey",
+            "melee_charge",
+            "tank_kill",
+            "witch_instantly_kill",
+        ]
+        inf_keys = [
+            "sur_ace",
+            "sur_down",
+            "boommer_hit",
+            "hunter_prefect",
+            "hunter_success",
+            "tank_damage",
+            "charger_multiple",
+        ]
+
+        info_dict = get_table_dict(tbody_tags[0], info_keys)
+        detail_dict = get_table_dict(tbody_tags[1], detail_keys)
+        error_dict = get_table_dict(tbody_tags[2], error_keys)
+        inf_avg_dict = get_table_dict(tbody_tags[3], inf_avg_keys)
+        sur_dict = get_table_dict(tbody_tags[4], sur_keys)
+        inf_dict = get_table_dict(tbody_tags[5], inf_keys)
 
-        info_tag = tbody_tags[0]
-        detail_tag = tbody_tags[1]
-        error_tag = tbody_tags[2]
-        inf_avg_tag = tbody_tags[3]
-        sur_tag = tbody_tags[4]
-        inf_tag = tbody_tags[5]
-
-        info_tr = info_tag.select("tr")
-        info_dict = {
-            "name": info_tr[0].select("td")[1].text.strip(),
-            "avatar": info_tr[1].select("td")[1].text.strip(),
-            "steamid": info_tr[2].select("td")[1].text.strip(),
-            "playtime": info_tr[3].select("td")[1].text.strip(),
-            "lasttime": info_tr[4].select("td")[1].text.strip(),
-        }
-        detail_tag = {
-            "rank": detail_tag.select("tr")[0].select("td")[1].text.strip(),
-            "source": detail_tag.select("tr")[1].select("td")[1].text.strip(),
-            "avg_source": detail_tag.select("tr")[2].select("td")[1].text.strip(),
-            "kills": detail_tag.select("tr")[3].select("td")[1].text.strip(),
-            "kills_people": detail_tag.select("tr")[4].select("td")[1].text.strip(),
-            "headshots": detail_tag.select("tr")[5].select("td")[1].text.strip(),
-            "avg_headshots": detail_tag.select("tr")[6].select("td")[1].text.strip(),
-            "map_play": detail_tag.select("tr")[7].select("td")[1].text.strip(),
-        }
-        error_tag = {
-            "mistake_shout": error_tag.select("tr")[0].select("td")[1].text.strip(),
-            "kill_friend": error_tag.select("tr")[1].select("td")[1].text.strip(),
-            "down_friend": error_tag.select("tr")[2].select("td")[1].text.strip(),
-            "abandon_friend": error_tag.select("tr")[3].select("td")[1].text.strip(),
-            "put_into": error_tag.select("tr")[4].select("td")[1].text.strip(),
-            "agitate_witch": error_tag.select("tr")[5].select("td")[1].text.strip(),
-        }
-        inf_avg_dict = {
-            "avg_smoker": inf_avg_tag.select("tr")[0].select("td")[1].text.strip(),
-            "avg_boomer": inf_avg_tag.select("tr")[1].select("td")[1].text.strip(),
-            "avg_hunter": inf_avg_tag.select("tr")[2].select("td")[1].text.strip(),
-            "avg_charger": inf_avg_tag.select("tr")[3].select("td")[1].text.strip(),
-            "avg_spitter": inf_avg_tag.select("tr")[4].select("td")[1].text.strip(),
-            "avg_jockey": inf_avg_tag.select("tr")[5].select("td")[1].text.strip(),
-            "avg_tank": inf_avg_tag.select("tr")[6].select("td")[1].text.strip(),
-        }
-        sur_dict = {
-            "map_clear": sur_tag.select("tr")[0].select("td")[1].text.strip(),
-            "prefect_into": sur_tag.select("tr")[1].select("td")[1].text.strip(),
-            "get_oil": sur_tag.select("tr")[2].select("td")[1].text.strip(),
-            "ammo_arrange": sur_tag.select("tr")[3].select("td")[1].text.strip(),
-            "adrenaline_give": sur_tag.select("tr")[4].select("td")[1].text.strip(),
-            "pills_give": sur_tag.select("tr")[5].select("td")[1].text.strip(),
-            "first_aid_give": sur_tag.select("tr")[6].select("td")[1].text.strip(),
-            "friend_up": sur_tag.select("tr")[7].select("td")[1].text.strip(),
-            "diss_friend": sur_tag.select("tr")[8].select("td")[1].text.strip(),
-            "save_friend": sur_tag.select("tr")[9].select("td")[1].text.strip(),
-            "protect_friend": sur_tag.select("tr")[10].select("td")[1].text.strip(),
-            "pro_from_smoker": sur_tag.select("tr")[11].select("td")[1].text.strip(),
-            "pro_from_hunter": sur_tag.select("tr")[12].select("td")[1].text.strip(),
-            "pro_from_charger": sur_tag.select("tr")[13].select("td")[1].text.strip(),
-            "pro_from_jockey": sur_tag.select("tr")[14].select("td")[1].text.strip(),
-            "melee_charge": sur_tag.select("tr")[15].select("td")[1].text.strip(),
-            "tank_kill": sur_tag.select("tr")[16].select("td")[1].text.strip(),
-            "witch_instantly_kill": sur_tag.select("tr")[17]
-            .select("td")[1]
-            .text.strip(),
-        }
-        inf_dict = {
-            "sur_ace": inf_tag.select("tr")[0].select("td")[1].text.strip(),
-            "sur_down": inf_tag.select("tr")[1].select("td")[1].text.strip(),
-            "boommer_hit": inf_tag.select("tr")[2].select("td")[1].text.strip(),
-            "hunter_prefect": inf_tag.select("tr")[3].select("td")[1].text.strip(),
-            "hunter_success": inf_tag.select("tr")[4].select("td")[1].text.strip(),
-            "tank_damage": inf_tag.select("tr")[5].select("td")[1].text.strip(),
-            "charger_multiple": inf_tag.select("tr")[6].select("td")[1].text.strip(),
-        }
         info_dict = cast(AnnePlayerInfo, info_dict)
-        detail_dict = cast(AnnePlayerDetail, detail_tag)
-        error_dict = cast(AnnePlayerError, error_tag)
+        detail_dict = cast(AnnePlayerDetail, detail_dict)
+        error_dict = cast(AnnePlayerError, error_dict)
         inf_avg_dict = cast(AnnePlayerInfAvg, inf_avg_dict)
         sur_dict = cast(AnnePlayerSur, sur_dict)
         inf_dict = cast(AnnePlayerInf, inf_dict)
 
         out_dict = {
-            "kill_msg": kill_tag.text if kill_tag is not None else "",
+            "kill_msg": kill_tag.text.strip() if kill_tag else "",
             "info": info_dict,
             "detail": detail_dict,
             "inf_avg": inf_avg_dict,

nonebot_plugin_l4d2_server/utils/api/utils.py

@@ -24,7 +24,7 @@ async def out_msg_out(
         await UniMessage.text(msg).finish()
     if is_connect:
         out = UniMessage.image(raw=msg) + UniMessage.text(
-            f"连接到服务器: {host}:{port}",
+            f"connect: {host}:{port}",
         )
         return await out.finish()
     return await UniMessage.image(raw=msg).finish()

{nonebot_plugin_l4d2_server-1.0.6.dist-info → nonebot_plugin_l4d2_server-1.0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-l4d2-server
-Version: 1.0.6
+Version: 1.0.8
 Summary: L4D2 server related operations plugin for NoneBot2
 Keywords: steam,game,l4d2,nonebot2,plugin
 Author-Email: Agnes_Digital <Z735803792@163.com>

{nonebot_plugin_l4d2_server-1.0.6.dist-info → nonebot_plugin_l4d2_server-1.0.8.dist-info}/RECORD

@@ -1,13 +1,13 @@
-nonebot_plugin_l4d2_server-1.0.6.dist-info/METADATA,sha256=TrdHugLvUGD1ocHgQilSDAkjsJePWYm38sMg4IOQMEc,6759
-nonebot_plugin_l4d2_server-1.0.6.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-nonebot_plugin_l4d2_server-1.0.6.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-nonebot_plugin_l4d2_server-1.0.6.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+nonebot_plugin_l4d2_server-1.0.8.dist-info/METADATA,sha256=oxEFgnJzb8aG9Ouh5q6sjIMpF8TabEOpauUXAwyPxxU,6759
+nonebot_plugin_l4d2_server-1.0.8.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+nonebot_plugin_l4d2_server-1.0.8.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+nonebot_plugin_l4d2_server-1.0.8.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
 nonebot_plugin_l4d2_server/__init__.py,sha256=xzhXyprPmoTTjpfyqYlMweC4umuLsm8MERA1ZTqCyYc,1661
-nonebot_plugin_l4d2_server/__main__.py,sha256=2o6EyUyig3iPqcKA2jQM5nxGS_MtTyf-4yDXjr7ga9w,9923
+nonebot_plugin_l4d2_server/__main__.py,sha256=Ysx4PkR3kIuSsKM6h9kmPBuylxXsuLjtrOdT1LbQT9A,10511
 nonebot_plugin_l4d2_server/config.py,sha256=t4BYygrrLTcsl9oBnyce0-tDhMCCkMrkEPs4DX2t4KI,2682
 nonebot_plugin_l4d2_server/data/font/loli.ttf,sha256=Yrh-RPoCrn1-NG94DR0x20ASXYUt8g3Ep6BCt3CdOFk,11125812
 nonebot_plugin_l4d2_server/l4_help/Help.json,sha256=D0YmZYGW-imC7nVebkQ0_eODiqevQhL9aKj-cyBaqDY,1704
-nonebot_plugin_l4d2_server/l4_help/__init__.py,sha256=xE9UfwgwJPg3bcYwPuGqtkSOkUFkAi9kNMG8zGDheas,1479
+nonebot_plugin_l4d2_server/l4_help/__init__.py,sha256=BsrZHgZXEZ0rXNb2mQJF7o3kwDeb05vAXoYwl6znMCc,1479
 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
@@ -85,13 +85,13 @@ 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=B4E30jX4733M4eNCJvIQhsN4M0nlxLezSXMSwUYLRIk,3581
 nonebot_plugin_l4d2_server/l4_local/file.py,sha256=hew1Y8kV3uSZvUGplmi09EGKC89-sUJWsWV7SCEstI8,3067
-nonebot_plugin_l4d2_server/l4_request/__init__.py,sha256=WXIIq8LZjAFl_DHs94mI-QfgPj2_hIb6R1khVx1giNY,6881
+nonebot_plugin_l4d2_server/l4_request/__init__.py,sha256=OrwOyucW-DyKVDk8LRA24h0gQIyzmhWbG73DG3O2JgM,7499
 nonebot_plugin_l4d2_server/l4_request/draw_msg.py,sha256=KpSfl6ZLaxPbax0SgO07niJloeMARuQJ2T-F_XeH6uQ,8108
-nonebot_plugin_l4d2_server/l4_request/utils.py,sha256=byhwj7JSI5B_42egwQOoMy15AUbtET0dTGRd8HvGfqU,5197
+nonebot_plugin_l4d2_server/l4_request/utils.py,sha256=7E_Cqp4UcKjrnGBn0gbs5nGiC37RAKmUBJx7qEaXi6Q,5166
 nonebot_plugin_l4d2_server/utils/api/api.py,sha256=auvDicCEKwvnm6EJYeCxCtugFby61K-zAmmaRWWEwtM,296
 nonebot_plugin_l4d2_server/utils/api/models.py,sha256=p-hoxPHwadTaMRb2hqwfbaQ3pvJySrV8VbBmhA0Oi-M,2391
-nonebot_plugin_l4d2_server/utils/api/request.py,sha256=9cipv2M7nar3kmpmmEjgtzBQKan18uup1osmsVMYs10,15969
-nonebot_plugin_l4d2_server/utils/api/utils.py,sha256=AnI9vwe3hqyh3GR4Xg2oOsVaXHo1xvnCCsVpGaIbpZ8,773
+nonebot_plugin_l4d2_server/utils/api/request.py,sha256=JGAhMgPgmy2Z2w7w3GVlUGKBmxlaTTDD3bq1T2dhHIE,13567
+nonebot_plugin_l4d2_server/utils/api/utils.py,sha256=rdrFK3VKP59KfNX-C8v0Q_IV3tBLm02Wo9axLTQQ87Y,762
 nonebot_plugin_l4d2_server/utils/database/models.py,sha256=SLdcgwsn39r_ZkcBoqf4MLX1EfpCOjGBwWcR16u9Bqo,454
 nonebot_plugin_l4d2_server/utils/utils.py,sha256=TD3cUCxmmj2GPmK1sQwP7NtkIXNO2FpuXjymaUqBDYo,6141
-nonebot_plugin_l4d2_server-1.0.6.dist-info/RECORD,,
+nonebot_plugin_l4d2_server-1.0.8.dist-info/RECORD,,