nonebot-plugin-l4d2-server 1.0.0b1__tar.gz → 1.0.2__tar.gz

{nonebot_plugin_l4d2_server-1.0.0b1 → nonebot_plugin_l4d2_server-1.0.2}/PKG-INFO

@@ -1,9 +1,8 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-l4d2-server
-Version: 1.0.0b1
+Version: 1.0.2
 Summary: L4D2 server related operations plugin for NoneBot2
 Keywords: steam,game,l4d2,nonebot2,plugin
-Home-page: https://github.com/Agnes4m/nonebot_plugin_l4d2_server
 Author-Email: Agnes_Digital <Z735803792@163.com>
 License: GPLv3
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
@@ -13,7 +12,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Operating System :: OS Independent
-Project-URL: Homepage, https://github.com/Agnes4m/nonebot_plugin_l4d2_server
+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: nonebot-plugin-htmlrender>=0.3.0
@@ -26,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 -->
@@ -87,7 +89,6 @@ _✨Nonebot & Left 4 Dead 2 server操作✨_
 
 以下提到的方法 任选**其一** 即可
 
-
 <details open>
 <summary>[推荐] 使用 nb-cli 安装</summary>
 在 nonebot2 项目的根目录下打开命令行, 输入以下指令即可安装
@@ -164,7 +165,7 @@ conda install nonebot-plugin-l4d2-server
     l4_style = "default"
     """图片风格，可选包括以下，默认简洁
     - 暗风格
-    - 孤独摇滚        
+    - 孤独摇滚
     - 电玩像素
     - 缤纷彩虹
 """
@@ -185,7 +186,7 @@ conda install nonebot-plugin-l4d2-server
 - 水果 - html图片优化
 
 - 感谢以下服主大力支持
-  - Michaela's | 机器人功能测试反馈 
+  - Michaela's | 机器人功能测试反馈
   - 东 | 提供docker部署方法等建议 | [电信服anne游戏群](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=6i7r5aJ7Jyg0ejby4rt9GWmFRF53nV1K&authKey=ekMsWepBZPL26%2BfJAG%2F95JD0fhvH39%2BIGVyKOvNlXVDbpIclJlly4kXqukL7JhWR&noverify=0&group_code=883237206)
   - 迷茫 | 催命更新byd
   - ArcPav | 积极反馈bug，提供改进思路

{nonebot_plugin_l4d2_server-1.0.0b1 → nonebot_plugin_l4d2_server-1.0.2}/README.md

@@ -51,7 +51,6 @@ _✨Nonebot & Left 4 Dead 2 server操作✨_
 
 以下提到的方法 任选**其一** 即可
 
-
 <details open>
 <summary>[推荐] 使用 nb-cli 安装</summary>
 在 nonebot2 项目的根目录下打开命令行, 输入以下指令即可安装
@@ -128,7 +127,7 @@ conda install nonebot-plugin-l4d2-server
     l4_style = "default"
     """图片风格，可选包括以下，默认简洁
     - 暗风格
-    - 孤独摇滚        
+    - 孤独摇滚
     - 电玩像素
     - 缤纷彩虹
 """
@@ -149,7 +148,7 @@ conda install nonebot-plugin-l4d2-server
 - 水果 - html图片优化
 
 - 感谢以下服主大力支持
-  - Michaela's | 机器人功能测试反馈 
+  - Michaela's | 机器人功能测试反馈
   - 东 | 提供docker部署方法等建议 | [电信服anne游戏群](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=6i7r5aJ7Jyg0ejby4rt9GWmFRF53nV1K&authKey=ekMsWepBZPL26%2BfJAG%2F95JD0fhvH39%2BIGVyKOvNlXVDbpIclJlly4kXqukL7JhWR&noverify=0&group_code=883237206)
   - 迷茫 | 催命更新byd
   - ArcPav | 积极反馈bug，提供改进思路

{nonebot_plugin_l4d2_server-1.0.0b1 → nonebot_plugin_l4d2_server-1.0.2}/nonebot_plugin_l4d2_server/__main__.py

@@ -15,8 +15,11 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
+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
 from nonebot.matcher import Matcher
@@ -33,6 +36,7 @@ from .l4_request import (
     get_ip_server,
     get_server_detail,
     reload_ip,
+    tj_request,
 )
 from .utils.api.request import L4API
 
@@ -48,6 +52,11 @@ l4_all = on_command("l4all", aliases={"l4全服"})
 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"
