:update 1.2.0

Author: Agnes4m

data/L4D2/l4d2.json

@@ -18,7 +18,6 @@
 from pathlib import Path
 from typing import List, Optional, cast
 
-import aiofiles
 import ujson as json
 from nonebot import get_driver
 from nonebot.adapters import Message
@@ -50,7 +49,7 @@
 from .utils.api.utils import out_msg_out
 from .utils.group_store import set_group
 from .utils.sb_sources import load_pages
-from .utils.utils import read_config, split_maohao, write_config
+from .utils.utils import split_maohao
 
 driver = get_driver()
 
@@ -143,7 +142,7 @@ async def _(
         6. 调用 get_server_detail 函数获取服务器详情，并根据返回结果发送相应的消息。
         7. 如果 get_server_detail 返回 None，则发送 "服务器无响应" 的文本消息。
     """
-
+    logger.info(f"[l4]开始执行请求]：{command}")
     if start:
         command = command.replace(start, "")
     if command == "anne":
@@ -275,67 +274,67 @@ async def _(args: Message = CommandArg()):
         await out_msg_out("重载ip完成")
 
 
-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_data = read_config(config_path)
-    config_data.update({arg[0]: arg[1]})
-    write_config(config_path, config_data)
-
-    await L4API.get_sourceban(arg[0], arg[1])
-    reload_ip()
-    refresh_server_command_rule(l4_request)
-    await UniMessage.text("添加成功\n组名: {arg[0]}\n网址: {arg[1]}").send()
-
-
-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 out_msg_out(f"删除成功，组名:{arg[0]}")
-    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 out_msg_out(f"修改成功，组名:{arg[0]},网址:{arg[1]}")
+# 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_data = read_config(config_path)
+#     config_data.update({arg[0]: arg[1]})
+#     write_config(config_path, config_data)
+
+#     await L4API.get_sourceban(arg[0], arg[1])
+#     reload_ip()
+#     refresh_server_command_rule(l4_request)
+#     await UniMessage.text("添加成功\n组名: {arg[0]}\n网址: {arg[1]}").send()
+
+
+# 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 out_msg_out(f"删除成功，组名:{arg[0]}")
+#     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 out_msg_out(f"修改成功，组名:{arg[0]},网址:{arg[1]}")
 
 
 if "云" in COMMAND:

data/L4D2/l4d2/l4d2.json

@@ -31,7 +31,19 @@ async def _delete_group_and_page(tag: str) -> tuple[bool, bool]:
 
 
 # l4addban <组名> [SourceBans服务器页URL]
-l4_add_ban = on_command("l4addban", aliases={"l4添加服务器组"})
+l4_add_ban = on_command("l4addban", aliases={"l4添加组"})
+# 批量刷新：遍历 sb_pages.json 中所有组
+l4_reload_sb = on_command("l4reloadsb", aliases={"l4刷新组"})
+# 列出所有组及数量
+l4_list_groups = on_command("l4listgroup", aliases={"l4listgroups", "l4列组"})
+# 删除服务器组（即删除 data/L4D2/l4d2/<tag>.json）
+l4_del_group = on_command("l4delgroup", aliases={"l4删除组"})
+# 删除 sb_pages.json 里的 URL 映射（仅删 URL）
+l4_del_page = on_command("l4delpage", aliases={"l4删除页"})
+# 导出指定组的 JSON 片段（直接读取 data/L4D2/l4d2/<tag>.json）
+l4_export_group = on_command("l4exportgroup", aliases={"l4导出组"})
+# 导出全部组（仅用于查看，组合成一个对象返回，不写入任何聚合文件）
+l4_export_groups = on_command("l4exportgroups", aliases={"l4导出全部组"})
 
 
 @l4_add_ban.handle()
@@ -55,21 +67,17 @@ async def _(args: Message = CommandArg()):
         ).finish()
 
     api = L4D2Api()
-    try:
-        server_list = await api.get_sourceban(tag, page)
-    except Exception as e:
-        await UniMessage.text(f"抓取失败：{e}").finish()
+    # try:
+    server_list = await api.get_sourceban(tag, page)
+    # except Exception as e:
+    #     await UniMessage.text(f"抓取失败：{e}").finish()
 
     path = await set_group(tag, server_list)
     await UniMessage.text(
         f"✅ 已更新：{path.name}（共 {len(server_list)} 台）",
     ).finish()
 
 
-# 批量刷新：遍历 sb_pages.json 中所有组
-l4_reload_sb = on_command("l4reloadsb", aliases={"l4刷新服务器组"})
-
-
 @l4_reload_sb.handle()
 async def _():
     pages = await load_pages()
@@ -96,10 +104,6 @@ async def _():
     refresh_server_command_rule(l4_request)
 
 
-# 列出所有组及数量
-l4_list_groups = on_command("l4listgroup", aliases={"l4listgroups", "l4列服务器组"})
-
-
 @l4_list_groups.handle()
 async def _():
     names = await list_groups()
@@ -112,10 +116,6 @@ async def _():
     await UniMessage.text("现有服务器组：\n" + "\n".join(lines)).finish()
 
 
-# 删除服务器组（即删除 data/L4D2/l4d2/<tag>.json）
-l4_del_group = on_command("l4delgroup", aliases={"l4删除服务器组"})
-
-
 @l4_del_group.handle()
 async def _(args: Message = CommandArg()):
     tag = args.extract_plain_text().strip()
@@ -137,10 +137,6 @@ async def _(args: Message = CommandArg()):
     refresh_server_command_rule(l4_request)
 
 
-# 删除 sb_pages.json 里的 URL 映射（仅删 URL）
-l4_del_page = on_command("l4delpage", aliases={"l4删除服务器页"})
-
-
 @l4_del_page.handle()
 async def _(args: Message = CommandArg()):
     tag = args.extract_plain_text().strip()
@@ -150,10 +146,6 @@ async def _(args: Message = CommandArg()):
     await UniMessage.text("✅ 已删除" if ok else "未找到该组的 URL").finish()
 
 
-# 导出指定组的 JSON 片段（直接读取 data/L4D2/l4d2/<tag>.json）
-l4_export_group = on_command("l4exportgroup", aliases={"l4导出服务器组"})
-
-
 @l4_export_group.handle()
 async def _(args: Message = CommandArg()):
     tag = args.extract_plain_text().strip()
@@ -166,10 +158,6 @@ async def _(args: Message = CommandArg()):
     await UniMessage.text(json.dumps(data, ensure_ascii=False, indent=4)).finish()
 
 
-# 导出全部组（仅用于查看，组合成一个对象返回，不写入任何聚合文件）
-l4_export_groups = on_command("l4exportgroups", aliases={"l4导出全部服务器组"})
-
-
 @l4_export_groups.handle()
 async def _():
     data = await export_all()

data/L4D2/sb_pages.json

@@ -73,6 +73,58 @@
       }
     ]
   },
+  "SourceBan服务": {
+    "desc": "通过网页抓取服务器信息",
+    "data": [
+      {
+        "name": "l4添加组",
+        "desc": "添加sb组网址",
+        "eg": "l4添加组 云 123.com",
+        "need_ck": false,
+        "need_sk": false,
+        "need_admin": false
+      },
+      {
+        "name": "l4刷新组",
+        "desc": "刷新sb组网址",
+        "eg": "l4刷新组",
+        "need_ck": false,
+        "need_sk": false,
+        "need_admin": false
+      },
+      {
+        "name": "l4列组",
+        "desc": "列出所有sb组网址",
+        "eg": "l4列组",
+        "need_ck": false,
+        "need_sk": false,
+        "need_admin": false
+      },
+      {
+        "name": "l4删除组",
+        "desc": "删除sb组网址",
+        "eg": "l4列组 云",
+        "need_ck": false,
+        "need_sk": false,
+        "need_admin": false
+      },
+      {
+        "name": "l4删除页",
+        "desc": "删除sb组网址",
+        "eg": "",
+        "need_ck": false,
+        "need_sk": false,
+        "need_admin": false
+      },
+      {
+        "name": "l4导出组",
+        "desc": "导出sb组网址",
+        "eg": "",
+        "need_ck": false,
+        "need_sk": false,
+        "need_admin": false
+      }
+    ],
   "其他服务": {
     "desc": "一些杂项服务",
     "data": [

nonebot_plugin_l4d2_server/__main__.py

@@ -10,7 +10,7 @@
 from ..l4_image.model import PluginHelp
 from .draw import get_help
 
-__version__ = "1.1.6"
+__version__ = "1.2.0"
 TEXT_PATH = Path(__file__).parent / "texture2d"
 HELP_DATA = Path(__file__).parent / "help.json"
 

nonebot_plugin_l4d2_server/l4_ban/__init__.py

@@ -320,7 +320,7 @@ async def get_sourceban(self, tag: str = "云", url: str = anne_ban):
                 new_dict["id"] = int(server.index) + 1
                 new_dict["ip"] = server.host + ":" + str(server.port)
                 up_data.update(new_dict)
-            json.dump(up_data, f, ensure_ascii=False, indent=4)
+            await f.write(json.dumps(up_data, ensure_ascii=False, indent=4))
         return server_list
 
     async def get_anne_steamid(self, name: str):

nonebot_plugin_l4d2_server/l4_help/Help.json

@@ -24,7 +24,8 @@ dependencies = [
     "rarfile>=4.2",
     "pyunpack>=0.3",
     "aiofiles>=24.1.0",
-    "bs4==0.0.2"
+    "bs4==0.0.2",
+    "lxml>=6.0.2",
 ]
 classifiers = [
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",