nonebot-plugin-l4d2-server 1.0.0a1__py3-none-any.whl → 1.0.0b1__py3-none-any.whl

nonebot_plugin_l4d2_server/utils/api/models.py

@@ -1,3 +1,4 @@
+# coding=utf-8
 from typing import List, Optional, TypedDict
 
 import a2s
@@ -27,3 +28,110 @@ class OutServer(TypedDict):
     port: int
     command: str
     id_: int
+
+
+class AnnePlayer(TypedDict):
+    mode: str
+    name: str
+    source: str
+    playtime: str
+
+
+class AllServer(TypedDict):
+    command: str
+    active_server: int
+    max_server: int
+    active_player: int
+    max_player: int
+
+
+class AnneSearch(TypedDict):
+    steamid: str
+    rank: str
+    name: str
+    score: str
+    play_time: str
+    last_time: str
+
+
+class AnnePlayerDetail(TypedDict):
+    rank: int
+    source: str
+    avg_source: float
+    kills: str
+    kills_people: str
+    headshots: str
+    avg_headshots: float
+    map_play: str
+
+
+class AnnePlayerError(TypedDict):
+    mistake_shout: str
+    kill_friend: str
+    down_friend: str
+    abandon_friend: str
+    put_into: str
+    agitate_witch: str
+
+
+class AnnePlayerInfAvg(TypedDict):
+    avg_smoker: float
+    avg_boomer: float
+    avg_hunter: float
+    avg_charger: float
+    avg_spitter: float
+    avg_jockey: float
+    avg_tank: float
+
+
+class AnnePlayerSur(TypedDict):
+    map_clear: str
+    prefect_into: str
+    get_oil: str
+    ammo_arrange: str
+    adrenaline_give: str
+    pills_give: str
+    """给药"""
+    first_aid_give: str
+    """给包"""
+    friend_up: str
+    diss_friend: str
+    save_friend: str
+    protect_friend: str
+    pro_from_smoker: str
+    pro_from_hunter: str
+    pro_from_charger: str
+    pro_from_jockey: str
+    melee_charge: str
+    """刀牛"""
+    tank_kill: str
+    witch_instantly_kill: str
+    """秒妹"""
+
+
+class AnnePlayerInf(TypedDict):
+    sur_ace: str
+    sur_down: str
+    boommer_hit: str
+    hunter_prefect: str
+    hunter_success: str
+    tank_damage: str
+    charger_multiple: str
+
+
+class AnnePlayerInfo(TypedDict):
+    name: str
+    avatar: str
+    steamid: str
+    playtime: str
+    lasttime: str
+
+
+class AnnePlayer2(TypedDict):
+    kill_msg: str
+    info: AnnePlayerInfo
+    detail: AnnePlayerDetail
+    error: AnnePlayerError
+    inf_avg: AnnePlayerInfAvg
+    sur: AnnePlayerSur
+    inf: AnnePlayerInf

nonebot_plugin_l4d2_server/utils/api/request.py

@@ -1,14 +1,28 @@
-import json as js
+import asyncio
+import contextlib
+import socket
 from copy import deepcopy
-from typing import Any, Dict, List, Literal, Optional, Union
+from typing import Any, Dict, List, Literal, Optional, Tuple, cast
 
 import a2s
+import ujson as js
+from bs4 import BeautifulSoup
 from httpx import AsyncClient
-from lxml import etree
 
+# from nonebot.log import logger
 from ..utils import split_maohao
-from .api import anne_ban
-from .models import SourceBansInfo
+from .api import AnnePlayerApi, AnneSearchApi, anne_ban
+from .models import (
+    AnnePlayer2,
+    AnnePlayerDetail,
+    AnnePlayerError,
+    AnnePlayerInf,
+    AnnePlayerInfAvg,
+    AnnePlayerInfo,
+    AnnePlayerSur,
+    AnneSearch,
+    SourceBansInfo,
+)
 
 
 class L4D2Api:
@@ -18,23 +32,75 @@ class L4D2Api:
         "(KHTML, like Gecko)"
         "Chrome/126.0.0.0"
         "Safari/537.36 Edg/126.0.0.0",
