nonebot-plugin-l4d2-server 1.0.0a1__tar.gz → 1.0.0b1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-l4d2-server
-Version: 1.0.0a1
+Version: 1.0.0b1
 Summary: L4D2 server related operations plugin for NoneBot2
 Keywords: steam,game,l4d2,nonebot2,plugin
 Home-page: https://github.com/Agnes4m/nonebot_plugin_l4d2_server
@@ -19,12 +19,19 @@ Requires-Dist: nonebot2>=2.0.0
 Requires-Dist: nonebot-plugin-htmlrender>=0.3.0
 Requires-Dist: nonebot-adapter-onebot>=2.4.4
 Requires-Dist: nonebot-plugin-alconna>=0.50.0
+Requires-Dist: nonebot_plugin_datastore>=1.3.0
+Requires-Dist: nonebot-plugin-tortoise-orm>=0.1.4
 Requires-Dist: aiohttp>=3.8.4
 Requires-Dist: jinja2>=3.0.0
 Requires-Dist: srctools>=2.3.9
-Requires-Dist: bs4==0.0.1
-Requires-Dist: httpx>=0.22.0
+Requires-Dist: httpx<0.24.1,>=0.22.0
+Requires-Dist: msgspec>=0.18.0
 Requires-Dist: python-a2s>=1.3.0
+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
 Description-Content-Type: text/markdown
 
 <!-- markdownlint-disable MD026 MD031 MD033 MD036 MD041 MD046 MD051 -->
@@ -137,28 +144,29 @@ conda install nonebot-plugin-l4d2-server
 
 ## [数据结构](./docs/standand.md)
 
+暂未更新
+
 ## env设置
 
 """bash
-    l4_anne: bool = False
+    l4_anne = False
     """是否启用anne电信服相关功能"""
-    l4_enable: bool = True
+    l4_enable = True
     """是否全局启用求生功能"""
-    l4_image: bool = False
+    l4_image = False
     """是否启用图片"""
-    l4_connect: bool = True
+    l4_connect = True
     """是否在查服命令后加入connect ip"""
-    l4_path: str = "data/L4D2"
+    l4_path = "data/L4D2"
     """插件数据路径"""
-    l4_players: int = 4
+    l4_players = 4
     """查询总图的时候展示的用户数量"""
-    l4_style: str = "default"
+    l4_style = "default"
     """图片风格，可选包括以下，默认简洁
     - 暗风格
     - 孤独摇滚        
     - 电玩像素
     - 缤纷彩虹
-    - 求生之路
 """
 
 ## 其他

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

@@ -108,28 +108,29 @@ conda install nonebot-plugin-l4d2-server
 
 ## [数据结构](./docs/standand.md)
 
+暂未更新
+
 ## env设置
 
 """bash
-    l4_anne: bool = False
+    l4_anne = False
     """是否启用anne电信服相关功能"""
-    l4_enable: bool = True
+    l4_enable = True
     """是否全局启用求生功能"""
-    l4_image: bool = False
+    l4_image = False
     """是否启用图片"""
-    l4_connect: bool = True
+    l4_connect = True
     """是否在查服命令后加入connect ip"""
-    l4_path: str = "data/L4D2"
+    l4_path = "data/L4D2"
     """插件数据路径"""
-    l4_players: int = 4
+    l4_players = 4
     """查询总图的时候展示的用户数量"""
-    l4_style: str = "default"
+    l4_style = "default"
     """图片风格，可选包括以下，默认简洁
     - 暗风格
     - 孤独摇滚        
     - 电玩像素
     - 缤纷彩虹
-    - 求生之路
 """
 
 ## 其他

{nonebot_plugin_l4d2_server-1.0.0a1 → nonebot_plugin_l4d2_server-1.0.0b1}/nonebot_plugin_l4d2_server/__init__.py

@@ -17,15 +17,15 @@
 
 from nonebot import get_driver, require
 
-require("nonebot_plugin_htmlrender")  # noqa: F401
+require("nonebot_plugin_htmlrender")
 require("nonebot_plugin_alconna")
+require("nonebot_plugin_tortoise_orm")
 
-from nonebot import require
-from nonebot.plugin import PluginMetadata, inherit_supported_adapters
+from nonebot.plugin import PluginMetadata, inherit_supported_adapters  # noqa: E402
 
 from . import __main__ as __main__  # noqa: E402
 from .config import ConfigModel  # noqa: E402
-from .l4_help import __version__
+from .l4_help import __version__  # noqa: E402
 
 driver = get_driver()
 

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

@@ -15,25 +15,38 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
-from typing import Optional
+from typing import TYPE_CHECKING, List, Optional
 
-from nonebot import require
 from nonebot.adapters import Message
 from nonebot.log import logger
 from nonebot.matcher import Matcher
 from nonebot.params import CommandArg, CommandStart, RawCommand
 from nonebot.plugin import on_command
