aljaz/flutter_server_box
1
1
Fork 0
mirror of https://github.com/lollipopkit/flutter_server_box.git synced 2025-12-17 07:14:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

opt.

Browse Source
This commit is contained in:
lollipopkit
2023-01-28 21:16:53 +08:00
parent be1a162632
commit a518dca0ca
19 changed files with 269 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
lib/data/model/server/cpu_2_status.dart
View File

@@ -1,56 +0,0 @@
import 'package:toolbox/data/model/server/cpu_status.dart';
class Cpu2Status {
List<CpuStatus> _pre;
List<CpuStatus> _now;
String temp;
Cpu2Status(this._pre, this._now, this.temp);
double usedPercent({int coreIdx = 0}) {
if (_now.length != _pre.length) return 0;
final idleDelta = _now[coreIdx].idle - _pre[coreIdx].idle;
final totalDelta = _now[coreIdx].total - _pre[coreIdx].total;
final used = idleDelta / totalDelta;
return used.isNaN ? 0 : 100 - used * 100;
}
void update(List<CpuStatus> newStatus, String newTemp) {
_pre = _now;
_now = newStatus;
temp = newTemp;
}
int get coresCount => _now.length;
int get totalDelta => _now[0].total - _pre[0].total;
double get user {
if (_now.length != _pre.length) return 0;
final delta = _now[0].user - _pre[0].user;
final used = delta / totalDelta;
return used.isNaN ? 0 : used * 100;
}
double get sys {
if (_now.length != _pre.length) return 0;
final delta = _now[0].sys - _pre[0].sys;
final used = delta / totalDelta;
return used.isNaN ? 0 : used * 100;
}
double get nice {
if (_now.length != _pre.length) return 0;
final delta = _now[0].nice - _pre[0].nice;
final used = delta / totalDelta;
return used.isNaN ? 0 : used * 100;
}
double get iowait {
if (_now.length != _pre.length) return 0;
final delta = _now[0].iowait - _pre[0].iowait;
final used = delta / totalDelta;
return used.isNaN ? 0 : used * 100;
}
double get idle => 100 - usedPercent();
}

75
lib/data/model/server/cpu_status.dart
View File

