nonebot-plugin-l4d2-server 1.0.1__tar.gz → 1.0.2__tar.gz

{nonebot_plugin_l4d2_server-1.0.1 → nonebot_plugin_l4d2_server-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-l4d2-server
-Version: 1.0.1
+Version: 1.0.2
 Summary: L4D2 server related operations plugin for NoneBot2
 Keywords: steam,game,l4d2,nonebot2,plugin
 Author-Email: Agnes_Digital <Z735803792@163.com>
@@ -25,12 +25,15 @@ Requires-Dist: jinja2>=3.0.0
 Requires-Dist: srctools>=2.3.9
 Requires-Dist: httpx<0.24.1,>=0.22.0
 Requires-Dist: msgspec>=0.18.0
-Requires-Dist: python-a2s>=1.3.0
+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: beautifulsoup4>=4.12.3
+Requires-Dist: rarfile>=4.2
+Requires-Dist: pyunpack>=0.3
+Requires-Dist: aiofiles>=24.1.0
 Description-Content-Type: text/markdown
 
 <!-- markdownlint-disable MD026 MD031 MD033 MD036 MD041 MD046 MD051 -->

{nonebot_plugin_l4d2_server-1.0.1 → nonebot_plugin_l4d2_server-1.0.2}/nonebot_plugin_l4d2_server/__main__.py

@@ -18,6 +18,7 @@
 from pathlib import Path
 from typing import TYPE_CHECKING, List, Optional
 
+import aiofiles
 import ujson as json
 from nonebot.adapters import Message
 from nonebot.log import logger
@@ -35,7 +36,7 @@ from .l4_request import (
     get_ip_server,
     get_server_detail,
     reload_ip,
-    tj_request
+    tj_request,
 )
 from .utils.api.request import L4API
 
@@ -54,6 +55,8 @@ 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"
+
 
 @l4_help.handle()
 async def _(matcher: Matcher):
@@ -149,18 +152,18 @@ async def _(args: Message = CommandArg()):
             logger.info(f"重载{tag}的ip")
             await L4API.get_sourceban(tag, url)
         await UniMessage.text("重载ip完成").finish()
-        
+
 
 l4_add_ban = on_command("l4addban", aliases={"l4添加ban"})
+
+
 @l4_add_ban.handle()
 async def _(args: Message = CommandArg()):
     arg = args.extract_plain_text().strip().split(" ")
-    
+
     if len(arg) != 2:
         await UniMessage.text("请在命令后增加响应指令名和网址").finish()
-    
-    config_path = Path(config.l4_path) / "config.json"
-    
+
     if not config_path.is_file():
         config_data = {}
     else:
@@ -169,61 +172,70 @@ async def _(args: Message = CommandArg()):
                 config_data = json.load(f)
         except (json.JSONDecodeError, FileNotFoundError):
             config_data = {}
-    
+
     config_data.update({arg[0]: arg[1]})
-    
+
     try:
         with config_path.open("w") as f:
             json.dump(config_data, f, ensure_ascii=False, indent=4)
     except IOError as e:
         await UniMessage.text(f"文件写入失败: {e}").finish()
-    
+
     await L4API.get_sourceban(arg[0], arg[1])
     await UniMessage.text(f"添加成功\n组名: {arg[0]}\n网址: {arg[1]}").finish()
-    
+
 
 l4_del_ban = on_command("l4delban", aliases={"l4删除ban", "l4移除ban"})
+
+
 @l4_del_ban.handle()
-async def _(args: Message = CommandArg()):    
+async def _(args: Message = CommandArg()):
     arg = args.extract_plain_text().strip().split(" ")
-    if  len(arg) not in [1,2]:
+    if len(arg) not in [1, 2]:
         await UniMessage.text("请在命令后增加响应指令名或者带响应网址").finish()
     elif len(arg) == 1:
         if not Path(Path(config.l4_path) / "config.json").is_file():
             await UniMessage.text("没有添加过组名").finish()
         else:
-            with (Path(config.l4_path) / "config.json").open("r", encoding="utf-8") as f:
+            with (Path(config.l4_path) / "config.json").open(
+                "r",
+                encoding="utf-8",
+            ) as f:
                 content = f.read().strip()
-                config_data = json.loads(content)            
+                config_data = json.loads(content)
             if arg[0] not in config_data:
                 await UniMessage.text("没有添加过这个组").finish()
             else:
                 del config_data[arg[0]]
-                with Path(Path(config.l4_path) / "config.json").open("w") as f:
-                    json.dump(config_data, f,ensure_ascii=False,indent=4)
-                await UniMessage.text(f"删除成功，组名:{arg[0]}").finish()
+            async with aiofiles.open(config_path, "w", encoding="utf-8") as f:
+                json.dump(config_data, f, ensure_ascii=False, indent=4)
+            await UniMessage.text(f"删除成功，组名:{arg[0]}").finish()
     elif len(arg) == 2:
         if not Path(Path(config.l4_path) / "config.json").is_file():
             await UniMessage.text("没有添加过组名").finish()
         else:
-            with (Path(config.l4_path) / "config.json").open("r", encoding="utf-8") as f:
+            with (Path(config.l4_path) / "config.json").open(
+                "r",
+                encoding="utf-8",
+            ) as f:
                 content = f.read().strip()
                 config_datas = json.loads(content)
             if arg[0] not in config_datas:
                 await UniMessage.text("没有添加过这个组").finish()
             else:
                 config_datas[arg[0]] = arg[1]
-                with Path(Path(config.l4_path) / "config.json").open("w") as f:
-                    json.dump(config_datas, f,ensure_ascii=False,indent=4)
+                async with aiofiles.open(config_path, "w", encoding="utf-8") as f:
+                    json.dump(config_datas, f, ensure_ascii=False, indent=4)
                 await UniMessage.text(f"修改成功，组名:{arg[0]},网址:{arg[1]}").finish()
-                
-                
+
+
 @ld_tj.handle()
 async def _(matcher: Matcher):
     await matcher.send("正在寻找牢房信息")
-    await matcher.finish(await tj_request("云","tj"))
-    
+    await matcher.finish(await tj_request("云", "tj"))
+
+
 @ld_zl.handle()
 async def _(matcher: Matcher):
     await matcher.send("正在寻找牢房信息")
-    await matcher.finish(await tj_request("云","zl"))
+    await matcher.finish(await tj_request("云", "zl"))

{nonebot_plugin_l4d2_server-1.0.1 → nonebot_plugin_l4d2_server-1.0.2}/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.1"
+__version__ = "1.0.2"
 TEXT_PATH = Path(__file__).parent / "texture2d"
 HELP_DATA = Path(__file__).parent / "Help.json"
 

{nonebot_plugin_l4d2_server-1.0.1 → nonebot_plugin_l4d2_server-1.0.2}/nonebot_plugin_l4d2_server/l4_local/__init__.py

@@ -13,7 +13,9 @@ from .file import updown_l4d2_vpk
 try:
     vpk_path = config.l4_local[map_index]
 except IndexError:
-    logger.warning("未填写本地服务器路径,如果想要使用本地服务器功能,请填写本地服务器路径")
+    logger.warning(
+        "未填写本地服务器路径,如果想要使用本地服务器功能,请填写本地服务器路径",
+    )
     vpk_path = ""
 
 local_path_list = config.l4_local

{nonebot_plugin_l4d2_server-1.0.1 → nonebot_plugin_l4d2_server-1.0.2}/nonebot_plugin_l4d2_server/l4_request/__init__.py

@@ -2,16 +2,19 @@ import random
 from typing import Dict, List, Optional, cast
 
 from nonebot.log import logger
+
 from ..config import server_all_path
 from ..l4_image import msg_to_image
 from ..utils.api.models import AllServer, NserverOut, OutServer
-from ..utils.utils import split_maohao
-from .draw_msg import draw_one_ip, get_much_server, convert_duration
 from ..utils.api.request import L4API
+from ..utils.utils import split_maohao
+from .draw_msg import convert_duration, draw_one_ip, get_much_server
+
 try:
     import ujson as json
 except ImportError:
     import json
+
 from ..config import config
 
 # 获取全部服务器信息
@@ -47,7 +50,10 @@ async def get_all_server_detail():
     # to do作图，先用文字凑合
     out_msg = ""
     for one in out_list:
-        out_msg += f"{one['command']} | 服务器{one['active_server']}/{one['max_server']} | 玩家{one['active_player']}/{one['max_player']}\n"
+        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
 
 
@@ -142,12 +148,13 @@ def reload_ip():
             if item.name.endswith("txt"):
                 """to do"""
 
-async def tj_request(command: str = "云",tj ="tj"):
+
+async def tj_request(command: str = "云", tj="tj"):
     server_json = ALLHOST.get(command)
     logger.info(server_json)
     if server_json is None:
         logger.warning("未找到这个组")
-        return None    
+        return None
     # 返回单个
     logger.info("正在anne电信服务器信息")
     player_msg = ""
@@ -156,27 +163,24 @@ async def tj_request(command: str = "云",tj ="tj"):
         ser_list = await L4API.a2s_info([(i["host"], i["port"])], is_player=True)
         one_server = ser_list[0][0]
         one_player = ser_list[0][1]
-        
+
         # 判断坐牢条件
-        if tj == "tj":
-            if "普通药役" 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":
-            if "普通药役" in one_server.map_name and len(one_player) <= 4:
+        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]

