feat: USP WiFi settings, network diagnostics & codegen updates

definitions/network/network_diagnostics.yaml

@@ -0,0 +1,33 @@
+name: NetworkDiagnostics
+description: Network diagnostic operations (Ping, Traceroute)
+type: operate
+category: network
+
+operations:
+  - name: ping
+    path: Device.IP.Diagnostics.IPPing()
+    description: Run ICMP ping diagnostic
+    inputs:
+      - path: Host
+        field: host
+        type: string
+        required: true
+      - path: NumberOfRepetitions
+        field: numberOfRepetitions
+        type: string
+        required: false
+        default: "3"
+
+  - name: traceRoute
+    path: Device.IP.Diagnostics.TraceRoute()
+    description: Run traceroute diagnostic
+    inputs:
+      - path: Host
+        field: host
+        type: string
+        required: true
+      - path: MaxHopCount
+        field: maxHopCount
+        type: string
+        required: false
+        default: "30"

definitions/wifi/wi_fi_radios.yaml

@@ -74,3 +74,8 @@ parameters:
     type: boolean
     writable: true
     description: Enables IEEE 802.11h on this radio, which activates both Dynamic Frequency Selection (DFS) and Transmit Power Control (TPC)
+
+  - field_name: supportedOperatingChannelBandwidths
+    path: .SupportedOperatingChannelBandwidths
+    type: string
+    description: Comma-separated list of supported channel bandwidths (e.g. "Auto,20MHz,40MHz,80MHz")

lib/generated/index.dart

@@ -18,6 +18,7 @@ export 'lan_network_info.g.dart';
 export 'ipv6settings.g.dart';
 export 'dhcp_clients.g.dart';
 export 'wan_traffic_stats.g.dart';
+export 'network_diagnostics.g.dart';
 export 'dhcp_reservations.g.dart';
 export 'wan_operations.g.dart';
 export 'multi_interface_traffic_stats.g.dart';

lib/generated/network_diagnostics.g.dart

@@ -0,0 +1,34 @@
+// AUTO-GENERATED CODE - DO NOT EDIT
+// This file was generated by usp-codegen
+// Any modifications will be overwritten on next generation
+
+import 'package:privacy_gui/usp/services/usp_service.dart';
+
+/// Network diagnostic operations (Ping, Traceroute)
+class NetworkDiagnostics {
+  /// Run ICMP ping diagnostic
+  static Future<Map<String, dynamic>> ping(
+    UspService client, {
+    required String host,
+    String? numberOfRepetitions,
+  }) async {
+    final inputs = <String, String>{};
+    inputs['Host'] = host;
+    if (numberOfRepetitions != null)
+      inputs['NumberOfRepetitions'] = numberOfRepetitions;
+    return await client.operate('Device.IP.Diagnostics.IPPing()', args: inputs);
+  }
+
+  /// Run traceroute diagnostic
+  static Future<Map<String, dynamic>> traceRoute(
+    UspService client, {
+    required String host,
+    String? maxHopCount,
+  }) async {
+    final inputs = <String, String>{};
+    inputs['Host'] = host;
+    if (maxHopCount != null) inputs['MaxHopCount'] = maxHopCount;
+    return await client.operate('Device.IP.Diagnostics.TraceRoute()',
+        args: inputs);
+  }
+}

lib/generated/wan_operations.g.dart