+        "Content-Type": "application/x-www-form-urlencoded",
     }
 
     async def a2s_info(
         self,
-        host: str,
-        port: int,
-    ) -> a2s.SourceInfo:
-        msg: a2s.SourceInfo = await a2s.ainfo((host, port))
-        return msg
+        ip_list: List[Tuple[str, int]],
+        is_server: bool = True,
+        is_player: bool = False,
+    ) -> List[Tuple[a2s.SourceInfo, List[a2s.Player]]]:
+        msg_list: List[Tuple[a2s.SourceInfo, List[a2s.Player]]] = []
+        sorted_msg_list = []
+        tasks = []  # 用来保存异步任务
+        if ip_list != []:
+            for index, i in enumerate(ip_list):
+                try:
+                    tasks.append(
+                        asyncio.create_task(
+                            self.process_message(
+                                i,
+                                index,
+                                is_server,
+                                is_player,
+                            ),
+                        ),
+                    )
+                except ValueError:
+                    continue  # 处理异常情况
+
+            msg_list = await asyncio.gather(*tasks)
+            sorted_msg_list = sorted(msg_list, key=lambda x: x[0].steam_id)
+
+        return sorted_msg_list
 
-    async def a2s_players(
+    async def process_message(
         self,
-        host: str,
-        port: int,
-    ) -> List[a2s.Player]:
-        msg: List[a2s.Player] = await a2s.aplayers((host, port))
-        return msg
+        ip: Tuple[str, int],
+        index: int,
+        is_server: bool,
+        is_player: bool,
+    ):
+        server: a2s.SourceInfo = a2s.SourceInfo()
+        play: List[a2s.Player] = []
+        if is_server:
+            try:
+                server = await a2s.ainfo(ip)
+                if server is not None:
+                    server.steam_id = index
+
+            except (
+                asyncio.exceptions.TimeoutError,
+                ConnectionRefusedError,
+                socket.gaierror,
+            ):
+                server.steam_id = index
+                server.player_count = 0
+                server.max_players = 0
+                server.server_name = "服务器无响应"
+                server.map_name = "无"
+                server.folder = "m"
+                server.vac_enabled = False
+
+        if is_player:
+            with contextlib.suppress(
+                asyncio.exceptions.TimeoutError,
+                ConnectionRefusedError,
+                socket.gaierror,
+            ):
+                play = await a2s.aplayers(ip)
+        return server, play
 
     async def _server_request(
         self,
@@ -45,7 +111,7 @@ class L4D2Api:
         json: Optional[Dict[str, Any]] = None,
         data: Optional[Dict[str, Any]] = None,
         is_json: bool = True,
-    ) -> Union[Dict, int]:
+    ):
         header = deepcopy(self._HEADER)
 
         if json is not None:
@@ -85,35 +151,187 @@ class L4D2Api:
                 ):
                     return raw_data["result"]["error_code"]
                 return raw_data
-            html_content = resp.text
-            return etree.HTML(html_content)
+            html_content = resp.content
+            return BeautifulSoup(html_content, "lxml")
 
-    async def get_sourceban(self, name: str, url: str = anne_ban):
-        tree = await self._server_request(
+    async def get_sourceban(self, url: str = anne_ban):
+        """从sourceban++获取服务器列表，目前未做名称处理"""
+        soup = await self._server_request(
             url=url,
             is_json=False,
-        )  # type: ignore
-        name = name
-        # 检查响应状态码
+        )
 
