yindo/Reboot-Launcher
1
0
Fork 0
mirror of https://github.com/Auties00/Reboot-Launcher.git synced 2026-01-13 11:12:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

9.0.4

Browse Source
This commit is contained in:
Alessandro Autiero
2024-05-22 16:49:03 +02:00
parent 9f5590d41c
commit d478650e9b
20 changed files with 383 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gui/lib/src/controller/authenticator_controller.dart
View File

@@ -16,7 +16,7 @@ class AuthenticatorController extends ServerController {
String get defaultHost => kDefaultAuthenticatorHost;
@override
String get defaultPort => kDefaultAuthenticatorPort.toString();
int get defaultPort => kDefaultAuthenticatorPort;
@override
Future<bool> get isPortFree => isAuthenticatorPortFree();
@@ -28,8 +28,8 @@ class AuthenticatorController extends ServerController {
RebootPageType get pageType => RebootPageType.authenticator;
@override
Future<int> startEmbeddedInternal() => startEmbeddedAuthenticator(detached.value);
Future<Win32Process> startEmbeddedInternal() => startEmbeddedAuthenticator(detached.value);
@override
Future<Uri?> pingServer(String host, String port) => pingAuthenticator(host, port);
Future<Uri?> pingServer(String host, int port) => pingAuthenticator(host, port);
}

2
gui/lib/src/controller/hosting_controller.dart
View File

@@ -30,7 +30,7 @@ class HostingController extends GetxController {
description.addListener(() => _storage.write("description", description.text));
password = TextEditingController(text: _storage.read("password") ?? "");
password.addListener(() => _storage.write("password", password.text));
discoverable = RxBool(_storage.read("discoverable") ?? true);
discoverable = RxBool(_storage.read("discoverable") ?? false);
discoverable.listen((value) => _storage.write("discoverable", value));
headless = RxBool(_storage.read("headless") ?? true);
headless.listen((value) => _storage.write("headless", value));

6
gui/lib/src/controller/matchmaker_controller.dart
View File

@@ -45,7 +45,7 @@ class MatchmakerController extends ServerController {
String get defaultHost => kDefaultMatchmakerHost;
@override
String get defaultPort => kDefaultMatchmakerPort.toString();
int get defaultPort => kDefaultMatchmakerPort;
@override
Future<bool> get isPortFree => isMatchmakerPortFree();
@@ -57,8 +57,8 @@ class MatchmakerController extends ServerController {
RebootPageType get pageType => RebootPageType.matchmaker;
@override
Future<int> startEmbeddedInternal() => startEmbeddedMatchmaker(detached.value);
Future<Win32Process> startEmbeddedInternal() => startEmbeddedMatchmaker(detached.value);
@override
Future<Uri?> pingServer(String host, String port) => pingMatchmaker(host, port);
Future<Uri?> pingServer(String host, int port) => pingMatchmaker(host, port);
}

73
gui/lib/src/controller/server_controller.dart
View File

@@ -51,9 +51,9 @@ abstract class ServerController extends GetxController {
String get defaultHost;
String get defaultPort;
int get defaultPort;
Future<Uri?> pingServer(String host, String port);
Future<Uri?> pingServer(String host, int port);
Future<bool> get isPortFree;
@@ -64,17 +64,17 @@ abstract class ServerController extends GetxController {
Future<bool> freePort();
@protected
Future<int> startEmbeddedInternal();
Future<Win32Process> startEmbeddedInternal();
void reset() async {
type.value = ServerType.values.elementAt(0);
for (var type in ServerType.values) {
for (final type in ServerType.values) {
storage.write("${type.name}_host", null);
storage.write("${type.name}_port", null);
}
host.text = type.value != ServerType.remote ? defaultHost : "";
port.text = defaultPort;
port.text = defaultPort.toString();
detached.value = false;
}
@@ -85,48 +85,48 @@ abstract class ServerController extends GetxController {
}
String _readPort() =>
storage.read("${type.value.name}_port") ?? defaultPort;
storage.read("${type.value.name}_port") ?? defaultPort.toString();
Stream<ServerResult> start() async* {
if(started.value) {
return;
}
if(type() != ServerType.local) {
started.value = true;
yield ServerResult(ServerResultType.starting);
}else {
started.value = false;
if(port != defaultPort) {
yield ServerResult(ServerResultType.starting);
}
}
try {
var host = this.host.text.trim();
if (host.isEmpty) {
if(started.value) {
return;
}
final hostData = this.host.text.trim();
final portData = this.port.text.trim();
if(type() != ServerType.local) {
started.value = true;
yield ServerResult(ServerResultType.starting);
}else {
started.value = false;
if(portData != defaultPort) {
yield ServerResult(ServerResultType.starting);
}
}
if (hostData.isEmpty) {
yield ServerResult(ServerResultType.missingHostError);
started.value = false;
return;
}
var port = this.port.text.trim();
if (port.isEmpty) {
if (portData.isEmpty) {
yield ServerResult(ServerResultType.missingPortError);
started.value = false;
return;
}
var portNumber = int.tryParse(port);
final portNumber = int.tryParse(portData);
if (portNumber == null) {
yield ServerResult(ServerResultType.illegalPortError);
started.value = false;
return;
}
if ((type() != ServerType.local || port != defaultPort) && await isPortTaken) {
if ((type() != ServerType.local || portData != defaultPort) && await isPortTaken) {
yield ServerResult(ServerResultType.freeingPort);
var result = await freePort();
final result = await freePort();
yield ServerResult(result ? ServerResultType.freePortSuccess : ServerResultType.freePortError);
if(!result) {
started.value = false;
@@ -136,8 +136,15 @@ abstract class ServerController extends GetxController {
switch(type()){
case ServerType.embedded:
final pid = await startEmbeddedInternal();
watchProcess(pid).then((value) {
final process = await startEmbeddedInternal();
final processPid = process.pid;
if(processPid == null) {
yield ServerResult(ServerResultType.startError);
started.value = false;
return;
}
watchProcess(processPid).then((value) {
if(started()) {
started.value = false;
}
@@ -145,7 +152,7 @@ abstract class ServerController extends GetxController {
break;
case ServerType.remote:
yield ServerResult(ServerResultType.pingingRemote);
var uriResult = await pingServer(host, port);
final uriResult = await pingServer(hostData, portNumber);
if(uriResult == null) {
yield ServerResult(ServerResultType.pingError);
started.value = false;
@@ -155,7 +162,7 @@ abstract class ServerController extends GetxController {
remoteServer = await startRemoteAuthenticatorProxy(uriResult);
break;
case ServerType.local:
if(port != defaultPort) {
if(portData != defaultPort) {
localServer = await startRemoteAuthenticatorProxy(Uri.parse("http://$defaultHost:$port"));
}
@@ -163,7 +170,7 @@ abstract class ServerController extends GetxController {
}
yield ServerResult(ServerResultType.pingingLocal);
var uriResult = await pingServer(defaultHost, defaultPort);
final uriResult = await pingServer(defaultHost, defaultPort);
if(uriResult == null) {
yield ServerResult(ServerResultType.pingError);
remoteServer?.close(force: true);
@@ -195,7 +202,7 @@ abstract class ServerController extends GetxController {
try{
switch(type()){
case ServerType.embedded:
killProcessByPort(int.parse(defaultPort));
killProcessByPort(defaultPort);
break;
case ServerType.remote:
await remoteServer?.close(force: true);