-
-require("nonebot_plugin_alconna")
 from nonebot_plugin_alconna import UniMessage
 
+from .config import config
 from .l4_help import get_l4d2_core_help
-from .l4_request import COMMAND, get_ip_server, get_server_detail, reload_ip
+from .l4_local import *  # noqa: F403
+from .l4_request import (
+    COMMAND,
+    get_all_server_detail,
+    get_ip_server,
+    get_server_detail,
+    reload_ip,
+)
+from .utils.api.request import L4API
+
+if TYPE_CHECKING:
+    from .utils.api.models import OutServer
+
+reload_ip()
 
-l4_help = on_command("l4帮助", aliases={"l4help", "l4d2帮助"})
-l4_request = on_command("anne", aliases=COMMAND)
-l4_reload = on_command("l4重载", aliases={"l4刷新"})
+l4_help = on_command("l4help", aliases={"l4帮助", "l4d2帮助"})
+l4_request = on_command("anne", aliases=COMMAND, priority=10)
+l4_reload = on_command("l4reload", aliases={"l4刷新,l4重载"})
+l4_all = on_command("l4all", aliases={"l4全服"})
 l4_connect = on_command("connect", aliases={"l4连接"})
+l4_find_player = on_command("l4find", aliases={"l4查找"})
 
 
 @l4_help.handle()
@@ -41,7 +54,6 @@ async def _(matcher: Matcher):
     """帮助"""
     logger.info("开始执行[l4d2帮助]")
     im = await get_l4d2_core_help()
-    print(type(im))
     if isinstance(im, str):
         await matcher.finish(im)
     await UniMessage.image(raw=im).send()
