mirror of
https://github.com/lollipopkit/flutter_server_box.git
synced 2025-12-16 23:04:22 +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>
69 lines
2.2 KiB
Dart
69 lines
2.2 KiB
Dart
import 'package:fl_lib/fl_lib.dart';
|
|
import 'package:server_box/data/model/app/shell_func.dart';
|
|
|
|
enum SystemType {
|
|
linux(linuxSign),
|
|
bsd(bsdSign),
|
|
windows(windowsSign);
|
|
|
|
final String? value;
|
|
|
|
const SystemType([this.value]);
|
|
|
|
static const linuxSign = '__linux';
|
|
static const bsdSign = '__bsd';
|
|
static const windowsSign = '__windows';
|
|
|
|
/// Used for parsing system types from shell output.
|
|
///
|
|
/// This method looks for specific system signatures in the shell output
|
|
/// and returns the corresponding SystemType. If no signature is found,
|
|
/// it defaults to Linux but logs the detection failure for debugging.
|
|
static SystemType parse(String value) {
|
|
// Log the raw value for debugging purposes (truncated to avoid spam)
|
|
final truncatedValue = value.length > 100
|
|
? '${value.substring(0, 100)}...'
|
|
: value;
|
|
|
|
if (value.contains(windowsSign)) {
|
|
Loggers.app.info('System detected as Windows from signature in: $truncatedValue');
|
|
return SystemType.windows;
|
|
}
|
|
if (value.contains(bsdSign)) {
|
|
Loggers.app.info('System detected as BSD from signature in: $truncatedValue');
|
|
return SystemType.bsd;
|
|
}
|
|
|
|
// Log when falling back to Linux detection
|
|
if (value.trim().isEmpty) {
|
|
Loggers.app.warning(
|
|
'System detection received empty input, defaulting to Linux. '
|
|
'This may indicate a script execution issue.'
|
|
);
|
|
} else if (!value.contains(linuxSign)) {
|
|
Loggers.app.warning(
|
|
'System detection could not find any known signatures (Windows: $windowsSign, '
|
|
'BSD: $bsdSign, Linux: $linuxSign) in output: "$truncatedValue". '
|
|
'Defaulting to Linux, but this may cause incorrect parsing.'
|
|
);
|
|
} else {
|
|
Loggers.app.info('System detected as Linux from signature in: $truncatedValue');
|
|
}
|
|
|
|
return SystemType.linux;
|
|
}
|
|
|
|
bool isSegmentsLenMatch(int len) => len == segmentsLen;
|
|
|
|
int get segmentsLen {
|
|
switch (this) {
|
|
case SystemType.linux:
|
|
return StatusCmdType.values.length;
|
|
case SystemType.bsd:
|
|
return BSDStatusCmdType.values.length;
|
|
case SystemType.windows:
|
|
return WindowsStatusCmdType.values.length;
|
|
}
|
|
}
|
|
}
|