nonebot-plugin-l4d2-server 1.0.2__py3-none-any.whl → 1.0.4__py3-none-any.whl

nonebot_plugin_l4d2_server/utils/api/request.py

@@ -3,7 +3,7 @@ import contextlib
 import socket
 from copy import deepcopy
 from pathlib import Path
-from typing import Any, Dict, List, Literal, Optional, Tuple, cast
+from typing import Any, Dict, List, Literal, Optional, Tuple, Union, cast
 
 import a2s
 import aiofiles
@@ -47,8 +47,12 @@ class L4D2Api:
         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]]] = []
+    ) -> List[
+        Tuple[Union[a2s.SourceInfo[str], a2s.GoldSrcInfo[str]], List[a2s.Player]]
+    ]:
+        msg_list: List[
+            Tuple[Union[a2s.SourceInfo[str], a2s.GoldSrcInfo[str]], List[a2s.Player]]
+        ] = []
         sorted_msg_list = []
         tasks = []  # 用来保存异步任务
         if ip_list != []:
@@ -80,19 +84,24 @@ class L4D2Api:
         is_player: bool,
     ):
         play: List[a2s.Player] = []
+        server: Union[a2s.SourceInfo, a2s.GoldSrcInfo]
         if is_server:
             try:
-                server: a2s.SourceInfo = await a2s.ainfo(ip, timeout=3, encoding="utf8")
+                server = await a2s.ainfo(
+                    ip,
+                    timeout=3,
+                    encoding="utf8",
+                )
 
                 if server is not None:
-                    server.steam_id = index
+                    server.steam_id = index  # type: ignore
 
             except (
                 asyncio.exceptions.TimeoutError,
                 ConnectionRefusedError,
                 socket.gaierror,
             ):
-                server: a2s.SourceInfo = a2s.SourceInfo(
+                server = a2s.SourceInfo(
                     protocol=0,
                     server_name="服务器无响应",
                     map_name="无",
@@ -137,7 +146,7 @@ class L4D2Api:
         json: Optional[Dict[str, Any]] = None,
         data: Optional[Dict[str, Any]] = None,
         is_json: bool = True,
-    ):
+    ) -> Union[Dict[str, Any], BeautifulSoup]:  # type: ignore
         header = deepcopy(self._HEADER)
 
         if json is not None:
@@ -181,7 +190,17 @@ class L4D2Api:
             return BeautifulSoup(html_content, "lxml")
 
     async def get_sourceban(self, tag: str = "云", url: str = anne_ban):