@@ -7,12 +7,13 @@ import 'package:privacy_gui/usp/services/usp_service.dart';
 /// WAN DHCP lease renewal operations
 class WanOperations {
   /// Renew DHCPv4 WAN lease
-  static Future<void> renewDhcpLease(UspService client) async {
-    await client.operate('Device.DHCPv4.Client.1.Renew()');
+  static Future<Map<String, dynamic>> renewDhcpLease(UspService client) async {
+    return await client.operate('Device.DHCPv4.Client.1.Renew()');
   }
 
   /// Renew DHCPv6 WAN lease
-  static Future<void> renewDhcpv6Lease(UspService client) async {
-    await client.operate('Device.DHCPv6.Client.1.Renew()');
+  static Future<Map<String, dynamic>> renewDhcpv6Lease(
+      UspService client) async {
+    return await client.operate('Device.DHCPv6.Client.1.Renew()');
   }
 }

lib/generated/wi_fi_radios.g.dart

@@ -19,6 +19,7 @@ class WiFiRadio {
   final int maxBitRate;
   final bool autoChannelEnable;
   final bool ieee80211hEnabled;
+  final String supportedOperatingChannelBandwidths;
 
   const WiFiRadio({
     required this.instancePath,
@@ -34,6 +35,7 @@ class WiFiRadio {
     required this.maxBitRate,
     required this.autoChannelEnable,
     required this.ieee80211hEnabled,
+    required this.supportedOperatingChannelBandwidths,
   });
 }
 
@@ -77,6 +79,7 @@ class WiFiRadios {
     'Device.WiFi.Radio.*.MaxBitRate',
     'Device.WiFi.Radio.*.AutoChannelEnable',
     'Device.WiFi.Radio.*.IEEE80211hEnabled',
+    'Device.WiFi.Radio.*.SupportedOperatingChannelBandwidths',
   ];
 
   /// Fetch all instances via USP Get message
@@ -112,7 +115,8 @@ class WiFiRadios {
         response['${p}TransmitPower'],
         response['${p}MaxBitRate'],
         response['${p}AutoChannelEnable'],
-        response['${p}IEEE80211hEnabled']
+        response['${p}IEEE80211hEnabled'],
+        response['${p}SupportedOperatingChannelBandwidths']
       ].every((v) =>
           v == null ||
           v == '' ||
@@ -146,6 +150,9 @@ class WiFiRadios {
         ieee80211hEnabled: response['${p}IEEE80211hEnabled'] == true ||
             response['${p}IEEE80211hEnabled'] == 'true' ||
             response['${p}IEEE80211hEnabled'] == '1',
+        supportedOperatingChannelBandwidths:
+            (response['${p}SupportedOperatingChannelBandwidths'] ?? '')
+                as String,
       ));
     }
     return WiFiRadios(items: items);

lib/page/usp_test/usp_test_page.dart

@@ -193,11 +193,11 @@ class _UspTestPageState extends State<UspTestPage> {
     try {
       final args = Map<String, String>.from(jsonDecode(argsJson) as Map? ?? {});
       final response = await _service!.operate(command, args: args);
-      _log('  commandKey = ${response.commandKey}');
-      if (response.data.isEmpty) {
+      _log('  commandKey = ${response['commandKey']}');
+      if (response.isEmpty) {
         _log('OPERATE OK (no output)');
       } else {
-        for (final entry in response.data.entries) {
+        for (final entry in response.entries) {
           _log('  ${entry.key} = ${entry.value}');
         }
       }

lib/providers/preservable_notifier_mixin.dart

@@ -36,6 +36,10 @@ mixin PreservableNotifierMixin<
           settings: Preservable(original: newSettings, current: newSettings),
           status: newStatus ?? state.status,
         ) as TState;
+      } else if (newStatus != null) {
+        // Settings unavailable but status returned (e.g. error) — apply status
+        // so the UI can exit the loading state and display the error.
+        state = state.copyWith(status: newStatus) as TState;
       }
     }
     return state;
@@ -104,6 +108,10 @@ mixin PreservableAutoDisposeNotifierMixin<
           settings: Preservable(original: newSettings, current: newSettings),
           status: newStatus ?? state.status,
         ) as TState;
+      } else if (newStatus != null) {
+        // Settings unavailable but status returned (e.g. error) — apply status
+        // so the UI can exit the loading state and display the error.
+        state = state.copyWith(status: newStatus) as TState;
       }
     }
     return state;

lib/usp/services/sse_operation_awaiter.dart

