feat: 支持退出时下线操作

Author: SilianZ

core/__init__.py

@@ -1,31 +1,49 @@
+import asyncio
 from core.cluster import Cluster
 from core.config import Config
-import asyncio
-import signal
+from core.logger import logger
 
 cluster = Cluster()
 
-
 async def main():
-    await cluster.token.fetchToken()
-    await cluster.getConfiguration()
-    await cluster.fetchFileList()
-    await cluster.init()
-    await cluster.checkStorages()
-    missing_filelist = await cluster.getMissingFiles()
-    delay = Config.get("advanced.delay")
-    retry = Config.get("advanced.retry")
-    await cluster.syncFiles(missing_filelist, retry, delay)
-    await cluster.connect()
-    protocol = "http" if Config.get("cluster.byoc") else "https"
-    if protocol == "https":
-        await cluster.socket.requestCertificate()
-    await cluster.setupRouter()
-    await cluster.listen(protocol == "https", Config.get("cluster.port"))
-    await cluster.enable()
-    while True:
-        await asyncio.sleep(3600)
+    try:
+        await cluster.token.fetchToken()
+        await cluster.getConfiguration()
+        await cluster.fetchFileList()
+        await cluster.init()
+        await cluster.checkStorages()
+        missing_filelist = await cluster.getMissingFiles()
+        await cluster.syncFiles(missing_filelist, Config.get("advanced.retry"), Config.get("advanced.delay"))
+        await cluster.connect()
+
+        protocol = "http" if Config.get("cluster.byoc") else "https"
+        if protocol == "https":
+            await cluster.socket.requestCertificate()
+
+        await cluster.setupRouter()
+        await cluster.listen(protocol == "https", Config.get("cluster.port"))
+        await cluster.enable()
+
+        while True:
+            await asyncio.sleep(3600)
 
+    except asyncio.CancelledError:
+        logger.tinfo('main.info.stopping')
+        if cluster.enabled:
+            await cluster.disable()
+        if cluster.socket:
+            await cluster.socket.socket.disconnect()
+        if cluster.site:
+            await cluster.site.stop()
+        logger.tsuccess("main.success.stopped")
 
 def init():
-    asyncio.run(main())
+    loop = asyncio.get_event_loop()
+    main_task = loop.create_task(main())
+    try:
+        loop.run_until_complete(main_task)
+    except KeyboardInterrupt:
+        main_task.cancel()
+        loop.run_until_complete(asyncio.shield(main_task))
+    finally:
+        loop.close()

core/client.py

@@ -28,8 +28,8 @@ async def _() -> None:
             logger.tsuccess("client.success.connected")
 
         @self.socket.on("disconnect")
-        async def _(reason: str) -> None:
-            logger.twarning("client.warn.disconnected", reason=reason)
+        async def _() -> None:
+            logger.twarning("client.warn.disconnected")
 
         @self.socket.on("message")
         async def _(message: str) -> None:

core/cluster.py

@@ -192,7 +192,6 @@ async def syncFiles(
                     for file in missing_filelist.files
                 ]
                 await asyncio.gather(*tasks)
-
             if not self.failed_filelist.files:
                 logger.tsuccess("cluster.success.sync_files.downloaded")
             elif retry > 1:
@@ -315,12 +314,13 @@ async def callback(data: List[Any]):
                 return
 
             self.enabled = True
+            logger.tsuccess("cluster.success.enable.enabled")
 
         except Exception as e:
             logger.terror("cluster.error.enable.exception", e=e)
 
     async def disable(self) -> None:
-        if not self.socket:
+        if not self.socket or not self.enabled:
             return
         logger.tinfo("cluster.info.disabling")
         future = asyncio.Future()
@@ -344,6 +344,7 @@ async def callback(data: List[Any]):
             if ack is not True:
                 logger.terror("cluster.error.disable.failed")
 
+            logger.tsuccess("cluster.success.disable.disabled")
         except Exception as e:
             logger.terror("cluster.error.enable.exception", e=e)
 

i18n/zh_cn.json

@@ -1,5 +1,7 @@
 {
     "main.info.start": "启动中……",
+    "main.info.stopping": "停止程序中……",
+    "main.success.stopped": "成功终止程序，再见！",
     "token.info.fetching": "正在获取 Token……",
     "token.success.fetched": "成功获取 Token！有效期：${ttl} 小时。",
     "storage.info.check": "储存测试中……",
@@ -36,8 +38,10 @@
     "cluster.tqdm.desc.sync_files": "同步文件中",
     "cluster.tqdm.unit.files": " 个文件",
     "client.success.connected": "成功与主控建立连接！",
+    "cluster.success.enable.enabled": "成功启用节点！",
+    "cluster.success.disable.disabled": "成功禁用节点！",
     "client.info.message": "[主控] ${message}",
-    "client.warn.disconnected": "与主控断开连接：${reason}",
+    "client.warn.disconnected": "与主控断开连接。",
     "cluster.error.disconnected": "未连接到服务器。",
     "client.error.exception": "[主控] ${error}",
     "client.error.reconnect": "在尝试重连至主控时发生错误：${e}",