{nonebot_plugin_l4d2_server-1.0.1 → nonebot_plugin_l4d2_server-1.0.2}/nonebot_plugin_l4d2_server/l4_request/draw_msg.py

@@ -31,7 +31,7 @@ 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)
+                # xing = "*" * (name_leg - 2)
                 name = f"{player.name[0]}xing{player.name[-1]}"
             else:
                 name = player.name

{nonebot_plugin_l4d2_server-1.0.1 → nonebot_plugin_l4d2_server-1.0.2}/nonebot_plugin_l4d2_server/utils/api/request.py

@@ -6,6 +6,7 @@ from pathlib import Path
 from typing import Any, Dict, List, Literal, Optional, Tuple, cast
 
 import a2s
+import aiofiles
 import ujson as js
 import ujson as json
 from bs4 import BeautifulSoup
@@ -28,6 +29,8 @@ from .models import (
     SourceBansInfo,
 )
 
+config_path = Path(config.l4_path) / "config.json"
+
 
 class L4D2Api:
     ssl_verify = False
@@ -76,11 +79,11 @@ class L4D2Api:
         is_server: bool,
         is_player: bool,
     ):
-        server: a2s.SourceInfo = a2s.SourceInfo()
         play: List[a2s.Player] = []
         if is_server:
             try:
