fix: PowerShell script error repair, Windows data parsing repair

Author: lxdklp

lib/core/extension/ssh_client.dart

@@ -175,21 +175,26 @@ extension SSHClientX on SSHClient {
   /// Runs a command and decodes output safely with encoding fallback
   ///
   /// [systemType] - The system type (affects encoding choice)
-  /// [context] - Optional context for debugging
+  /// Runs a command and safely decodes the result
   Future<String> runSafe(
     String command, {
     SystemType? systemType,
     String? context,
   }) async {
+    // Let SSH errors propagate with their original type (e.g., SSHError subclasses)
+    final result = await run(command);
+    
+    // Only catch decoding failures and add context
     try {
-      final result = await run(command);
       return SSHDecoder.decode(
         result,
         isWindows: systemType == SystemType.windows,
         context: context,
       );
-    } catch (e) {
-      throw Exception('Failed to run command${context != null ? " [$context]" : ""}: $e');
+    } on FormatException catch (e) {
+      throw Exception(
+        'Failed to decode command output${context != null ? " [$context]" : ""}: $e',
+      );
     }
   }
 
@@ -231,17 +236,32 @@ extension SSHClientX on SSHClient {
     final stdoutBytes = stdoutBuilder.takeBytes();
     final stderrBytes = stderrBuilder.takeBytes();
 
-    final stdout = SSHDecoder.decode(
-      stdoutBytes,
-      isWindows: systemType == SystemType.windows,
-      context: context != null ? '$context (stdout)' : 'stdout',
-    );
+    // Only catch decoding failures, let other errors propagate
+    String stdout;
+    try {
+      stdout = SSHDecoder.decode(
+        stdoutBytes,
+        isWindows: systemType == SystemType.windows,
+        context: context != null ? '$context (stdout)' : 'stdout',
+      );
+    } on FormatException catch (e) {
+      throw Exception(
+        'Failed to decode stdout${context != null ? " [$context]" : ""}: $e',
+      );
+    }
 
-    final stderr = SSHDecoder.decode(
-      stderrBytes,
-      isWindows: systemType == SystemType.windows,
-      context: context != null ? '$context (stderr)' : 'stderr',
-    );
+    String stderr;
+    try {
+      stderr = SSHDecoder.decode(
+        stderrBytes,
+        isWindows: systemType == SystemType.windows,
+        context: context != null ? '$context (stderr)' : 'stderr',
+      );
+    } on FormatException catch (e) {
+      throw Exception(
+        'Failed to decode stderr${context != null ? " [$context]" : ""}: $e',
+      );
+    }
 
     return (stdout, stderr);
   }

lib/data/helper/system_detector.dart

@@ -1,5 +1,6 @@
 import 'package:dartssh2/dartssh2.dart';
 import 'package:fl_lib/fl_lib.dart';
+import 'package:server_box/core/extension/ssh_client.dart';
 import 'package:server_box/data/model/server/server_private_info.dart';
 import 'package:server_box/data/model/server/system.dart';
 
@@ -23,7 +24,10 @@ class SystemDetector {
 
     try {
       // Try to detect Unix/Linux/BSD systems first (more reliable and doesn't create files)
-      final unixResult = await client.run('uname -a 2>/dev/null').string;
+      final unixResult = await client.runSafe(
+        'uname -a 2>/dev/null',
+        context: 'uname detection for ${spi.oldId}',
+      );
       if (unixResult.contains('Linux')) {
         detectedSystemType = SystemType.linux;
         dprint('Detected Linux system type for ${spi.oldId}');
@@ -35,15 +39,19 @@ class SystemDetector {
       }
 
       // If uname fails, try to detect Windows systems
-      final powershellResult = await client.run('ver 2>nul').string;
+      final powershellResult = await client.runSafe(
+        'ver 2>nul',
+        systemType: SystemType.windows,
+        context: 'ver detection for ${spi.oldId}',
+      );
       if (powershellResult.isNotEmpty &&
           (powershellResult.contains('Windows') || powershellResult.contains('NT'))) {
         detectedSystemType = SystemType.windows;
         dprint('Detected Windows system type for ${spi.oldId}');
         return detectedSystemType;
       }
-    } catch (e) {
-      Loggers.app.warning('System detection failed for ${spi.oldId}: $e');
+    } catch (e, stackTrace) {
+      Loggers.app.warning('System detection failed for ${spi.oldId}: $e\n$stackTrace');
     }
 
     // Default fallback

lib/data/model/app/scripts/cmd_types.dart

@@ -182,7 +182,7 @@ enum WindowsStatusCmdType implements ShellCmdType {
   sys('(Get-ComputerInfo).OsName'),
   cpu(
     'Get-WmiObject -Class Win32_Processor | '
-    'Select-Object Name, LoadPercentage | ConvertTo-Json',
+    'Select-Object Name, LoadPercentage, NumberOfCores, NumberOfLogicalProcessors | ConvertTo-Json',
   ),
   uptime('(Get-CimInstance -ClassName Win32_OperatingSystem).LastBootUpTime'),
   conn('(netstat -an | findstr ESTABLISHED | Measure-Object -Line).Count'),
@@ -287,7 +287,7 @@ enum WindowsStatusCmdType implements ShellCmdType {
   String get separator => ScriptConstants.getCmdSeparator(name);
 
   @override
-  String get divider => ScriptConstants.getCmdDivider(name);
+  String get divider => ScriptConstants.getWindowsCmdDivider(name);
 
   @override
   CmdTypeSys get sysType => CmdTypeSys.windows;

lib/data/model/app/scripts/script_consts.dart

@@ -29,6 +29,9 @@ class ScriptConstants {
   /// Generate command-specific divider
   static String getCmdDivider(String cmdName) => '\necho ${getCmdSeparator(cmdName)}\n\t';
 
+  /// Generate command-specific divider for Windows PowerShell
+  static String getWindowsCmdDivider(String cmdName) => '\n    Write-Host "${getCmdSeparator(cmdName)}"\n    ';
+
   /// Parse script output into command-specific map
   static Map<String, String> parseScriptOutput(String raw) {
     final result = <String, String>{};

lib/data/model/server/cpu.dart

@@ -14,13 +14,20 @@ class Cpus extends TimeSeq<List<SingleCpuCore>> {
   @override
   void onUpdate() {
     _coresCount = now.length;
+    if (pre.isEmpty || now.isEmpty || pre.length != now.length) {
+      _totalDelta = 0;
+      _user = 0;
+      _sys = 0;
+      _iowait = 0;
+      _idle = 0;
+      return;
+    }
     _totalDelta = now[0].total - pre[0].total;
     _user = _getUser();
     _sys = _getSys();
     _iowait = _getIowait();
     _idle = _getIdle();
     _updateSpots();
-    //_updateRange();
   }
 
   double usedPercent({int coreIdx = 0}) {

lib/data/model/server/server_status_update_req.dart

@@ -378,18 +378,27 @@ void _parseWindowsCpuData(ServerStatusUpdateReq req, Map<String, String> parsedO
     // Windows CPU parsing - JSON format from PowerShell
     final cpuRaw = WindowsStatusCmdType.cpu.findInMap(parsedOutput);
     if (cpuRaw.isNotEmpty && cpuRaw != 'null' && !cpuRaw.contains('error') && !cpuRaw.contains('Exception')) {
-      final cpus = WindowsParser.parseCpu(cpuRaw, req.ss);
-      if (cpus.isNotEmpty) {
-        req.ss.cpu.update(cpus);
+      final cpuResult = WindowsParser.parseCpu(cpuRaw, req.ss);
+      if (cpuResult.cores.isNotEmpty) {
+        req.ss.cpu.update(cpuResult.cores);
+        final brandRaw = WindowsStatusCmdType.cpuBrand.findInMap(parsedOutput);
+        if (brandRaw.isNotEmpty && brandRaw != 'null') {
+          req.ss.cpu.brand.clear();
+          final brandLines = brandRaw.trim().split('\n');
+          final uniqueBrands = <String>{};
+          for (final line in brandLines) {
+            final trimmedLine = line.trim();
+            if (trimmedLine.isNotEmpty) {
+              uniqueBrands.add(trimmedLine);
+            }
+          }
+          if (uniqueBrands.isNotEmpty) {
+            final brandName = uniqueBrands.first;
+            req.ss.cpu.brand[brandName] = cpuResult.coreCount;
+          }
+        }
       }
     }
-
-    // Windows CPU brand parsing
-    final brandRaw = WindowsStatusCmdType.cpuBrand.findInMap(parsedOutput);
-    if (brandRaw.isNotEmpty && brandRaw != 'null') {
-      req.ss.cpu.brand.clear();
-      req.ss.cpu.brand[brandRaw.trim()] = 1;
-    }
   } catch (e, s) {
     Loggers.app.warning('Windows CPU parsing failed: $e', s);
   }

lib/data/model/server/time_seq.dart

@@ -56,8 +56,18 @@ abstract class TimeSeq<T extends List<TimeSeqIface>> extends Fifo<T> {
     add(new_);
 
     if (pre.length != now.length) {
-      pre.removeWhere((e) => now.any((el) => e.same(el)));
-      pre.addAll(now.where((e) => pre.every((el) => !e.same(el))));
+      final sizeDiff = (pre.length - now.length).abs();
+      final isSignificantChange = sizeDiff > 1;
+      if (isSignificantChange) {
+        // Replace the pre entry with a new empty list instead of clearing it
+        // to avoid mutating the historical FIFO data
+        _list[length - 2] = <TimeSeqIface>[] as T;
+      } else {
+        final newPre = List<TimeSeqIface>.from(pre);
+        newPre.removeWhere((e) => now.any((el) => e.same(el)));
+        newPre.addAll(now.where((e) => newPre.every((el) => !e.same(el))));
+        _list[length - 2] = newPre as T;
+      }
     }
 
     onUpdate();