@@ -1,7 +1,78 @@
get initOneTimeCpuStatus => OneTimeCpuStatus(
'cpu',
0,
0,
0,
0,
0,
0,
0,
);
get initCpuStatus => CpuStatus(
[initOneTimeCpuStatus],
[initOneTimeCpuStatus],
'',
);
class CpuStatus {
List<OneTimeCpuStatus> _pre;
List<OneTimeCpuStatus> _now;
String temp;
CpuStatus(this._pre, this._now, this.temp);
double usedPercent({int coreIdx = 0}) {
if (_now.length != _pre.length) return 0;
final idleDelta = _now[coreIdx].idle - _pre[coreIdx].idle;
final totalDelta = _now[coreIdx].total - _pre[coreIdx].total;
final used = idleDelta / totalDelta;
return used.isNaN ? 0 : 100 - used * 100;
}
void update(List<OneTimeCpuStatus> newStatus, String newTemp) {
_pre = _now;
_now = newStatus;
temp = newTemp;
}
int get coresCount => _now.length;
int get totalDelta => _now[0].total - _pre[0].total;
double get user {
if (_now.length != _pre.length) return 0;
final delta = _now[0].user - _pre[0].user;
final used = delta / totalDelta;
return used.isNaN ? 0 : used * 100;
}
double get sys {
if (_now.length != _pre.length) return 0;
final delta = _now[0].sys - _pre[0].sys;
final used = delta / totalDelta;
return used.isNaN ? 0 : used * 100;
}
double get nice {
if (_now.length != _pre.length) return 0;
final delta = _now[0].nice - _pre[0].nice;
final used = delta / totalDelta;
return used.isNaN ? 0 : used * 100;
}
double get iowait {
if (_now.length != _pre.length) return 0;
final delta = _now[0].iowait - _pre[0].iowait;
final used = delta / totalDelta;
return used.isNaN ? 0 : used * 100;
}
double get idle => 100 - usedPercent();
}
/// ///
/// Code generated by jsonToDartModel https://ashamp.github.io/jsonToDartModel/ /// Code generated by jsonToDartModel https://ashamp.github.io/jsonToDartModel/
/// ///
class CpuStatus { class OneTimeCpuStatus {
/* /*
{ {
"user": 0, "user": 0,
@@ -23,7 +94,7 @@ class CpuStatus {
late int irq; late int irq;
late int softirq; late int softirq;
CpuStatus( OneTimeCpuStatus(
this.id, this.id,
this.user, this.user,
this.sys, this.sys,

8
lib/data/model/server/disk_info.dart
View File

@@ -10,16 +10,16 @@ class DiskInfo {
} }
*/ */
late String mountPath; late String path;
late String mountLocation; late String loc;
late int usedPercent; late int usedPercent;
late String used; late String used;
late String size; late String size;
late String avail; late String avail;
DiskInfo( DiskInfo(
this.mountPath, this.path,
this.mountLocation, this.loc,
this.usedPercent, this.usedPercent,
this.used, this.used,
this.size, this.size,

8
lib/data/model/server/memory.dart
View File

@@ -1,3 +1,11 @@
get initMemory => Memory(
total: 1,
used: 0,
free: 1,
cache: 0,
avail: 1,
);
class Memory { class Memory {
int total; int total;
int used; int used;

11
lib/data/model/server/net_speed.dart
View File

@@ -1,5 +1,16 @@
import 'package:toolbox/core/extension/numx.dart'; import 'package:toolbox/core/extension/numx.dart';
get initNetSpeedPart => NetSpeedPart(
'',
0,
0,
0,
);
get initNetSpeed => NetSpeed(
[initNetSpeedPart],
[initNetSpeedPart],
);
class NetSpeedPart { class NetSpeedPart {
String device; String device;
int bytesIn; int bytesIn;

8
lib/data/model/server/server.dart
View File

@@ -2,13 +2,13 @@ import 'package:dartssh2/dartssh2.dart';
import 'package:toolbox/data/model/server/server_private_info.dart'; import 'package:toolbox/data/model/server/server_private_info.dart';
import 'package:toolbox/data/model/server/server_status.dart'; import 'package:toolbox/data/model/server/server_status.dart';
class ServerInfo { class Server {
ServerPrivateInfo info; ServerPrivateInfo spi;
ServerStatus status; ServerStatus status;
SSHClient? client; SSHClient? client;
ServerConnectionState connectionState; ServerConnectionState cs;
ServerInfo(this.info, this.status, this.client, this.connectionState); Server(this.spi, this.status, this.client, this.cs);
} }
enum ServerConnectionState { disconnected, connecting, connected, failed } enum ServerConnectionState { disconnected, connecting, connected, failed }

20
lib/data/model/server/server_status.dart
View File

@@ -1,4 +1,4 @@
import 'package:toolbox/data/model/server/cpu_2_status.dart'; import 'package:toolbox/data/model/server/cpu_status.dart';
import 'package:toolbox/data/model/server/disk_info.dart'; import 'package:toolbox/data/model/server/disk_info.dart';
import 'package:toolbox/data/model/server/memory.dart'; import 'package:toolbox/data/model/server/memory.dart';
import 'package:toolbox/data/model/server/net_speed.dart'; import 'package:toolbox/data/model/server/net_speed.dart';
@@ -8,6 +8,16 @@ import 'package:toolbox/data/model/server/tcp_status.dart';
/// Code generated by jsonToDartModel https://ashamp.github.io/jsonToDartModel/ /// Code generated by jsonToDartModel https://ashamp.github.io/jsonToDartModel/
/// ///
get initStatus => ServerStatus(
initCpuStatus,
initMemory,
'Loading...',
'',
[DiskInfo('/', '/', 0, '0', '0', '0')],
TcpStatus(0, 0, 0, 0),
initNetSpeed,
);
class ServerStatus { class ServerStatus {
/* /*
{ {
@@ -30,8 +40,8 @@ class ServerStatus {
} }
*/ */
Cpu2Status cpu2Status; CpuStatus cpu;
Memory memory; Memory mem;
String sysVer; String sysVer;
String uptime; String uptime;
List<DiskInfo> disk; List<DiskInfo> disk;
@@ -39,7 +49,7 @@ class ServerStatus {
NetSpeed netSpeed; NetSpeed netSpeed;
String? failedInfo; String? failedInfo;
ServerStatus(this.cpu2Status, this.memory, this.sysVer, this.uptime, ServerStatus(this.cpu, this.mem, this.sysVer, this.uptime, this.disk,
this.disk, this.tcp, this.netSpeed, this.tcp, this.netSpeed,
{this.failedInfo}); {this.failedInfo});
} }

84
lib/data/provider/server.dart
View File

@@ -6,7 +6,6 @@ import 'package:logging/logging.dart';
import 'package:toolbox/core/extension/stringx.dart'; import 'package:toolbox/core/extension/stringx.dart';
import 'package:toolbox/core/extension/uint8list.dart'; import 'package:toolbox/core/extension/uint8list.dart';
import 'package:toolbox/core/provider_base.dart'; import 'package:toolbox/core/provider_base.dart';
import 'package:toolbox/data/model/server/cpu_2_status.dart';
import 'package:toolbox/data/model/server/cpu_status.dart'; import 'package:toolbox/data/model/server/cpu_status.dart';
import 'package:toolbox/data/model/server/memory.dart'; import 'package:toolbox/data/model/server/memory.dart';
import 'package:toolbox/data/model/server/net_speed.dart'; import 'package:toolbox/data/model/server/net_speed.dart';
@@ -45,35 +44,13 @@ final numReg = RegExp(r'\s{1,}');
final memItemReg = RegExp(r'([A-Z].+:)\s+([0-9]+) kB'); final memItemReg = RegExp(r'([A-Z].+:)\s+([0-9]+) kB');
class ServerProvider extends BusyProvider { class ServerProvider extends BusyProvider {
List<ServerInfo> _servers = []; List<Server> _servers = [];
List<ServerInfo> get servers => _servers; List<Server> get servers => _servers;
Timer? _timer; Timer? _timer;
final logger = Logger('SERVER'); final logger = Logger('SERVER');
Memory get emptyMemory =>
Memory(total: 1, used: 0, free: 1, cache: 0, avail: 1);
NetSpeedPart get emptyNetSpeedPart => NetSpeedPart('', 0, 0, 0);
NetSpeed get emptyNetSpeed =>
NetSpeed([emptyNetSpeedPart], [emptyNetSpeedPart]);
CpuStatus get emptyCpuStatus => CpuStatus('cpu', 0, 0, 0, 0, 0, 0, 0);
Cpu2Status get emptyCpu2Status =>
Cpu2Status([emptyCpuStatus], [emptyCpuStatus], '');
ServerStatus get emptyStatus => ServerStatus(
emptyCpu2Status,
emptyMemory,
'Loading...',
'',
[DiskInfo('/', '/', 0, '0', '0', '0')],
TcpStatus(0, 0, 0, 0),
emptyNetSpeed);
Future<void> loadLocalData() async { Future<void> loadLocalData() async {
setBusyState(true); setBusyState(true);
final infos = locator<ServerStore>().fetch(); final infos = locator<ServerStore>().fetch();
@@ -82,9 +59,8 @@ class ServerProvider extends BusyProvider {
notifyListeners(); notifyListeners();
} }
ServerInfo genInfo(ServerPrivateInfo spi) { Server genInfo(ServerPrivateInfo spi) {
return ServerInfo( return Server(spi, initStatus, null, ServerConnectionState.disconnected);
spi, emptyStatus, null, ServerConnectionState.disconnected);
} }
Future<SSHClient> genClient(ServerPrivateInfo spi) async { Future<SSHClient> genClient(ServerPrivateInfo spi) async {
@@ -105,7 +81,7 @@ class ServerProvider extends BusyProvider {
return; return;
} }
await Future.wait(_servers.map((s) async { await Future.wait(_servers.map((s) async {
await _getData(s.info); await _getData(s.spi);
})); }));
} }
@@ -128,7 +104,7 @@ class ServerProvider extends BusyProvider {
void setDisconnected() { void setDisconnected() {
for (var i = 0; i < _servers.length; i++) { for (var i = 0; i < _servers.length; i++) {
_servers[i].connectionState = ServerConnectionState.disconnected; _servers[i].cs = ServerConnectionState.disconnected;
} }
} }
@@ -140,7 +116,7 @@ class ServerProvider extends BusyProvider {
} }
return; return;
} }
final idx = _servers.indexWhere((e) => e.info == spi); final idx = _servers.indexWhere((e) => e.spi == spi);
if (idx < 0) { if (idx < 0) {
throw RangeError.index(idx, _servers); throw RangeError.index(idx, _servers);
} }
@@ -155,7 +131,7 @@ class ServerProvider extends BusyProvider {
} }
void delServer(ServerPrivateInfo info) { void delServer(ServerPrivateInfo info) {
final idx = _servers.indexWhere((s) => s.info == info); final idx = _servers.indexWhere((s) => s.spi == info);
if (idx == -1) return; if (idx == -1) return;
_servers[idx].client?.close(); _servers[idx].client?.close();
_servers.removeAt(idx); _servers.removeAt(idx);
@@ -165,11 +141,11 @@ class ServerProvider extends BusyProvider {
Future<void> updateServer( Future<void> updateServer(
ServerPrivateInfo old, ServerPrivateInfo newSpi) async { ServerPrivateInfo old, ServerPrivateInfo newSpi) async {
final idx = _servers.indexWhere((e) => e.info == old); final idx = _servers.indexWhere((e) => e.spi == old);
if (idx < 0) { if (idx < 0) {
throw RangeError.index(idx, _servers); throw RangeError.index(idx, _servers);
} }
_servers[idx].info = newSpi; _servers[idx].spi = newSpi;
locator<ServerStore>().update(old, newSpi); locator<ServerStore>().update(old, newSpi);
_servers[idx].client = await genClient(newSpi); _servers[idx].client = await genClient(newSpi);
notifyListeners(); notifyListeners();
@@ -177,11 +153,11 @@ class ServerProvider extends BusyProvider {
} }
Future<void> _getData(ServerPrivateInfo spi) async { Future<void> _getData(ServerPrivateInfo spi) async {
final s = _servers.firstWhere((element) => element.info == spi); final s = _servers.firstWhere((element) => element.spi == spi);
final state = s.connectionState; final state = s.cs;
if (state == ServerConnectionState.failed || if (state == ServerConnectionState.failed ||
state == ServerConnectionState.disconnected) { state == ServerConnectionState.disconnected) {
s.connectionState = ServerConnectionState.connecting; s.cs = ServerConnectionState.connecting;
notifyListeners(); notifyListeners();
final time1 = DateTime.now(); final time1 = DateTime.now();
try { try {
@@ -189,7 +165,7 @@ class ServerProvider extends BusyProvider {
final time2 = DateTime.now(); final time2 = DateTime.now();
logger.info( logger.info(
'Connected to [${spi.name}] in [${time2.difference(time1).toString()}].'); 'Connected to [${spi.name}] in [${time2.difference(time1).toString()}].');
s.connectionState = ServerConnectionState.connected; s.cs = ServerConnectionState.connected;
final writeResult = await s.client! final writeResult = await s.client!
.run("echo '$shellCmd' > $shellPath && chmod +x $shellPath") .run("echo '$shellCmd' > $shellPath && chmod +x $shellPath")
.string; .string;
@@ -197,7 +173,7 @@ class ServerProvider extends BusyProvider {
throw Exception(writeResult); throw Exception(writeResult);
} }
} catch (e) { } catch (e) {
s.connectionState = ServerConnectionState.failed; s.cs = ServerConnectionState.failed;
s.status.failedInfo = '$e ## '; s.status.failedInfo = '$e ## ';
logger.warning(e); logger.warning(e);
} finally { } finally {
@@ -210,7 +186,7 @@ class ServerProvider extends BusyProvider {
final raw = await s.client!.run("sh $shellPath").string; final raw = await s.client!.run("sh $shellPath").string;
final segments = raw.split(seperator).map((e) => e.trim()).toList(); final segments = raw.split(seperator).map((e) => e.trim()).toList();
if (raw.isEmpty || segments.length == 1) { if (raw.isEmpty || segments.length == 1) {
s.connectionState = ServerConnectionState.failed; s.cs = ServerConnectionState.failed;
if (s.status.failedInfo == null || s.status.failedInfo!.isEmpty) { if (s.status.failedInfo == null || s.status.failedInfo!.isEmpty) {
s.status.failedInfo = 'No data received'; s.status.failedInfo = 'No data received';
} }
@@ -228,7 +204,7 @@ class ServerProvider extends BusyProvider {
_getTcp(spi, segments[4]); _getTcp(spi, segments[4]);
_getNetSpeed(spi, segments[0]); _getNetSpeed(spi, segments[0]);
} catch (e) { } catch (e) {
s.connectionState = ServerConnectionState.failed; s.cs = ServerConnectionState.failed;
s.status.failedInfo = e.toString(); s.status.failedInfo = e.toString();
logger.warning(e); logger.warning(e);
rethrow; rethrow;
@@ -244,12 +220,12 @@ class ServerProvider extends BusyProvider {
/// eth0: 48481023 505772 0 0 0 0 0 0 36002262 202307 0 0 0 0 0 0 /// eth0: 48481023 505772 0 0 0 0 0 0 36002262 202307 0 0 0 0 0 0
/// 1635752901 /// 1635752901
Future<void> _getNetSpeed(ServerPrivateInfo spi, String raw) async { Future<void> _getNetSpeed(ServerPrivateInfo spi, String raw) async {
final info = _servers.firstWhere((e) => e.info == spi); final info = _servers.firstWhere((e) => e.spi == spi);
info.status.netSpeed.update(await compute(_parseNetSpeed, raw)); info.status.netSpeed.update(await compute(_parseNetSpeed, raw));
} }
void _getSysVer(ServerPrivateInfo spi, String raw) { void _getSysVer(ServerPrivateInfo spi, String raw) {
final info = _servers.firstWhere((e) => e.info == spi); final info = _servers.firstWhere((e) => e.spi == spi);
final s = raw.split('='); final s = raw.split('=');
if (s.length == 2) { if (s.length == 2) {
info.status.sysVer = s[1].replaceAll('"', '').replaceFirst('\n', ''); info.status.sysVer = s[1].replaceAll('"', '').replaceFirst('\n', '');
@@ -258,22 +234,22 @@ class ServerProvider extends BusyProvider {
Future<void> _getCPU(ServerPrivateInfo spi, String raw, String tempType, Future<void> _getCPU(ServerPrivateInfo spi, String raw, String tempType,
String tempValue) async { String tempValue) async {
final info = _servers.firstWhere((e) => e.info == spi); final info = _servers.firstWhere((e) => e.spi == spi);
final cpus = await compute(_parseCPU, raw); final cpus = await compute(_parseCPU, raw);
if (cpus.isNotEmpty) { if (cpus.isNotEmpty) {
info.status.cpu2Status info.status.cpu
.update(cpus, await compute(_getCPUTemp, [tempType, tempValue])); .update(cpus, await compute(_getCPUTemp, [tempType, tempValue]));
} }
} }
void _getUpTime(ServerPrivateInfo spi, String raw) { void _getUpTime(ServerPrivateInfo spi, String raw) {
_servers.firstWhere((e) => e.info == spi).status.uptime = _servers.firstWhere((e) => e.spi == spi).status.uptime =
raw.split('up ')[1].split(', ')[0]; raw.split('up ')[1].split(', ')[0];
} }
Future<void> _getTcp(ServerPrivateInfo spi, String raw) async { Future<void> _getTcp(ServerPrivateInfo spi, String raw) async {
final info = _servers.firstWhere((e) => e.info == spi); final info = _servers.firstWhere((e) => e.spi == spi);
final status = await compute(_parseTcp, raw); final status = await compute(_parseTcp, raw);
if (status != null) { if (status != null) {
info.status.tcp = status; info.status.tcp = status;
@@ -281,7 +257,7 @@ class ServerProvider extends BusyProvider {
} }
void _getDisk(ServerPrivateInfo spi, String raw) { void _getDisk(ServerPrivateInfo spi, String raw) {
final info = _servers.firstWhere((e) => e.info == spi); final info = _servers.firstWhere((e) => e.spi == spi);
final list = <DiskInfo>[]; final list = <DiskInfo>[];
final items = raw.split('\n'); final items = raw.split('\n');
for (var item in items) { for (var item in items) {
@@ -296,14 +272,14 @@ class ServerProvider extends BusyProvider {
} }
Future<void> _getMem(ServerPrivateInfo spi, String raw) async { Future<void> _getMem(ServerPrivateInfo spi, String raw) async {
final info = _servers.firstWhere((e) => e.info == spi); final info = _servers.firstWhere((e) => e.spi == spi);
final mem = await compute(_parseMem, raw); final mem = await compute(_parseMem, raw);
info.status.memory = mem; info.status.mem = mem;
} }
Future<String?> runSnippet(String id, Snippet snippet) async { Future<String?> runSnippet(String id, Snippet snippet) async {
final client = final client =
_servers.firstWhere((element) => element.info.id == id).client; _servers.firstWhere((element) => element.spi.id == id).client;
if (client == null) { if (client == null) {
return null; return null;
} }
@@ -340,14 +316,14 @@ TcpStatus? _parseTcp(String raw) {
return null; return null;
} }
List<CpuStatus> _parseCPU(String raw) { List<OneTimeCpuStatus> _parseCPU(String raw) {
final List<CpuStatus> cpus = []; final List<OneTimeCpuStatus> cpus = [];
for (var item in raw.split('\n')) { for (var item in raw.split('\n')) {
if (item == '') break; if (item == '') break;
final id = item.split(' ').first; final id = item.split(' ').first;
final matches = item.replaceFirst(id, '').trim().split(' '); final matches = item.replaceFirst(id, '').trim().split(' ');
cpus.add(CpuStatus( cpus.add(OneTimeCpuStatus(
id, id,
int.parse(matches[0]), int.parse(matches[0]),
int.parse(matches[1]), int.parse(matches[1]),

8
lib/data/res/build_data.dart
View File

@@ -2,9 +2,9 @@
class BuildData { class BuildData {
static const String name = "ServerBox"; static const String name = "ServerBox";
static const int build = 189; static const int build = 190;
static const String engine = static const String engine =
"Flutter 3.7.0 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision b06b8b2710 (4 days ago) • 2023-01-23 16:55:55 -0800\nEngine • revision b24591ed32\nTools • Dart 2.19.0 • DevTools 2.20.1\n"; "Flutter 3.7.0 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision b06b8b2710 (5 days ago) • 2023-01-23 16:55:55 -0800\nEngine • revision b24591ed32\nTools • Dart 2.19.0 • DevTools 2.20.1\n";
static const String buildAt = "2023-01-28 14:28:14.979200"; static const String buildAt = "2023-01-28 21:12:37.408372";
static const int modifications = 2; static const int modifications = 19;
} }

4
lib/data/res/sizedbox.dart Normal file
View File

@@ -0,0 +1,4 @@
import 'package:flutter/widgets.dart';
const height13 = SizedBox(height: 13);
const width13 = SizedBox(width: 13);

2
lib/view/page/docker.dart
View File

@@ -47,7 +47,7 @@ class _DockerManagePageState extends State<DockerManagePage> {
super.initState(); super.initState();
final client = locator<ServerProvider>() final client = locator<ServerProvider>()
.servers .servers
.firstWhere((element) => element.info == widget.spi) .firstWhere((element) => element.spi == widget.spi)
.client; .client;
if (client == null) { if (client == null) {
showSnackBar(context, Text(_s.noClient)); showSnackBar(context, Text(_s.noClient));

4
lib/view/page/home.dart
View File

@@ -188,8 +188,8 @@ class _MyHomePageState extends State<MyHomePage>
ListTile( ListTile(
leading: const Icon(Icons.vpn_key), leading: const Icon(Icons.vpn_key),
title: Text(_s.privateKey), title: Text(_s.privateKey),
onTap: () => AppRoute( onTap: () =>
const StoredPrivateKeysPage(), 'private key list') AppRoute(const PrivateKeysListPage(), 'private key list')
.go(context), .go(context),
), ),
ListTile( ListTile(

2
lib/view/page/ping.dart
View File

@@ -153,7 +153,7 @@ class _PingPageState extends State<PingPage>
return; return;
} }
final result = await e.client!.run('ping -c 3 $target').string; final result = await e.client!.run('ping -c 3 $target').string;
_results.add(PingResult.parse(e.info.name, result)); _results.add(PingResult.parse(e.spi.name, result));
setState(() {}); setState(() {});
})); }));
} catch (e) { } catch (e) {

2
lib/view/page/pkg.dart
View File

@@ -51,7 +51,7 @@ class _PkgManagePageState extends State<PkgManagePage>
super.initState(); super.initState();
final si = locator<ServerProvider>() final si = locator<ServerProvider>()
.servers .servers
.firstWhere((e) => e.info == widget.spi); .firstWhere((e) => e.spi == widget.spi);
if (si.client == null) { if (si.client == null) {
showSnackBar(context, Text(_s.waitConnection)); showSnackBar(context, Text(_s.waitConnection));
Navigator.of(context).pop(); Navigator.of(context).pop();

6
lib/view/page/private_key/list.dart
View File

@@ -7,14 +7,14 @@ import 'package:toolbox/generated/l10n.dart';
import 'package:toolbox/view/page/private_key/edit.dart'; import 'package:toolbox/view/page/private_key/edit.dart';
import 'package:toolbox/view/widget/round_rect_card.dart'; import 'package:toolbox/view/widget/round_rect_card.dart';
class StoredPrivateKeysPage extends StatefulWidget { class PrivateKeysListPage extends StatefulWidget {
const StoredPrivateKeysPage({Key? key}) : super(key: key); const PrivateKeysListPage({Key? key}) : super(key: key);
@override @override
_PrivateKeyListState createState() => _PrivateKeyListState(); _PrivateKeyListState createState() => _PrivateKeyListState();
} }
class _PrivateKeyListState extends State<StoredPrivateKeysPage> { class _PrivateKeyListState extends State<PrivateKeysListPage> {
late S _s; late S _s;
@override @override

88
lib/view/page/server/detail.dart
View File

@@ -14,6 +14,8 @@ import 'package:toolbox/generated/l10n.dart';
import 'package:toolbox/locator.dart'; import 'package:toolbox/locator.dart';
import 'package:toolbox/view/widget/round_rect_card.dart'; import 'package:toolbox/view/widget/round_rect_card.dart';
import '../../../data/res/sizedbox.dart';
class ServerDetailPage extends StatefulWidget { class ServerDetailPage extends StatefulWidget {
const ServerDetailPage(this.id, {Key? key}) : super(key: key); const ServerDetailPage(this.id, {Key? key}) : super(key: key);
@@ -23,10 +25,6 @@ class ServerDetailPage extends StatefulWidget {
_ServerDetailPageState createState() => _ServerDetailPageState(); _ServerDetailPageState createState() => _ServerDetailPageState();
} }
const width13 = SizedBox(
width: 13,
);
class _ServerDetailPageState extends State<ServerDetailPage> class _ServerDetailPageState extends State<ServerDetailPage>
with SingleTickerProviderStateMixin { with SingleTickerProviderStateMixin {
late MediaQueryData _media; late MediaQueryData _media;
@@ -48,16 +46,16 @@ class _ServerDetailPageState extends State<ServerDetailPage>
return Consumer<ServerProvider>(builder: (_, provider, __) { return Consumer<ServerProvider>(builder: (_, provider, __) {
return _buildMainPage( return _buildMainPage(
provider.servers.firstWhere( provider.servers.firstWhere(
(e) => '${e.info.ip}:${e.info.port}' == widget.id, (e) => e.spi.id == widget.id,
), ),
); );
}); });
} }
Widget _buildMainPage(ServerInfo si) { Widget _buildMainPage(Server si) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text(si.info.name, style: textSize18), title: Text(si.spi.name, style: textSize18),
), ),
body: ListView( body: ListView(
padding: const EdgeInsets.all(13), padding: const EdgeInsets.all(13),
@@ -96,10 +94,10 @@ class _ServerDetailPageState extends State<ServerDetailPage>
} }
Widget _buildCPUView(ServerStatus ss) { Widget _buildCPUView(ServerStatus ss) {
final tempWidget = ss.cpu2Status.temp.isEmpty final tempWidget = ss.cpu.temp.isEmpty
? const SizedBox() ? const SizedBox()
: Text( : Text(
ss.cpu2Status.temp, ss.cpu.temp,
style: textSize13Grey, style: textSize13Grey,
); );
return RoundRectCard( return RoundRectCard(
@@ -112,7 +110,7 @@ class _ServerDetailPageState extends State<ServerDetailPage>
Row( Row(
children: [ children: [
Text( Text(
'${ss.cpu2Status.usedPercent(coreIdx: 0).toInt()}%', '${ss.cpu.usedPercent(coreIdx: 0).toInt()}%',
style: textSize27, style: textSize27,
textScaleFactor: 1.0, textScaleFactor: 1.0,
), ),
@@ -121,17 +119,18 @@ class _ServerDetailPageState extends State<ServerDetailPage>
), ),
Row( Row(
children: [ children: [
_buildDetailPercent(ss.cpu2Status.user, 'user'), _buildDetailPercent(ss.cpu.user, 'user'),
width13, width13,
_buildDetailPercent(ss.cpu2Status.sys, 'sys'), _buildDetailPercent(ss.cpu.sys, 'sys'),
width13, width13,
_buildDetailPercent(ss.cpu2Status.iowait, 'io'), _buildDetailPercent(ss.cpu.iowait, 'io'),
width13, width13,
_buildDetailPercent(ss.cpu2Status.idle, 'idle') _buildDetailPercent(ss.cpu.idle, 'idle')
], ],
) )
], ],
), ),
height13,
_buildCPUProgress(ss) _buildCPUProgress(ss)
]), ]),
), ),
@@ -159,22 +158,18 @@ class _ServerDetailPageState extends State<ServerDetailPage>
} }
Widget _buildCPUProgress(ServerStatus ss) { Widget _buildCPUProgress(ServerStatus ss) {
return SizedBox( final children = <Widget>[];
height: 12.0 * ss.cpu2Status.coresCount, for (var i = 0; i < ss.cpu.coresCount; i++) {
child: ListView.builder( if (i == 0) continue;
physics: const NeverScrollableScrollPhysics(), children.add(
padding: const EdgeInsets.only(top: 13), Padding(
itemBuilder: (ctx, idx) {
if (idx == 0) return const SizedBox();
return Padding(
padding: const EdgeInsets.all(2), padding: const EdgeInsets.all(2),
child: _buildProgress(ss.cpu2Status.usedPercent(coreIdx: idx)), child: _buildProgress(ss.cpu.usedPercent(coreIdx: i)),
);
},
itemCount: ss.cpu2Status.coresCount,
), ),
); );
} }
return Column(children: children);
}
Widget _buildProgress(double percent) { Widget _buildProgress(double percent) {
if (percent > 100) percent = 100; if (percent > 100) percent = 100;
@@ -188,7 +183,8 @@ class _ServerDetailPageState extends State<ServerDetailPage>
} }
Widget _buildUpTimeAndSys(ServerStatus ss) { Widget _buildUpTimeAndSys(ServerStatus ss) {
return RoundRectCard(Padding( return RoundRectCard(
Padding(
padding: roundRectCardPadding, padding: roundRectCardPadding,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -201,15 +197,17 @@ class _ServerDetailPageState extends State<ServerDetailPage>
), ),
], ],
), ),
)); ),
);
} }
Widget _buildMemView(ServerStatus ss) { Widget _buildMemView(ServerStatus ss) {
final used = ss.memory.used / ss.memory.total * 100; final used = ss.mem.used / ss.mem.total * 100;
final free = ss.memory.free / ss.memory.total * 100; final free = ss.mem.free / ss.mem.total * 100;
final avail = ss.memory.avail / ss.memory.total * 100; final avail = ss.mem.avail / ss.mem.total * 100;
return RoundRectCard(Padding( return RoundRectCard(
Padding(
padding: roundRectCardPadding, padding: roundRectCardPadding,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
@@ -222,7 +220,7 @@ class _ServerDetailPageState extends State<ServerDetailPage>
children: [ children: [
Text('${used.toStringAsFixed(0)}%', style: textSize27), Text('${used.toStringAsFixed(0)}%', style: textSize27),
const SizedBox(width: 7), const SizedBox(width: 7),
Text('of ${(ss.memory.total * 1024).convertBytes}', Text('of ${(ss.mem.total * 1024).convertBytes}',
style: textSize13Grey) style: textSize13Grey)
], ],
), ),
@@ -241,19 +239,20 @@ class _ServerDetailPageState extends State<ServerDetailPage>
_buildProgress(used) _buildProgress(used)
], ],
), ),
)); ),
);
} }
Widget _buildDiskView(ServerStatus ss) { Widget _buildDiskView(ServerStatus ss) {
final clone = ss.disk.toList(); final clone = ss.disk.toList();
for (var item in ss.disk) { for (var item in ss.disk) {
if (ignorePath.any((ele) => item.mountLocation.contains(ele))) { if (ignorePath.any((ele) => item.loc.contains(ele))) {
clone.remove(item); clone.remove(item);
} }
} }
final children = clone final children = clone
.map((disk) => Padding( .map((disk) => Padding(
padding: const EdgeInsets.all(3), padding: const EdgeInsets.symmetric(vertical: 3),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
@@ -265,8 +264,7 @@ class _ServerDetailPageState extends State<ServerDetailPage>
style: textSize11, style: textSize11,
textScaleFactor: 1.0, textScaleFactor: 1.0,
), ),
Text(disk.mountPath, Text(disk.path, style: textSize11, textScaleFactor: 1.0)
style: textSize11, textScaleFactor: 1.0)
], ],
), ),
_buildProgress(disk.usedPercent.toDouble()) _buildProgress(disk.usedPercent.toDouble())
@@ -274,13 +272,15 @@ class _ServerDetailPageState extends State<ServerDetailPage>
), ),
)) ))
.toList(); .toList();
return RoundRectCard(Padding( return RoundRectCard(
Padding(
padding: roundRectCardPadding, padding: roundRectCardPadding,
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: children, children: children,
), ),
)); ),
);
} }
Widget _buildNetView(NetSpeed ns) { Widget _buildNetView(NetSpeed ns) {
@@ -301,17 +301,19 @@ class _ServerDetailPageState extends State<ServerDetailPage>
children.addAll(ns.devices.map((e) => _buildNetSpeedItem(ns, e))); children.addAll(ns.devices.map((e) => _buildNetSpeedItem(ns, e)));
} }
return RoundRectCard(Padding( return RoundRectCard(
Padding(
padding: roundRectCardPadding, padding: roundRectCardPadding,
child: Column( child: Column(
children: children, children: children,
), ),
)); ),
);
} }
Widget _buildNetSpeedTop() { Widget _buildNetSpeedTop() {
return Padding( return Padding(
padding: const EdgeInsets.symmetric(vertical: 3), padding: const EdgeInsets.only(bottom: 3),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: const [ children: const [

19
lib/view/page/server/tab.dart
View File

@@ -100,22 +100,20 @@ class _ServerPageState extends State<ServerPage>
); );
} }
Widget _buildEachServerCard(ServerInfo si) { Widget _buildEachServerCard(Server si) {
return RoundRectCard( return RoundRectCard(
InkWell( InkWell(
onLongPress: () => AppRoute( onLongPress: () => AppRoute(
ServerEditPage( ServerEditPage(
spi: si.info, spi: si.spi,
), ),
'Edit server info page') 'Edit server info page')
.go(context), .go(context),
child: Padding( child: Padding(
padding: const EdgeInsets.all(13), padding: const EdgeInsets.all(13),
child: _buildRealServerCard( child: _buildRealServerCard(si.status, si.spi.name, si.cs, si.spi),
si.status, si.info.name, si.connectionState, si.info),
), ),
onTap: () => AppRoute(ServerDetailPage('${si.info.ip}:${si.info.port}'), onTap: () => AppRoute(ServerDetailPage(si.spi.id), 'server detail page')
'server detail page')
.go(context), .go(context),
), ),
); );
@@ -123,11 +121,10 @@ class _ServerPageState extends State<ServerPage>
Widget _buildRealServerCard(ServerStatus ss, String serverName, Widget _buildRealServerCard(ServerStatus ss, String serverName,
ServerConnectionState cs, ServerPrivateInfo spi) { ServerConnectionState cs, ServerPrivateInfo spi) {
final rootDisk = final rootDisk = ss.disk.firstWhere((element) => element.loc == '/');
ss.disk.firstWhere((element) => element.mountLocation == '/');
final topRightStr = final topRightStr =
getTopRightStr(cs, ss.cpu2Status.temp, ss.uptime, ss.failedInfo); getTopRightStr(cs, ss.cpu.temp, ss.uptime, ss.failedInfo);
final hasError = final hasError =
cs == ServerConnectionState.failed && ss.failedInfo != null; cs == ServerConnectionState.failed && ss.failedInfo != null;
final style = TextStyle( final style = TextStyle(
@@ -178,8 +175,8 @@ class _ServerPageState extends State<ServerPage>
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [ children: [
_buildPercentCircle(ss.cpu2Status.usedPercent()), _buildPercentCircle(ss.cpu.usedPercent()),
_buildPercentCircle(ss.memory.used / ss.memory.total * 100), _buildPercentCircle(ss.mem.used / ss.mem.total * 100),
_buildIOData('Conn:\n${ss.tcp.maxConn}', 'Fail:\n${ss.tcp.fail}'), _buildIOData('Conn:\n${ss.tcp.maxConn}', 'Fail:\n${ss.tcp.fail}'),
_buildIOData( _buildIOData(
'Total:\n${rootDisk.size}', 'Used:\n${rootDisk.usedPercent}%') 'Total:\n${rootDisk.size}', 'Used:\n${rootDisk.usedPercent}%')

7
lib/view/page/sftp/view.dart
View File

@@ -37,7 +37,7 @@ class _SFTPPageState extends State<SFTPPage> {
late MediaQueryData _media; late MediaQueryData _media;
late S _s; late S _s;
ServerInfo? _si; Server? _si;
SSHClient? _client; SSHClient? _client;
@override @override
@@ -51,7 +51,7 @@ class _SFTPPageState extends State<SFTPPage> {
void initState() { void initState() {
super.initState(); super.initState();
final serverProvider = locator<ServerProvider>(); final serverProvider = locator<ServerProvider>();
_si = serverProvider.servers.firstWhere((s) => s.info == widget.spi); _si = serverProvider.servers.firstWhere((s) => s.spi == widget.spi);
_client = _si?.client; _client = _si?.client;
} }
@@ -175,8 +175,7 @@ class _SFTPPageState extends State<SFTPPage> {
); );
Widget _buildFileView() { Widget _buildFileView() {
if (_client == null || if (_client == null || _si?.cs != ServerConnectionState.connected) {
_si?.connectionState != ServerConnectionState.connected) {
return centerCircleLoading; return centerCircleLoading;
} }

2
lib/view/page/ssh.dart
View File

@@ -52,7 +52,7 @@ class _SSHPageState extends State<SSHPage> {
final client = locator<ServerProvider>() final client = locator<ServerProvider>()
.servers .servers
.where((e) => e.info.id == widget.spi.id) .where((e) => e.spi.id == widget.spi.id)
.first .first
.client; .client;
if (client == null) { if (client == null) {