同步移动端工程、设备控制改进与发布资料

核桃派软件源代码/app/network/service.py

@@ -30,10 +30,16 @@ def validate_wifi_settings(
         raise WifiConfigError("ssid must contain 1..32 UTF-8 bytes")
 
     password_value = raw.get("password")
+    security = raw.get('security', 'wpa-psk')
+    if security not in ('open', 'wpa-psk'):
+        raise WifiConfigError('unsupported WiFi security')
     password = None if password_value in (None, "") else str(password_value)
     if password is not None and not 8 <= _utf8_length(password) <= 63:
         raise WifiConfigError("password must contain 8..63 UTF-8 bytes")
-    if previous is None or previous.get("ssid") != ssid:
+    if security == 'open':
+        if password is not None:
+            raise WifiConfigError('open networks cannot have a password')
+    elif previous is None or previous.get("ssid") != ssid:
         if password is None:
             raise WifiConfigError("a new password is required when the SSID changes")
     elif password is None and not previous.get("password_configured"):
@@ -79,8 +85,9 @@ def validate_wifi_settings(
 
     return {
         "ssid": ssid,
+        "security": security,
         "password": password,
-        "password_configured": bool(password or (previous or {}).get("password_configured")),
+        "password_configured": security != 'open' and bool(password or (previous or {}).get("password_configured")),
         "ipv4_mode": mode,
         "address": address,
         "prefix": prefix if mode == "manual" else None,
@@ -105,6 +112,8 @@ class WifiNetworkService:
         self.monotonic = monotonic
         self.poll_seconds = poll_seconds
         self._lock = threading.RLock()
+        self.configuration_lock = self._lock
+        self.settings_revision = str(uuid4())
         self._stop = threading.Event()
         self._thread: threading.Thread | None = None
         self._activation_active = False
@@ -256,6 +265,7 @@ class WifiNetworkService:
                 else "WiFi 配置已保存，将在下次断电开机后生效"
             )
             self.store.set_operation({"id": operation_id, "state": state, "message": message})
+            self.settings_revision = str(uuid4())
             return {
                 "operation_id": operation_id,
                 "activation": activation,
@@ -297,7 +307,8 @@ class WifiNetworkService:
             self.store.set_operation({
                 "id": operation_id,
                 "state": "failed",
-                "message": str(exc),
+                "message": "WiFi activation failed",
+                "error_code": getattr(exc, "error_code", "UNKNOWN"),
             })
         finally:
             with self._lock: