mirror of
https://github.com/lollipopkit/flutter_server_box.git
synced 2025-12-17 07:14:28 +01:00
* feat: win compatibility * fix * fix: uptime parse * opt.: linux uptime accuracy * fix: windows temperature fetching * opt. * opt.: powershell exec * refactor: address PR review feedback and improve code quality ### Major Improvements: - **Refactored Windows status parsing**: Broke down large `_getWindowsStatus` method into 13 smaller, focused helper methods for better maintainability and readability - **Extracted system detection logic**: Created dedicated `SystemDetector` helper class to separate OS detection concerns from ServerProvider - **Improved concurrency handling**: Implemented proper synchronization for server updates using Future-based locks to prevent race conditions ### Bug Fixes: - **Fixed CPU percentage parsing**: Removed incorrect '*100' multiplication in BSD CPU parsing (values were already percentages) - **Enhanced memory parsing**: Added validation and error handling to BSD memory fallback parsing with proper logging - **Improved uptime parsing**: Added support for multiple Windows date formats and robust error handling with validation - **Fixed division by zero**: Added safety checks in Swap.usedPercent getter ### Code Quality Enhancements: - **Added comprehensive documentation**: Documented Windows CPU counter limitations and approach - **Strengthened error handling**: Added detailed logging and validation throughout parsing methods - **Improved robustness**: Enhanced BSD CPU parsing with percentage validation and warnings - **Better separation of concerns**: Each parsing method now has single responsibility ### Files Changed: - `lib/data/helper/system_detector.dart` (new): System detection helper - `lib/data/model/server/cpu.dart`: Fixed percentage parsing and added validation - `lib/data/model/server/memory.dart`: Enhanced fallback parsing and division-by-zero protection - `lib/data/model/server/server_status_update_req.dart`: Refactored into 13 focused parsing methods - `lib/data/provider/server.dart`: Improved synchronization and extracted system detection 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * refactor: parse & shell fn struct --------- Co-authored-by: Claude <noreply@anthropic.com>
83 lines
2.5 KiB
Dart
83 lines
2.5 KiB
Dart
final parseFailed = Exception('Parse failed');
|
|
final seqReg = RegExp(r'seq=(.+) ttl=(.+) time=(.+) ms');
|
|
final packetReg = RegExp(r'(.+) packets transmitted, (.+) received, (.+)% packet loss');
|
|
final timeReg = RegExp(r'min/avg/max/mdev = (.+)/(.+)/(.+)/(.+) ms');
|
|
final timeAlpineReg = RegExp(r'round-trip min/avg/max = (.+)/(.+)/(.+) ms');
|
|
final ipReg = RegExp(r' \((\S+)\)');
|
|
|
|
class PingResult {
|
|
String serverName;
|
|
String? ip;
|
|
List<PingSeqResult>? results;
|
|
PingStatistics? statistic;
|
|
|
|
PingResult.parse(this.serverName, String raw) {
|
|
final lines = raw.split('\n');
|
|
lines.removeWhere((element) => element.isEmpty);
|
|
final statisticIndex = lines.indexWhere((element) => element.startsWith('---'));
|
|
if (statisticIndex == -1) {
|
|
throw parseFailed;
|
|
}
|
|
final statisticRaw = lines.sublist(statisticIndex + 1);
|
|
statistic = PingStatistics.parse(statisticRaw);
|
|
results = lines.sublist(1, statisticIndex).map((e) => PingSeqResult.parse(e)).toList();
|
|
ip = ipReg.firstMatch(lines[0])?.group(1);
|
|
}
|
|
}
|
|
|
|
class PingSeqResult {
|
|
int? seq;
|
|
int? ttl;
|
|
double? time;
|
|
|
|
PingSeqResult.parse(String raw) {
|
|
final seqMatched = seqReg.firstMatch(raw);
|
|
if (seqMatched == null) {
|
|
throw parseFailed;
|
|
}
|
|
seq = int.tryParse(seqMatched.group(1)!);
|
|
ttl = int.tryParse(seqMatched.group(2)!);
|
|
time = double.tryParse(seqMatched.group(3)!);
|
|
}
|
|
|
|
@override
|
|
String toString() {
|
|
return 'seq: $seq, ttl: $ttl, time: $time';
|
|
}
|
|
}
|
|
|
|
class PingStatistics {
|
|
int? total;
|
|
int? received;
|
|
double? loss;
|
|
double? min;
|
|
double? max;
|
|
double? avg;
|
|
double? stddev;
|
|
|
|
PingStatistics.parse(List<String> lines) {
|
|
if (lines.isEmpty || lines.length != 2) {
|
|
return;
|
|
}
|
|
final packetMatched = packetReg.firstMatch(lines[0]);
|
|
final timeMatched = timeReg.firstMatch(lines[1]);
|
|
final timeAlpineMatched = timeAlpineReg.firstMatch(lines[1]);
|
|
if (packetMatched == null) {
|
|
return;
|
|
}
|
|
total = int.tryParse(packetMatched.group(1)!);
|
|
received = int.tryParse(packetMatched.group(2)!);
|
|
loss = double.tryParse(packetMatched.group(3)!);
|
|
if (timeMatched != null) {
|
|
min = double.tryParse(timeMatched.group(1)!);
|
|
avg = double.tryParse(timeMatched.group(2)!);
|
|
max = double.tryParse(timeMatched.group(3)!);
|
|
stddev = double.tryParse(timeMatched.group(4)!);
|
|
} else if (timeAlpineMatched != null) {
|
|
min = double.tryParse(timeAlpineMatched.group(1)!);
|
|
avg = double.tryParse(timeAlpineMatched.group(2)!);
|
|
max = double.tryParse(timeAlpineMatched.group(3)!);
|
|
}
|
|
}
|
|
}
|