fix(agent,teacher,common): async cmd dispatch, errno import, atomic yaml writes, treeview diff refresh, recv body deadline, subprocess timeouts, hostname validation

Author: misakano7545

agent/firewall_manager.py

@@ -11,6 +11,7 @@
 import subprocess
 from typing import Any, Dict, List, Optional, Tuple
 from common.utils import is_admin, get_subprocess_flags
+from common.clash_config import config_to_yaml
 
 _script_dir = os.path.dirname(os.path.abspath(sys.executable)) if getattr(sys, "frozen", False) else os.path.dirname(os.path.abspath(__file__))
 CLASH_CONFIG_DIR = os.path.join(_script_dir, "configs")
@@ -46,7 +47,7 @@ def _build_clash_config(mode: str, rules: List[Dict[str, str]]) -> Dict[str, Any
         "socks-port": 0,
         "mixed-port": 0,
         "allow-lan": False,
-        "bind-address": "\"*\"",
+        "bind-address": "*",
         "mode": "rule",
         "log-level": "silent",
         "ipv6": False,
@@ -150,89 +151,66 @@ def _is_ip(s: str) -> bool:
 def _save_config(config: Dict[str, Any]) -> Tuple[bool, str]:
     _ensure_config_dir()
     try:
-        with open(CLASH_CONFIG_FILE, "w", encoding="utf-8") as f:
-            yaml_content = _dict_to_yaml(config)
+        yaml_content = config_to_yaml(config)
+        tmp_path = CLASH_CONFIG_FILE + ".tmp"
+        with open(tmp_path, "w", encoding="utf-8") as f:
             f.write(yaml_content)
+        os.replace(tmp_path, CLASH_CONFIG_FILE)
         return True, "config saved"
     except Exception as e:
         return False, str(e)
 
 
-def _dict_to_yaml(data: Any, indent: int = 0) -> str:
-    result = []
-    spaces = "  " * indent
-    if isinstance(data, dict):
-        for key, value in data.items():
-            if isinstance(value, (dict, list)):
-                result.append(f"{spaces}{key}:")
-                result.append(_dict_to_yaml(value, indent + 1))
-            elif isinstance(value, str) and ("#" in value or "\n" in value or value == ""):
-                result.append(f"{spaces}{key}: |")
-                for line in value.split("\n"):
-                    result.append(f"{spaces}  {line}")
-            elif isinstance(value, bool):
-                result.append(f"{spaces}{key}: {'true' if value else 'false'}")
-            elif value is None:
-                result.append(f"{spaces}{key}: null")
-            elif isinstance(value, list):
-                if len(value) == 0:
-                    result.append(f"{spaces}{key}: []")
-                else:
-                    first = value[0]
-                    if isinstance(first, (dict, list)):
-                        result.append(f"{spaces}{key}:")
-                        for item in value:
-                            result.append(f"{spaces}  -")
-                            result.append(_dict_to_yaml(item, indent + 2))
-                    else:
-                        items = ", ".join(str(v) for v in value)
-                        result.append(f"{spaces}{key}: [{items}]")
-            else:
-                result.append(f"{spaces}{key}: {value}")
-    elif isinstance(data, list):
-        for item in data:
-            if isinstance(item, dict):
-                result.append(f"{spaces}-")
-                result.append(_dict_to_yaml(item, indent + 1))
-            else:
-                result.append(f"{spaces}- {item}")
-    else:
-        result.append(f"{spaces}{data}")
-    return "\n".join(result)
+def _stop_clash_process_locked() -> None:
+    """Caller MUST hold CLASH_PROCESS_LOCK."""
+    global _clash_process
+    if _clash_process is None:
+        return
+    proc = _clash_process
+    _clash_process = None
+    try:
+        proc.terminate()
+        try:
+            proc.wait(timeout=5)
+            return
+        except subprocess.TimeoutExpired:
+            pass
+        proc.kill()
+        try:
+            proc.wait(timeout=5)
+        except subprocess.TimeoutExpired:
+            # mihomo (TUN driver) 偶尔卸载慢；不再等待，但前面已发送 SIGKILL，
+            # 句柄一旦 Python 端释放，Windows 会回收。
+            pass
+    except OSError:
+        pass
 
 
 def _stop_clash_process() -> None:
-    global _clash_process
     with CLASH_PROCESS_LOCK:
-        if _clash_process is not None:
-            try:
-                _clash_process.terminate()
-                _clash_process.wait(timeout=5)
-            except Exception:
-                try:
-                    _clash_process.kill()
-                except Exception:
-                    pass
-            _clash_process = None
+        _stop_clash_process_locked()
 
 
 def _start_clash_process(clash_path: str) -> Tuple[bool, str]:
     global _clash_process
-    _stop_clash_process()
-
-    try:
-        _clash_process = subprocess.Popen(
-            [clash_path, "-f", CLASH_CONFIG_FILE, "-d", CLASH_CONFIG_DIR],
-            stdout=subprocess.DEVNULL,
-            stderr=subprocess.DEVNULL,
-            creationflags=get_subprocess_flags(),
-        )
-        time.sleep(1.5)
+    with CLASH_PROCESS_LOCK:
+        _stop_clash_process_locked()
+        try:
+            _clash_process = subprocess.Popen(
+                [clash_path, "-f", CLASH_CONFIG_FILE, "-d", CLASH_CONFIG_DIR],
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL,
+                creationflags=get_subprocess_flags(),
+            )
+        except Exception as e:
+            return False, f"启动 mihomo 失败: {e}"
+    time.sleep(1.5)
+    with CLASH_PROCESS_LOCK:
+        if _clash_process is None:
+            return False, "mihomo 进程已被外部停止"
         if _clash_process.poll() is not None:
             return False, "mihomo 进程立即退出"
-        return True, "mihomo 已启动"
-    except Exception as e:
-        return False, f"启动 mihomo 失败: {e}"
+    return True, "mihomo 已启动"
 
 
 def _is_clash_running() -> bool:
@@ -309,19 +287,12 @@ def disable_restrictions() -> Tuple[bool, str]:
         return False, "需要管理员权限"
 
     with CLASH_PROCESS_LOCK:
-        global _clash_process
-        if _clash_process is not None:
-            try:
-                _clash_process.terminate()
-                _clash_process.wait(timeout=5)
-            except Exception:
-                try:
-                    _clash_process.kill()
-                except Exception:
-                    pass
-            _clash_process = None
+        _stop_clash_process_locked()
         if os.path.exists(CLASH_CONFIG_FILE):
-            os.remove(CLASH_CONFIG_FILE)
+            try:
+                os.remove(CLASH_CONFIG_FILE)
+            except OSError as e:
+                return False, f"删除配置失败: {e}"
 
     return True, "已解除网络限制"
 
@@ -344,33 +315,4 @@ def start_clash_if_config_exists() -> Tuple[bool, str]:
     if not ok:
         return False, f"启动 mihomo 失败: {msg}"
 
-    return True, "mihomo 已启动"
-
-
-def get_current_restriction_status() -> Dict[str, Any]:
-    status: Dict[str, Any] = {
-        "has_restrictions": _is_clash_running(),
-        "mode": "disabled",
-        "rule_count": 0,
-        "rules": [],
-    }
-
-    if not os.path.exists(CLASH_CONFIG_FILE):
-        return status
-
-    try:
-        with open(CLASH_CONFIG_FILE, "r", encoding="utf-8") as f:
-            content = f.read()
-            if "MATCH,REJECT" in content:
-                if "DOMAIN-SUFFIX" in content or "DOMAIN," in content or "IP-CIDR" in content:
-                    if "DOMAIN-SUFFIX" in content or "DOMAIN," in content:
-                        status["mode"] = "blacklist"
-                    else:
-                        status["mode"] = "block_all"
-                else:
-                    status["mode"] = "block_all"
-                status["has_restrictions"] = True
-    except Exception:
-        pass
-
-    return status
+    return True, "mihomo 已启动"