+
 
 @l4_help.handle()
 async def _(matcher: Matcher):
@@ -136,6 +145,97 @@ async def _(args: Message = CommandArg()):
     if not arg:
         reload_ip()
         logger.success("重载ip完成")
+        with (Path(config.l4_path) / "config.json").open("r", encoding="utf-8") as f:
+            content = f.read().strip()
+            ip_json = json.loads(content)
+        for tag, url in ip_json.items():
+            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()
+
+    if not config_path.is_file():
+        config_data = {}
     else:
-        print(await L4API.get_sourceban())
+        try:
+            with config_path.open("r") as f:
+                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()):
+    arg = args.extract_plain_text().strip().split(" ")
+    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:
+                content = f.read().strip()
+                config_data = json.loads(content)
+            if arg[0] not in config_data:
+                await UniMessage.text("没有添加过这个组").finish()
+            else:
+                del config_data[arg[0]]
+            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:
+                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]
+                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"))
+
+
+@ld_zl.handle()
+async def _(matcher: Matcher):
+    await matcher.send("正在寻找牢房信息")
+    await matcher.finish(await tj_request("云", "zl"))

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

{nonebot_plugin_l4d2_server-1.0.0b1 → nonebot_plugin_l4d2_server-1.0.2}/nonebot_plugin_l4d2_server/l4_local/__init__.py

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

{nonebot_plugin_l4d2_server-1.0.0b1 → nonebot_plugin_l4d2_server-1.0.2}/nonebot_plugin_l4d2_server/l4_request/__init__.py

@@ -1,3 +1,4 @@
+import random
 from typing import Dict, List, Optional, cast
 
 from nonebot.log import logger
@@ -5,14 +6,16 @@ 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.api.request import L4API
 from ..utils.utils import split_maohao
-from .draw_msg import draw_one_ip, get_much_server
+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
 
 # 获取全部服务器信息
 ALLHOST: Dict[str, List[NserverOut]] = {}
@@ -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
 
 
@@ -141,3 +147,67 @@ def reload_ip():
 
             if item.name.endswith("txt"):
                 """to do"""
+
+
+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
+    # 返回单个
+    logger.info("正在anne电信服务器信息")
+    player_msg = ""
+    right_ip = []
+    for i in server_json:
+        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" 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

{nonebot_plugin_l4d2_server-1.0.0b1 → nonebot_plugin_l4d2_server-1.0.2}/nonebot_plugin_l4d2_server/l4_request/draw_msg.py

@@ -29,8 +29,13 @@ async def draw_one_ip(host: str, port: int):
             soc = "[{:>{}}]".format(player.score, max_score_len)
             chines_dur = await convert_duration(player.duration)
             dur = "{:^{}}".format(chines_dur, max_duration_len)
-
-            player_msg += f"{soc} | {dur} | {player.name} \n"
+            name_leg = len(player.name)
+            if name_leg > 2:
+                # xing = "*" * (name_leg - 2)
+                name = f"{player.name[0]}xing{player.name[-1]}"
+            else:
+                name = player.name
+            player_msg += f"{soc} | {dur} | {name} \n"
     else:
         player_msg = "服务器感觉很安静啊"
 

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

@@ -2,13 +2,18 @@ import asyncio
 import contextlib
 import socket
 from copy import deepcopy
+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
 from httpx import AsyncClient
 
+from ...config import config
+
 # from nonebot.log import logger
 from ..utils import split_maohao
 from .api import AnnePlayerApi, AnneSearchApi, anne_ban
@@ -24,6 +29,8 @@ from .models import (
     SourceBansInfo,
 )
 
+config_path = Path(config.l4_path) / "config.json"
+
 
 class L4D2Api:
     ssl_verify = False
@@ -72,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
 
@@ -85,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
@@ -99,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(
@@ -154,8 +180,10 @@ class L4D2Api:
             html_content = resp.content
             return BeautifulSoup(html_content, "lxml")
 
-    async def get_sourceban(self, 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://
         soup = await self._server_request(
             url=url,
             is_json=False,
@@ -177,6 +205,26 @@ class L4D2Api:
                         SourceBansInfo(index=index, host=host, port=port),
                     )
 
+        if not Path(Path(config.l4_path) / "config.json").is_file():
+            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]
+        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["ip"] = server.host + ":" + str(server.port)
+                up_data.update(new_dict)
+            print(up_data)
+            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.0b1 → nonebot_plugin_l4d2_server-1.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-l4d2-server"
-version = "1.0.0b1"
+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",