-                server = await a2s.ainfo(ip)
+                server: a2s.SourceInfo = await a2s.ainfo(ip, timeout=3, encoding="utf8")
+
                 if server is not None:
                     server.steam_id = index
 
@@ -89,6 +92,25 @@ class L4D2Api:
                 ConnectionRefusedError,
                 socket.gaierror,
             ):
+                server: a2s.SourceInfo = a2s.SourceInfo(
+                    protocol=0,
+                    server_name="服务器无响应",
+                    map_name="无",
+                    folder="m",
+                    game="L4D2",
+                    app_id=114514,
+                    steam_id=index,
+                    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.steam_id = index
                 server.player_count = 0
                 server.max_players = 0
@@ -103,7 +125,7 @@ class L4D2Api:
                 ConnectionRefusedError,
                 socket.gaierror,
             ):
-                play = await a2s.aplayers(ip)
+                play = await a2s.aplayers(ip, timeout=3, encoding="utf8")
         return server, play
 
     async def _server_request(
@@ -158,7 +180,7 @@ class L4D2Api:
             html_content = resp.content
             return BeautifulSoup(html_content, "lxml")
 
-    async def get_sourceban(self, tag:str = "云", url: str = anne_ban):
+    async def get_sourceban(self, tag: str = "云", url: str = anne_ban):
         """从sourceban++获取服务器列表，目前未做名称处理"""
         if not (url.startswith(("http://", "https://"))):
             url = "http://" + url  # 默认添加 http://
@@ -184,23 +206,25 @@ class L4D2Api:
                     )
 
         if not Path(Path(config.l4_path) / "config.json").is_file():
-            with Path(Path(config.l4_path) / "config.json").open("w") as f:
-                f.write("{}")
+            async with aiofiles.open(config_path, "w", encoding="utf-8") as f:
+                await f.write("{}")
         with (Path(config.l4_path) / "config.json").open("r", encoding="utf-8") as f:
             content = f.read().strip()
             ip_json = json.loads(content)
         if tag in ip_json:
             url = ip_json[tag]
-        with (Path(Path(config.l4_path) / f"l4d2/{tag}.json")).open("w") as f:
+        tag_path = Path(Path(config.l4_path) / f"l4d2/{tag}.json")
+
+        async with aiofiles.open(tag_path, "w", encoding="utf-8") as f:
             print(Path(Path(config.l4_path) / f"l4d2/{tag}.json"))
             up_data = {}
             for server in server_list:
                 new_dict = {}
-                new_dict["id"] = int(server.index )+ 1
+                new_dict["id"] = int(server.index) + 1
                 new_dict["ip"] = server.host + ":" + str(server.port)
                 up_data.update(new_dict)
             print(up_data)
-            json.dump(up_data, f)
+            json.dump(up_data, f, ensure_ascii=False, indent=4)
         return server_list
 
     async def get_anne_steamid(self, name: str):

{nonebot_plugin_l4d2_server-1.0.1 → nonebot_plugin_l4d2_server-1.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-l4d2-server"
-version = "1.0.1"
+version = "1.0.2"
 description = "L4D2 server related operations plugin for NoneBot2"
 authors = [
     { name = "Agnes_Digital", email = "Z735803792@163.com" },
@@ -25,12 +25,15 @@ dependencies = [
     "srctools>=2.3.9",
     "httpx>=0.22.0,<0.24.1",
     "msgspec>=0.18.0",
-    "python-a2s>=1.3.0",
+    "python-a2s>=1.4.1",
     "ujson>=5.10.0",
     "lxml>=5.2.2",
     "rcon>=2.1.0",
     "pillow>9",
     "beautifulsoup4>=4.12.3",
+    "rarfile>=4.2",
+    "pyunpack>=0.3",
+    "aiofiles>=24.1.0",
 ]
 classifiers = [
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
@@ -52,7 +55,7 @@ homepage = "https://github.com/Agnes4m/nonebot_plugin_l4d2_server"
 [tool.pdm.build]
 includes = []
 
-[tool.ruff]
+[tool.ruff.lint]
 ignore = [
     "B008",
     "B905",