📝完善tj/zl/kl功能(仅限云服)

Author: Agnes4m

nonebot_plugin_l4d2_server/__main__.py

@@ -57,9 +57,7 @@
 l4_connect = on_command("connect", aliases={"l4连接"})
 l4_find_player = on_command("l4find", aliases={"l4查找"})
 
-ld_tj = on_command("tj", aliases={"探监"})
-ld_zl = on_command("zl")
-ld_kl = on_command("kl")
+
 config_path = Path(config.l4_path) / "config.json"
 
 
@@ -265,16 +263,25 @@ async def _(args: Message = CommandArg()):
                 await out_msg_out(f"修改成功，组名:{arg[0]},网址:{arg[1]}")
 
 
-@ld_tj.handle()
-async def _(matcher: Matcher):
-    await matcher.send("正在寻找牢房信息")
-    await matcher.finish(await tj_request("云", "tj"))
+if "云" in COMMAND:
+    ld_tj = on_command("tj", aliases={"探监"})
+    ld_zl = on_command("zl")
+    ld_kl = on_command("kl")
+
+    @ld_tj.handle()
+    async def _(matcher: Matcher):
+        await matcher.send("正在寻找牢房信息")
+        await matcher.finish(await tj_request("云", "tj"))
 
+    @ld_zl.handle()
+    async def _(matcher: Matcher):
+        await matcher.send("正在寻找牢房信息")
+        await matcher.finish(await tj_request("云", "zl"))
 
-@ld_zl.handle()
-async def _(matcher: Matcher):
-    await matcher.send("正在寻找牢房信息")
-    await matcher.finish(await tj_request("云", "zl"))
+    @ld_kl.handle()
+    async def _(matcher: Matcher):
+        await matcher.send("正在寻找牢房信息")
+        await matcher.finish(await tj_request("云", "kl"))
 
 
 ## 以下为配置修改

nonebot_plugin_l4d2_server/l4_request/utils.py

@@ -103,7 +103,7 @@ async def _handle_single_server(
 async def _filter_servers(
     servers: list,
     tj_mode: str,
-    map_type: str = "普通药役",
+    map_type: Optional[list[str]] = None,
 ) -> list:
     """筛选符合条件的服务器
     Args:
@@ -113,28 +113,46 @@ async def _filter_servers(
     Returns:
         符合条件的服务器列表
     """
+    if map_type is None:
+        map_type = ["普通药役", "硬核药役"]
     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]
+        logger.info(srv)
+        logger.info(players)
+        if srv.map_name == "无":
+            continue
 
-        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:
+        if tj_mode == "tj" and any(
+            map_type_value in srv.server_name for map_type_value in map_type
+        ):
+            scores = [p.score for p in players[:4]]
+            total_score = sum(scores)
+            part_with_number = srv.server_name.split("[")[1].split("]")[0]
+            t = part_with_number.split("特")[0]
+            logger.info(t)
+            logger.info(total_score)
+            if t.isdigit() and int(t) * 10 < total_score:
                 logger.info(
-                    f"符合TJ条件的服务器: {i['host']}:{i['port']}, 地图: {srv.map_name}, 分数: {score}",
+                    f"符合TJ条件的服务器: {i['host']}:{i['port']}, 地图: {srv.map_name}, 分数: {total_score}",
                 )
                 filtered.append(i)
-        elif tj_mode == "zl" and map_type in srv.map_name and len(players) <= 4:
+        elif tj_mode == "zl" and map_type in srv.server_name and len(players) <= 4:
             logger.info(
                 f"符合ZL条件的服务器: {i['host']}:{i['port']}, 地图: {srv.map_name}, 玩家数: {len(players)}",
             )
             filtered.append(i)
+        elif tj_mode == "kl" and len(players) == 0:
+            logger.info(
+                f"符合KL条件的服务器: {i['host']}:{i['port']}, 地图: {srv.map_name}, 玩家数: {len(players)}",
+            )
+            filtered.append(i)
     return filtered
 
 

nonebot_plugin_l4d2_server/utils/api/request.py

@@ -59,6 +59,49 @@ def safe_find_all(
             return element.find_all(tag, class_=class_)
         return []
 
+    async def a2s_server_info(
+        self,
+        ip: Tuple[str, int],
+    ):
+        try:
+            server = await a2s.ainfo(
+                ip,
+                timeout=3,
+                encoding="utf8",
+            )
+
+        except (
+            asyncio.exceptions.TimeoutError,
+            ConnectionRefusedError,
+            socket.gaierror,
+        ):
+            server = a2s.SourceInfo(
+                protocol=0,
+                server_name="服务器无响应",
+                map_name="无",
+                folder="m",
+                game="L4D2",
+                app_id=114514,
+                steam_id=0,
+                player_count=0,
+                max_players=0,
+                bot_count=0,
+                server_type="w",
+                platform="w",
+                password_protected=False,
+                vac_enabled=False,
+                version="1.0",
+                edf=0,
+                ping=0,
+            )
+            server.player_count = 0
+            server.max_players = 0
+            server.server_name = "服务器无响应"
+            server.map_name = "无"
+            server.folder = "m"
+            server.vac_enabled = False
+        return server
+
     async def a2s_info(
         self,
         ip_list: List[Tuple[str, int]],
@@ -145,6 +188,7 @@ async def process_message(
                 server.map_name = "无"
                 server.folder = "m"
                 server.vac_enabled = False
+                is_player = False
 
         if is_player:
             with contextlib.suppress(
@@ -153,6 +197,8 @@ async def process_message(
                 socket.gaierror,
             ):
                 play = await a2s.aplayers(ip, timeout=3, encoding="utf8")
+        else:
+            play = []
         return server, play
 
     async def _server_request(