fix(teacher): presend IPv4 command result before netsh; suppress benign TCP hangup errors on teacher

Author: misakano7545

agent/main.py

@@ -51,7 +51,7 @@
     start_clash_if_config_exists,
 )
 
-AGENT_VERSION = "1.0.3"
+AGENT_VERSION = "1.0.0"
 
 
 def _debug(msg: str) -> None:
@@ -243,11 +243,32 @@ def _run() -> None:
 
         threading.Thread(target=_run, daemon=True).start()
 
+    def _try_presend_ipv4_result(self, cmd_id: str) -> bool:
+        """Notify teacher before netsh; TCP often dies after IP change (WinError 10038)."""
+        if not cmd_id:
+            return False
+        try:
+            self._send(
+                {
+                    "type": MSG_RESULT,
+                    "cmd_id": cmd_id,
+                    "ok": True,
+                    "message": (
+                        "正在通过 netsh 应用 IPv4；成功后本会话通常会断开并重连。"
+                        "若未再收到本条命令的第二条结果，一般以本机网络配置为准。"
+                    ),
+                }
+            )
+            return True
+        except (ConnectionError, OSError, ValueError):
+            return False
+
     def _handle_command(self, cmd: Dict[str, Any]) -> None:
         cmd_type = get_message_type(cmd)
         cmd_id = str(cmd.get("cmd_id") or "")
         ok = False
         msg = "unsupported command"
+        skip_final_result = False
 
         if cmd_type == MSG_COMMAND_RENAME_HOST:
             new_name = str(cmd.get("new_hostname") or "").strip()
@@ -262,7 +283,12 @@ def _handle_command(self, cmd: Dict[str, Any]) -> None:
             else:
                 mode = str(cmd.get("mode") or "").strip().lower()
                 if mode == "dhcp":
+                    presend = (
+                        sys.platform == "win32" and self._try_presend_ipv4_result(cmd_id)
+                    )
                     ok, msg = apply_ipv4_dhcp(name)
+                    if sys.platform == "win32" and ok and presend:
+                        skip_final_result = True
                 elif mode == "static":
                     ip = str(cmd.get("ip") or "").strip()
                     mask = str(cmd.get("mask") or "").strip()
@@ -272,7 +298,13 @@ def _handle_command(self, cmd: Dict[str, Any]) -> None:
                     if not ip or not mask:
                         ok, msg = False, "missing ip/mask"
                     else:
+                        presend = (
+                            sys.platform == "win32"
+                            and self._try_presend_ipv4_result(cmd_id)
+                        )
                         ok, msg = apply_ipv4_static(name, ip, mask, gw, dns1, dns2)
+                        if sys.platform == "win32" and ok and presend:
+                            skip_final_result = True
                 else:
                     ok, msg = False, "unknown mode"
         elif cmd_type == MSG_COMMAND_POWER:
@@ -320,6 +352,9 @@ def _handle_command(self, cmd: Dict[str, Any]) -> None:
                 ok = False
                 msg = "unknown mode: %s" % mode
 
+        if skip_final_result:
+            return
+
         try:
             self._send(
                 {

teacher/main.py

@@ -91,7 +91,7 @@ def enqueue_network_restrict(session_id: str, cmd_id: str, payload: Dict[str, An
     if os.path.exists(yaml_file_path):
         app.log_line(f"配置文件同步已启用 yaml={yaml_file_path}")
     else:
-        app.log_line(f"警告: yaml配置文件不存在 {yaml_file_path}")
+        app.log_line(f"警告: yaml 配置文件不存在 {yaml_file_path}")
 
     def poll_queue() -> None:
         try:
@@ -100,7 +100,7 @@ def poll_queue() -> None:
                 if kind == "client_registered":
                     hn = data.get("hostname") or "-"
                     app.log_line(
-                        "上线: pc_name=%s [%s] %s (%s)"
+                        "上线: %s [%s] %s (%s)"
                         % (
                             hn,
                             (data.get("machine_id") or "")[:12] or "-",
@@ -146,4 +146,4 @@ def poll_queue() -> None:
 
 
 if __name__ == "__main__":
-    main()
+    main()

teacher/server.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import collections
+import errno
 import json
 import os
 import socket
@@ -28,6 +29,26 @@
 )
 
 
+def _socket_exc_likely_peer_hangup(exc: BaseException) -> bool:
+    """True when the client side probably closed or reset TCP (e.g. after IPv4 change)."""
+    if isinstance(exc, ConnectionError):
+        return True
+    if isinstance(exc, OSError):
+        w = getattr(exc, "winerror", None)
+        if w in (10038, 10053, 10054, 10057):
+            return True
+        errno = exc.errno
+        if errno is not None:
+            if errno in (
+                errno.ECONNRESET,
+                errno.EPIPE,
+                errno.ENOTCONN,
+                errno.ECONNABORTED,
+            ):
+                return True
+    return False
+
+
 @dataclass
 class ClientSession:
     session_id: str
@@ -302,14 +323,15 @@ def _client_loop(self, conn: socket.socket, peer_ip: str) -> None:
                     s_err = self._sessions.get(session_id)
                     if s_err:
                         err_host = str(s_err.hostname or "")
-            self._emit(
-                "client_error",
-                {
-                    "session_id": session_id or "",
-                    "hostname": err_host,
-                    "message": str(e),
-                },
-            )
+            if not _socket_exc_likely_peer_hangup(e):
+                self._emit(
+                    "client_error",
+                    {
+                        "session_id": session_id or "",
+                        "hostname": err_host,
+                        "message": str(e),
+                    },
+                )
         finally:
             if session_id:
                 disc_host = ""