fix: 修正脑残打 tcp server

Author: tianxiu2b2t

assets/js/index.js

@@ -457,6 +457,23 @@ $style.addAll({
     "h1,h2,h3,h4,h5,h6": "margin:0;color:var(--color)",
     "svg": {
         "fill": "var(--color)"
+    },
+    "main": {
+        "position": "relative",
+        "top": "56px",
+        "display": "flex",
+        "min-height": "calc(-56px + 100vh)"
+    },
+    "aside": {
+        "z-index": "1",
+        "position": "fixed",
+        "min-width": "240px",
+        "padding": "20px",
+        "height": "100%",
+        "box-shadow": "var(--shadow) 0px 4px 10px",
+        "opacity": "1",
+        "transition": "min-width 250ms linear, width 250ms linear, padding 250ms linear, box-shadow 250ms linear, opacity 250ms linear",
+        "background": "var(--background)"
     }
 })
 function load() {
@@ -485,7 +502,10 @@ function load() {
     );
     const $header_content_right = createElement("div");
     $header.append($header_content_left, $header_content_right);
-    $app.append($header);
+
+    const $main = createElement("main");
+
+    $app.append($header, $main);
 
     $dom_body.appendBefore($app);
 }

core/web.py

@@ -214,24 +214,49 @@ async def ssl_handle(reader: asyncio.StreamReader, writer: asyncio.StreamWriter)
     finally:
         writer.close()
 
-async def check_server():
-    global public_server
-    if public_server is None:
+async def _check_server(ip: str, port: int, ssl: Optional[ssl.SSLContext] = None):
+    try:
+        r, w = await asyncio.wait_for(asyncio.open_connection(ip, port, ssl=ssl), 5)
+        w.close()
+        await w.wait_closed()
+        return True
+    except:
         return False
-    async def _check():
-        try:
-            r, w = await asyncio.wait_for(asyncio.open_connection('127.0.0.1', public_server.sockets[0].getsockname()[1]), 5) # type: ignore
-            w.write(CHECK_PORT_SECRET)
-            await w.drain()
-            data = await r.read(REQUEST_BUFFER)
-            return data == CHECK_PORT_SECRET
-        except:
-            return False
-    if await _check():
-        return
-    await start_public_server()
-    logger.twarning("web.warning.public_port", port=config.const.public_port)
 
+async def check_server():
+    global site, public_server, private_ssl_server
+    servers = [
+    ]
+    if site is not None:
+        servers.append(
+            ("127.0.0.1", site._port, start_tcp_site)
+        )
+    if public_server is not None:
+        servers.append(
+            ("127.0.0.1", config.const.public_port, start_public_server)
+        )
+    if private_ssl_server is not None:
+        servers.append(
+            ("127.0.0.1", private_ssl_server.sockets[0].getsockname()[1], _start_ssl_server)
+        )
+    result = await asyncio.gather(*(
+        _check_server(*server) for server in servers
+    ))
+    for i, r in enumerate(result):
+        if not r:
+            await servers[i][2]()
+            logger.twarning("web.warning.server_down", server=servers[i][0], port=servers[i][1])
+
+async def start_tcp_site():
+    global site, runner
+    if runner is None:
+        return
+    port = await get_free_port()
+    if site is not None:
+        await site.stop()
+    site = web.TCPSite(runner, '127.0.0.1', port)
+    await site.start()
+    logger.tdebug("web.debug.local_port", port=site._port)
 
 async def init():
     global runner, site, public_server, routes, app
@@ -241,12 +266,7 @@ async def init():
     runner = web.AppRunner(app)
     await runner.setup()
 
-    port = await get_free_port()
-
-    site = web.TCPSite(runner, '127.0.0.1', port)
-    await site.start()
-
-    logger.tdebug("web.debug.local_port", port=site._port)
+    await start_tcp_site()
 
     await start_public_server()
 
@@ -282,6 +302,12 @@ async def start_ssl_server(cert: Path, key: Path):
         client
     )
 
+    await _start_ssl_server()
+
+async def _start_ssl_server():
+    global private_ssl_server, private_ssl
+    if not private_ssl:
+        return
     if private_ssl_server is not None and private_ssl_server.is_serving():
         private_ssl_server.close()
         await private_ssl_server.wait_closed()
@@ -290,12 +316,11 @@ async def start_ssl_server(cert: Path, key: Path):
         ssl_handle,
         '127.0.0.1',
         port,
-        ssl=context
+        ssl=private_ssl[0]
     )
     logger.tdebug("web.debug.ssl_port", port=private_ssl_server.sockets[0].getsockname()[1])
 
 
-
 async def unload():
     global app
     await app.cleanup()

i18n/zh_cn.json

@@ -35,5 +35,5 @@
     "cluster.error.socketio.message": "节点 [${cluster}] 收到错误消息，原因 [${message}]",
     "cluster.error.socketio.warden": "[Warden] 节点 [${cluster}] 收到错误消息，原因 [${message}]",
     "utils.error.service_error": "服务出错，状态码 [${code}(${httpCode})] 类型 [${name}] 信息 [${message}]",
-    "web.warning.public_port": "当前 Web 服务器在 [${port}] 端口已重新开启"
+    "web.warning.shutdown_port": "当前 [${port}] 端口已重新开启"
 }