-        """从sourceban++获取服务器列表，目前未做名称处理"""
+        """
+        异步函数，从sourceban++获取服务器列表，目前未做名称处理。
+
+        Args:
+            tag (str): 用于标识不同来源的标签，默认为"云"。
+            url (str): SourceBan的URL，默认为anne_ban。
+
+        Returns:
+            list: 包含服务器信息的列表。
+
+        """
         if not (url.startswith(("http://", "https://"))):
             url = "http://" + url  # 默认添加 http://
         soup = await self._server_request(
@@ -272,14 +291,14 @@ class L4D2Api:
         if not isinstance(soup, BeautifulSoup):
             return None
 
-        tbody = soup.find(
+        tbody = cast(BeautifulSoup, soup).find(
             "div",
             class_="content text-center text-md-left",
             style="background-color: #f2f2f2;",
         )
         if tbody is None:
             return None
-        kill_tag = tbody.find(
+        kill_tag = cast(BeautifulSoup, tbody).find(
             "div",
             class_="card-body worldmap d-flex flex-column justify-content-center text-center",
         )

nonebot_plugin_l4d2_server/utils/utils.py

@@ -7,6 +7,7 @@ from typing import Any, Dict, List, Optional, Tuple
 import aiofiles
 import aiohttp
 import nonebot
+from aiohttp import ClientTimeout
 from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, MessageEvent
 from nonebot.log import logger
 from nonebot_plugin_alconna import UniMessage
@@ -184,7 +185,11 @@ async def url_to_byte(url: str):
     """获取URL数据的字节流"""
 
     async with aiohttp.ClientSession() as session:
-        async with session.get(url, headers=headers, timeout=600) as response:
+        async with session.get(
+            url,
+            headers=headers,
+            timeout=ClientTimeout(total=600),
+        ) as response:
             if response.status == 200:
                 return await response.read()
             return None
@@ -194,7 +199,11 @@ async def url_to_msg(url: str):
     """获取URL数据的字节流"""
 
     async with aiohttp.ClientSession() as session:
-        async with session.get(url, headers=headers, timeout=600) as response:
+        async with session.get(
+            url,
+            headers=headers,
+            timeout=ClientTimeout(total=600),
+        ) as response:
             if response.status == 200:
                 return await response.text()
             return None

{nonebot_plugin_l4d2_server-1.0.2.dist-info → nonebot_plugin_l4d2_server-1.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-l4d2-server
-Version: 1.0.2
+Version: 1.0.4
 Summary: L4D2 server related operations plugin for NoneBot2
 Keywords: steam,game,l4d2,nonebot2,plugin
 Author-Email: Agnes_Digital <Z735803792@163.com>
@@ -11,10 +11,12 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Operating System :: OS Independent
 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: nonebot2[fastapi]>=2.3.3
 Requires-Dist: nonebot-plugin-htmlrender>=0.3.0
 Requires-Dist: nonebot-adapter-onebot>=2.4.4
 Requires-Dist: nonebot-plugin-alconna>=0.50.0
@@ -29,8 +31,8 @@ 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: pillow>10
+Requires-Dist: bs4>=0.0.2
 Requires-Dist: rarfile>=4.2
 Requires-Dist: pyunpack>=0.3
 Requires-Dist: aiofiles>=24.1.0
@@ -45,7 +47,7 @@ Description-Content-Type: text/markdown
 
 <div align="center">
 
-# nonebot_plugin_l4d2_server 1.0.0a1
+# nonebot_plugin_l4d2_server 1.0.4
 
 _✨Nonebot & Left 4 Dead 2 server操作✨_
 <div align = "center">
@@ -75,15 +77,12 @@ _✨Nonebot & Left 4 Dead 2 server操作✨_
 
 ## 顶置公告（如果以前用0.x.x版本暂时别更新）
 
-- **版本**  1.x.x进行了破坏式更新，目前处于测试阶段，使用旧插件的不要更新
+- **版本**  1.x.x进行了破坏式更新，使用旧插件的不要更新
 
-## 更改部分
+## 指令
 
-- 取消了网页控制台(没有卵用)
-- 取消了自动重启(与其他插件功能重复)
-- 取消了git拉取更新(nb规范用pypi)
-- 增加pil和浏览器渲染做选择(可以选择pil以节省性能性能)
-- 删除无用部分(依赖太多难以维护)
+- 在json文件设置的前缀指令，例如设置"云"，则指令 云 输出组服务器，云1 输出1号服务器
+- l4图片开启/关闭 超管指令 可以修改输出单图是否为图片输出
 
 ## 安装
 
@@ -140,8 +139,7 @@ conda install nonebot-plugin-l4d2-server
 ## 主要功能
 
 - [ ] 求生服务器-本地多路径操作（传地图等）
-- [ ] 批量查询指定ip服务器状态和玩家
-- [ ] [求生电信服anne](https://github.com/fantasylidong/CompetitiveWithAnne)[查询~](https://sb.trygek.com/l4d_stats/ranking/index.php)
+- [x] 批量查询指定ip服务器状态和玩家
 
 ## [数据结构](./docs/standand.md)
 
@@ -150,8 +148,6 @@ conda install nonebot-plugin-l4d2-server
 ## env设置
 
 """bash
-    l4_anne = False
-    """是否启用anne电信服相关功能"""
     l4_enable = True
     """是否全局启用求生功能"""
     l4_image = False
@@ -170,6 +166,15 @@ conda install nonebot-plugin-l4d2-server
     - 缤纷彩虹
 """
 
+## 和0.x.x更改部分
+
+- 取消了网页控制台(没有卵用)
+- 取消了自动重启(与其他插件功能重复)
+- 取消了git拉取更新(nb规范用pypi)
+- 增加pil和浏览器渲染做选择(可以选择pil以节省性能性能)
+- 删除无用部分(依赖太多难以维护)
+- 删除了anne部分，已移植到[这里](https://github.com/Agnes4m/L4D2UID),通过core插件调用
+
 ## 其他
 
 - 本人技术很差，如果您有发现BUG或者更好的建议，欢迎提Issue & Pr

{nonebot_plugin_l4d2_server-1.0.2.dist-info → nonebot_plugin_l4d2_server-1.0.4.dist-info}/RECORD

@@ -1,15 +1,13 @@
-nonebot_plugin_l4d2_server-1.0.2.dist-info/METADATA,sha256=XqVzrC4S7KU6SCMgUx_ztxZobhrTefaqwnhG6vFzUmU,6596
-nonebot_plugin_l4d2_server-1.0.2.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-nonebot_plugin_l4d2_server-1.0.2.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-nonebot_plugin_l4d2_server-1.0.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+nonebot_plugin_l4d2_server-1.0.4.dist-info/METADATA,sha256=kZdrFtRaRtfYjXvIapyyUJnulUxQPjtbzRAOHAVyBkA,6763
+nonebot_plugin_l4d2_server-1.0.4.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+nonebot_plugin_l4d2_server-1.0.4.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+nonebot_plugin_l4d2_server-1.0.4.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
 nonebot_plugin_l4d2_server/__init__.py,sha256=PIufOk1bxOx-nYqdoinoB7BcntIETNFwfzqKnmu-teE,1624
-nonebot_plugin_l4d2_server/__main__.py,sha256=E33d-UIdYmBZfT0ASW8WRkqoTXcF_NWRJIcQD_NS3FA,7981
-nonebot_plugin_l4d2_server/config.py,sha256=CavZ4EGdLvooVrUeP8zGsbZ0TJNsxGl2WT9rpyJtvhw,1175
+nonebot_plugin_l4d2_server/__main__.py,sha256=Z8laU36rLdNq-Qfroj-1t6dbt4rfKLetvJ1cY937oGo,10232
+nonebot_plugin_l4d2_server/config.py,sha256=_UKAn1g5BbykMNc6LXRujKoGhpxIM5JAdh3z301BLHk,2665
 nonebot_plugin_l4d2_server/data/font/loli.ttf,sha256=Yrh-RPoCrn1-NG94DR0x20ASXYUt8g3Ep6BCt3CdOFk,11125812
-nonebot_plugin_l4d2_server/l4_anne/__init__.py,sha256=zX4kTu4LAsqm7_li0-GcihnbYI65SBPkfUCPTs79U8k,4124
-nonebot_plugin_l4d2_server/l4_anne/ranne.py,sha256=vtNQJ-74rJiwVI3IYS3ZgFk_LaCviKU1yxrGk3DFvQs,532
 nonebot_plugin_l4d2_server/l4_help/Help.json,sha256=hz_k-qmGmGJKwCa8wmkHTLzXu6C-G-E_g7xdK-t6fNk,2673
-nonebot_plugin_l4d2_server/l4_help/__init__.py,sha256=cabiFBsUVFWs6EUC2XpXhp6PBWRmdBLWEVRNJAvjN6Y,1535
+nonebot_plugin_l4d2_server/l4_help/__init__.py,sha256=sZRp6HJE2hvEcSST7CXJk8eAyv6rj4kLIcOK_7xUTI0,1535
 nonebot_plugin_l4d2_server/l4_help/draw.py,sha256=y6yDPUnoZFvwly8cf7g9HRpT1JXTxyA9DC1TuvUinTM,6448
 nonebot_plugin_l4d2_server/l4_help/icon/介绍.png,sha256=3QC6A38QC-7gDBxmtQSQdbsz7hsefU5LL-oZmJ41zTk,3806
 nonebot_plugin_l4d2_server/l4_help/icon/任务.png,sha256=nyZ4_kM21ZO95nwanCFnUfCGX-PkmJXYQf9OrJVKomY,3782
@@ -88,12 +86,12 @@ nonebot_plugin_l4d2_server/l4_image/model.py,sha256=FGsCvf_BKbRNJUVy6I5BKnArMY-3
 nonebot_plugin_l4d2_server/l4_image/vtfs.py,sha256=He_7zzEIOip8MXP55TS7aWPbzo6ac0wPf602nN3GWZM,1461
 nonebot_plugin_l4d2_server/l4_local/__init__.py,sha256=nz9KUxmuvRrryHakQQ4B30oC9jeGWZ3sON1tCKb-lS0,3603
 nonebot_plugin_l4d2_server/l4_local/file.py,sha256=hew1Y8kV3uSZvUGplmi09EGKC89-sUJWsWV7SCEstI8,3067
-nonebot_plugin_l4d2_server/l4_request/__init__.py,sha256=FRYBGRM30VoImQqAu3k90r82qkeo8wPjR93t6WLx7nk,7144
-nonebot_plugin_l4d2_server/l4_request/draw_msg.py,sha256=WjV2eEVVxsd4akNKDzVl6aRIegJ5pPbIzqziC0vBRmM,2697
+nonebot_plugin_l4d2_server/l4_request/__init__.py,sha256=9Yo6mQ_bIBvMwQubC3Ctie6H2Qzx7ScwCQyVS9y25TE,11682
+nonebot_plugin_l4d2_server/l4_request/draw_msg.py,sha256=koAVWrsDoLCTmwXY-NJTi5yjL1y1ND3daFkDWccQjcU,8071
 nonebot_plugin_l4d2_server/l4_request/utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nonebot_plugin_l4d2_server/utils/api/api.py,sha256=auvDicCEKwvnm6EJYeCxCtugFby61K-zAmmaRWWEwtM,296
-nonebot_plugin_l4d2_server/utils/api/models.py,sha256=EKAAM5RsFK-hV-a80tc4r35ToNRhnCWVuQ-7imwBjwE,2386
-nonebot_plugin_l4d2_server/utils/api/request.py,sha256=hugBaPBK-gUr5Xemyk7dSHP1JlzYrEZcXPinkNX0AuU,14987
+nonebot_plugin_l4d2_server/utils/api/models.py,sha256=p-hoxPHwadTaMRb2hqwfbaQ3pvJySrV8VbBmhA0Oi-M,2391
+nonebot_plugin_l4d2_server/utils/api/request.py,sha256=aAsXtxvm7erXLfFCbs6NmsZCRGpsg3tsMdWvSn8SkNU,15575
 nonebot_plugin_l4d2_server/utils/database/models.py,sha256=SLdcgwsn39r_ZkcBoqf4MLX1EfpCOjGBwWcR16u9Bqo,454
-nonebot_plugin_l4d2_server/utils/utils.py,sha256=C-QzwtUCbq7QXmHplpmo3OTKbRztE1W7V-IywvufDl0,5971
-nonebot_plugin_l4d2_server-1.0.2.dist-info/RECORD,,
+nonebot_plugin_l4d2_server/utils/utils.py,sha256=TD3cUCxmmj2GPmK1sQwP7NtkIXNO2FpuXjymaUqBDYo,6141
+nonebot_plugin_l4d2_server-1.0.4.dist-info/RECORD,,

nonebot_plugin_l4d2_server/l4_anne/__init__.py

@@ -1,125 +0,0 @@
-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/l4_anne/ranne.py

@@ -1,18 +0,0 @@
-# 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']}
-    """