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>
212 lines
6.2 KiB
Dart
212 lines
6.2 KiB
Dart
import 'dart:io';
|
|
|
|
import 'package:computer/computer.dart';
|
|
import 'package:fl_lib/fl_lib.dart';
|
|
import 'package:flutter/material.dart';
|
|
import 'package:flutter/services.dart';
|
|
import 'package:server_box/core/extension/context/locale.dart';
|
|
import 'package:server_box/core/utils/server.dart';
|
|
import 'package:server_box/data/model/server/private_key_info.dart';
|
|
import 'package:server_box/data/provider/private_key.dart';
|
|
import 'package:server_box/data/res/misc.dart';
|
|
|
|
const _format = 'text/plain';
|
|
|
|
final class PrivateKeyEditPageArgs {
|
|
final PrivateKeyInfo? pki;
|
|
const PrivateKeyEditPageArgs({this.pki});
|
|
}
|
|
|
|
class PrivateKeyEditPage extends StatefulWidget {
|
|
final PrivateKeyEditPageArgs? args;
|
|
const PrivateKeyEditPage({super.key, this.args});
|
|
|
|
@override
|
|
State<PrivateKeyEditPage> createState() => _PrivateKeyEditPageState();
|
|
|
|
static const route = AppRoute(page: PrivateKeyEditPage.new, path: '/private_key/edit');
|
|
}
|
|
|
|
class _PrivateKeyEditPageState extends State<PrivateKeyEditPage> {
|
|
final _nameController = TextEditingController();
|
|
final _keyController = TextEditingController();
|
|
final _pwdController = TextEditingController();
|
|
final _nameNode = FocusNode();
|
|
final _keyNode = FocusNode();
|
|
final _pwdNode = FocusNode();
|
|
|
|
late FocusScopeNode _focusScope;
|
|
|
|
final _loading = ValueNotifier<Widget?>(null);
|
|
|
|
PrivateKeyInfo? get pki => widget.args?.pki;
|
|
|
|
@override
|
|
void dispose() {
|
|
super.dispose();
|
|
_nameController.dispose();
|
|
_keyController.dispose();
|
|
_pwdController.dispose();
|
|
_nameNode.dispose();
|
|
_keyNode.dispose();
|
|
_pwdNode.dispose();
|
|
_loading.dispose();
|
|
}
|
|
|
|
@override
|
|
void initState() {
|
|
super.initState();
|
|
final pki = this.pki;
|
|
if (pki != null) {
|
|
_nameController.text = pki.id;
|
|
_keyController.text = pki.key;
|
|
} else {
|
|
Clipboard.getData(_format).then((value) {
|
|
if (value == null) return;
|
|
final clipdata = value.text?.trim() ?? '';
|
|
if (clipdata.startsWith('-----BEGIN') && clipdata.endsWith('-----')) {
|
|
_keyController.text = clipdata;
|
|
}
|
|
});
|
|
}
|
|
}
|
|
|
|
@override
|
|
void didChangeDependencies() {
|
|
super.didChangeDependencies();
|
|
_focusScope = FocusScope.of(context);
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return Scaffold(appBar: _buildAppBar(), body: _buildBody(), floatingActionButton: _buildFAB());
|
|
}
|
|
|
|
CustomAppBar _buildAppBar() {
|
|
final pki = this.pki;
|
|
final actions = pki != null
|
|
? [
|
|
IconButton(
|
|
tooltip: libL10n.delete,
|
|
onPressed: () {
|
|
context.showRoundDialog(
|
|
title: libL10n.attention,
|
|
child: Text(libL10n.askContinue('${libL10n.delete} ${l10n.privateKey}(${pki.id})')),
|
|
actions: Btn.ok(
|
|
onTap: () {
|
|
PrivateKeyProvider.delete(pki);
|
|
context.pop();
|
|
context.pop();
|
|
},
|
|
red: true,
|
|
).toList,
|
|
);
|
|
},
|
|
icon: const Icon(Icons.delete),
|
|
),
|
|
]
|
|
: null;
|
|
return CustomAppBar(title: Text(libL10n.edit), actions: actions);
|
|
}
|
|
|
|
String _standardizeLineSeparators(String value) {
|
|
return value.replaceAll('\r\n', '\n').replaceAll('\r', '\n');
|
|
}
|
|
|
|
Widget _buildFAB() {
|
|
return FloatingActionButton(tooltip: l10n.save, onPressed: _onTapSave, child: const Icon(Icons.save));
|
|
}
|
|
|
|
Widget _buildBody() {
|
|
return AutoMultiList(
|
|
children: [
|
|
Input(
|
|
autoFocus: true,
|
|
controller: _nameController,
|
|
type: TextInputType.text,
|
|
node: _nameNode,
|
|
onSubmitted: (_) => _focusScope.requestFocus(_keyNode),
|
|
label: libL10n.name,
|
|
icon: Icons.info,
|
|
suggestion: true,
|
|
),
|
|
Input(
|
|
controller: _keyController,
|
|
minLines: 3,
|
|
maxLines: 10,
|
|
type: TextInputType.text,
|
|
node: _keyNode,
|
|
onSubmitted: (_) => _focusScope.requestFocus(_pwdNode),
|
|
label: l10n.privateKey,
|
|
icon: Icons.vpn_key,
|
|
suggestion: false,
|
|
),
|
|
TextButton(
|
|
onPressed: () async {
|
|
final path = await Pfs.pickFilePath();
|
|
if (path == null) return;
|
|
|
|
final file = File(path);
|
|
if (!file.existsSync()) {
|
|
context.showSnackBar(libL10n.notExistFmt(path));
|
|
return;
|
|
}
|
|
final size = (await file.stat()).size;
|
|
if (size > Miscs.privateKeyMaxSize) {
|
|
context.showSnackBar(
|
|
l10n.fileTooLarge(path, size.bytes2Str, Miscs.privateKeyMaxSize.bytes2Str),
|
|
);
|
|
return;
|
|
}
|
|
|
|
final content = await file.readAsString();
|
|
// dartssh2 accepts only LF (but not CRLF or CR)
|
|
_keyController.text = _standardizeLineSeparators(content.trim());
|
|
},
|
|
child: Text(libL10n.file),
|
|
),
|
|
Input(
|
|
controller: _pwdController,
|
|
type: TextInputType.text,
|
|
node: _pwdNode,
|
|
obscureText: true,
|
|
label: libL10n.pwd,
|
|
icon: Icons.password,
|
|
suggestion: false,
|
|
onSubmitted: (_) => _onTapSave(),
|
|
),
|
|
SizedBox(height: MediaQuery.of(context).size.height * 0.1),
|
|
ValBuilder(listenable: _loading, builder: (val) => val ?? UIs.placeholder),
|
|
],
|
|
);
|
|
}
|
|
|
|
void _onTapSave() async {
|
|
final name = _nameController.text;
|
|
final key = _standardizeLineSeparators(_keyController.text.trim());
|
|
final pwd = _pwdController.text;
|
|
if (name.isEmpty || key.isEmpty) {
|
|
context.showSnackBar(libL10n.empty);
|
|
return;
|
|
}
|
|
FocusScope.of(context).unfocus();
|
|
_loading.value = SizedLoading.medium;
|
|
try {
|
|
final decrypted = await Computer.shared.start(decyptPem, [key, pwd]);
|
|
final pki = PrivateKeyInfo(id: name, key: decrypted);
|
|
final originPki = this.pki;
|
|
if (originPki != null) {
|
|
PrivateKeyProvider.update(originPki, pki);
|
|
} else {
|
|
PrivateKeyProvider.add(pki);
|
|
}
|
|
} catch (e) {
|
|
context.showSnackBar(e.toString());
|
|
rethrow;
|
|
} finally {
|
|
_loading.value = null;
|
|
}
|
|
context.pop();
|
|
}
|
|
}
|