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

refactors (#539)

Browse Source
This commit is contained in:
lollipopkit🏳️‍⚧️
2024-08-16 01:24:43 +08:00
committed by GitHub
parent 7e5bb54c98
commit 38366a2ef3
45 changed files with 527 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/data/model/app/backup.dart
View File

@@ -7,8 +7,8 @@ import 'package:logging/logging.dart';
import 'package:server_box/data/model/server/private_key_info.dart';
import 'package:server_box/data/model/server/server_private_info.dart';
import 'package:server_box/data/model/server/snippet.dart';
import 'package:server_box/data/provider/base.dart';
import 'package:server_box/data/res/misc.dart';
import 'package:server_box/data/res/provider.dart';
import 'package:server_box/data/res/rebuild.dart';
import 'package:server_box/data/res/store.dart';
@@ -23,7 +23,7 @@ class Backup {
// backup format version
final int version;
final String date;
final List<ServerPrivateInfo> spis;
final List<Spi> spis;
final List<Snippet> snippets;
final List<PrivateKeyInfo> keys;
final Map<String, dynamic> container;
@@ -177,7 +177,7 @@ class Backup {
}
}
Pros.reload();
Provider.reload();
RNodes.app.notify();
_logger.info('Restore success');

2
lib/data/model/app/backup.g.dart
View File

@@ -10,7 +10,7 @@ Backup _$BackupFromJson(Map<String, dynamic> json) => Backup(
version: (json['version'] as num).toInt(),
date: json['date'] as String,
spis: (json['spis'] as List<dynamic>)
.map((e) => ServerPrivateInfo.fromJson(e as Map<String, dynamic>))
.map((e) => Spi.fromJson(e as Map<String, dynamic>))
.toList(),
snippets: (json['snippets'] as List<dynamic>)
.map((e) => Snippet.fromJson(e as Map<String, dynamic>))

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

@@ -15,7 +15,7 @@ import 'package:server_box/data/model/server/system.dart';
import 'package:server_box/data/model/server/temp.dart';
class Server implements TagPickable {
ServerPrivateInfo spi;
Spi spi;
ServerStatus status;
SSHClient? client;
ServerConn conn;

35
lib/data/model/server/server_private_info.dart
View File

@@ -1,11 +1,12 @@
import 'dart:convert';
import 'package:fl_lib/fl_lib.dart';
import 'package:hive_flutter/hive_flutter.dart';
import 'package:json_annotation/json_annotation.dart';
import 'package:server_box/data/model/server/custom.dart';
import 'package:server_box/data/model/server/server.dart';
import 'package:server_box/data/model/server/wol_cfg.dart';
import 'package:server_box/data/res/provider.dart';
import 'package:server_box/data/provider/server.dart';
import 'package:server_box/data/model/app/error.dart';
@@ -13,13 +14,13 @@ part 'server_private_info.g.dart';
/// In the first version, it's called `ServerPrivateInfo` which was designed to
/// store the private information of a server.
///
///
/// Some params named as `spi` in the codebase which is the abbreviation of `ServerPrivateInfo`.
///
/// Nowaday, more fields are added to this class, but the name is still the same.
/// Nowaday, more fields are added to this class, and it's renamed to `Spi`.
@JsonSerializable()
@HiveType(typeId: 3)
class ServerPrivateInfo {
class Spi {
@HiveField(0)
final String name;
@HiveField(1)
@@ -58,7 +59,7 @@ class ServerPrivateInfo {
final String id;
const ServerPrivateInfo({
const Spi({
required this.name,
required this.ip,
required this.port,
@@ -74,17 +75,22 @@ class ServerPrivateInfo {
this.envs,
}) : id = '$user@$ip:$port';
factory ServerPrivateInfo.fromJson(Map<String, dynamic> json) =>
_$ServerPrivateInfoFromJson(json);
factory Spi.fromJson(Map<String, dynamic> json) =>
_$SpiFromJson(json);
Map<String, dynamic> toJson() => _$ServerPrivateInfoToJson(this);
Map<String, dynamic> toJson() => _$SpiToJson(this);
@override
String toString() => id;
}
extension Spix on Spi {
String toJsonString() => json.encode(toJson());
Server? get server => Pros.server.pick(spi: this);
Server? get jumpServer => Pros.server.pick(id: jumpId);
VNode<Server>? get server => ServerProvider.pick(spi: this);
VNode<Server>? get jumpServer => ServerProvider.pick(id: jumpId);
bool shouldReconnect(ServerPrivateInfo old) {
bool shouldReconnect(Spi old) {
return id != old.id ||
pwd != old.pwd ||
keyId != old.keyId ||
@@ -113,12 +119,7 @@ class ServerPrivateInfo {
return (ip_, port_);
}
@override
String toString() {
return id;
}
static const example = ServerPrivateInfo(
static const example = Spi(
name: 'name',
ip: 'ip',
port: 22,

16
lib/data/model/server/server_private_info.g.dart
View File

@@ -6,17 +6,17 @@ part of 'server_private_info.dart';
// TypeAdapterGenerator
// **************************************************************************
class ServerPrivateInfoAdapter extends TypeAdapter<ServerPrivateInfo> {
class SpiAdapter extends TypeAdapter<Spi> {
@override
final int typeId = 3;
@override
ServerPrivateInfo read(BinaryReader reader) {
Spi read(BinaryReader reader) {
final numOfFields = reader.readByte();
final fields = <int, dynamic>{
for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
};
return ServerPrivateInfo(
return Spi(
name: fields[0] as String,
ip: fields[1] as String,
port: fields[2] as int,
@@ -34,7 +34,7 @@ class ServerPrivateInfoAdapter extends TypeAdapter<ServerPrivateInfo> {
}
@override
void write(BinaryWriter writer, ServerPrivateInfo obj) {
void write(BinaryWriter writer, Spi obj) {
writer
..writeByte(13)
..writeByte(0)
@@ -71,7 +71,7 @@ class ServerPrivateInfoAdapter extends TypeAdapter<ServerPrivateInfo> {
@override
bool operator ==(Object other) =>
identical(this, other) ||
other is ServerPrivateInfoAdapter &&
other is SpiAdapter &&
runtimeType == other.runtimeType &&
typeId == other.typeId;
}
@@ -80,8 +80,7 @@ class ServerPrivateInfoAdapter extends TypeAdapter<ServerPrivateInfo> {
// JsonSerializableGenerator
// **************************************************************************
ServerPrivateInfo _$ServerPrivateInfoFromJson(Map<String, dynamic> json) =>
ServerPrivateInfo(
Spi _$SpiFromJson(Map<String, dynamic> json) => Spi(
name: json['name'] as String,
ip: json['ip'] as String,
port: (json['port'] as num).toInt(),
@@ -103,8 +102,7 @@ ServerPrivateInfo _$ServerPrivateInfoFromJson(Map<String, dynamic> json) =>
),
);
Map<String, dynamic> _$ServerPrivateInfoToJson(ServerPrivateInfo instance) =>
<String, dynamic>{
Map<String, dynamic> _$SpiToJson(Spi instance) => <String, dynamic>{
'name': instance.name,
'ip': instance.ip,
'port': instance.port,

16
lib/data/model/server/snippet.dart
View File

@@ -48,7 +48,7 @@ class Snippet implements TagPickable {
static final fmtFinder = RegExp(r'\$\{[^{}]+\}');
String fmtWithSpi(ServerPrivateInfo spi) {
String fmtWithSpi(Spi spi) {
return script.replaceAllMapped(
fmtFinder,
(match) {
@@ -63,7 +63,7 @@ class Snippet implements TagPickable {
Future<void> runInTerm(
Terminal terminal,
ServerPrivateInfo spi, {
Spi spi, {
bool autoEnter = false,
}) async {
final argsFmted = fmtWithSpi(spi);
@@ -159,12 +159,12 @@ class Snippet implements TagPickable {
}
static final fmtArgs = {
r'${host}': (ServerPrivateInfo spi) => spi.ip,
r'${port}': (ServerPrivateInfo spi) => spi.port.toString(),
r'${user}': (ServerPrivateInfo spi) => spi.user,
r'${pwd}': (ServerPrivateInfo spi) => spi.pwd ?? '',
r'${id}': (ServerPrivateInfo spi) => spi.id,
r'${name}': (ServerPrivateInfo spi) => spi.name,
r'${host}': (Spi spi) => spi.ip,
r'${port}': (Spi spi) => spi.port.toString(),
r'${user}': (Spi spi) => spi.user,
r'${pwd}': (Spi spi) => spi.pwd ?? '',
r'${id}': (Spi spi) => spi.id,
r'${name}': (Spi spi) => spi.name,
};
/// r'${ctrl+ad}' -> TerminalKey.control, a, d

4
lib/data/model/sftp/req.dart
View File

@@ -1,12 +1,12 @@
part of 'worker.dart';
class SftpReq {
final ServerPrivateInfo spi;
final Spi spi;
final String remotePath;
final String localPath;
final SftpReqType type;
String? privateKey;
ServerPrivateInfo? jumpSpi;
Spi? jumpSpi;
String? jumpPrivateKey;
SftpReq(

20
lib/data/provider/base.dart Normal file
View File

@@ -0,0 +1,20 @@
import 'dart:async';
import 'package:flutter/foundation.dart';
abstract class Provider<T> {
const Provider();
/// (Re)Load data from store / network / etc.
@mustCallSuper
FutureOr<void> load() {
all.add(this);
debugPrint('$runtimeType added');
}
static final all = <Provider>[];
static Future<void> reload() {
return Future.wait(all.map((e) async => await e.load()));
}
}

37
lib/data/provider/private_key.dart
View File

@@ -1,35 +1,40 @@
import 'package:flutter/material.dart';
import 'package:fl_lib/fl_lib.dart';
import 'package:server_box/data/model/server/private_key_info.dart';
import 'package:server_box/data/provider/base.dart';
import 'package:server_box/data/res/store.dart';
class PrivateKeyProvider extends ChangeNotifier {
List<PrivateKeyInfo> get pkis => _pkis;
late List<PrivateKeyInfo> _pkis;
class PrivateKeyProvider extends Provider {
const PrivateKeyProvider._();
static const instance = PrivateKeyProvider._();
static final pkis = <PrivateKeyInfo>[].vn;
@override
void load() {
_pkis = Stores.key.fetch();
super.load();
pkis.value = Stores.key.fetch();
}
void add(PrivateKeyInfo info) {
_pkis.add(info);
static void add(PrivateKeyInfo info) {
pkis.value.add(info);
pkis.notify();
Stores.key.put(info);
notifyListeners();
}
void delete(PrivateKeyInfo info) {
_pkis.removeWhere((e) => e.id == info.id);
static void delete(PrivateKeyInfo info) {
pkis.value.removeWhere((e) => e.id == info.id);
pkis.notify();
Stores.key.delete(info);
notifyListeners();
}
void update(PrivateKeyInfo old, PrivateKeyInfo newInfo) {
final idx = _pkis.indexWhere((e) => e.id == old.id);
static void update(PrivateKeyInfo old, PrivateKeyInfo newInfo) {
final idx = pkis.value.indexWhere((e) => e.id == old.id);
if (idx == -1) {
_pkis.add(newInfo);
pkis.value.add(newInfo);
} else {
_pkis[idx] = newInfo;
pkis.value[idx] = newInfo;
}
pkis.notify();
Stores.key.put(newInfo);
notifyListeners();
}
}

4
lib/data/provider/pve.dart
View File

@@ -15,7 +15,7 @@ import 'package:dartssh2/dartssh2.dart';
typedef PveCtrlFunc = Future<bool> Function(String node, String id);
final class PveProvider extends ChangeNotifier {
final ServerPrivateInfo spi;
final Spi spi;
late String addr;
late final SSHClient _client;
late final ServerSocket _serverSocket;
@@ -23,7 +23,7 @@ final class PveProvider extends ChangeNotifier {
int _localPort = 0;
PveProvider({required this.spi}) {
final client = spi.server?.client;
final client = spi.server?.value.client;
if (client == null) {
throw Exception('Server client is null');
}

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

@@ -4,12 +4,12 @@ import 'dart:async';
import 'package:computer/computer.dart';
import 'package:dartssh2/dartssh2.dart';
import 'package:fl_lib/fl_lib.dart';
import 'package:flutter/material.dart';
import 'package:server_box/core/extension/ssh_client.dart';
import 'package:server_box/core/utils/ssh_auth.dart';
import 'package:server_box/data/model/app/error.dart';
import 'package:server_box/data/model/app/shell_func.dart';
import 'package:server_box/data/model/server/system.dart';
import 'package:server_box/data/provider/base.dart';
// import 'package:server_box/data/model/sftp/req.dart';
// import 'package:server_box/data/res/provider.dart';
import 'package:server_box/data/res/store.dart';
@@ -21,24 +21,27 @@ import 'package:server_box/data/model/server/server_status_update_req.dart';
import 'package:server_box/data/model/server/try_limiter.dart';
import 'package:server_box/data/res/status.dart';
class ServerProvider extends ChangeNotifier {
final Map<String, Server> _servers = {};
Iterable<Server> get servers => _servers.values;
final List<String> _serverOrder = [];
List<String> get serverOrder => _serverOrder;
final _tags = ValueNotifier(<String>{});
ValueNotifier<Set<String>> get tags => _tags;
class ServerProvider extends Provider {
const ServerProvider._();
static const instance = ServerProvider._();
Timer? _timer;
static final Map<String, VNode<Server>> servers = {};
static final serverOrder = <String>[].vn;
static final _tags = <String>{}.vn;
static VNode<Set<String>> get tags => _tags;
final _manualDisconnectedIds = <String>{};
static Timer? _timer;
static final _manualDisconnectedIds = <String>{};
@override
Future<void> load() async {
super.load();
// #147
// Clear all servers because of restarting app will cause duplicate servers
final oldServers = Map<String, Server>.from(_servers);
_servers.clear();
_serverOrder.clear();
final oldServers = Map<String, VNode<Server>>.from(servers);
servers.clear();
serverOrder.value.clear();
final spis = Stores.server.fetch();
for (int idx = 0; idx < spis.length; idx++) {
@@ -48,10 +51,11 @@ class ServerProvider extends ChangeNotifier {
/// #258
/// If not [shouldReconnect], then keep the old state.
if (originServer != null && !originServer.spi.shouldReconnect(spi)) {
newServer.conn = originServer.conn;
if (originServer != null &&
!originServer.value.spi.shouldReconnect(spi)) {
newServer.conn = originServer.value.conn;
}
_servers[spi.id] = newServer;
servers[spi.id] = newServer.vn;
}
final serverOrder_ = Stores.setting.serverOrder.fetch();
if (serverOrder_.isNotEmpty) {
@@ -59,35 +63,37 @@ class ServerProvider extends ChangeNotifier {
order: serverOrder_,
finder: (n, id) => n.id == id,
);
_serverOrder.addAll(spis.map((e) => e.id));
serverOrder.value.addAll(spis.map((e) => e.id));
} else {
_serverOrder.addAll(_servers.keys);
serverOrder.value.addAll(servers.keys);
}
// Must use [equals] to compare [Order] here.
if (!_serverOrder.equals(serverOrder_)) {
Stores.setting.serverOrder.put(_serverOrder);
if (!serverOrder.value.equals(serverOrder_)) {
Stores.setting.serverOrder.put(serverOrder.value);
}
_updateTags();
notifyListeners();
// Must notify here, or the UI will not be updated.
serverOrder.notify();
}
/// Get a [Server] by [spi] or [id].
///
/// Priority: [spi] > [id]
Server? pick({ServerPrivateInfo? spi, String? id}) {
static VNode<Server>? pick({Spi? spi, String? id}) {
if (spi != null) {
return _servers[spi.id];
return servers[spi.id];
}
if (id != null) {
return _servers[id];
return servers[id];
}
return null;
}
void _updateTags() {
for (final s in _servers.values) {
if (s.spi.tags == null) continue;
for (final t in s.spi.tags!) {
static void _updateTags() {
for (final s in servers.values) {
final tags = s.value.spi.tags;
if (tags == null) continue;
for (final t in tags) {
if (!_tags.value.contains(t)) {
_tags.value.add(t);
}
@@ -96,14 +102,14 @@ class ServerProvider extends ChangeNotifier {
_tags.value = (_tags.value.toList()..sort()).toSet();
}
Server genServer(ServerPrivateInfo spi) {
static Server genServer(Spi spi) {
return Server(spi, InitStatus.status, ServerConn.disconnected);
}
/// if [spi] is specificed then only refresh this server
/// [onlyFailed] only refresh failed servers
Future<void> refresh({
ServerPrivateInfo? spi,
static Future<void> refresh({
Spi? spi,
bool onlyFailed = false,
}) async {
if (spi != null) {
@@ -112,7 +118,8 @@ class ServerProvider extends ChangeNotifier {
return;
}
await Future.wait(_servers.values.map((s) async {
await Future.wait(servers.values.map((val) async {
final s = val.value;
if (onlyFailed) {
if (s.conn != ServerConn.failed) return;
TryLimiter.reset(s.spi.id);
@@ -128,7 +135,7 @@ class ServerProvider extends ChangeNotifier {
}));
}
Future<void> startAutoRefresh() async {
static Future<void> startAutoRefresh() async {
var duration = Stores.setting.serverStatusUpdateInterval.fetch();
stopAutoRefresh();
if (duration == 0) return;
@@ -141,84 +148,85 @@ class ServerProvider extends ChangeNotifier {
});
}
void stopAutoRefresh() {
static void stopAutoRefresh() {
if (_timer != null) {
_timer!.cancel();
_timer = null;
}
}
bool get isAutoRefreshOn => _timer != null;
static bool get isAutoRefreshOn => _timer != null;
void setDisconnected() {
for (final s in _servers.values) {
s.conn = ServerConn.disconnected;
static void setDisconnected() {
for (final s in servers.values) {
s.value.conn = ServerConn.disconnected;
s.notify();
}
//TryLimiter.clear();
notifyListeners();
}
void closeServer({String? id}) {
static void closeServer({String? id}) {
if (id == null) {
for (final s in _servers.values) {
_closeOneServer(s.spi.id);
for (final s in servers.values) {
_closeOneServer(s.value.spi.id);
}
return;
}
_closeOneServer(id);
}
void _closeOneServer(String id) {
final item = _servers[id];
static void _closeOneServer(String id) {
final s = servers[id];
final item = s?.value;
item?.client?.close();
item?.client = null;
item?.conn = ServerConn.disconnected;
_manualDisconnectedIds.add(id);
notifyListeners();
s?.notify();
}
void addServer(ServerPrivateInfo spi) {
_servers[spi.id] = genServer(spi);
notifyListeners();
static void addServer(Spi spi) {
servers[spi.id] = genServer(spi).vn;
Stores.server.put(spi);
_serverOrder.add(spi.id);
Stores.setting.serverOrder.put(_serverOrder);
serverOrder.value.add(spi.id);
serverOrder.notify();
Stores.setting.serverOrder.put(serverOrder.value);
_updateTags();
refresh(spi: spi);
}
void delServer(String id) {
_servers.remove(id);
_serverOrder.remove(id);
Stores.setting.serverOrder.put(_serverOrder);
_updateTags();
notifyListeners();
static void delServer(String id) {
servers.remove(id);
serverOrder.value.remove(id);
serverOrder.notify();
Stores.setting.serverOrder.put(serverOrder.value);
Stores.server.delete(id);
}
void deleteAll() {
_servers.clear();
_serverOrder.clear();
Stores.setting.serverOrder.put(_serverOrder);
_updateTags();
notifyListeners();
Stores.server.deleteAll();
}
Future<void> updateServer(
ServerPrivateInfo old,
ServerPrivateInfo newSpi,
static void deleteAll() {
servers.clear();
serverOrder.value.clear();
serverOrder.notify();
Stores.setting.serverOrder.put(serverOrder.value);
Stores.server.deleteAll();
_updateTags();
}
static Future<void> updateServer(
Spi old,
Spi newSpi,
) async {
if (old != newSpi) {
Stores.server.update(old, newSpi);
_servers[old.id]?.spi = newSpi;
servers[old.id]?.value.spi = newSpi;
if (newSpi.id != old.id) {
_servers[newSpi.id] = _servers[old.id]!;
_servers[newSpi.id]?.spi = newSpi;
_servers.remove(old.id);
_serverOrder.update(old.id, newSpi.id);
Stores.setting.serverOrder.put(_serverOrder);
servers[newSpi.id] = servers[old.id]!;
servers.remove(old.id);
serverOrder.value.update(old.id, newSpi.id);
Stores.setting.serverOrder.put(serverOrder.value);
serverOrder.notify();
}
// Only reconnect if neccessary
@@ -227,33 +235,32 @@ class ServerProvider extends ChangeNotifier {
TryLimiter.reset(newSpi.id);
refresh(spi: newSpi);
}
// Only update if [spi.tags] changed
_updateTags();
}
_updateTags();
}
void _setServerState(Server s, ServerConn ss) {
s.conn = ss;
notifyListeners();
static void _setServerState(VNode<Server> s, ServerConn ss) {
s.value.conn = ss;
s.notify();
}
Future<void> _getData(ServerPrivateInfo spi) async {
static Future<void> _getData(Spi spi) async {
final sid = spi.id;
final s = _servers[sid];
final s = servers[sid];
if (s == null) return;
final sv = s.value;
if (!TryLimiter.canTry(sid)) {
if (s.conn != ServerConn.failed) {
if (sv.conn != ServerConn.failed) {
_setServerState(s, ServerConn.failed);
}
return;
}
s.status.err = null;
sv.status.err = null;
if (s.needGenClient || (s.client?.isClosed ?? true)) {
if (sv.needGenClient || (sv.client?.isClosed ?? true)) {
_setServerState(s, ServerConn.connecting);
final wol = spi.wolCfg;
@@ -274,7 +281,7 @@ class ServerProvider extends ChangeNotifier {
try {
final time1 = DateTime.now();
s.client = await genClient(
sv.client = await genClient(
spi,
timeout: Duration(seconds: Stores.setting.timeout.fetch()),
onKeyboardInteractive: (_) => KeybordInteractive.defaultHandle(spi),
@@ -288,7 +295,7 @@ class ServerProvider extends ChangeNotifier {
}
} catch (e) {
TryLimiter.inc(sid);
s.status.err = SSHErr(type: SSHErrType.connect, message: e.toString());
sv.status.err = SSHErr(type: SSHErrType.connect, message: e.toString());
_setServerState(s, ServerConn.failed);
/// In order to keep privacy, print [spi.name] instead of [spi.id]
@@ -301,7 +308,7 @@ class ServerProvider extends ChangeNotifier {
final scriptRaw = ShellFunc.allScript(spi.custom?.cmds).uint8List;
try {
final (_, writeScriptResult) = await s.client!.exec(
final (_, writeScriptResult) = await sv.client!.exec(
(session) async {
session.stdin.add(scriptRaw);
session.stdin.close();
@@ -315,14 +322,14 @@ class ServerProvider extends ChangeNotifier {
} on SSHAuthAbortError catch (e) {
TryLimiter.inc(sid);
final err = SSHErr(type: SSHErrType.auth, message: e.toString());
s.status.err = err;
sv.status.err = err;
Loggers.app.warning(err);
_setServerState(s, ServerConn.failed);
return;
} on SSHAuthFailError catch (e) {
TryLimiter.inc(sid);
final err = SSHErr(type: SSHErrType.auth, message: e.toString());
s.status.err = err;
sv.status.err = err;
Loggers.app.warning(err);
_setServerState(s, ServerConn.failed);
return;
@@ -330,18 +337,18 @@ class ServerProvider extends ChangeNotifier {
// If max try times < 2 and can't write script, this will stop the status getting and etc.
// TryLimiter.inc(sid);
final err = SSHErr(type: SSHErrType.writeScript, message: e.toString());
s.status.err = err;
sv.status.err = err;
Loggers.app.warning(err);
_setServerState(s, ServerConn.failed);
}
}
if (s.conn == ServerConn.connecting) return;
if (sv.conn == ServerConn.connecting) return;
/// Keep [finished] state, or the UI will be refreshed to [loading] state
/// instead of the '$Temp | $Uptime'.
/// eg: '32C | 7 days'
if (s.conn != ServerConn.finished) {
if (sv.conn != ServerConn.finished) {
_setServerState(s, ServerConn.loading);
}
@@ -349,17 +356,17 @@ class ServerProvider extends ChangeNotifier {
String? raw;
try {
raw = await s.client?.run(ShellFunc.status.exec(spi.id)).string;
raw = await sv.client?.run(ShellFunc.status.exec(spi.id)).string;
segments = raw?.split(ShellFunc.seperator).map((e) => e.trim()).toList();
if (raw == null || raw.isEmpty || segments == null || segments.isEmpty) {
if (Stores.setting.keepStatusWhenErr.fetch()) {
// Keep previous server status when err occurs
if (s.conn != ServerConn.failed && s.status.more.isNotEmpty) {
if (sv.conn != ServerConn.failed && sv.status.more.isNotEmpty) {
return;
}
}
TryLimiter.inc(sid);
s.status.err = SSHErr(
sv.status.err = SSHErr(
type: SSHErrType.segements,
message: 'Seperate segments failed, raw:\n$raw',
);
@@ -368,7 +375,7 @@ class ServerProvider extends ChangeNotifier {
}
} catch (e) {
TryLimiter.inc(sid);
s.status.err = SSHErr(type: SSHErrType.getStatus, message: e.toString());
sv.status.err = SSHErr(type: SSHErrType.getStatus, message: e.toString());
_setServerState(s, ServerConn.failed);
Loggers.app.warning('Get status from ${spi.name} failed', e);
return;
@@ -379,36 +386,36 @@ class ServerProvider extends ChangeNotifier {
if (!systemType.isSegmentsLenMatch(segments.length - customCmdLen)) {
TryLimiter.inc(sid);
if (raw.contains('Could not chdir to home directory /var/services/')) {
s.status.err = SSHErr(type: SSHErrType.chdir, message: raw);
sv.status.err = SSHErr(type: SSHErrType.chdir, message: raw);
_setServerState(s, ServerConn.failed);
return;
}
final expected = systemType.segmentsLen;
final actual = segments.length;
s.status.err = SSHErr(
sv.status.err = SSHErr(
type: SSHErrType.segements,
message: 'Segments: expect $expected, got $actual, raw:\n\n$raw',
);
_setServerState(s, ServerConn.failed);
return;
}
s.status.system = systemType;
sv.status.system = systemType;
try {
final req = ServerStatusUpdateReq(
ss: s.status,
ss: sv.status,
segments: segments,
system: systemType,
customCmds: spi.custom?.cmds ?? {},
);
s.status = await Computer.shared.start(
sv.status = await Computer.shared.start(
getStatus,
req,
taskName: 'StatusUpdateReq<${s.id}>',
taskName: 'StatusUpdateReq<${sv.id}>',
);
} catch (e, trace) {
TryLimiter.inc(sid);
s.status.err = SSHErr(
sv.status.err = SSHErr(
type: SSHErrType.getStatus,
message: 'Parse failed: $e\n\n$raw',
);

44
lib/data/provider/sftp.dart
View File

@@ -1,38 +1,42 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:fl_lib/fl_lib.dart';
import 'package:server_box/data/model/sftp/worker.dart';
import 'package:server_box/data/provider/base.dart';
class SftpProvider extends ChangeNotifier {
final List<SftpReqStatus> _status = [];
List<SftpReqStatus> get status => _status;
class SftpProvider extends Provider {
const SftpProvider._();
static const instance = SftpProvider._();
SftpReqStatus? get(int id) {
return _status.singleWhere((element) => element.id == id);
static final status = <SftpReqStatus>[].vn;
static SftpReqStatus? get(int id) {
return status.value.singleWhere((element) => element.id == id);
}
int add(SftpReq req, {Completer? completer}) {
final status = SftpReqStatus(
notifyListeners: notifyListeners,
static int add(SftpReq req, {Completer? completer}) {
final reqStat = SftpReqStatus(
notifyListeners: status.notify,
completer: completer,
req: req,
);
_status.add(status);
return status.id;
status.value.add(reqStat);
status.notify();
return reqStat.id;
}
@override
void dispose() {
for (final item in _status) {
static void dispose() {
for (final item in status.value) {
item.dispose();
}
super.dispose();
status.value.clear();
status.notify();
}
void cancel(int id) {
final idx = _status.indexWhere((element) => element.id == id);
_status[idx].dispose();
_status.removeAt(idx);
notifyListeners();
static void cancel(int id) {
final idx = status.value.indexWhere((e) => e.id == id);
status.value[idx].dispose();
status.value.removeAt(idx);
status.notify();
}
}

51
lib/data/provider/snippet.dart
View File

@@ -1,21 +1,22 @@
import 'dart:convert';
import 'package:fl_lib/fl_lib.dart';
import 'package:flutter/material.dart';
import 'package:server_box/data/model/server/snippet.dart';
import 'package:server_box/data/provider/base.dart';
import 'package:server_box/data/res/store.dart';
class SnippetProvider extends ChangeNotifier {
late List<Snippet> _snippets;
List<Snippet> get snippets => _snippets;
class SnippetProvider extends Provider {
const SnippetProvider._();
static const instance = SnippetProvider._();
final tags = ValueNotifier(<String>{});
static final snippets = <Snippet>[].vn;
static final tags = <String>{}.vn;
@override
void load() {
_snippets = Stores.snippet.fetch();
super.load();
final snippets_ = Stores.snippet.fetch();
final order = Stores.setting.snippetOrder.fetch();
if (order.isNotEmpty) {
final surplus = _snippets.reorder(
final surplus = snippets_.reorder(
order: order,
finder: (n, name) => n.name == name,
);
@@ -24,12 +25,13 @@ class SnippetProvider extends ChangeNotifier {
Stores.setting.snippetOrder.put(order);
}
}
snippets.value = snippets_;
_updateTags();
}
void _updateTags() {
static void _updateTags() {
final tags_ = <String>{};
for (final s in _snippets) {
for (final s in snippets.value) {
final t = s.tags;
if (t != null) {
tags_.addAll(t);
@@ -38,31 +40,31 @@ class SnippetProvider extends ChangeNotifier {
tags.value = tags_;
}
void add(Snippet snippet) {
_snippets.add(snippet);
static void add(Snippet snippet) {
snippets.value.add(snippet);
snippets.notify();
Stores.snippet.put(snippet);
_updateTags();
notifyListeners();
}
void del(Snippet snippet) {
_snippets.remove(snippet);
static void del(Snippet snippet) {
snippets.value.remove(snippet);
snippets.notify();
Stores.snippet.delete(snippet);
_updateTags();
notifyListeners();
}
void update(Snippet old, Snippet newOne) {
static void update(Snippet old, Snippet newOne) {
snippets.value.remove(old);
snippets.value.add(newOne);
snippets.notify();
Stores.snippet.delete(old);
Stores.snippet.put(newOne);
_snippets.remove(old);
_snippets.add(newOne);
_updateTags();
notifyListeners();
}
void renameTag(String old, String newOne) {
for (final s in _snippets) {
static void renameTag(String old, String newOne) {
for (final s in snippets.value) {
if (s.tags?.contains(old) ?? false) {
s.tags?.remove(old);
s.tags?.add(newOne);
@@ -70,8 +72,5 @@ class SnippetProvider extends ChangeNotifier {
}
}
_updateTags();
notifyListeners();
}
String get export => json.encode(snippets);
}

22
lib/data/provider/systemd.dart
View File

@@ -1,18 +1,18 @@
import 'package:dartssh2/dartssh2.dart';
import 'package:fl_lib/fl_lib.dart';
import 'package:server_box/core/extension/ssh_client.dart';
import 'package:server_box/data/model/app/shell_func.dart';
import 'package:server_box/data/model/server/server.dart';
import 'package:server_box/data/model/server/server_private_info.dart';
import 'package:server_box/data/model/server/systemd.dart';
import 'package:server_box/data/res/provider.dart';
import 'package:server_box/data/provider/server.dart';
final class SystemdProvider {
late final SSHClient _client;
late final bool isRoot;
late final VNode<Server> _si;
late final bool _isRoot;
SystemdProvider.init(ServerPrivateInfo spi) {
isRoot = spi.isRoot;
_client = Pros.server.pick(spi: spi)!.client!;
SystemdProvider.init(Spi spi) {
_isRoot = spi.isRoot;
_si = ServerProvider.pick(spi: spi)!;
getUnits();
}
@@ -23,7 +23,8 @@ final class SystemdProvider {
isBusy.value = true;
try {
final result = await _client.execForOutput(_getUnitsCmd);
final client = _si.value.client;
final result = await client!.execForOutput(_getUnitsCmd);
final units = result.split('\n');
final userUnits = <String>[];
@@ -63,7 +64,8 @@ for unit in ${unitNames_.join(' ')}; do
echo -n "${ShellFunc.seperator}\n\$state"
done
''';
final result = await _client.execForOutput(script);
final client = _si.value.client!;
final result = await client.execForOutput(script);
final units = result.split(ShellFunc.seperator);
final parsedUnits = <SystemdUnit>[];
@@ -141,7 +143,7 @@ get_type_files() {
unit_type=\$1
base_dir=""
${isRoot ? """
${_isRoot ? """
get_files \$unit_type /etc/systemd/system
get_files \$unit_type ~/.config/systemd/user""" : """
get_files \$unit_type ~/.config/systemd/user"""}

17
lib/data/res/provider.dart
View File

@@ -1,17 +0,0 @@
import 'package:server_box/data/provider/private_key.dart';
import 'package:server_box/data/provider/server.dart';
import 'package:server_box/data/provider/sftp.dart';
import 'package:server_box/data/provider/snippet.dart';
abstract final class Pros {
static final key = PrivateKeyProvider();
static final server = ServerProvider();
static final sftp = SftpProvider();
static final snippet = SnippetProvider();
static void reload() {
key.load();
server.load();
snippet.load();
}
}

12
lib/data/store/server.dart
View File

@@ -5,17 +5,17 @@ import 'package:server_box/data/model/server/server_private_info.dart';
class ServerStore extends PersistentStore {
ServerStore() : super('server');
void put(ServerPrivateInfo info) {
void put(Spi info) {
box.put(info.id, info);
box.updateLastModified();
}
List<ServerPrivateInfo> fetch() {
List<Spi> fetch() {
final ids = box.keys;
final List<ServerPrivateInfo> ss = [];
final List<Spi> ss = [];
for (final id in ids) {
final s = box.get(id);
if (s != null && s is ServerPrivateInfo) {
if (s != null && s is Spi) {
ss.add(s);
}
}
@@ -32,7 +32,7 @@ class ServerStore extends PersistentStore {
box.updateLastModified();
}
void update(ServerPrivateInfo old, ServerPrivateInfo newInfo) {
void update(Spi old, Spi newInfo) {
if (!have(old)) {
throw Exception('Old spi: $old not found');
}
@@ -40,5 +40,5 @@ class ServerStore extends PersistentStore {
put(newInfo);
}
bool have(ServerPrivateInfo s) => box.get(s.id) != null;
bool have(Spi s) => box.get(s.id) != null;
}