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>
116 lines
3.3 KiB
Dart
116 lines
3.3 KiB
Dart
import 'dart:async';
|
|
|
|
import 'package:dartssh2/dartssh2.dart';
|
|
import 'package:fl_lib/fl_lib.dart';
|
|
import 'package:flutter/foundation.dart';
|
|
import 'package:server_box/data/model/app/error.dart';
|
|
import 'package:server_box/data/model/server/server_private_info.dart';
|
|
import 'package:server_box/data/res/store.dart';
|
|
|
|
/// Must put this func out of any Class.
|
|
///
|
|
/// Because of this function is called by [compute].
|
|
///
|
|
/// https://stackoverflow.com/questions/51998995/invalid-arguments-illegal-argument-in-isolate-message-object-is-a-closure
|
|
List<SSHKeyPair> loadIndentity(String key) {
|
|
return SSHKeyPair.fromPem(key);
|
|
}
|
|
|
|
/// [args] : [key, pwd]
|
|
String decyptPem(List<String> args) {
|
|
/// skip when the key is not encrypted, or will throw exception
|
|
if (!SSHKeyPair.isEncryptedPem(args[0])) return args[0];
|
|
final sshKey = SSHKeyPair.fromPem(args[0], args[1]);
|
|
return sshKey.first.toPem();
|
|
}
|
|
|
|
enum GenSSHClientStatus { socket, key, pwd }
|
|
|
|
String getPrivateKey(String id) {
|
|
final pki = Stores.key.fetchOne(id);
|
|
if (pki == null) {
|
|
throw SSHErr(type: SSHErrType.noPrivateKey, message: 'key [$id] not found');
|
|
}
|
|
return pki.key;
|
|
}
|
|
|
|
Future<SSHClient> genClient(
|
|
Spi spi, {
|
|
void Function(GenSSHClientStatus)? onStatus,
|
|
|
|
/// Only pass this param if using multi-threading and key login
|
|
String? privateKey,
|
|
|
|
/// Only pass this param if using multi-threading and key login
|
|
String? jumpPrivateKey,
|
|
Duration timeout = const Duration(seconds: 5),
|
|
|
|
/// [Spi] of the jump server
|
|
///
|
|
/// Must pass this param if using multi-threading and key login
|
|
Spi? jumpSpi,
|
|
|
|
/// Handle keyboard-interactive authentication
|
|
SSHUserInfoRequestHandler? onKeyboardInteractive,
|
|
}) async {
|
|
onStatus?.call(GenSSHClientStatus.socket);
|
|
|
|
String? alterUser;
|
|
|
|
final socket = await () async {
|
|
// Proxy
|
|
final jumpSpi_ = () {
|
|
// Multi-thread or key login
|
|
if (jumpSpi != null) return jumpSpi;
|
|
// Main thread
|
|
if (spi.jumpId != null) return Stores.server.box.get(spi.jumpId);
|
|
}();
|
|
if (jumpSpi_ != null) {
|
|
final jumpClient = await genClient(jumpSpi_, privateKey: jumpPrivateKey, timeout: timeout);
|
|
|
|
return await jumpClient.forwardLocal(spi.ip, spi.port);
|
|
}
|
|
|
|
// Direct
|
|
try {
|
|
return await SSHSocket.connect(spi.ip, spi.port, timeout: timeout);
|
|
} catch (e) {
|
|
Loggers.app.warning('genClient', e);
|
|
if (spi.alterUrl == null) rethrow;
|
|
try {
|
|
final res = spi.fromStringUrl();
|
|
alterUser = res.$2;
|
|
return await SSHSocket.connect(res.$1, res.$3, timeout: timeout);
|
|
} catch (e) {
|
|
Loggers.app.warning('genClient alterUrl', e);
|
|
rethrow;
|
|
}
|
|
}
|
|
}();
|
|
|
|
final keyId = spi.keyId;
|
|
if (keyId == null) {
|
|
onStatus?.call(GenSSHClientStatus.pwd);
|
|
return SSHClient(
|
|
socket,
|
|
username: alterUser ?? spi.user,
|
|
onPasswordRequest: () => spi.pwd,
|
|
onUserInfoRequest: onKeyboardInteractive,
|
|
// printDebug: debugPrint,
|
|
// printTrace: debugPrint,
|
|
);
|
|
}
|
|
privateKey ??= getPrivateKey(keyId);
|
|
|
|
onStatus?.call(GenSSHClientStatus.key);
|
|
return SSHClient(
|
|
socket,
|
|
username: spi.user,
|
|
// Must use [compute] here, instead of [Computer.shared.start]
|
|
identities: await compute(loadIndentity, privateKey),
|
|
onUserInfoRequest: onKeyboardInteractive,
|
|
// printDebug: debugPrint,
|
|
// printTrace: debugPrint,
|
|
);
|
|
}
|