fix: 修复点小问题

Author: tianxiu2b2t

core/config.py

@@ -35,7 +35,7 @@
         {
             "type": "local", 
             "path": "./bmclapi",
-            "width": 0
+            "weight": 0
         }
     ],
     "database": {
@@ -170,7 +170,7 @@ def rank_clusters_url(self):
 
 const = Const()
 
-VERSION = "3.3.1"
+VERSION = "3.3.2"
 API_VERSION = "1.13.1"
 USER_AGENT = f"openbmclapi/{API_VERSION} python-openbmclapi/{VERSION}"
 PYTHON_VERSION = ".".join(map(str, (sys.version_info.major, sys.version_info.minor, sys.version_info.micro)))

core/web.py

@@ -6,17 +6,23 @@
 from pathlib import Path
 import ssl
 import time
-from typing import Any, Optional
+from typing import Any, Optional, Callable
 from aiohttp import web
 from aiohttp.web_urldispatcher import SystemRoute
 
-from core import config, units, utils
+from core import config, scheduler, units, utils
 from .logger import logger
 
 from cryptography import x509
 from cryptography.x509.oid import NameOID
 
 
+@dataclass
+class CheckServer:
+    port: int
+    start_handle: Callable
+    client: Optional[ssl.SSLContext] = None
+
 @dataclass
 class PrivateSSLServer:
     server: asyncio.Server
@@ -158,8 +164,6 @@ async def start_tcp_site():
     site = web.TCPSite(runner, '0.0.0.0', port)
     await site.start()
 
-    print(site)
-
 async def init():
     global runner, site
 
@@ -172,6 +176,12 @@ async def init():
 
     await start_public_server()
 
+    scheduler.run_repeat_later(
+        check_server,
+        60,
+        10
+    )
+
 async def forward_data(reader: asyncio.StreamReader, writer: asyncio.StreamWriter):
     while not writer.is_closing():
         data = await reader.read(IO_BUFFER)
@@ -354,5 +364,47 @@ def get_certificate_domains(
     ]
     return results
 
+async def check_server():
+    servers: list[CheckServer] = []
+    if site is not None:
+        servers.append(CheckServer(site._port, start_private_server))
+    if public_server is not None:
+        servers.append(CheckServer(public_server.sockets[0].getsockname()[1], start_public_server))
+    if privates:
+        for server in privates.values():
+            servers.append(CheckServer(server.server.sockets[0].getsockname()[1], start_private_server, server.key))
+    
+    logger.tdebug("web.debug.check_server", servers=len(servers))
+    results = await asyncio.gather(*[asyncio.create_task(_check_server(server)) for server in servers])
+    for server, result in zip(servers, results):
+        if result:
+            continue
+        await server.start_handle()
+        logger.twarning("web.warning.server_down", port=server.port)
+
+
+async def _check_server(
+    server: CheckServer
+):
+    try:
+        r, w = await asyncio.wait_for(
+            asyncio.open_connection(
+                '127.0.0.1',
+                server.port,
+                ssl=server.client
+            ),
+            timeout=5
+        )
+        w.close()
+        try:
+            await asyncio.wait_for(w.wait_closed(), timeout=10)
+        except:
+            ...
+        return True
+    except:
+        logger.ttraceback("web.traceback.check_server", port=server.port)
+    return False
+
 async def unload():
-    ...
+    await app.cleanup()
+    await app.shutdown()

i18n/zh_cn.json

@@ -19,6 +19,7 @@
     "web.success.public_port": "当前 Web 服务器在 [${port}] 端口上开启",
     "web.error.any": "Web 服务器出错 ${e}",
     "web.debug.request_info": "${host} | ${time} | ${address} | ${method} ${status} | ${real_path} - ${user_agent}",
+    "web.debug.check_server": "一共有 [${servers}] 个服务器准备检查",
     "cluster.error.socketio.request_cert": "节点 [${cluster}] 请求证书失败，原因 [${err}]",
     "cluster.debug.public_host": "已在 [${host}:${port}] 上开放，节点地址 [https://${domain}:${port}]",
     "cluster.error.socketio": "节点 [${cluster}] 发送 [${type}] 时出错，原因 [${err}]",