@@ -87,7 +87,7 @@ class SseOperationAwaiter {
 
       // Step 2: Fire the operate command and capture commandKey for correlation
       final operateResponse = await _usp.operate(operateCommand, args: args);
-      final expectedKey = operateResponse.commandKey;
+      final expectedKey = operateResponse['commandKey'] as String?;
 
       logger.d('[SSE Operate] Starting $operateCommand '
           '(sub=$subscriptionId, commandKey=$expectedKey)');

lib/usp/services/usp_service.dart

@@ -3,7 +3,6 @@ import 'dart:convert';
 
 import 'package:flutter/foundation.dart';
 import 'package:privacy_gui/core/utils/logger.dart';
-import 'package:privacy_gui/usp/models/usp_response.dart';
 
 // Conditional import: use WASM client on Web, stub on other platforms (VM/tests).
 import '../stub/usp_client_stub.dart'
@@ -341,8 +340,9 @@ class UspService {
   /// [command] is the command path (e.g., "Device.Reboot()" or
   /// "Device.IP.Diagnostics.Ping()").
   /// [args] are the input arguments for the command.
-  /// Returns [UspResponse] with commandKey (for SSE correlation) and output arguments.
-  Future<UspResponse<Map<String, String>>> operate(String command,
+  /// Returns a flat map containing `commandKey` (for SSE correlation) and
+  /// all output arguments from the Operate response.
+  Future<Map<String, dynamic>> operate(String command,
       {Map<String, String> args = const {}}) async {
     final id = ++_reqId;
     final sw = Stopwatch()..start();
@@ -351,10 +351,10 @@ class UspService {
     sw.stop();
     logger.d('[UspService]:#$id OPERATE $command'
         '${args.isNotEmpty ? ' — ${args.length} args' : ''}'
-        ' → key=${response.commandKey}, ${response.data.length} output keys'
+        ' → key=${response['commandKey']}, ${response.length} output keys'
         ' (${sw.elapsedMilliseconds}ms)');
-    if (response.data.isNotEmpty) {
-      logger.d('[UspService]:#$id ← ${_mapSummary(response.data)}');
+    if (response.isNotEmpty) {
+      logger.d('[UspService]:#$id ← ${_mapSummary(response)}');
     }
     return response;
   }

lib/usp/stub/usp_client_stub.dart

@@ -1,5 +1,3 @@
-import 'package:privacy_gui/usp/models/usp_response.dart';
-
 /// Stub implementation of UspClientWeb for non-Web platforms (Dart VM / tests).
 ///
 /// This file is selected by conditional import when dart.library.js_interop
@@ -54,7 +52,7 @@ class UspClientWeb {
           {bool allowPartial = false}) =>
       throw UnsupportedError('USP is only available on Web');
 
-  Future<UspResponse<Map<String, String>>> operate(String command,
+  Future<Map<String, dynamic>> operate(String command,
           {Map<String, String> args = const {}}) =>
       throw UnsupportedError('USP is only available on Web');
 

lib/usp/web/usp_client_wasm.dart

@@ -3,8 +3,6 @@ library usp_client;
 
 import 'dart:js_interop';
 
-import 'package:privacy_gui/usp/models/usp_response.dart';
-
 // Bind to the UspClient class exported in usp_client.js
 @JS('UspClient')
 extension type UspClientJS._(JSObject _) implements JSObject {
@@ -157,26 +155,29 @@ class UspClientWeb {
   }
 
   /// Executes a USP Operate command.
-  /// Returns [UspResponse] with commandKey and output arguments.
-  Future<UspResponse<Map<String, String>>> operate(String command,
+  ///
+  /// Returns a flat map containing:
+  ///   - `commandKey`: UUID correlator from the USP agent (may be absent)
+  ///   - all output arguments from the Operate response
+  Future<Map<String, dynamic>> operate(String command,
       {Map<String, String> args = const {}}) async {
     final result = await _client.operate(command, args.jsify()!).toDart;
-    if (result == null || result.isUndefinedOrNull) {
-      return UspResponse(data: {});
-    }
+    if (result == null || result.isUndefinedOrNull) return {};
     final map = result.dartify() as Map?;
-    if (map == null) return UspResponse(data: {});
+    if (map == null) return {};
 
+    final output = <String, dynamic>{};
     final commandKey = map['commandKey']?.toString();
+    if (commandKey != null && commandKey.isNotEmpty) {
+      output['commandKey'] = commandKey;
+    }
     final rawOutputArgs = map['outputArgs'];
-    final outputArgs = <String, String>{};
     if (rawOutputArgs is Map) {
       for (final entry in rawOutputArgs.entries) {
-        outputArgs[entry.key.toString()] = entry.value.toString();
+        output[entry.key.toString()] = entry.value.toString();
       }
     }
-
-    return UspResponse(data: outputArgs, commandKey: commandKey);
+    return output;
   }
 
   /// Lists all active OBUSPA subscriptions on the router.