@@ -65,6 +77,8 @@ async def _(
     if command == "anne":
         command = "云"
     _id: Optional[str] = args.extract_plain_text()
+    if _id is not None and not _id.isdigit() and _id:
+        return
     if not _id:
         _id = None
     logger.info(f"组:{command} ;数字:{_id}")
@@ -72,9 +86,34 @@ async def _(
     if msg is not None:
         if isinstance(msg, str):
             await UniMessage.text(msg).finish()
-        await UniMessage.image(raw=msg).finish()
+        if isinstance(msg, bytes):
+            await UniMessage.image(raw=msg).finish()
     else:
-        await UniMessage.text("没有这个服呢").send()
+        await UniMessage.text("服务器无响应").finish()
+
+
+@l4_find_player.handle()
+async def _(
+    args: Message = CommandArg(),
+):
+    msg: str = args.extract_plain_text().strip()
+    tag_list: List[str] = msg.split(" ", maxsplit=1)
+    if len(tag_list) < 2:
+        return await UniMessage.text("格式错误，正确格式：/l4find 组名 玩家名").finish()
+    group, name = tag_list
+    out: List[OutServer] = await get_server_detail(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']}")
+
+    return await UniMessage.text(out_msg).finish()
+
+
+@l4_all.handle()
+async def _():
+    await UniMessage.text(await get_all_server_detail()).finish()
 
 
 @l4_connect.handle()
@@ -84,7 +123,19 @@ async def _(args: Message = CommandArg()):
         await UniMessage.text(await get_ip_server(ip)).finish()
 
 
+# anne部分
+if config.l4_anne:
+    logger.info("加载anne功能")
+    from .l4_anne import *  # noqa: F403
+
+
 @l4_reload.handle()
-async def _():
-    reload_ip()
-    logger.success("重载ip完成")
+async def _(args: Message = CommandArg()):
+    arg = args.extract_plain_text().strip()
+    print(arg)
+    if not arg:
+        reload_ip()
+        logger.success("重载ip完成")
+        await UniMessage.text("重载ip完成").finish()
+    else:
+        print(await L4API.get_sourceban())

{nonebot_plugin_l4d2_server-1.0.0a1 → nonebot_plugin_l4d2_server-1.0.0b1}/nonebot_plugin_l4d2_server/config.py

@@ -5,11 +5,15 @@ from pydantic import BaseModel
 
 DATAPATH = Path(__file__).parent.joinpath("data")
 DATAOUT = Path("data/L4D2")
+print(DATAOUT.absolute())
 server_all_path = DATAOUT / "l4d2"
 server_all_path.mkdir(parents=True, exist_ok=True)
 
 ICONPATH = DATAPATH / "icon"
 
+global map_index
+map_index = 0
+
 
 class ConfigModel(BaseModel):
     l4_anne: bool = False
@@ -25,6 +29,13 @@ class ConfigModel(BaseModel):
     l4_players: int = 4
     """查询总图的时候展示的用户数量"""
     l4_style: str = "default"
+    """图片风格"""
+    l4_font: str = str(Path(__file__).parent.joinpath("data/font/loli.ttf"))
+    """字体"""
+    l4_show_ip: bool = True
+    """单服务器查询时候是否展示ip直连地址"""
+    l4_local: list[str] = []
+    """本地服务器路径,填写路径下有`steam_appid.txt`文件"""
 
 
 config = get_plugin_config(ConfigModel)

nonebot_plugin_l4d2_server-1.0.0b1/nonebot_plugin_l4d2_server/l4_anne/__init__.py

@@ -0,0 +1,125 @@
+from nonebot import log as log
+from nonebot import on_command
+from nonebot.adapters import Event, Message
+from nonebot.log import logger
+from nonebot.params import CommandArg
+from nonebot_plugin_alconna import UniMessage
+
+from ..utils.api.request import L4API
+from ..utils.database.models import SteamUser
+from ..utils.utils import get_message_at
+from .ranne import get_anne_rank_out
+
+anne_bind = on_command("Banne", aliases={"l4绑定", "anne绑定"}, priority=5, block=True)
+anne_search = on_command("Sanne", aliases={"anne搜索"})
+anne_rank = on_command("Ranne", aliases={"anne成绩"}, block=True, priority=1)
+
+anne_del = on_command(
+    "Danne",
+    aliases={"l4删除", "anne删除", "l4解绑", "anne解绑"},
+    priority=5,
+    block=True,
+)
+
+
+@anne_search.handle()
+async def _(args: Message = CommandArg()):
+    name: str = args.extract_plain_text().strip()
+    print(name)
+    user_list = await L4API.get_anne_steamid(name)
+    if user_list is None:
+        await UniMessage.text("未找到玩家").finish()
+    msg = f"---有{len(user_list)}个玩家---"
+    for index, user in enumerate(user_list, start=1):
+        if index >= 10:
+            break
+        msg += f"""
+        {index}. {user["name"]} | [{user["score"]}] | {user["play_time"]}
+        {user["steamid"]}
+        """
+    if msg:
+        await UniMessage.text("\n".join(msg.splitlines())).finish()
+    else:
+        await UniMessage.text("没有找到玩家").finish()
+
+
+@anne_bind.handle()
+async def _(ev: Event, args: Message = CommandArg()):
+    arg: str = args.extract_plain_text()
+    if not arg:
+        await UniMessage.text("虚空绑定？").finish()
+
+    user = await SteamUser.get_or_none(userid=int(ev.get_user_id()))
+    if user is None:
+        user = await SteamUser.create(userid=int(ev.get_user_id()))
+
+    if len(arg) == 17:
+        # steamid64
+        logger.info(f"SteamID64:{arg}")
+        user.SteamID64 = arg
+        msg = "绑定steamid64"
+
+    elif arg.startswith("STEAM_"):
+        # steamid
+        logger.info(f"SteamID:{arg}")
+        user.SteamID = arg
+        msg = "绑定steamid"
+
+    else:
+        # name
+        logger.info(f"Name:{arg}")
+        user.Name = arg
+        msg = "绑定名字"
+    await user.save()
+
+    return await UniMessage.text(f"{msg}成功").finish()
+
+
+@anne_del.handle()
+async def _(ev: Event):
+    if record := await SteamUser.get_or_none(userid=int(ev.get_user_id())):
+        logger.info(f"删除用户:{record}")
+        await record.delete()
+        await record.save()
+        return await UniMessage.text("删除成功").finish()
+    return await UniMessage.text("没有绑定信息呢").finish()
+
+
+@anne_rank.handle()
+async def _(ev: Event, args: Message = CommandArg()):
+    uid = await get_message_at(str(ev.json()))
+    if uid is None:
+        uid = int(int(ev.get_user_id()))
+    steamid = ""
+    arg: str = args.extract_plain_text().strip()
+    logger.info(f"arg:{arg}")
+    # 优先从数据库查询
+    if not arg:
+        msg = await SteamUser.get_or_none(userid=uid)
+        if msg is not None:
+            steamid = msg.SteamID
+            if not steamid:
+                name = msg.Name
+                if not name:
+                    await UniMessage.text("未绑定名字/steamid").finish()
+                msg_dict = await L4API.get_anne_steamid(name)
+                if not msg_dict:
+                    await UniMessage.text("绑定的昵称找不到呢").finish()
+                steamid = msg_dict[0]["steamid"]
+            logger.info(f"steamid:{steamid}")
+
+    # 再从arg中查找
+    else:
+        if arg.startswith("STEAM_"):
+            steamid = arg
+        else:
+            arg_dict = await L4API.get_anne_steamid(arg)
+            if not arg_dict:
+                await UniMessage.text("未找到该昵称玩家").finish()
+            steamid = arg_dict[0]["steamid"]
+    if not steamid:
+        await UniMessage.text("未找到玩家,请使用指令`l4搜索`查找").finish()
+    out_msg = await get_anne_rank_out(steamid)
+    if out_msg is None:
+        await UniMessage.text("未找到玩家").finish()
+    await UniMessage.text(out_msg).finish()

nonebot_plugin_l4d2_server-1.0.0b1/nonebot_plugin_l4d2_server/l4_anne/ranne.py

@@ -0,0 +1,18 @@
+# coding=utf-8
+# anne战绩查询
+from ..utils.api.request import L4API
+
+
+async def get_anne_rank_out(steamid: str):
+    msg = await L4API.get_anne_playerdetail(steamid)
+    if msg is None:
+        return None
+    return f"""电信anne查询结果：
+    昵称：{msg['info']['name']}
+    排名：{msg['detail']['rank']}
+    分数：{msg['detail']["source"]}
+    击杀：{msg['detail']["kills"]}
+    爆头率：{msg['detail']["avg_source"]}
+    时间：{msg['info']['playtime']}
+    上次：{msg['info']['lasttime']}
+    """

nonebot_plugin_l4d2_server-1.0.0b1/nonebot_plugin_l4d2_server/l4_help/Help.json

@@ -0,0 +1,110 @@
+{
+  "基础服务": {
+    "desc": "无需任何权限",
+    "data": [
+      {
+        "name": "(组)",
+        "desc": "返回一个组的服务器信息",
+        "eg": "/云",
+        "need_ck": false,
+        "need_sk": false,
+        "need_admin": false
+      },
+      {
+        "name": "(组)(id)",
+        "desc": "查询单服信息",
+        "eg": "/云1",
+        "need_ck": false,
+        "need_sk": false,
+        "need_admin": false
+      },
+      {
+        "name": "l4查找(组)(玩家)",
+        "desc": "查询用户所在服务器状态",
+        "eg": "/l4查找 云 爱丽数码",
+        "need_ck": false,
+        "need_sk": false,
+        "need_admin": false
+      },
+      {
+        "name": "l4全服",
+        "desc": "返回可以查询的所有服务器组(未完成)",
+        "eg": "/l4全服",
+        "need_ck": false,
+        "need_sk": false,
+        "need_admin": false
+      }
+    ]
+  },
+  "电信服anne服务": {
+    "desc": "电信anne服相关服务",
+    "data": [
+      {
+        "name": "Banne xx",
+        "desc": "绑定昵称/steamid",
+        "eg": "/Banne 爱丽数码",
+        "need_ck": false,
+        "need_sk": false,
+        "need_admin": false
+      },
+      {
+        "name": "Ranne(玩家)",
+        "desc": "查询anne个人信息,没有参数查自己",
+        "eg": "/Ranne 爱丽数码",
+        "need_ck": false,
+        "need_sk": false,
+        "need_admin": false
+      },
+      {
+        "name": "Sanne(玩家)",
+        "desc": "按昵称查询anne玩家信息",
+        "eg": "/Sanne 爱丽数码",
+        "need_ck": false,
+        "need_sk": false,
+        "need_admin": false
+      },
+      {
+        "name": "Danne(玩家)",
+        "desc": "删除anne玩家信息",
+        "eg": "/Danne 爱丽数码",
+        "need_ck": false,
+        "need_sk": false,
+        "need_admin": false
+      }
+    ]
+  },
+  "管理员服务": {
+    "desc": "管理可以使用的指令",
+    "data": [
+      {
+        "name": "l4刷新",
+        "desc": "重载存储的ip数据",
+        "eg": "l4刷新",
+        "need_ck": false,
+        "need_sk": false,
+        "need_admin": true
+      },      
+      {
+        "name": "l4地图上传",
+        "desc": "进入交互上传地图文件",
+        "eg": "l4地图上传",
+        "need_ck": false,
+        "need_sk": false,
+        "need_admin": true
+      }
+    ]
+  },
+  "其他服务": {
+    "desc": "一些杂项服务",
+    "data": [
+      {
+        "name": "connect",
+        "desc": "直接发送求生链接返回信息",
+        "eg": "connect 127.0.0.1:27015",
+        "need_ck": false,
+        "need_sk": false,
+        "need_admin": false
+      }
+    ]
+  }
+}

{nonebot_plugin_l4d2_server-1.0.0a1 → nonebot_plugin_l4d2_server-1.0.0b1}/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.0a1"
+__version__ = "1.0.0b1"
 TEXT_PATH = Path(__file__).parent / "texture2d"
 HELP_DATA = Path(__file__).parent / "Help.json"
 
@@ -39,7 +39,7 @@ async def get_l4d2_core_help() -> Union[bytes, str]:
     bg_out.paste(bg_new, None, bg_new)
 
     return await get_help(
-        "CS2UID",
+        "L4插件",
         f"版本号:{__version__}",
         help_data,
         bg_out,