mirror of
https://github.com/lollipopkit/flutter_server_box.git
synced 2025-12-18 15:54:35 +01:00
opt.: linux/win window size & server reconnect
This commit is contained in:
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
|
||||
import 'package:flutter_gen/gen_l10n/l10n.dart';
|
||||
import 'package:toolbox/core/extension/context/common.dart';
|
||||
import 'package:toolbox/core/extension/locale.dart';
|
||||
import 'package:toolbox/core/utils/rebuild.dart';
|
||||
import 'package:toolbox/data/res/rebuild.dart';
|
||||
import 'package:toolbox/data/res/store.dart';
|
||||
import 'package:toolbox/view/widget/value_notifier.dart';
|
||||
|
||||
|
||||
@@ -80,8 +80,11 @@ Future<SSHClient> genClient(
|
||||
timeout: timeout,
|
||||
);
|
||||
// Use `0.0.0.0` as localhost to use all interfaces.
|
||||
return await jumpClient.forwardLocal(spi.ip, spi.port,
|
||||
localHost: '0.0.0.0');
|
||||
return await jumpClient.forwardLocal(
|
||||
spi.ip,
|
||||
spi.port,
|
||||
localHost: '0.0.0.0',
|
||||
);
|
||||
}
|
||||
}();
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
|
||||
// ignore: prefer_void_to_null
|
||||
class _RebuildNode implements ValueListenable<Null> {
|
||||
class RebuildNode implements ValueListenable<Null> {
|
||||
final List<VoidCallback> _listeners = [];
|
||||
|
||||
_RebuildNode();
|
||||
RebuildNode();
|
||||
|
||||
@override
|
||||
void addListener(VoidCallback listener) {
|
||||
@@ -25,9 +25,3 @@ class _RebuildNode implements ValueListenable<Null> {
|
||||
@override
|
||||
Null get value => null;
|
||||
}
|
||||
|
||||
class RebuildNodes {
|
||||
const RebuildNodes._();
|
||||
|
||||
static final _RebuildNode app = _RebuildNode();
|
||||
}
|
||||
@@ -10,6 +10,10 @@ class Server implements TagPickable {
|
||||
SSHClient? client;
|
||||
ServerState state;
|
||||
|
||||
/// Whether is generating client.
|
||||
/// Use this to avoid reconnecting if last connect try not finished.
|
||||
bool isGenerating = false;
|
||||
|
||||
Server(this.spi, this.status, this.client, this.state);
|
||||
|
||||
@override
|
||||
|
||||
@@ -267,7 +267,9 @@ class ServerProvider extends ChangeNotifier {
|
||||
|
||||
final time1 = DateTime.now();
|
||||
|
||||
try {
|
||||
try {
|
||||
if (s.isGenerating) return;
|
||||
s.isGenerating = true;
|
||||
s.client = await genClient(
|
||||
spi,
|
||||
timeout: Stores.setting.timeoutD,
|
||||
@@ -282,6 +284,8 @@ class ServerProvider extends ChangeNotifier {
|
||||
/// In order to keep privacy, print [spi.name] instead of [spi.id]
|
||||
Loggers.app.warning('Connect to ${spi.name} failed', e);
|
||||
return;
|
||||
} finally {
|
||||
s.isGenerating = false;
|
||||
}
|
||||
|
||||
final time2 = DateTime.now();
|
||||
|
||||
7
lib/data/res/rebuild.dart
Normal file
7
lib/data/res/rebuild.dart
Normal file
@@ -0,0 +1,7 @@
|
||||
import 'package:toolbox/data/model/app/rebuild.dart';
|
||||
|
||||
class RebuildNodes {
|
||||
const RebuildNodes._();
|
||||
|
||||
static final app = RebuildNode();
|
||||
}
|
||||
@@ -10,11 +10,11 @@ import 'package:toolbox/core/extension/context/snackbar.dart';
|
||||
import 'package:toolbox/core/persistant_store.dart';
|
||||
import 'package:toolbox/core/utils/icloud.dart';
|
||||
import 'package:toolbox/core/utils/platform/base.dart';
|
||||
import 'package:toolbox/core/utils/rebuild.dart';
|
||||
import 'package:toolbox/data/model/app/backup.dart';
|
||||
import 'package:toolbox/data/res/logger.dart';
|
||||
import 'package:toolbox/data/res/path.dart';
|
||||
import 'package:toolbox/data/res/provider.dart';
|
||||
import 'package:toolbox/data/res/rebuild.dart';
|
||||
import 'package:toolbox/data/res/store.dart';
|
||||
import 'package:toolbox/view/widget/expand_tile.dart';
|
||||
import 'package:toolbox/view/widget/cardx.dart';
|
||||
|
||||
@@ -12,8 +12,8 @@ import 'package:toolbox/core/extension/locale.dart';
|
||||
import 'package:toolbox/core/extension/context/dialog.dart';
|
||||
import 'package:toolbox/core/extension/stringx.dart';
|
||||
import 'package:toolbox/core/utils/platform/base.dart';
|
||||
import 'package:toolbox/core/utils/rebuild.dart';
|
||||
import 'package:toolbox/data/res/provider.dart';
|
||||
import 'package:toolbox/data/res/rebuild.dart';
|
||||
import 'package:toolbox/data/res/store.dart';
|
||||
import 'package:toolbox/view/widget/expand_tile.dart';
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@ import 'package:toolbox/core/utils/platform/base.dart';
|
||||
import 'package:toolbox/core/utils/platform/path.dart';
|
||||
import 'package:toolbox/data/model/pkg/manager.dart';
|
||||
import 'package:toolbox/data/model/server/dist.dart';
|
||||
import 'package:toolbox/data/res/path.dart';
|
||||
import 'package:toolbox/data/res/provider.dart';
|
||||
|
||||
import '../../core/route.dart';
|
||||
@@ -149,9 +150,11 @@ Future<void> _gotoSSH(
|
||||
extraArgs.addAll(['-p', '${spi.port}']);
|
||||
}
|
||||
|
||||
final path = () {
|
||||
final path = await () async {
|
||||
final tempKeyFileName = 'srvbox_pk_${spi.pubKeyId}';
|
||||
return joinPath(Directory.systemTemp.path, tempKeyFileName);
|
||||
|
||||
/// For security reason, save the private key file to app doc path
|
||||
return joinPath(await Paths.doc, tempKeyFileName);
|
||||
}();
|
||||
final file = File(path);
|
||||
final shouldGenKey = spi.pubKeyId != null;
|
||||
@@ -175,7 +178,7 @@ Future<void> _gotoSSH(
|
||||
default:
|
||||
context.showSnackBar('Mismatch system: $system');
|
||||
}
|
||||
// For security reason, delete the private key file after use
|
||||
|
||||
if (shouldGenKey) {
|
||||
if (!await file.exists()) return;
|
||||
await Future.delayed(const Duration(seconds: 2), file.delete);
|
||||
|
||||
Reference in New Issue
Block a user