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

Optimize load speed

Browse Source
This commit is contained in:
Junyuan Feng
2022-01-11 13:21:52 +08:00
parent 340a7641e6
commit a58119ef54
2 changed files with 83 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,11 @@ import 'package:toolbox/locator.dart';
/// Because of this function is called by [compute] in [ServerProvider.genClient]. /// Because of this function is called by [compute] in [ServerProvider.genClient].
/// https://stackoverflow.com/questions/51998995/invalid-arguments-illegal-argument-in-isolate-message-object-is-a-closure /// https://stackoverflow.com/questions/51998995/invalid-arguments-illegal-argument-in-isolate-message-object-is-a-closure
List<SSHKeyPair> loadIndentity(String key) { List<SSHKeyPair> loadIndentity(String key) {
return SSHKeyPair.fromPem(key); final watch = Stopwatch()..start();
final pem = SSHKeyPair.fromPem(key);
watch.stop();
print('loadIndentity: ${watch.elapsedMilliseconds}ms');
return pem;
} }
class ServerProvider extends BusyProvider { class ServerProvider extends BusyProvider {
@@ -81,27 +85,20 @@ class ServerProvider extends BusyProvider {
} }
final key = locator<PrivateKeyStore>().get(spi.pubKeyId!); final key = locator<PrivateKeyStore>().get(spi.pubKeyId!);
return SSHClient(socket, return SSHClient(socket,
username: spi.user, identities: await compute(loadIndentity, key.privateKey)); username: spi.user,
identities: await compute(loadIndentity, key.privateKey));
} }
Future<void> refreshData({int? idx}) async { Future<void> refreshData({int? idx}) async {
if (idx != null) { if (idx != null) {
final singleData = await _getData(_servers[idx].info, idx); _getData(idx);
if (singleData != null) {
_servers[idx].status = singleData;
notifyListeners();
}
return; return;
} }
try { try {
await Future.wait(_servers.map((s) async { await Future.wait(_servers.map((s) async {
final idx = _servers.indexOf(s); final idx = _servers.indexOf(s);
if (idx == -1) return; if (idx == -1) return;
final status = await _getData(s.info, idx); await _getData(idx);
if (status != null) {
_servers[idx].status = status;
notifyListeners();
}
})); }));
} catch (e) { } catch (e) {
if (e is! RangeError) { if (e is! RangeError) {
@@ -152,8 +149,9 @@ class ServerProvider extends BusyProvider {
refreshData(idx: idx); refreshData(idx: idx);
} }
Future<ServerStatus?> _getData(ServerPrivateInfo info, int idx) async { Future<void> _getData(int idx) async {
final client = _servers[idx].client; final client = _servers[idx].client;
final info = _servers[idx].info;
final connected = client != null; final connected = client != null;
final state = _servers[idx].connectionState; final state = _servers[idx].connectionState;
if (!connected || if (!connected ||
@@ -177,32 +175,19 @@ class ServerProvider extends BusyProvider {
} }
} }
try { try {
if (!connected) return null; if (_servers[idx].client == null) return;
final cpu = utf8.decode(await client!.run("cat /proc/stat | grep cpu")); _getCPU(_servers[idx]);
final cpuTemp = utf8.decode(await client.run( _getMem(_servers[idx]);
r"paste <(cat /sys/class/thermal/thermal_zone*/type) <(cat /sys/class/thermal/thermal_zone*/temp) | column -s $'\t' -t | sed 's/\(.\)..$/.\1°C/'")); _getSysVer(_servers[idx]);
final mem = utf8.decode(await client.run('free -m')); _getUpTime(_servers[idx]);
final sysVer = utf8 _getDisk(_servers[idx]);
.decode(await client.run('cat /etc/os-release | grep PRETTY_NAME')); _getTcp(_servers[idx]);
final upTime = utf8.decode(await client.run('uptime')); _getNetSpeed(_servers[idx]);
final disk = utf8.decode(await client.run('df -h'));
final tcp = utf8.decode(await client.run('cat /proc/net/snmp'));
final netSpeed =
utf8.decode(await client.run('cat /proc/net/dev && date +%s'));
return ServerStatus(
_getCPU(cpu, _servers[idx].status.cpu2Status, cpuTemp),
_getMem(mem),
_getSysVer(sysVer),
_getUpTime(upTime),
_getDisk(disk),
_getTcp(tcp),
_getNetSpeed(netSpeed, _servers[idx].status.netSpeed));
} catch (e) { } catch (e) {
_servers[idx].connectionState = ServerConnectionState.failed; _servers[idx].connectionState = ServerConnectionState.failed;
servers[idx].status.failedInfo = e.toString();
notifyListeners(); notifyListeners();
logger.warning(e); logger.warning(e);
return null;
} }
} }
@@ -212,10 +197,13 @@ class ServerProvider extends BusyProvider {
/// lo: 45929941 269112 0 0 0 0 0 0 45929941 269112 0 0 0 0 0 0 /// lo: 45929941 269112 0 0 0 0 0 0 45929941 269112 0 0 0 0 0 0
/// 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
NetSpeed _getNetSpeed(String raw, NetSpeed old) { Future<void> _getNetSpeed(ServerInfo info) async {
final idx = _servers.indexOf(info);
final client = _servers[idx].client!;
final raw = utf8.decode(await client.run('cat /proc/net/dev && date +%s'));
final split = raw.split('\n'); final split = raw.split('\n');
final deviceCount = split.length - 3; final deviceCount = split.length - 3;
if (deviceCount < 1) return emptyNetSpeed; if (deviceCount < 1) return;
final time = int.parse(split[split.length - 2]); final time = int.parse(split[split.length - 2]);
final results = <NetSpeedPart>[]; final results = <NetSpeedPart>[];
for (int idx = 2; idx < deviceCount; idx++) { for (int idx = 2; idx < deviceCount; idx++) {
@@ -227,15 +215,23 @@ class ServerProvider extends BusyProvider {
final bytesOut = int.parse(bytes[8]); final bytesOut = int.parse(bytes[8]);
results.add(NetSpeedPart(device, bytesIn, bytesOut, time)); results.add(NetSpeedPart(device, bytesIn, bytesOut, time));
} }
return old.update(results); info.status.netSpeed = info.status.netSpeed.update(results);
notifyListeners();
} }
String _getSysVer(String raw) { Future<void> _getSysVer(ServerInfo info) async {
final idx = _servers.indexOf(info);
final client = _servers[idx].client!;
final raw =
utf8.decode(await client.run('cat /etc/os-release | grep PRETTY_NAME'));
final s = raw.split('='); final s = raw.split('=');
if (s.length == 2) { if (s.length == 2) {
return s[1].replaceAll('"', '').replaceFirst('\n', ''); info.status.sysVer = s[1].replaceAll('"', '').replaceFirst('\n', '');
} else {
info.status.sysVer = '';
} }
return '';
notifyListeners();
} }
String _getCPUTemp(String raw) { String _getCPUTemp(String raw) {
@@ -248,7 +244,12 @@ class ServerProvider extends BusyProvider {
return ''; return '';
} }
Cpu2Status _getCPU(String raw, Cpu2Status old, String temp) { Future<void> _getCPU(ServerInfo info) async {
final idx = _servers.indexOf(info);
final client = _servers[idx].client!;
final raw = utf8.decode(await client.run("cat /proc/stat | grep cpu"));
final temp = utf8.decode(await client.run(
r"paste <(cat /sys/class/thermal/thermal_zone*/type) <(cat /sys/class/thermal/thermal_zone*/temp) | column -s $'\t' -t | sed 's/\(.\)..$/.\1°C/'"));
final List<CpuStatus> cpus = []; final List<CpuStatus> cpus = [];
for (var item in raw.split('\n')) { for (var item in raw.split('\n')) {
@@ -266,32 +267,44 @@ class ServerProvider extends BusyProvider {
int.parse(matches[6]))); int.parse(matches[6])));
} }
if (cpus.isEmpty) { if (cpus.isEmpty) {
return emptyCpu2Status; info.status.cpu2Status = emptyCpu2Status;
} else {
info.status.cpu2Status =
info.status.cpu2Status.update(cpus, _getCPUTemp(temp));
} }
return old.update(cpus, _getCPUTemp(temp)); notifyListeners();
} }
String _getUpTime(String raw) { Future<void> _getUpTime(ServerInfo info) async {
return raw.split('up ')[1].split(', ')[0]; final idx = _servers.indexOf(info);
final client = _servers[idx].client!;
final raw = utf8.decode(await client.run('uptime'));
info.status.uptime = raw.split('up ')[1].split(', ')[0];
notifyListeners();
} }
TcpStatus _getTcp(String raw) { Future<void> _getTcp(ServerInfo info) async {
final sidx = _servers.indexOf(info);
final client = _servers[sidx].client!;
final raw = utf8.decode(await client.run('cat /proc/net/snmp'));
final lines = raw.split('\n'); final lines = raw.split('\n');
int idx = 0; final idx = lines.lastWhere((element) => element.startsWith('Tcp:'),
for (var item in lines) { orElse: () => '');
if (item.contains('Tcp:')) { if (idx != '') {
idx++; final vals = idx.split(RegExp(r'\s{1,}'));
} info.status.tcp = TcpStatus(vals[5].i, vals[6].i, vals[7].i, vals[8].i);
if (idx == 2) { } else {
final vals = item.split(RegExp(r'\s{1,}')); info.status.tcp = TcpStatus(0, 0, 0, 0);
return TcpStatus(vals[5].i, vals[6].i, vals[7].i, vals[8].i);
}
} }
return TcpStatus(0, 0, 0, 0); notifyListeners();
} }
List<DiskInfo> _getDisk(String disk) { Future<void> _getDisk(ServerInfo info) async {
final idx = _servers.indexOf(info);
final client = _servers[idx].client!;
final disk = utf8.decode(await client.run('df -h'));
final list = <DiskInfo>[]; final list = <DiskInfo>[];
final items = disk.split('\n'); final items = disk.split('\n');
for (var item in items) { for (var item in items) {
@@ -302,16 +315,20 @@ class ServerProvider extends BusyProvider {
list.add(DiskInfo(vals[0], vals[5], list.add(DiskInfo(vals[0], vals[5],
int.parse(vals[4].replaceFirst('%', '')), vals[2], vals[1], vals[3])); int.parse(vals[4].replaceFirst('%', '')), vals[2], vals[1], vals[3]));
} }
return list; info.status.disk = list;
notifyListeners();
} }
Memory _getMem(String mem) { Future<void> _getMem(ServerInfo info) async {
final idx = _servers.indexOf(info);
final client = _servers[idx].client!;
final mem = utf8.decode(await client.run('free -m'));
for (var item in mem.split('\n')) { for (var item in mem.split('\n')) {
if (item.contains('Mem:')) { if (item.contains('Mem:')) {
final split = item.replaceFirst('Mem:', '').split(' '); final split = item.replaceFirst('Mem:', '').split(' ');
split.removeWhere((e) => e == ''); split.removeWhere((e) => e == '');
final memList = split.map((e) => int.parse(e)).toList(); final memList = split.map((e) => int.parse(e)).toList();
return Memory( info.status.memory = Memory(
total: memList[0], total: memList[0],
used: memList[1], used: memList[1],
free: memList[2], free: memList[2],
@@ -320,7 +337,7 @@ class ServerProvider extends BusyProvider {
avail: memList[5]); avail: memList[5]);
} }
} }
return emptyMemory; notifyListeners();
} }
Future<String?> runSnippet(int idx, Snippet snippet) async { Future<String?> runSnippet(int idx, Snippet snippet) async {

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

@@ -2,9 +2,8 @@
class BuildData { class BuildData {
static const String name = "ToolBox"; static const String name = "ToolBox";
static const int build = 79; static const int build = 81;
static const String engine = static const String engine = "Flutter 2.8.1 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision 77d935af4d (4 weeks ago) • 2021-12-16 08:37:33 -0800\nEngine • revision 890a5fca2e\nTools • Dart 2.15.1\n";
"Flutter 2.8.1 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision 77d935af4d (4 weeks ago) • 2021-12-16 08:37:33 -0800\nEngine • revision 890a5fca2e\nTools • Dart 2.15.1\n"; static const String buildAt = "2022-01-11 13:16:48.400673";
static const String buildAt = "2022-01-10 16:04:12.547744"; static const int modifications = 2;
static const int modifications = 0;
} }