🐛修复bug

Author: Agnes4m

.pre-commit-config.yaml

@@ -5,21 +5,24 @@ ci:
   autoupdate_branch: main
   autoupdate_schedule: monthly
   autoupdate_commit_msg: ':arrow_up: auto update by pre-commit hooks'
-  
+
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.6
+    rev: v0.14.14
     hooks:
       - id: ruff
-        args: [--fix, --exit-non-zero-on-fix]
+        args: [--fix]
+      - id: ruff-format
 
-  # - repo: https://github.com/RobertCraigie/pyright-python
-  #   rev: v1.1.318
-  #   hooks:
-  #     - id: pyright
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v6.0.0
+    hooks:
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
 
-  - repo: https://github.com/psf/black
-    rev: 24.8.0
+  - repo: https://github.com/astral-sh/uv-pre-commit
+    # uv version.
+    rev: 0.9.28
     hooks:
-      - id: black
-        stages: [pre-commit]
+      - id: uv-lock
+      - id: uv-export

data/L4D2/l4d2.json

@@ -0,0 +1 @@
+{}

nonebot_plugin_l4d2_server/__init__.py

@@ -27,6 +27,7 @@
 from . import __main__ as __main__  # noqa: E402
 from .config import ConfigModel  # noqa: E402
 from .l4_help import __version__  # noqa: E402
+from .utils.database import models  # noqa: E402, F401
 
 driver = get_driver()
 

nonebot_plugin_l4d2_server/l4_image/html_img.py

@@ -46,10 +46,15 @@ async def server_ip_pic(server_dict: List[OutServer]):
             )[:max_number]
             logger.debug(sorted_players)
 
-            # 时间转换
-            max_duration_len = max(
-                [len(str(await convert_duration(i.duration))) for i in sorted_players],
-            )
+            # 时间转换 - 添加空列表安全检查
+            max_duration_len = 1
+            if sorted_players:
+                max_duration_len = max(
+                    [
+                        len(str(await convert_duration(i.duration)))
+                        for i in sorted_players
+                    ],
+                )
             for player in sorted_players:
                 chines_dur = await convert_duration(player.duration)
                 dur = "{:^{}}".format(chines_dur, max_duration_len)
@@ -70,7 +75,6 @@ async def server_ip_pic(server_dict: List[OutServer]):
 async def get_server_img(plugins: List[OutServer]) -> Optional[bytes]:
     try:
         if config.l4_style == "default":
-
             template = env.get_template("normal.html")
         else:
             template = env.get_template("normal_old.html")

nonebot_plugin_l4d2_server/l4_request/draw_msg.py

@@ -260,6 +260,32 @@ async def get_much_server(
 
     all_server = await L4API.a2s_info(search_list, is_player=True)
 
+    # 确保两个列表长度相同，如果不同则用默认值填充
+    while len(all_server) < len(server_json):
+        # 创建默认的无响应服务器信息
+        import a2s
+
+        default_server = a2s.SourceInfo(
+            protocol=0,
+            server_name="服务器无响应",
+            map_name="无",
+            folder="m",
+            game="L4D2",
+            app_id=114514,
+            steam_id=len(all_server),
+            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,
+        )
+        all_server.append((default_server, []))
+
     for (server, player), srv_json in zip(all_server, server_json):
         out_server.append(
             OutServer(

nonebot_plugin_l4d2_server/utils/api/request.py

@@ -1,6 +1,5 @@
 import asyncio
 import contextlib
-import socket
 from copy import deepcopy
 from pathlib import Path
 from typing import Any, Dict, List, Literal, Optional, Tuple, Union, cast
@@ -70,11 +69,7 @@ async def a2s_server_info(
                 encoding="utf8",
             )
 
-        except (
-            asyncio.exceptions.TimeoutError,
-            ConnectionRefusedError,
-            socket.gaierror,
-        ):
+        except Exception:
             server = a2s.SourceInfo(
                 protocol=0,
                 server_name="服务器无响应",
@@ -124,7 +119,7 @@ async def a2s_info(
 
             try:
                 results = await asyncio.gather(*tasks)
-                msg_list = [r for r in results if r is not None]
+                msg_list = results  # 不过滤 None，保持与输入列表相同的长度
             except Exception as e:
                 logger.error(f"获取服务器信息时发生错误: {e}")
 
@@ -156,11 +151,7 @@ async def process_message(
                 )
                 if server is not None:
                     server.steam_id = index  # type: ignore
-            except (
-                asyncio.exceptions.TimeoutError,
-                ConnectionRefusedError,
-                socket.gaierror,
-            ):
+            except Exception:
                 server = a2s.SourceInfo(
                     protocol=0,
                     server_name="服务器无响应",
@@ -204,11 +195,7 @@ async def process_message(
             )
 
         if is_player:
-            with contextlib.suppress(
-                asyncio.exceptions.TimeoutError,
-                ConnectionRefusedError,
-                socket.gaierror,
-            ):
+            with contextlib.suppress(Exception):
                 play = await a2s.aplayers(ip, timeout=3, encoding="utf8")
         else:
             play = []