mirror of
https://github.com/lollipopkit/flutter_server_box.git
synced 2025-12-17 15:24:35 +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>
140 lines
4.3 KiB
Dart
140 lines
4.3 KiB
Dart
import 'package:xml/xml.dart';
|
|
|
|
/// [
|
|
/// {
|
|
/// "name": "GeForce RTX 3090",
|
|
/// "temp": 40,
|
|
/// "power": "30W / 350W",
|
|
/// "memory": {
|
|
/// "total": 24268,
|
|
/// "used": 240,
|
|
/// "unit": "MiB",
|
|
/// "processes": [
|
|
/// {
|
|
/// "pid": 1456,
|
|
/// "name": "/usr/lib/xorg/Xorg",
|
|
/// "memory": 40
|
|
/// },
|
|
/// ]
|
|
/// },
|
|
/// }
|
|
/// ]
|
|
///
|
|
|
|
class NvidiaSmi {
|
|
static List<NvidiaSmiItem> fromXml(String raw) {
|
|
final xmlData = XmlDocument.parse(raw);
|
|
final gpus = xmlData.findAllElements('gpu');
|
|
final result = List<NvidiaSmiItem?>.generate(gpus.length, (index) {
|
|
final gpu = gpus.elementAt(index);
|
|
final name = gpu.findElements('product_name').firstOrNull?.innerText;
|
|
final temp = gpu
|
|
.findElements('temperature')
|
|
.firstOrNull
|
|
?.findElements('gpu_temp')
|
|
.firstOrNull
|
|
?.innerText;
|
|
final power = gpu.findElements('gpu_power_readings').firstOrNull;
|
|
final powerDraw = power?.findElements('power_draw').firstOrNull?.innerText;
|
|
final powerLimit = power?.findElements('current_power_limit').firstOrNull?.innerText;
|
|
final memory = gpu.findElements('fb_memory_usage').firstOrNull;
|
|
final memoryUsed = memory?.findElements('used').firstOrNull?.innerText;
|
|
final memoryTotal = memory?.findElements('total').firstOrNull?.innerText;
|
|
final processes = gpu.findElements('processes').firstOrNull?.findElements('process_info');
|
|
final memoryProcesses = List<NvidiaSmiMemProcess?>.generate(processes?.length ?? 0, (index) {
|
|
final process = processes?.elementAt(index);
|
|
final pid = process?.findElements('pid').firstOrNull?.innerText;
|
|
final name = process?.findElements('process_name').firstOrNull?.innerText;
|
|
final memory = process?.findElements('used_memory').firstOrNull?.innerText;
|
|
if (pid != null && name != null && memory != null) {
|
|
return NvidiaSmiMemProcess(
|
|
int.tryParse(pid) ?? 0,
|
|
name,
|
|
int.tryParse(memory.split(' ').firstOrNull ?? '0') ?? 0,
|
|
);
|
|
}
|
|
return null;
|
|
});
|
|
memoryProcesses.removeWhere((element) => element == null);
|
|
final percent = gpu
|
|
.findElements('utilization')
|
|
.firstOrNull
|
|
?.findElements('gpu_util')
|
|
.firstOrNull
|
|
?.innerText;
|
|
final fanSpeed = gpu.findElements('fan_speed').firstOrNull?.innerText;
|
|
if (name != null && temp != null) {
|
|
return NvidiaSmiItem(
|
|
name: name,
|
|
uuid: gpu.findElements('uuid').firstOrNull?.innerText ?? '',
|
|
temp: int.tryParse(temp.split(' ').firstOrNull ?? '0') ?? 0,
|
|
percent: int.tryParse(percent?.split(' ').firstOrNull ?? '0') ?? 0,
|
|
power: '$powerDraw / $powerLimit',
|
|
memory: NvidiaSmiMem(
|
|
int.tryParse(memoryTotal?.split(' ').firstOrNull ?? '0') ?? 0,
|
|
int.tryParse(memoryUsed?.split(' ').firstOrNull ?? '0') ?? 0,
|
|
'MiB',
|
|
List.from(memoryProcesses),
|
|
),
|
|
fanSpeed: int.tryParse(fanSpeed?.split(' ').firstOrNull ?? '0') ?? 0,
|
|
);
|
|
}
|
|
return null;
|
|
});
|
|
result.removeWhere((element) => element == null);
|
|
return List.from(result);
|
|
}
|
|
}
|
|
|
|
class NvidiaSmiItem {
|
|
final String uuid;
|
|
final String name;
|
|
final int temp;
|
|
final String power;
|
|
final NvidiaSmiMem memory;
|
|
final int percent;
|
|
final int fanSpeed;
|
|
|
|
const NvidiaSmiItem({
|
|
required this.uuid,
|
|
required this.name,
|
|
required this.temp,
|
|
required this.power,
|
|
required this.memory,
|
|
required this.percent,
|
|
required this.fanSpeed,
|
|
});
|
|
|
|
@override
|
|
String toString() {
|
|
return 'NvdiaSmiItem{name: $name, temp: $temp, power: $power, memory: $memory}';
|
|
}
|
|
}
|
|
|
|
class NvidiaSmiMem {
|
|
final int total;
|
|
final int used;
|
|
final String unit;
|
|
final List<NvidiaSmiMemProcess> processes;
|
|
|
|
const NvidiaSmiMem(this.total, this.used, this.unit, this.processes);
|
|
|
|
@override
|
|
String toString() {
|
|
return 'NvdiaSmiMem{total: $total, used: $used, unit: $unit, processes: $processes}';
|
|
}
|
|
}
|
|
|
|
class NvidiaSmiMemProcess {
|
|
final int pid;
|
|
final String name;
|
|
final int memory;
|
|
|
|
const NvidiaSmiMemProcess(this.pid, this.name, this.memory);
|
|
|
|
@override
|
|
String toString() {
|
|
return 'NvdiaSmiMemProcess{pid: $pid, name: $name, memory: $memory}';
|
|
}
|
|
}
|