-        target_element = tree.xpath(
-            "/html/body/main/div[3]/div[5]/div/div/table/tbody/tr",
+        if not isinstance(soup, BeautifulSoup):
+            return []
+        server_list = []
+        tbody = soup.select_one("tbody")
+        if tbody is None:
+            return []
+        tr_tags = tbody.select("tr")
+        for index, tr in enumerate(tr_tags):
+            td_tags = tr.select("td")
+            for num, td in enumerate(td_tags):
+                if num == 4:
+                    host, port = split_maohao(td.text)
+                    server_list.append(
+                        SourceBansInfo(index=index, host=host, port=port),
+                    )
+
+        return server_list
+
+    async def get_anne_steamid(self, name: str):
+        """从电信anne服搜索昵称获取steamid"""
+        soup = await self._server_request(
+            url=AnneSearchApi,
+            data={"search": name},
+            method="POST",
+            is_json=False,
         )
+        if not isinstance(soup, BeautifulSoup):
+            return None
         server_list = []
-        # for tr in target_element:
-        for tr in target_element:
-            if tr.get("class") != "collapse":
+        tbody = soup.select_one("tbody")
+        if tbody is None:
+            return None
+        tr_tags = tbody.select("tr")
+        for tr in tr_tags:
+            onclick = tr.get("onclick")
+            if onclick is None or isinstance(onclick, list):
                 continue
-            index = 0
-            for td in tr.xpath("./td"):
-                if td.get("id") is not None or td.text == "\n":
-                    continue
-                index += 1
-                host, port = split_maohao(td.text)
-                server_list.append(SourceBansInfo(index=index, host=host, port=port))
-
-        # 通过一次请求，确定服务器的序号
-        return server_list
+            steamid = onclick.split("steamid=")[1].replace("'", "")
+            td_tags = tr.select("td")
+            server_list.append(
+                {
+                    "steamid": steamid,
+                    "rank": td_tags[0].text.strip(),
+                    "name": td_tags[1].text.strip(),
+                    "score": td_tags[2].text.strip(),
+                    "play_time": td_tags[3].text.strip(),
+                    "last_time": td_tags,
+                },
+            )
+        print(server_list)
+        return cast(List[AnneSearch], server_list)
+
+    async def get_anne_playerdetail(self, steamid: str):
+        """从电信anne服通过steamid获取战绩"""
+        soup = await self._server_request(
+            url=AnnePlayerApi,
+            method="GET",
+            params={"steamid": steamid},
+            is_json=False,
+        )
+        if not isinstance(soup, BeautifulSoup):
+            return None
+
+        tbody = soup.find(
+            "div",
+            class_="content text-center text-md-left",
+            style="background-color: #f2f2f2;",
+        )
+        if tbody is None:
+            return None
+        kill_tag = tbody.find(
+            "div",
+            class_="card-body worldmap d-flex flex-column justify-content-center text-center",
+        )
+
+        tbody_tags = tbody.find_all(
+            "table",
+            class_="table content-table-noborder text-left",
+        )
+        print(len(tbody_tags))
+        info_tag = tbody_tags[0]
+        detail_tag = tbody_tags[1]
+        error_tag = tbody_tags[2]
+        inf_avg_tag = tbody_tags[3]
+        sur_tag = tbody_tags[4]
+        inf_tag = tbody_tags[5]
+
+        info_tr = info_tag.select("tr")
+        info_dict = {
+            "name": info_tr[0].select("td")[1].text.strip(),
+            "avatar": info_tr[1].select("td")[1].text.strip(),
+            "steamid": info_tr[2].select("td")[1].text.strip(),
+            "playtime": info_tr[3].select("td")[1].text.strip(),
+            "lasttime": info_tr[4].select("td")[1].text.strip(),
+        }
+        detail_tag = {
+            "rank": detail_tag.select("tr")[0].select("td")[1].text.strip(),
+            "source": detail_tag.select("tr")[1].select("td")[1].text.strip(),
+            "avg_source": detail_tag.select("tr")[2].select("td")[1].text.strip(),
+            "kills": detail_tag.select("tr")[3].select("td")[1].text.strip(),
+            "kills_people": detail_tag.select("tr")[4].select("td")[1].text.strip(),
+            "headshots": detail_tag.select("tr")[5].select("td")[1].text.strip(),
+            "avg_headshots": detail_tag.select("tr")[6].select("td")[1].text.strip(),
+            "map_play": detail_tag.select("tr")[7].select("td")[1].text.strip(),
+        }
+        error_tag = {
+            "mistake_shout": error_tag.select("tr")[0].select("td")[1].text.strip(),
+            "kill_friend": error_tag.select("tr")[1].select("td")[1].text.strip(),
+            "down_friend": error_tag.select("tr")[2].select("td")[1].text.strip(),
+            "abandon_friend": error_tag.select("tr")[3].select("td")[1].text.strip(),
+            "put_into": error_tag.select("tr")[4].select("td")[1].text.strip(),
+            "agitate_witch": error_tag.select("tr")[5].select("td")[1].text.strip(),
+        }
+        inf_avg_dict = {
+            "avg_smoker": inf_avg_tag.select("tr")[0].select("td")[1].text.strip(),
+            "avg_boomer": inf_avg_tag.select("tr")[1].select("td")[1].text.strip(),
+            "avg_hunter": inf_avg_tag.select("tr")[2].select("td")[1].text.strip(),
+            "avg_charger": inf_avg_tag.select("tr")[3].select("td")[1].text.strip(),
+            "avg_spitter": inf_avg_tag.select("tr")[4].select("td")[1].text.strip(),
+            "avg_jockey": inf_avg_tag.select("tr")[5].select("td")[1].text.strip(),
+            "avg_tank": inf_avg_tag.select("tr")[6].select("td")[1].text.strip(),
+        }
+        sur_dict = {
+            "map_clear": sur_tag.select("tr")[0].select("td")[1].text.strip(),
+            "prefect_into": sur_tag.select("tr")[1].select("td")[1].text.strip(),
+            "get_oil": sur_tag.select("tr")[2].select("td")[1].text.strip(),
+            "ammo_arrange": sur_tag.select("tr")[3].select("td")[1].text.strip(),
+            "adrenaline_give": sur_tag.select("tr")[4].select("td")[1].text.strip(),
+            "pills_give": sur_tag.select("tr")[5].select("td")[1].text.strip(),
+            "first_aid_give": sur_tag.select("tr")[6].select("td")[1].text.strip(),
+            "friend_up": sur_tag.select("tr")[7].select("td")[1].text.strip(),
+            "diss_friend": sur_tag.select("tr")[8].select("td")[1].text.strip(),
+            "save_friend": sur_tag.select("tr")[9].select("td")[1].text.strip(),
+            "protect_friend": sur_tag.select("tr")[10].select("td")[1].text.strip(),
+            "pro_from_smoker": sur_tag.select("tr")[11].select("td")[1].text.strip(),
+            "pro_from_hunter": sur_tag.select("tr")[12].select("td")[1].text.strip(),
+            "pro_from_charger": sur_tag.select("tr")[13].select("td")[1].text.strip(),
+            "pro_from_jockey": sur_tag.select("tr")[14].select("td")[1].text.strip(),
+            "melee_charge": sur_tag.select("tr")[15].select("td")[1].text.strip(),
+            "tank_kill": sur_tag.select("tr")[16].select("td")[1].text.strip(),
+            "witch_instantly_kill": sur_tag.select("tr")[17]
+            .select("td")[1]
+            .text.strip(),
+        }
+        inf_dict = {
+            "sur_ace": inf_tag.select("tr")[0].select("td")[1].text.strip(),
+            "sur_down": inf_tag.select("tr")[1].select("td")[1].text.strip(),
+            "boommer_hit": inf_tag.select("tr")[2].select("td")[1].text.strip(),
+            "hunter_prefect": inf_tag.select("tr")[3].select("td")[1].text.strip(),
+            "hunter_success": inf_tag.select("tr")[4].select("td")[1].text.strip(),
+            "tank_damage": inf_tag.select("tr")[5].select("td")[1].text.strip(),
+            "charger_multiple": inf_tag.select("tr")[6].select("td")[1].text.strip(),
+        }
+        info_dict = cast(AnnePlayerInfo, info_dict)
+        detail_dict = cast(AnnePlayerDetail, detail_tag)
+        error_dict = cast(AnnePlayerError, error_tag)
+        inf_avg_dict = cast(AnnePlayerInfAvg, inf_avg_dict)
+        sur_dict = cast(AnnePlayerSur, sur_dict)
+        inf_dict = cast(AnnePlayerInf, inf_dict)
+
+        out_dict = {
+            "kill_msg": kill_tag.text if kill_tag is not None else "",
+            "info": info_dict,
+            "detail": detail_dict,
+            "inf_avg": inf_avg_dict,
+            "sur": sur_dict,
+            "inf": inf_dict,
+            "error": error_dict,
+        }
+
+        return cast(AnnePlayer2, out_dict)
 
 
 L4API = L4D2Api()

nonebot_plugin_l4d2_server/utils/database/models.py

@@ -1,29 +1,18 @@
-from pathlib import Path
+from nonebot_plugin_tortoise_orm import add_model
+from tortoise import fields
+from tortoise.models import Model
 
-from nonebot import on_command
-from nonebot_plugin_datastore import get_plugin_data
-from sqlalchemy.orm import Mapped, mapped_column
+add_model(__name__)
 
-plugin_data = get_plugin_data()
 
-# 定义模型
-DATA = get_plugin_data()
-DATA.set_migration_dir(Path("data/L4D2/") / "sql")
-
-
-class SteamUser(DATA.Model):
+class SteamUser(Model):
     """个人资料"""
 
-    SteamID: Mapped[str] = mapped_column(primary_key=True)
-    SteamID64: Mapped[str]
-    Name: Mapped[str]
-
-
-matcher = on_command("test")
+    userid = fields.BigIntField(pk=True)
+    SteamID = fields.TextField(null=True)
+    SteamID64 = fields.TextField(null=True)
+    Name = fields.TextField(null=True)
 
-# 数据库相关操作
-# @matcher.handle()
-# async def handle(session: AsyncSession = Depends(get_session)):
-#     example = SteamUser(message="matcher")
-#     session.add(example)
-#     await session.commit()
+    class Meta:  # type: ignore
+        table = "steam_user"
+        table_description = "个人资料"

nonebot_plugin_l4d2_server/utils/utils.py

@@ -5,8 +5,11 @@ from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple
 
 import aiofiles
+import aiohttp
+import nonebot
 from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, MessageEvent
 from nonebot.log import logger
+from nonebot_plugin_alconna import UniMessage
 
 
 async def get_file(url: str, down_file: Path):
@@ -37,7 +40,7 @@ def get_vpk(map_path: Path, file_: str = ".vpk") -> List[str]:
 def mes_list(mes: str, name_list: List[str]) -> str:
     if name_list:
         for idx, name in enumerate(name_list):
-            mes += f"\n{idx+1}、{name}"
+            mes += f"\n{idx + 1}、{name}"
     return mes
 
 
@@ -72,16 +75,11 @@ def solve(msg: str):
     return "\n".join(lines)
 
 
-async def get_message_at(datas: str) -> List[int]:
-    data: Dict[str, Any] = json.loads(datas)
-    return [int(msg["data"]["qq"]) for msg in data["message"] if msg["type"] == "at"]
-
-
 def at_to_usrid(at: List[int]):
     return at[0] if at else None
 
 
-async def save_file(file: bytes, path_name):
+async def save_file(file: bytes, path_name: str):
     """保存文件"""
     async with aiofiles.open(path_name, "wb") as files:
         await files.write(file)
@@ -149,7 +147,7 @@ def register_menu_func(
 
 
 def register_menu(*args, **kwargs):
-    def decorator(f):
+    def decorator(f):  # noqa: ANN001
         register_menu_func(*args, **kwargs)
         return f
 
@@ -177,10 +175,8 @@ def split_maohao(msg: str) -> Tuple[str, int]:
     return "", -1
 
 
-import aiohttp
-
 headers = {
-    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:107.0) Gecko/20100101 Firefox/107.0",  # noqa: E501
+    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:107.0) Gecko/20100101 Firefox/107.0",
 }
 
 
@@ -202,3 +198,18 @@ async def url_to_msg(url: str):
             if response.status == 200:
                 return await response.text()
             return None
+
+
+async def get_message_at(datas: str) -> Optional[int]:
+    data: Dict[str, Any] = json.loads(datas)
+    at_list = [int(msg["data"]["qq"]) for msg in data["message"] if msg["type"] == "at"]
+    return at_list[0] if at_list else None
+
+
+async def send_ip_msg(msg: str):
+    try:
+        await UniMessage.text(msg).finish()
+    except nonebot.adapters.qq:
+        msg_new = msg.split("\n")[:-2]
+        msg_out = "\n".join(msg_new)
+        await UniMessage.text(msg_out).send()

{nonebot_plugin_l4d2_server-1.0.0a1.dist-info → nonebot_plugin_l4d2_server-1.0.0b1.dist-info}/METADATA

@@ -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"
     """图片风格，可选包括以下，默认简洁
     - 暗风格
     - 孤独摇滚        
     - 电玩像素
     - 缤纷彩虹
-    - 求生之路
 """
 
 ## 其他