Merge pull request #118 from Auties00/_onLoggedIn

On logged in
This commit is contained in:
Alessandro Autiero
2024-10-21 22:34:47 +02:00
committed by GitHub
48 changed files with 2493 additions and 425 deletions

View File

@@ -1,6 +1,6 @@
enum InjectableDll { enum InjectableDll {
console, console,
cobalt, sinum,
reboot, reboot,
memory memory
} }

View File

@@ -6,13 +6,16 @@ import 'package:path/path.dart' as path;
import 'package:reboot_common/common.dart'; import 'package:reboot_common/common.dart';
bool _watcher = false; bool _watcher = false;
final File rebootDllFile = File("${dllsDirectory.path}\\reboot.dll"); final File rebootBeforeS20DllFile = File("${dllsDirectory.path}\\reboot.dll");
const String kRebootDownloadUrl = final File rebootAboveS20DllFile = File("${dllsDirectory.path}\\rebootS20.dll");
const String kRebootBelowS20DownloadUrl =
"http://nightly.link/Milxnor/Project-Reboot-3.0/workflows/msbuild/master/Release.zip"; "http://nightly.link/Milxnor/Project-Reboot-3.0/workflows/msbuild/master/Release.zip";
const String kRebootAboveS20DownloadUrl =
"http://nightly.link/Milxnor/Project-Reboot-3.0/workflows/msbuild/aboveS20/Release.zip";
Future<bool> hasRebootDllUpdate(int? lastUpdateMs, {int hours = 24, bool force = false}) async { Future<bool> hasRebootDllUpdate(int? lastUpdateMs, {int hours = 24, bool force = false}) async {
final lastUpdate = await _getLastUpdate(lastUpdateMs); final lastUpdate = await _getLastUpdate(lastUpdateMs);
final exists = await rebootDllFile.exists(); final exists = await rebootBeforeS20DllFile.exists() && await rebootAboveS20DllFile.exists();
final now = DateTime.now(); final now = DateTime.now();
return force || !exists || (hours > 0 && lastUpdate != null && now.difference(lastUpdate).inHours > hours); return force || !exists || (hours > 0 && lastUpdate != null && now.difference(lastUpdate).inHours > hours);
} }
@@ -28,9 +31,8 @@ Future<void> downloadCriticalDll(String name, String outputPath) async {
await output.writeAsBytes(response.bodyBytes, flush: true); await output.writeAsBytes(response.bodyBytes, flush: true);
} }
Future<int> downloadRebootDll(String url) async { Future<void> downloadRebootDll(File file, String url) async {
Directory? outputDir; Directory? outputDir;
final now = DateTime.now();
try { try {
final response = await http.get(Uri.parse(url)); final response = await http.get(Uri.parse(url));
if(response.statusCode != 200) { if(response.statusCode != 200) {
@@ -42,8 +44,7 @@ Future<int> downloadRebootDll(String url) async {
await tempZip.writeAsBytes(response.bodyBytes, flush: true); await tempZip.writeAsBytes(response.bodyBytes, flush: true);
await extractFileToDisk(tempZip.path, outputDir.path); await extractFileToDisk(tempZip.path, outputDir.path);
final rebootDll = File(outputDir.listSync().firstWhere((element) => path.extension(element.path) == ".dll").path); final rebootDll = File(outputDir.listSync().firstWhere((element) => path.extension(element.path) == ".dll").path);
await rebootDllFile.writeAsBytes(await rebootDll.readAsBytes(), flush: true); await file.writeAsBytes(await rebootDll.readAsBytes(), flush: true);
return now.millisecondsSinceEpoch;
} finally{ } finally{
if(outputDir != null) { if(outputDir != null) {
delete(outputDir); delete(outputDir);
@@ -63,7 +64,7 @@ Stream<String> watchDlls() async* {
} }
_watcher = true; _watcher = true;
await for(final event in rebootDllFile.parent.watch(events: FileSystemEvent.delete | FileSystemEvent.move)) { await for(final event in dllsDirectory.watch(events: FileSystemEvent.delete | FileSystemEvent.move)) {
if (event.path.endsWith(".dll")) { if (event.path.endsWith(".dll")) {
yield event.path; yield event.path;
} }

View File

@@ -7,13 +7,13 @@ environment:
sdk: ">=3.0.0 <=4.0.0" sdk: ">=3.0.0 <=4.0.0"
dependencies: dependencies:
dio: ^5.3.2 dio: ^5.7.0
win32: 3.0.0 win32: ^5.5.4
ffi: ^2.1.0 ffi: ^2.1.3
path: ^1.8.3 path: ^1.9.0
http: ^1.1.0 http: ^1.2.2
crypto: ^3.0.2 crypto: ^3.0.5
archive: ^3.3.7 archive: ^3.6.1
ini: ^2.1.0 ini: ^2.1.0
shelf_proxy: ^1.0.2 shelf_proxy: ^1.0.2
sync: ^0.3.0 sync: ^0.3.0
@@ -22,4 +22,4 @@ dependencies:
version: ^3.0.2 version: ^3.0.2
dev_dependencies: dev_dependencies:
flutter_lints: ^2.0.1 flutter_lints: ^5.0.0

Binary file not shown.

View File

@@ -98,11 +98,13 @@
"settingsServerTypeDescription": "The type of game server to inject", "settingsServerTypeDescription": "The type of game server to inject",
"settingsServerTypeEmbeddedName": "Embedded", "settingsServerTypeEmbeddedName": "Embedded",
"settingsServerTypeCustomName": "Custom", "settingsServerTypeCustomName": "Custom",
"settingsServerFileName": "Implementation", "settingsOldServerFileName": "Game server (Before Fortnite Season 20)",
"settingsNewServerFileName": "Game server (After Fortnite Season 20)",
"settingsServerFileDescription": "The file injected to create the game server", "settingsServerFileDescription": "The file injected to create the game server",
"settingsServerPortName": "Port", "settingsServerPortName": "Port",
"settingsServerPortDescription": "The port the launcher expects the game server to be hosted on", "settingsServerPortDescription": "The port the launcher expects the game server to be hosted on",
"settingsServerMirrorName": "Update mirror", "settingsServerOldMirrorName": "Update mirror (Before Fortnite Season 20)",
"settingsServerNewMirrorName": "Update mirror (After Fortnite Season 20)",
"settingsServerMirrorDescription": "The URL used to update the game server dll", "settingsServerMirrorDescription": "The URL used to update the game server dll",
"settingsServerMirrorPlaceholder": "mirror", "settingsServerMirrorPlaceholder": "mirror",
"settingsServerTimerName": "Update timer", "settingsServerTimerName": "Update timer",
@@ -368,5 +370,7 @@
"automaticGameServerDialogStart": "Start server", "automaticGameServerDialogStart": "Start server",
"gameResetDefaultsName": "Reset", "gameResetDefaultsName": "Reset",
"gameResetDefaultsDescription": "Resets the game's settings to their default values", "gameResetDefaultsDescription": "Resets the game's settings to their default values",
"gameResetDefaultsContent": "Reset" "gameResetDefaultsContent": "Reset",
"selectFile": "Select a file",
"reset": "Reset"
} }

View File

@@ -2,6 +2,7 @@ import 'dart:async';
import 'dart:io'; import 'dart:io';
import 'package:bitsdojo_window/bitsdojo_window.dart'; import 'package:bitsdojo_window/bitsdojo_window.dart';
import 'package:file_picker/file_picker.dart';
import 'package:fluent_ui/fluent_ui.dart'; import 'package:fluent_ui/fluent_ui.dart';
import 'package:flutter_acrylic/flutter_acrylic.dart'; import 'package:flutter_acrylic/flutter_acrylic.dart';
import 'package:flutter_gen/gen_l10n/reboot_localizations.dart'; import 'package:flutter_gen/gen_l10n/reboot_localizations.dart';
@@ -19,9 +20,9 @@ import 'package:reboot_launcher/src/controller/settings_controller.dart';
import 'package:reboot_launcher/src/messenger/implementation/error.dart'; import 'package:reboot_launcher/src/messenger/implementation/error.dart';
import 'package:reboot_launcher/src/page/implementation/home_page.dart'; import 'package:reboot_launcher/src/page/implementation/home_page.dart';
import 'package:reboot_launcher/src/util/os.dart'; import 'package:reboot_launcher/src/util/os.dart';
import 'package:reboot_launcher/src/util/url_protocol.dart';
import 'package:supabase_flutter/supabase_flutter.dart'; import 'package:supabase_flutter/supabase_flutter.dart';
import 'package:system_theme/system_theme.dart'; import 'package:system_theme/system_theme.dart';
import 'package:url_protocol/url_protocol.dart';
import 'package:version/version.dart'; import 'package:version/version.dart';
import 'package:window_manager/window_manager.dart'; import 'package:window_manager/window_manager.dart';
@@ -146,7 +147,7 @@ Future<Object?> _initVersion() async {
Future<Object?> _initUrlHandler() async { Future<Object?> _initUrlHandler() async {
try { try {
registerProtocolHandler(kCustomUrlSchema, arguments: ['%s']); registerUrlProtocol(kCustomUrlSchema, arguments: ['%s']);
return null; return null;
}catch(error) { }catch(error) {
return error; return error;

View File

@@ -4,15 +4,11 @@ import 'dart:io';
import 'package:fluent_ui/fluent_ui.dart'; import 'package:fluent_ui/fluent_ui.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart'; import 'package:get_storage/get_storage.dart';
import 'package:http/http.dart' as http;
import 'package:path/path.dart'; import 'package:path/path.dart';
import 'package:reboot_common/common.dart'; import 'package:reboot_common/common.dart';
import 'package:reboot_launcher/main.dart'; import 'package:reboot_launcher/main.dart';
import 'package:reboot_launcher/src/messenger/abstract/info_bar.dart'; import 'package:reboot_launcher/src/messenger/abstract/info_bar.dart';
import 'package:reboot_launcher/src/util/translations.dart'; import 'package:reboot_launcher/src/util/translations.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:version/version.dart';
import 'package:yaml/yaml.dart';
class DllController extends GetxController { class DllController extends GetxController {
static const String storageName = "dll_storage"; static const String storageName = "dll_storage";
@@ -25,7 +21,8 @@ class DllController extends GetxController {
late final TextEditingController memoryLeakDll; late final TextEditingController memoryLeakDll;
late final TextEditingController gameServerPort; late final TextEditingController gameServerPort;
late final Rx<UpdateTimer> timer; late final Rx<UpdateTimer> timer;
late final TextEditingController url; late final TextEditingController beforeS20Mirror;
late final TextEditingController aboveS20Mirror;
late final RxBool customGameServer; late final RxBool customGameServer;
late final RxnInt timestamp; late final RxnInt timestamp;
late final Rx<UpdateStatus> status; late final Rx<UpdateStatus> status;
@@ -43,8 +40,10 @@ class DllController extends GetxController {
final timerIndex = _storage?.read("timer"); final timerIndex = _storage?.read("timer");
timer = Rx(timerIndex == null ? UpdateTimer.hour : UpdateTimer.values.elementAt(timerIndex)); timer = Rx(timerIndex == null ? UpdateTimer.hour : UpdateTimer.values.elementAt(timerIndex));
timer.listen((value) => _storage?.write("timer", value.index)); timer.listen((value) => _storage?.write("timer", value.index));
url = TextEditingController(text: _storage?.read("update_url") ?? kRebootDownloadUrl); beforeS20Mirror = TextEditingController(text: _storage?.read("update_url") ?? kRebootBelowS20DownloadUrl);
url.addListener(() => _storage?.write("update_url", url.text)); beforeS20Mirror.addListener(() => _storage?.write("update_url", beforeS20Mirror.text));
aboveS20Mirror = TextEditingController(text: _storage?.read("old_update_url") ?? kRebootAboveS20DownloadUrl);
aboveS20Mirror.addListener(() => _storage?.write("new_update_url", aboveS20Mirror.text));
status = Rx(UpdateStatus.waiting); status = Rx(UpdateStatus.waiting);
customGameServer = RxBool(_storage?.read("custom_game_server") ?? false); customGameServer = RxBool(_storage?.read("custom_game_server") ?? false);
customGameServer.listen((value) => _storage?.write("custom_game_server", value)); customGameServer.listen((value) => _storage?.write("custom_game_server", value));
@@ -68,7 +67,8 @@ class DllController extends GetxController {
void resetServer() { void resetServer() {
gameServerPort.text = kDefaultGameServerPort; gameServerPort.text = kDefaultGameServerPort;
timer.value = UpdateTimer.hour; timer.value = UpdateTimer.hour;
url.text = kRebootDownloadUrl; beforeS20Mirror.text = kRebootBelowS20DownloadUrl;
aboveS20Mirror.text = kRebootAboveS20DownloadUrl;
status.value = UpdateStatus.waiting; status.value = UpdateStatus.waiting;
customGameServer.value = false; customGameServer.value = false;
timestamp.value = null; timestamp.value = null;
@@ -109,7 +109,15 @@ class DllController extends GetxController {
duration: null duration: null
); );
} }
timestamp.value = await downloadRebootDll(url.text); await Future.wait(
[
downloadRebootDll(rebootBeforeS20DllFile, beforeS20Mirror.text),
downloadRebootDll(rebootAboveS20DllFile, aboveS20Mirror.text),
Future.delayed(const Duration(seconds: 1))
],
eagerError: false
);
timestamp.value = DateTime.now().millisecondsSinceEpoch;
status.value = UpdateStatus.success; status.value = UpdateStatus.success;
infoBarEntry?.close(); infoBarEntry?.close();
if(!silent) { if(!silent) {
@@ -126,15 +134,18 @@ class DllController extends GetxController {
error = error.contains(": ") ? error.substring(error.indexOf(": ") + 2) : error; error = error.contains(": ") ? error.substring(error.indexOf(": ") + 2) : error;
error = error.toLowerCase(); error = error.toLowerCase();
status.value = UpdateStatus.error; status.value = UpdateStatus.error;
showRebootInfoBar( infoBarEntry = showRebootInfoBar(
translations.downloadDllError("reboot.dll", error.toString()), translations.downloadDllError(error.toString(), "reboot.dll"),
duration: infoBarLongDuration, duration: infoBarLongDuration,
severity: InfoBarSeverity.error, severity: InfoBarSeverity.error,
action: Button( action: Button(
onPressed: () => updateGameServerDll( onPressed: () async {
infoBarEntry?.close();
updateGameServerDll(
force: true, force: true,
silent: silent silent: silent
), );
},
child: Text(translations.downloadDllRetry), child: Text(translations.downloadDllRetry),
) )
); );
@@ -155,7 +166,7 @@ class DllController extends GetxController {
} }
} }
return (rebootDllFile, false); return (rebootBeforeS20DllFile, false);
case InjectableDll.console: case InjectableDll.console:
final ue4ConsoleFile = File(unrealEngineConsoleDll.text); final ue4ConsoleFile = File(unrealEngineConsoleDll.text);
return (ue4ConsoleFile, canonicalize(ue4ConsoleFile.path) != defaultPath); return (ue4ConsoleFile, canonicalize(ue4ConsoleFile.path) != defaultPath);
@@ -215,7 +226,7 @@ class DllController extends GetxController {
error = error.toLowerCase(); error = error.toLowerCase();
final completer = Completer(); final completer = Completer();
await showRebootInfoBar( await showRebootInfoBar(
translations.downloadDllError(fileName, error.toString()), translations.downloadDllError(error.toString(), fileName),
duration: infoBarLongDuration, duration: infoBarLongDuration,
severity: InfoBarSeverity.error, severity: InfoBarSeverity.error,
onDismissed: () => completer.complete(null), onDismissed: () => completer.complete(null),

View File

@@ -56,20 +56,36 @@ class HostingController extends GetxController {
published = RxBool(false); published = RxBool(false);
showPassword = RxBool(false); showPassword = RxBool(false);
instance = Rxn(); instance = Rxn();
final supabase = Supabase.instance.client;
servers = Rxn(); servers = Rxn();
supabase.from("hosting_v2") _listenServers();
.stream(primaryKey: ['id'])
.map((event) => event.map((element) => FortniteServer.fromJson(element)).where((element) => element.ip.isNotEmpty).toSet())
.listen((event) {
servers.value = event;
published.value = event.any((element) => element.id == uuid);
});
customLaunchArgs = TextEditingController(text: _storage?.read("custom_launch_args") ?? ""); customLaunchArgs = TextEditingController(text: _storage?.read("custom_launch_args") ?? "");
customLaunchArgs.addListener(() => _storage?.write("custom_launch_args", customLaunchArgs.text)); customLaunchArgs.addListener(() => _storage?.write("custom_launch_args", customLaunchArgs.text));
_semaphore = Semaphore(); _semaphore = Semaphore();
} }
void _listenServers([int attempt = 0]) {
log("[SUPABASE] Listening...");
final supabase = Supabase.instance.client;
supabase.from("hosting_v2")
.stream(primaryKey: ['id'])
.map((event) => event.map((element) => FortniteServer.fromJson(element)).where((element) => element.ip.isNotEmpty).toSet())
.listen(
_onNewServer,
onError: (error) async {
log("[SUPABASE] Error: ${error}");
await Future.delayed(Duration(seconds: attempt * 5));
_listenServers(attempt + 1);
},
cancelOnError: true
);
}
void _onNewServer(Set<FortniteServer> event) {
log("[SUPABASE] New event: ${event}");
servers.value = event;
published.value = event.any((element) => element.id == uuid);
}
Future<void> publishServer(String author, String version) async { Future<void> publishServer(String author, String version) async {
try { try {
_semaphore.acquire(); _semaphore.acquire();

View File

@@ -1,11 +1,9 @@
import 'dart:async'; import 'dart:async';
import 'dart:io';
import 'package:fluent_ui/fluent_ui.dart'; import 'package:fluent_ui/fluent_ui.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart'; import 'package:get_storage/get_storage.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:path/path.dart';
import 'package:reboot_common/common.dart'; import 'package:reboot_common/common.dart';
import 'package:reboot_launcher/main.dart'; import 'package:reboot_launcher/main.dart';
import 'package:reboot_launcher/src/messenger/abstract/info_bar.dart'; import 'package:reboot_launcher/src/messenger/abstract/info_bar.dart';
@@ -21,7 +19,6 @@ class SettingsController extends GetxController {
late final RxString language; late final RxString language;
late final Rx<ThemeMode> themeMode; late final Rx<ThemeMode> themeMode;
late final RxBool firstRun; late final RxBool firstRun;
late final RxBool debug;
late double width; late double width;
late double height; late double height;
late double? offsetX; late double? offsetX;
@@ -39,7 +36,6 @@ class SettingsController extends GetxController {
language.listen((value) => _storage?.write("language", value)); language.listen((value) => _storage?.write("language", value));
firstRun = RxBool(_storage?.read("first_run_tutorial") ?? true); firstRun = RxBool(_storage?.read("first_run_tutorial") ?? true);
firstRun.listen((value) => _storage?.write("first_run_tutorial", value)); firstRun.listen((value) => _storage?.write("first_run_tutorial", value));
debug = RxBool(false);
} }
void saveWindowSize(Size size) { void saveWindowSize(Size size) {

View File

@@ -300,7 +300,7 @@ class _DialogButtonState extends State<DialogButton> {
Widget get _primaryButton => Button( Widget get _primaryButton => Button(
style: ButtonStyle( style: ButtonStyle(
backgroundColor: ButtonState.all(FluentTheme.of(context).accentColor) backgroundColor: WidgetStateProperty.all(FluentTheme.of(context).accentColor)
), ),
onPressed: widget.onTap!, onPressed: widget.onTap!,
child: Text(widget.text!), child: Text(widget.text!),
@@ -308,7 +308,7 @@ class _DialogButtonState extends State<DialogButton> {
Widget get _secondaryButton => Button( Widget get _secondaryButton => Button(
style: widget.color != null ? ButtonStyle( style: widget.color != null ? ButtonStyle(
backgroundColor: ButtonState.all(widget.color!) backgroundColor: WidgetStateProperty.all(widget.color!)
) : null, ) : null,
onPressed: widget.onTap ?? _onDefaultSecondaryActionTap, onPressed: widget.onTap ?? _onDefaultSecondaryActionTap,
child: Text(widget.text ?? translations.defaultDialogSecondaryAction), child: Text(widget.text ?? translations.defaultDialogSecondaryAction),

View File

@@ -18,9 +18,12 @@ void onError(Object exception, StackTrace? stackTrace, bool framework) {
} }
lastError = exception.toString(); lastError = exception.toString();
final route = ModalRoute.of(pageKey.currentContext!); if(inDialog){
if(route != null && !route.isCurrent){ final context = pageKey.currentContext;
Navigator.of(pageKey.currentContext!).pop(false); if(context != null) {
Navigator.of(context).pop(false);
inDialog = false;
}
} }
WidgetsBinding.instance.addPostFrameCallback((timeStamp) => showRebootDialog( WidgetsBinding.instance.addPostFrameCallback((timeStamp) => showRebootDialog(

View File

@@ -62,7 +62,7 @@ void _promptPlayVersion() {
onTap: () async { onTap: () async {
onClose(); onClose();
if(!hasBuilds) { if(!hasBuilds) {
await VersionSelector.openDownloadDialog(closable: false); await VersionSelector.openDownloadDialog();
} }
_promptServerBrowserPage(); _promptServerBrowserPage();
} }
@@ -339,7 +339,7 @@ Widget _buildActionButton({
required void Function() onTap, required void Function() onTap,
}) => Button( }) => Button(
style: themed ? ButtonStyle( style: themed ? ButtonStyle(
backgroundColor: ButtonState.all(FluentTheme.of(context).accentColor) backgroundColor: WidgetStateProperty.all(FluentTheme.of(context).accentColor)
) : null, ) : null,
child: Text(label), child: Text(label),
onPressed: onTap onPressed: onTap

View File

@@ -56,8 +56,8 @@ Future<bool> showProfileForm(BuildContext context) async{
suffix: Button( suffix: Button(
onPressed: () => showPassword.value = !showPassword.value, onPressed: () => showPassword.value = !showPassword.value,
style: ButtonStyle( style: ButtonStyle(
shape: ButtonState.all(const CircleBorder()), shape: WidgetStateProperty.all(const CircleBorder()),
backgroundColor: ButtonState.all(Colors.transparent) backgroundColor: WidgetStateProperty.all(Colors.transparent)
), ),
child: Icon( child: Icon(
showPassword.value ? Icons.visibility_off : Icons.visibility, showPassword.value ? Icons.visibility_off : Icons.visibility,

View File

@@ -257,8 +257,8 @@ extension ServerControllerDialog on BackendController {
suffix: !showPasswordTrailing.value ? null : Button( suffix: !showPasswordTrailing.value ? null : Button(
onPressed: () => showPassword.value = !showPassword.value, onPressed: () => showPassword.value = !showPassword.value,
style: ButtonStyle( style: ButtonStyle(
shape: ButtonState.all(const CircleBorder()), shape: WidgetStateProperty.all(const CircleBorder()),
backgroundColor: ButtonState.all(Colors.transparent) backgroundColor: WidgetStateProperty.all(Colors.transparent)
), ),
child: Icon( child: Icon(
showPassword.value ? FluentIcons.eye_off_24_regular : FluentIcons.eye_24_regular showPassword.value ? FluentIcons.eye_off_24_regular : FluentIcons.eye_24_regular

View File

@@ -9,6 +9,7 @@ import 'package:reboot_common/common.dart';
import 'package:reboot_launcher/src/controller/game_controller.dart'; import 'package:reboot_launcher/src/controller/game_controller.dart';
import 'package:reboot_launcher/src/messenger/abstract/dialog.dart'; import 'package:reboot_launcher/src/messenger/abstract/dialog.dart';
import 'package:reboot_launcher/src/util/translations.dart'; import 'package:reboot_launcher/src/util/translations.dart';
import 'package:reboot_launcher/src/util/types.dart';
import 'package:reboot_launcher/src/widget/file_selector.dart'; import 'package:reboot_launcher/src/widget/file_selector.dart';
import 'package:universal_disk_space/universal_disk_space.dart'; import 'package:universal_disk_space/universal_disk_space.dart';
import 'package:windows_taskbar/windows_taskbar.dart'; import 'package:windows_taskbar/windows_taskbar.dart';
@@ -41,6 +42,7 @@ class _AddVersionDialogState extends State<AddVersionDialog> {
SendPort? _downloadPort; SendPort? _downloadPort;
Object? _error; Object? _error;
StackTrace? _stackTrace; StackTrace? _stackTrace;
bool _selecting = false;
@override @override
void initState() { void initState() {
@@ -102,7 +104,12 @@ class _AddVersionDialogState extends State<AddVersionDialog> {
return ErrorDialog( return ErrorDialog(
exception: _error ?? Exception(translations.unknownError), exception: _error ?? Exception(translations.unknownError),
stackTrace: _stackTrace, stackTrace: _stackTrace,
errorMessageBuilder: (exception) => translations.downloadVersionError(exception.toString()) errorMessageBuilder: (exception) {
var error = exception.toString();
error = error.after("Error: ")?.replaceAll(":", ",") ?? error.after(": ") ?? error;
error = error.toLowerCase();
return translations.downloadVersionError(error);
}
); );
case _DownloadStatus.done: case _DownloadStatus.done:
return InfoDialog( return InfoDialog(
@@ -274,7 +281,8 @@ class _AddVersionDialogState extends State<AddVersionDialog> {
); );
} }
Widget _buildFormBody(List<FortniteBuild> builds) => Column( Widget _buildFormBody(List<FortniteBuild> builds) {
return Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@@ -292,7 +300,8 @@ class _AddVersionDialogState extends State<AddVersionDialog> {
windowTitle: _source.value == _BuildSource.local ? translations.gameFolderPlaceWindowTitle : translations.buildInstallationDirectoryWindowTitle, windowTitle: _source.value == _BuildSource.local ? translations.gameFolderPlaceWindowTitle : translations.buildInstallationDirectoryWindowTitle,
controller: _pathController, controller: _pathController,
validator: _source.value == _BuildSource.local ? _checkGameFolder : _checkDownloadDestination, validator: _source.value == _BuildSource.local ? _checkGameFolder : _checkDownloadDestination,
folder: true folder: true,
allowNavigator: true
), ),
const SizedBox( const SizedBox(
@@ -300,6 +309,7 @@ class _AddVersionDialogState extends State<AddVersionDialog> {
) )
], ],
); );
}
String? _checkGameFolder(text) { String? _checkGameFolder(text) {
if (text == null || text.isEmpty) { if (text == null || text.isEmpty) {

View File

@@ -1,6 +1,5 @@
import 'package:fluent_ui/fluent_ui.dart'; import 'package:fluent_ui/fluent_ui.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:get/get_state_manager/src/rx_flutter/rx_obx_widget.dart';
import 'package:reboot_launcher/src/controller/settings_controller.dart'; import 'package:reboot_launcher/src/controller/settings_controller.dart';
import 'package:reboot_launcher/src/messenger/implementation/onboard.dart'; import 'package:reboot_launcher/src/messenger/implementation/onboard.dart';
import 'package:reboot_launcher/src/page/abstract/page_type.dart'; import 'package:reboot_launcher/src/page/abstract/page_type.dart';
@@ -35,7 +34,6 @@ abstract class RebootPageState<T extends RebootPage> extends State<T> with Autom
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
_buildFirstLaunchInfo(), _buildFirstLaunchInfo(),
_buildDebugInfo(),
Expanded( Expanded(
child: _listView child: _listView
) )
@@ -47,7 +45,6 @@ abstract class RebootPageState<T extends RebootPage> extends State<T> with Autom
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
_buildFirstLaunchInfo(), _buildFirstLaunchInfo(),
_buildDebugInfo(),
Expanded( Expanded(
child: Column( child: Column(
children: [ children: [
@@ -99,35 +96,6 @@ abstract class RebootPageState<T extends RebootPage> extends State<T> with Autom
); );
}); });
Widget _buildDebugInfo() => Obx(() {
if(!_settingsController.debug.value) {
return const SizedBox.shrink();
}
return Padding(
padding: const EdgeInsets.only(
bottom: 8.0
),
child: SizedBox(
width: double.infinity,
child: InfoBar(
title: Text("Debug mode is enabled"),
severity: InfoBarSeverity.warning,
isLong: true,
content: SizedBox(
width: double.infinity,
child: Text( "• Automatic dll injection is disabled\n"
"• The game server cannot start automatically\n"
"• The game server runs in a normal window")
),
onClose: () {
_settingsController.debug.value = false;
},
),
)
);
});
ListView get _listView => ListView.builder( ListView get _listView => ListView.builder(
itemCount: settings.length, itemCount: settings.length,
itemBuilder: (context, index) => settings[index], itemBuilder: (context, index) => settings[index],

View File

@@ -5,7 +5,6 @@ import 'package:flutter/services.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:reboot_common/common.dart'; import 'package:reboot_common/common.dart';
import 'package:reboot_launcher/src/controller/backend_controller.dart'; import 'package:reboot_launcher/src/controller/backend_controller.dart';
import 'package:reboot_launcher/src/controller/game_controller.dart';
import 'package:reboot_launcher/src/messenger/abstract/info_bar.dart'; import 'package:reboot_launcher/src/messenger/abstract/info_bar.dart';
import 'package:reboot_launcher/src/messenger/abstract/overlay.dart'; import 'package:reboot_launcher/src/messenger/abstract/overlay.dart';
import 'package:reboot_launcher/src/messenger/implementation/data.dart'; import 'package:reboot_launcher/src/messenger/implementation/data.dart';
@@ -153,9 +152,9 @@ class _BackendPageState extends RebootPageState<BackendPage> {
contentWidth: null, contentWidth: null,
content: Row( content: Row(
children: [ children: [
Text( Obx(() => Text(
_backendController.detached.value ? translations.on : translations.off _backendController.detached.value ? translations.on : translations.off
), )),
const SizedBox( const SizedBox(
width: 16.0 width: 16.0
), ),

View File

@@ -276,8 +276,8 @@ class _BrowsePageState extends RebootPageState<BrowsePage> {
_filterControllerStream.add(""); _filterControllerStream.add("");
}, },
style: ButtonStyle( style: ButtonStyle(
backgroundColor: ButtonState.all(Colors.transparent), backgroundColor: WidgetStateProperty.all(Colors.transparent),
shape: ButtonState.all(Border()) shape: WidgetStateProperty.all(Border())
), ),
child: _searchBarIconData child: _searchBarIconData
); );

View File

@@ -298,8 +298,7 @@ class _HomePageState extends State<HomePage> with WindowListener, AutomaticKeepA
}); });
} }
Widget _buildBody() { Widget _buildBody() => Expanded(
return Expanded(
child: Padding( child: Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: HomePage.kDefaultPadding, left: HomePage.kDefaultPadding,
@@ -339,7 +338,6 @@ class _HomePageState extends State<HomePage> with WindowListener, AutomaticKeepA
) )
), ),
); );
}
Widget _buildBodyContent() => PageView.builder( Widget _buildBodyContent() => PageView.builder(
controller: _pageController, controller: _pageController,
@@ -500,7 +498,7 @@ class _HomePageState extends State<HomePage> with WindowListener, AutomaticKeepA
decoration: BoxDecoration( decoration: BoxDecoration(
color: ButtonThemeData.uncheckedInputColor( color: ButtonThemeData.uncheckedInputColor(
FluentTheme.of(context), FluentTheme.of(context),
pageIndex.value == index ? {ButtonStates.hovering} : states, pageIndex.value == index ? {WidgetState.hovered} : states,
transparentWhenNone: true, transparentWhenNone: true,
), ),
borderRadius: BorderRadius.all(Radius.circular(6.0)) borderRadius: BorderRadius.all(Radius.circular(6.0))
@@ -529,12 +527,12 @@ class _HomePageState extends State<HomePage> with WindowListener, AutomaticKeepA
stream: pagesController.stream, stream: pagesController.stream,
builder: (context, _) => Button( builder: (context, _) => Button(
style: ButtonStyle( style: ButtonStyle(
padding: ButtonState.all(const EdgeInsets.symmetric( padding: WidgetStateProperty.all(const EdgeInsets.symmetric(
vertical: 12.0, vertical: 12.0,
horizontal: 16.0 horizontal: 16.0
)), )),
backgroundColor: ButtonState.all(Colors.transparent), backgroundColor: WidgetStateProperty.all(Colors.transparent),
shape: ButtonState.all(Border()) shape: WidgetStateProperty.all(Border())
), ),
onPressed: appStack.isEmpty && !inDialog ? null : () { onPressed: appStack.isEmpty && !inDialog ? null : () {
if(inDialog) { if(inDialog) {

View File

@@ -155,8 +155,8 @@ class _HostingPageState extends RebootPageState<HostPage> {
suffix: Button( suffix: Button(
onPressed: () => _hostingController.showPassword.value = !_hostingController.showPassword.value, onPressed: () => _hostingController.showPassword.value = !_hostingController.showPassword.value,
style: ButtonStyle( style: ButtonStyle(
shape: ButtonState.all(const CircleBorder()), shape: WidgetStateProperty.all(const CircleBorder()),
backgroundColor: ButtonState.all(Colors.transparent) backgroundColor: WidgetStateProperty.all(Colors.transparent)
), ),
child: Icon( child: Icon(
_hostingController.showPassword.value ? FluentIcons.eye_off_24_filled : FluentIcons.eye_24_filled, _hostingController.showPassword.value ? FluentIcons.eye_off_24_filled : FluentIcons.eye_24_filled,
@@ -175,9 +175,9 @@ class _HostingPageState extends RebootPageState<HostPage> {
contentWidth: null, contentWidth: null,
content: Obx(() => Row( content: Obx(() => Row(
children: [ children: [
Text( Obx(() => Text(
_hostingController.discoverable.value ? translations.on : translations.off _hostingController.discoverable.value ? translations.on : translations.off
), )),
const SizedBox( const SizedBox(
width: 16.0 width: 16.0
), ),
@@ -221,12 +221,11 @@ class _HostingPageState extends RebootPageState<HostPage> {
content: Obx(() => DropDownButton( content: Obx(() => DropDownButton(
onOpen: () => inDialog = true, onOpen: () => inDialog = true,
onClose: () => inDialog = false, onClose: () => inDialog = false,
leading: Text(_settingsController.debug.value ? GameServerType.window.translatedName : _hostingController.type.value.translatedName), leading: Text(_hostingController.type.value.translatedName),
items: GameServerType.values.map((entry) => MenuFlyoutItem( items: GameServerType.values.map((entry) => MenuFlyoutItem(
text: Text(entry.translatedName), text: Text(entry.translatedName),
onPressed: () => _hostingController.type.value = entry onPressed: () => _hostingController.type.value = entry
)).toList(), )).toList()
disabled: _settingsController.debug.value
)), )),
), ),
SettingTile( SettingTile(
@@ -238,9 +237,9 @@ class _HostingPageState extends RebootPageState<HostPage> {
contentWidth: null, contentWidth: null,
content: Row( content: Row(
children: [ children: [
Text( Obx(() => Text(
_hostingController.autoRestart.value ? translations.on : translations.off _hostingController.autoRestart.value ? translations.on : translations.off
), )),
const SizedBox( const SizedBox(
width: 16.0 width: 16.0
), ),
@@ -278,12 +277,20 @@ class _HostingPageState extends RebootPageState<HostPage> {
title: Text(translations.settingsServerName), title: Text(translations.settingsServerName),
subtitle: Text(translations.settingsServerSubtitle), subtitle: Text(translations.settingsServerSubtitle),
children: [ children: [
SettingTile( _internalFilesServerType,
_internalFilesUpdateTimer,
_internalFilesOldServerSource,
_internalFilesNewServerSource,
],
);
Widget get _internalFilesServerType => SettingTile(
icon: Icon( icon: Icon(
FluentIcons.timer_24_regular FluentIcons.games_24_regular
), ),
title: Text(translations.settingsServerTypeName), title: Text(translations.settingsServerTypeName),
subtitle: Text(translations.settingsServerTypeDescription), subtitle: Text(translations.settingsServerTypeDescription),
contentWidth: SettingTile.kDefaultContentWidth + 30,
content: Obx(() => DropDownButton( content: Obx(() => DropDownButton(
onOpen: () => inDialog = true, onOpen: () => inDialog = true,
onClose: () => inDialog = false, onClose: () => inDialog = false,
@@ -309,49 +316,52 @@ class _HostingPageState extends RebootPageState<HostPage> {
} }
)).toList() )).toList()
)) ))
),
Obx(() {
if(!_dllController.customGameServer.value) {
return const SizedBox.shrink();
}
return createFileSetting(
title: translations.settingsServerFileName,
description: translations.settingsServerFileDescription,
controller: _dllController.gameServerDll,
onReset: () {
final path = _dllController.getDefaultDllPath(InjectableDll.reboot);
_dllController.gameServerDll.text = path;
_dllController.downloadCriticalDllInteractive(path);
}
); );
}),
Obx(() {
if(_dllController.customGameServer.value) {
return const SizedBox.shrink();
}
Widget get _internalFilesOldServerSource => Obx(() {
if(!_dllController.customGameServer.value) {
return SettingTile( return SettingTile(
icon: Icon( icon: Icon(
FluentIcons.globe_24_regular FluentIcons.globe_24_regular
), ),
title: Text(translations.settingsServerMirrorName), title: Text(translations.settingsServerOldMirrorName),
subtitle: Text(translations.settingsServerMirrorDescription), subtitle: Text(translations.settingsServerMirrorDescription),
contentWidth: SettingTile.kDefaultContentWidth + 30,
content: Row( content: Row(
children: [ children: [
Expanded( Expanded(
child: TextFormBox( child: TextFormBox(
placeholder: translations.settingsServerMirrorPlaceholder, placeholder: translations.settingsServerMirrorPlaceholder,
controller: _dllController.url, controller: _dllController.beforeS20Mirror,
validator: _checkUpdateUrl onChanged: (value) {
if(Uri.tryParse(value) != null) {
_dllController.updateGameServerDll(force: true);
}
},
), ),
), ),
const SizedBox(width: 8.0), const SizedBox(width: 8.0),
Button( Button(
style: ButtonStyle( style: ButtonStyle(
padding: ButtonState.all(EdgeInsets.zero) padding: WidgetStateProperty.all(EdgeInsets.zero)
), ),
onPressed: () => _dllController.url.text = kRebootDownloadUrl, onPressed: () => _dllController.updateGameServerDll(force: true),
child: SizedBox.square(
dimension: 30,
child: Icon(
FluentIcons.arrow_download_24_regular
),
)
),
const SizedBox(width: 8.0),
Button(
style: ButtonStyle(
padding: WidgetStateProperty.all(EdgeInsets.zero)
),
onPressed: () {
_dllController.beforeS20Mirror.text = kRebootBelowS20DownloadUrl;
_dllController.updateGameServerDll(force: true);
},
child: SizedBox.square( child: SizedBox.square(
dimension: 30, dimension: 30,
child: Icon( child: Icon(
@@ -362,8 +372,89 @@ class _HostingPageState extends RebootPageState<HostPage> {
], ],
) )
); );
}), }else {
Obx(() { return createFileSetting(
title: translations.settingsOldServerFileName,
description: translations.settingsServerFileDescription,
controller: _dllController.gameServerDll,
onReset: () {
final path = _dllController.getDefaultDllPath(InjectableDll.reboot);
_dllController.gameServerDll.text = path;
_dllController.downloadCriticalDllInteractive(path);
}
);
}
});
Widget get _internalFilesNewServerSource => Obx(() {
if(!_dllController.customGameServer.value) {
return SettingTile(
icon: Icon(
FluentIcons.globe_24_regular
),
title: Text(translations.settingsServerNewMirrorName),
subtitle: Text(translations.settingsServerMirrorDescription),
contentWidth: SettingTile.kDefaultContentWidth + 30,
content: Row(
children: [
Expanded(
child: TextFormBox(
placeholder: translations.settingsServerMirrorPlaceholder,
controller: _dllController.aboveS20Mirror,
onChanged: (value) {
if(Uri.tryParse(value) != null) {
_dllController.updateGameServerDll(force: true);
}
},
),
),
const SizedBox(width: 8.0),
Button(
style: ButtonStyle(
padding: WidgetStateProperty.all(EdgeInsets.zero)
),
onPressed: () => _dllController.updateGameServerDll(force: true),
child: SizedBox.square(
dimension: 30,
child: Icon(
FluentIcons.arrow_download_24_regular
),
)
),
const SizedBox(width: 8.0),
Button(
style: ButtonStyle(
padding: WidgetStateProperty.all(EdgeInsets.zero)
),
onPressed: () {
_dllController.aboveS20Mirror.text = kRebootBelowS20DownloadUrl;
_dllController.updateGameServerDll(force: true);
},
child: SizedBox.square(
dimension: 30,
child: Icon(
FluentIcons.arrow_reset_24_regular
),
)
)
],
)
);
}else {
return createFileSetting(
title: translations.settingsNewServerFileName,
description: translations.settingsServerFileDescription,
controller: _dllController.gameServerDll,
onReset: () {
final path = _dllController.getDefaultDllPath(InjectableDll.reboot);
_dllController.gameServerDll.text = path;
_dllController.downloadCriticalDllInteractive(path);
}
);
}
});
Widget get _internalFilesUpdateTimer => Obx(() {
if(_dllController.customGameServer.value) { if(_dllController.customGameServer.value) {
return const SizedBox.shrink(); return const SizedBox.shrink();
} }
@@ -374,10 +465,8 @@ class _HostingPageState extends RebootPageState<HostPage> {
), ),
title: Text(translations.settingsServerTimerName), title: Text(translations.settingsServerTimerName),
subtitle: Text(translations.settingsServerTimerSubtitle), subtitle: Text(translations.settingsServerTimerSubtitle),
content: Row( contentWidth: SettingTile.kDefaultContentWidth + 30,
children: [ content: Obx(() => DropDownButton(
Expanded(
child: Obx(() => DropDownButton(
onOpen: () => inDialog = true, onOpen: () => inDialog = true,
onClose: () => inDialog = false, onClose: () => inDialog = false,
leading: Text(_dllController.timer.value.text), leading: Text(_dllController.timer.value.text),
@@ -391,38 +480,9 @@ class _HostingPageState extends RebootPageState<HostPage> {
); );
} }
)).toList() )).toList()
)), ))
),
const SizedBox(width: 8.0),
Button(
style: ButtonStyle(
padding: ButtonState.all(EdgeInsets.zero)
),
onPressed: () {
_dllController.updateGameServerDll(force: true);
},
child: SizedBox.square(
dimension: 30,
child: Icon(
FluentIcons.arrow_download_24_regular
),
)
)
],
)
); );
}) });
],
);
String? _checkUpdateUrl(String? text) {
if (text == null || text.isEmpty) {
return translations.emptyURL;
}
return null;
}
SettingTile get _share => SettingTile( SettingTile get _share => SettingTile(
icon: Icon( icon: Icon(

View File

@@ -7,7 +7,6 @@ import 'package:reboot_launcher/src/controller/game_controller.dart';
import 'package:reboot_launcher/src/controller/settings_controller.dart'; import 'package:reboot_launcher/src/controller/settings_controller.dart';
import 'package:reboot_launcher/src/messenger/abstract/overlay.dart'; import 'package:reboot_launcher/src/messenger/abstract/overlay.dart';
import 'package:reboot_launcher/src/messenger/implementation/data.dart'; import 'package:reboot_launcher/src/messenger/implementation/data.dart';
import 'package:reboot_launcher/src/messenger/implementation/onboard.dart';
import 'package:reboot_launcher/src/page/abstract/page.dart'; import 'package:reboot_launcher/src/page/abstract/page.dart';
import 'package:reboot_launcher/src/page/abstract/page_type.dart'; import 'package:reboot_launcher/src/page/abstract/page_type.dart';
import 'package:reboot_launcher/src/util/translations.dart'; import 'package:reboot_launcher/src/util/translations.dart';
@@ -38,7 +37,6 @@ class PlayPage extends RebootPage {
} }
class _PlayPageState extends RebootPageState<PlayPage> { class _PlayPageState extends RebootPageState<PlayPage> {
final SettingsController _settingsController = Get.find<SettingsController>();
final GameController _gameController = Get.find<GameController>(); final GameController _gameController = Get.find<GameController>();
final DllController _dllController = Get.find<DllController>(); final DllController _dllController = Get.find<DllController>();

View File

@@ -6,7 +6,6 @@ import 'package:get/get.dart';
import 'package:reboot_common/common.dart'; import 'package:reboot_common/common.dart';
import 'package:reboot_launcher/src/controller/settings_controller.dart'; import 'package:reboot_launcher/src/controller/settings_controller.dart';
import 'package:reboot_launcher/src/messenger/abstract/dialog.dart'; import 'package:reboot_launcher/src/messenger/abstract/dialog.dart';
import 'package:reboot_launcher/src/messenger/implementation/data.dart';
import 'package:reboot_launcher/src/page/abstract/page.dart'; import 'package:reboot_launcher/src/page/abstract/page.dart';
import 'package:reboot_launcher/src/page/abstract/page_type.dart'; import 'package:reboot_launcher/src/page/abstract/page_type.dart';
import 'package:reboot_launcher/src/util/translations.dart'; import 'package:reboot_launcher/src/util/translations.dart';
@@ -42,7 +41,6 @@ class _SettingsPageState extends RebootPageState<SettingsPage> {
List<Widget> get settings => [ List<Widget> get settings => [
_language, _language,
_theme, _theme,
_debugMode,
_installationDirectory, _installationDirectory,
]; ];
@@ -100,29 +98,6 @@ class _SettingsPageState extends RebootPageState<SettingsPage> {
child: Text(translations.settingsUtilsInstallationDirectoryContent), child: Text(translations.settingsUtilsInstallationDirectoryContent),
) )
); );
SettingTile get _debugMode => SettingTile(
icon: Icon(
FluentIcons.developer_board_24_regular
),
title: Text("Debug mode"),
subtitle: Text("Whether the launcher should disable automatic features for troubleshooting"),
contentWidth: null,
content: Row(
children: [
Text(
_settingsController.debug.value ? translations.on : translations.off
),
const SizedBox(
width: 16.0
),
Obx(() => ToggleSwitch(
checked: _settingsController.debug.value,
onChanged: (value) => _settingsController.debug.value = value
))
],
)
);
} }
extension _ThemeModeExtension on ThemeMode { extension _ThemeModeExtension on ThemeMode {

View File

@@ -24,10 +24,13 @@ bool get isWin11 {
return intBuild != null && intBuild > 22000; return intBuild != null && intBuild > 22000;
} }
Future<String?> openFolderPicker(String title) async => Future<String?> openFolderPicker(String title) async {
await FilePicker.platform.getDirectoryPath(dialogTitle: title); FilePicker.platform = FilePickerWindows();
return await FilePicker.platform.getDirectoryPath(dialogTitle: title);
}
Future<String?> openFilePicker(String extension) async { Future<String?> openFilePicker(String extension) async {
FilePicker.platform = FilePickerWindows();
var result = await FilePicker.platform.pickFiles( var result = await FilePicker.platform.pickFiles(
type: FileType.custom, type: FileType.custom,
allowMultiple: false, allowMultiple: false,
@@ -93,7 +96,7 @@ class IVirtualDesktop extends IUnknown {
throw WindowsException(code); throw WindowsException(code);
} }
return convertFromHString(result.value); return _convertFromHString(result.value);
} }
} }
@@ -280,7 +283,7 @@ class _IVirtualDesktopManagerInternal extends IUnknown {
HRESULT Function(Pointer, COMObject, Int8)>>>() HRESULT Function(Pointer, COMObject, Int8)>>>()
.value .value
.asFunction<int Function(Pointer, COMObject, int)>()( .asFunction<int Function(Pointer, COMObject, int)>()(
ptr.ref.lpVtbl, desktop.ptr.ref, convertToHString(newName)); ptr.ref.lpVtbl, desktop.ptr.ref, _convertToHString(newName));
if (code != 0) { if (code != 0) {
throw WindowsException(code); throw WindowsException(code);
} }
@@ -369,7 +372,7 @@ List<int> _getHWnds(int pid, String? excludedWindowName) {
result.ref.excluded = excludedWindowName.toNativeUtf16(); result.ref.excluded = excludedWindowName.toNativeUtf16();
} }
EnumWindows(Pointer.fromFunction<EnumWindowsProc>(_filter, TRUE), result.address); EnumWindows(Pointer.fromFunction<WNDENUMPROC>(_filter, TRUE), result.address);
final length = result.ref.HWndLength; final length = result.ref.HWndLength;
final HWndsPointer = result.ref.HWnd; final HWndsPointer = result.ref.HWnd;
if(HWndsPointer == nullptr) { if(HWndsPointer == nullptr) {
@@ -397,7 +400,7 @@ class VirtualDesktopManager {
} }
final hr = CoInitializeEx( final hr = CoInitializeEx(
nullptr, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE); nullptr, COINIT.COINIT_APARTMENTTHREADED | COINIT.COINIT_DISABLE_OLE1DDE);
if (FAILED(hr)) { if (FAILED(hr)) {
throw WindowsException(hr); throw WindowsException(hr);
} }
@@ -468,3 +471,19 @@ class VirtualDesktopManager {
void setDesktopName(IVirtualDesktop desktop, String newName) => void setDesktopName(IVirtualDesktop desktop, String newName) =>
windowManager.setDesktopName(desktop, newName); windowManager.setDesktopName(desktop, newName);
} }
String _convertFromHString(int hstring) =>
WindowsGetStringRawBuffer(hstring, nullptr).toDartString();
int _convertToHString(String string) {
final hString = calloc<HSTRING>();
final stringPtr = string.toNativeUtf16();
try {
final hr = WindowsCreateString(stringPtr, string.length, hString);
if (FAILED(hr)) throw WindowsException(hr);
return hString.value;
} finally {
free(stringPtr);
free(hString);
}
}

View File

@@ -6,3 +6,14 @@ extension IterableExtension<E> on Iterable<E> {
return null; return null;
} }
} }
extension StringExtension on String {
String? after(String leading) {
final index = indexOf(leading);
if(index == -1) {
return null;
}
return substring(index + leading.length);
}
}

View File

@@ -0,0 +1,63 @@
import 'dart:io';
import 'package:ffi/ffi.dart';
import 'package:win32/win32.dart';
final _hive = HKEY_CURRENT_USER;
void registerUrlProtocol(String scheme, {String? executable, List<String>? arguments}) {
final prefix = _regPrefix(scheme);
final capitalized = scheme[0].toUpperCase() + scheme.substring(1);
final args = _getArguments(arguments).map((a) => _sanitize(a));
final cmd =
'${executable ?? Platform.resolvedExecutable} ${args.join(' ')}';
_regCreateStringKey(_hive, prefix, '', 'URL:$capitalized');
_regCreateStringKey(_hive, prefix, 'URL Protocol', '');
_regCreateStringKey(_hive, prefix + '\\shell\\open\\command', '', cmd);
}
void unregisterUrlProtocol(String scheme) {
final txtKey = TEXT(_regPrefix(scheme));
try {
RegDeleteTree(HKEY_CURRENT_USER, txtKey);
} finally {
free(txtKey);
}
}
String _regPrefix(String scheme) => 'SOFTWARE\\Classes\\$scheme';
int _regCreateStringKey(int hKey, String key, String valueName, String data) {
final txtKey = TEXT(key);
final txtValue = TEXT(valueName);
final txtData = TEXT(data);
try {
return RegSetKeyValue(
hKey,
txtKey,
txtValue,
REG_VALUE_TYPE.REG_SZ,
txtData,
txtData.length * 2 + 2,
);
} finally {
free(txtKey);
free(txtValue);
free(txtData);
}
}
String _sanitize(String value) {
value = value.replaceAll(r'%s', '%1').replaceAll(r'"', '\\"');
return '"$value"';
}
List<String> _getArguments(List<String>? arguments) {
if (arguments == null) return ['%s'];
if (arguments.isEmpty && !arguments.any((e) => e.contains('%s'))) {
throw ArgumentError('arguments must contain at least 1 instance of "%s"');
}
return arguments;
}

View File

@@ -19,10 +19,10 @@ class FileSelector extends StatefulWidget {
required this.controller, required this.controller,
required this.validator, required this.validator,
required this.folder, required this.folder,
required this.allowNavigator,
this.label, this.label,
this.extension, this.extension,
this.validatorMode, this.validatorMode,
this.allowNavigator = true,
Key? key}) Key? key})
: assert(folder || extension != null, "Missing extension for file selector"), : assert(folder || extension != null, "Missing extension for file selector"),
super(key: key); super(key: key);

View File

@@ -1,21 +1,29 @@
import 'dart:io'; import 'dart:io';
import 'package:fluent_ui/fluent_ui.dart' as fluentIcons show FluentIcons;
import 'package:fluent_ui/fluent_ui.dart' hide FluentIcons; import 'package:fluent_ui/fluent_ui.dart' hide FluentIcons;
import 'package:fluentui_system_icons/fluentui_system_icons.dart'; import 'package:fluentui_system_icons/fluentui_system_icons.dart';
import 'package:flutter/foundation.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:reboot_launcher/src/util/os.dart';
import 'package:reboot_launcher/src/util/translations.dart'; import 'package:reboot_launcher/src/util/translations.dart';
import 'package:reboot_launcher/src/widget/file_selector.dart'; import 'package:reboot_launcher/src/widget/file_selector.dart';
import 'package:reboot_launcher/src/widget/setting_tile.dart'; import 'package:reboot_launcher/src/widget/setting_tile.dart';
const double _kButtonDimensions = 30;
const double _kButtonSpacing = 8;
SettingTile createFileSetting({required String title, required String description, required TextEditingController controller, required void Function() onReset}) { SettingTile createFileSetting({required String title, required String description, required TextEditingController controller, required void Function() onReset}) {
final obx = RxString(controller.text); final obx = RxString(controller.text);
controller.addListener(() => obx.value = controller.text); controller.addListener(() => obx.value = controller.text);
final selecting = RxBool(false);
return SettingTile( return SettingTile(
icon: Icon( icon: Icon(
FluentIcons.document_24_regular FluentIcons.document_24_regular
), ),
title: Text(title), title: Text(title),
subtitle: Text(description), subtitle: Text(description),
contentWidth: SettingTile.kDefaultContentWidth + _kButtonDimensions,
content: Row( content: Row(
children: [ children: [
Expanded( Expanded(
@@ -26,30 +34,72 @@ SettingTile createFileSetting({required String title, required String descriptio
validator: _checkDll, validator: _checkDll,
extension: "dll", extension: "dll",
folder: false, folder: false,
validatorMode: AutovalidateMode.always validatorMode: AutovalidateMode.always,
allowNavigator: false,
), ),
), ),
const SizedBox(width: 8.0), const SizedBox(width: _kButtonSpacing),
Obx(() => Padding( Obx(() => Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
bottom: _checkDll(obx.value) == null ? 0.0 : 20.0 bottom: _checkDll(obx.value) == null ? 0.0 : 20.0
), ),
child: Tooltip(
message: translations.selectFile,
child: Button( child: Button(
style: ButtonStyle( style: ButtonStyle(
padding: ButtonState.all(EdgeInsets.zero) padding: WidgetStateProperty.all(EdgeInsets.zero)
),
onPressed: () => _onPressed(selecting, controller),
child: SizedBox.square(
dimension: _kButtonDimensions,
child: Icon(
fluentIcons.FluentIcons.open_folder_horizontal
),
)
),
),
)),
const SizedBox(width: _kButtonSpacing),
Obx(() => Padding(
padding: EdgeInsets.only(
bottom: _checkDll(obx.value) == null ? 0.0 : 20.0
),
child: Tooltip(
message: translations.reset,
child: Button(
style: ButtonStyle(
padding: WidgetStateProperty.all(EdgeInsets.zero)
), ),
onPressed: onReset, onPressed: onReset,
child: SizedBox.square( child: SizedBox.square(
dimension: 30, dimension: _kButtonDimensions,
child: Icon( child: Icon(
FluentIcons.arrow_reset_24_regular FluentIcons.arrow_reset_24_regular
), ),
) )
), ),
),
)) ))
], ],
) )
); );
}
void _onPressed(RxBool selecting, TextEditingController controller) {
if(selecting.value){
return;
}
selecting.value = true;
compute(openFilePicker, "dll")
.then((value) => _updateText(controller, value))
.then((_) => selecting.value = false);
}
void _updateText(TextEditingController controller, String? value) {
final text = value ?? controller.text;
controller.text = text;
controller.selection = TextSelection.collapsed(offset: text.length);
} }
String? _checkDll(String? text) { String? _checkDll(String? text) {

View File

@@ -121,7 +121,7 @@ class _LaunchButtonState extends State<LaunchButton> {
return; return;
} }
log("[${host ? 'HOST' : 'GAME'}] Backend works"); log("[${host ? 'HOST' : 'GAME'}] Backend works");
final serverType = _settingsController.debug.value ? GameServerType.window : _hostingController.type.value; final serverType = _hostingController.type.value;
log("[${host ? 'HOST' : 'GAME'}] Implicit game server metadata: headless($serverType)"); log("[${host ? 'HOST' : 'GAME'}] Implicit game server metadata: headless($serverType)");
final linkedHostingInstance = await _startMatchMakingServer(version, host, serverType, false); final linkedHostingInstance = await _startMatchMakingServer(version, host, serverType, false);
log("[${host ? 'HOST' : 'GAME'}] Implicit game server result: $linkedHostingInstance"); log("[${host ? 'HOST' : 'GAME'}] Implicit game server result: $linkedHostingInstance");
@@ -159,11 +159,6 @@ class _LaunchButtonState extends State<LaunchButton> {
return null; return null;
} }
if(_settingsController.debug.value) {
log("[${host ? 'HOST' : 'GAME'}] The user is on debug mode, not asking for auto server");
return null;
}
if(!forceLinkedHosting && _backendController.type.value == ServerType.embedded && !isLocalHost(_backendController.gameServerAddress.text)) { if(!forceLinkedHosting && _backendController.type.value == ServerType.embedded && !isLocalHost(_backendController.gameServerAddress.text)) {
log("[${host ? 'HOST' : 'GAME'}] Backend is not set to embedded and/or not pointing to the local game server"); log("[${host ? 'HOST' : 'GAME'}] Backend is not set to embedded and/or not pointing to the local game server");
return null; return null;
@@ -248,7 +243,7 @@ class _LaunchButtonState extends State<LaunchButton> {
}else{ }else{
_gameController.instance.value = instance; _gameController.instance.value = instance;
} }
await _injectOrShowError(InjectableDll.cobalt, host); await _injectOrShowError(InjectableDll.sinum, host);
log("[${host ? 'HOST' : 'GAME'}] Finished creating game instance"); log("[${host ? 'HOST' : 'GAME'}] Finished creating game instance");
return instance; return instance;
} }
@@ -280,13 +275,7 @@ class _LaunchButtonState extends State<LaunchButton> {
line: line, line: line,
host: host, host: host,
onShutdown: () => _onStop(reason: _StopReason.normal), onShutdown: () => _onStop(reason: _StopReason.normal),
onTokenError: () { onTokenError: () => _onStop(reason: _StopReason.tokenError),
if(_settingsController.debug.value) {
log("[PROCESS] Ignoring token error because debug mode is on");
}else {
_onStop(reason: _StopReason.tokenError);
}
},
onBuildCorrupted: () { onBuildCorrupted: () {
if(instance == null) { if(instance == null) {
return; return;
@@ -687,10 +676,6 @@ class _LaunchButtonState extends State<LaunchButton> {
} }
log("[${hosting ? 'HOST' : 'GAME'}] Trying to inject ${injectable.name}..."); log("[${hosting ? 'HOST' : 'GAME'}] Trying to inject ${injectable.name}...");
if(_settingsController.debug.value) {
return;
}
await injectDll(gameProcess, dllPath); await injectDll(gameProcess, dllPath);
instance.injectedDlls.add(injectable); instance.injectedDlls.add(injectable);
log("[${hosting ? 'HOST' : 'GAME'}] Injected ${injectable.name}"); log("[${hosting ? 'HOST' : 'GAME'}] Injected ${injectable.name}");
@@ -742,7 +727,7 @@ class _LaunchButtonState extends State<LaunchButton> {
loading: true, loading: true,
duration: null, duration: null,
action: Obx(() { action: Obx(() {
if(_settingsController.debug.value || _hostingController.started.value || linkedHosting) { if(_hostingController.started.value || linkedHosting) {
return const SizedBox.shrink(); return const SizedBox.shrink();
} }

View File

@@ -24,7 +24,9 @@ class InfoBarAreaState extends State<InfoBarArea> {
} }
@override @override
Widget build(BuildContext context) => Obx(() => Padding( Widget build(BuildContext context) => StreamBuilder(
stream: pagesController.stream,
builder: (context, _) => Obx(() => Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
bottom: hasPageButton ? 72.0 : 16.0 bottom: hasPageButton ? 72.0 : 16.0
), ),
@@ -38,5 +40,6 @@ class InfoBarAreaState extends State<InfoBarArea> {
child: child child: child
)).toList(growable: false) )).toList(growable: false)
), ),
)); ))
);
} }

View File

@@ -15,11 +15,11 @@ import 'package:url_launcher/url_launcher.dart';
class VersionSelector extends StatefulWidget { class VersionSelector extends StatefulWidget {
const VersionSelector({Key? key}) : super(key: key); const VersionSelector({Key? key}) : super(key: key);
static Future<void> openDownloadDialog({bool closable = true}) => showRebootDialog<bool>( static Future<void> openDownloadDialog() => showRebootDialog<bool>(
builder: (context) => AddVersionDialog( builder: (context) => AddVersionDialog(
closable: closable, closable: true,
), ),
dismissWithEsc: closable dismissWithEsc: true
); );
@override @override

View File

@@ -1,6 +1,6 @@
name: reboot_launcher name: reboot_launcher
description: Graphical User Interface for Project Reboot description: Graphical User Interface for Project Reboot
version: "9.2.6" version: "9.2.7"
publish_to: 'none' publish_to: 'none'
@@ -17,53 +17,50 @@ dependencies:
path: ./../common path: ./../common
# Windows UI 3 # Windows UI 3
fluent_ui: ^4.8.7 fluent_ui: ^4.9.1
flutter_acrylic: flutter_acrylic:
path: ./dependencies/flutter_acrylic path: ./dependencies/flutter_acrylic
fluentui_system_icons: ^1.1.238 fluentui_system_icons: ^1.1.258
system_theme: ^2.0.0 system_theme: ^3.1.1
skeletons: skeletons:
git: git:
url: https://github.com/talok/skeletons url: https://github.com/talok/skeletons
ref: main ref: main
# Window management # Window management
bitsdojo_window: ^0.1.5 bitsdojo_window: ^0.1.6
window_manager: ^0.3.8 window_manager: ^0.4.2
# Extract zip archives (for example the reboot.zip) # Extract zip archives (for example the reboot.zip)
archive: ^3.3.1 archive: ^3.6.1
# Cryptographic functions # Cryptographic functions
crypto: ^3.0.2
bcrypt: ^1.1.3 bcrypt: ^1.1.3
pointycastle: ^3.7.3 pointycastle: ^3.9.1
# Async helpers # Async helpers
async: ^2.8.2 async: ^2.11.0
sync: ^0.3.0 sync: ^0.3.0
# State management # State management
get: ^4.6.5 get: ^4.6.6
# Native utilities # Native utilities
clipboard: ^0.1.3 clipboard: ^0.1.3
app_links: ^6.0.2 app_links: ^6.3.2
url_protocol: ^1.0.0
windows_taskbar: ^1.1.2 windows_taskbar: ^1.1.2
file_picker: ^8.0.3 file_picker: ^8.1.2
url_launcher: ^6.1.5 url_launcher: ^6.3.0
local_notifier: ^0.1.6 local_notifier: ^0.1.6
# Server browser # Server browser
supabase_flutter: ^2.5.2 supabase_flutter: ^2.7.0
uuid: ^3.0.6
dart_ipify: ^1.1.1 dart_ipify: ^1.1.1
# Storage # Storage
get_storage: ^2.0.3 get_storage: ^2.1.1
universal_disk_space: ^0.2.3 universal_disk_space: ^0.2.3
path: ^1.8.3 path: ^1.9.0
# Translations # Translations
intl: any intl: any
@@ -71,23 +68,17 @@ dependencies:
# Auto updater # Auto updater
yaml: ^3.1.2 yaml: ^3.1.2
package_info_plus: ^8.0.0 package_info_plus: ^8.0.2
version: ^3.0.2 version: ^3.0.2
# Validate profile # Validate profile
email_validator: ^3.0.0 email_validator: ^3.0.0
dependency_overrides:
xml: ^6.3.0
http: ^0.13.5
win32: ^3.0.0
ffi: ^2.0.0
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
sdk: flutter sdk: flutter
flutter_lints: ^4.0.0 flutter_lints: ^5.0.0
flutter: flutter:
uses-material-design: true uses-material-design: true

13
redirect/Core/Constants.h Normal file
View File

@@ -0,0 +1,13 @@
// Copyright (c) 2024 Project Nova LLC
#pragma once
namespace Constants
{
constexpr auto API_URL = L"http://localhost:3551";
constexpr auto ProcessRequest = L"Could not set libcurl options for easy handle, processing HTTP request failed. Increase verbosity for additional information.";
constexpr auto ProcessRequest_C2 = L"STAT_FCurlHttpRequest_ProcessRequest";
constexpr auto URLOffset = L"ProcessRequest failed. URL '%s' is not a valid HTTP request. %p";
constexpr auto Realloc = L"AbilitySystem.Debug.NextTarget";
}

11
redirect/Core/Core.cpp Normal file
View File

@@ -0,0 +1,11 @@
// Copyright (c) 2024 Project Nova LLC
#include "Core.h"
void Core::Init()
{
FMemory::_Realloc = Memcury::Scanner::FindStringRef(Constants::Realloc)
.ScanFor({ Memcury::ASM::MNEMONIC::CALL })
.RelativeOffset(1)
.GetAs<decltype(FMemory::_Realloc)>();
}

16
redirect/Core/Core.h Normal file
View File

@@ -0,0 +1,16 @@
// Copyright (c) 2024 Project Nova LLC
#pragma once
#include "..\Utilities\memcury.h"
#include "Constants.h"
#include "Unreal\Memory.h"
#include "Unreal\Array.h"
#include "Unreal\String.h"
namespace Core
{
void Init();
}

View File

@@ -0,0 +1,143 @@
// Copyright (c) 2024 Project Nova LLC
#pragma once
#include <functional>
#include "Memory.h"
template <typename T>
class TArray
{
friend class FString;
T* Data;
int32_t NumElements;
int32_t MaxElements;
public:
inline TArray()
{
Data = nullptr;
NumElements = 0;
MaxElements = 0;
};
inline void Free()
{
FMemory::Free(Data);
Data = nullptr;
NumElements = 0;
MaxElements = 0;
}
inline void Reset()
{
Free();
}
inline auto GetData()
{
return Data;
}
inline int GetCount() const
{
return NumElements;
}
inline int Num() const
{
return NumElements;
}
inline auto& Get(const int Index)
{
return Data[Index];
}
inline auto& First()
{
return Get(0);
}
inline auto GetRef(const int Index, int Size = sizeof(T))
{
return (T*)((uint8_t*)Data + (Index * Size));
}
inline T& operator[](int i)
{
return Get(i);
};
inline const T& operator[](int i) const
{
return Get(i);
};
inline bool Remove(const int Index, int Size = sizeof(T))
{
if (Index < NumElements)
{
if (Index != NumElements - 1)
Get(Index) = Get(NumElements - 1);
--NumElements;
return true;
}
return false;
};
inline bool Any(std::function<bool(T)> Func)
{
for (int i = 0; i < NumElements; ++i)
{
if (Func(Get(i)))
return true;
}
return false;
}
inline T Select(std::function<bool(T)> Func)
{
for (int i = 0; i < NumElements; ++i)
{
if (Func(Get(i)))
return Get(i);
}
return NULL;
}
inline void ForEach(std::function<void(T)> Func)
{
for (int i = 0; i < NumElements; ++i)
{
Func(Get(i));
}
}
inline int Count(std::function<bool(T)> Func)
{
int Num = 0;
for (int i = 0; i < NumElements; ++i)
{
if (Func(Get(i)))
Num++;
}
return Num;
}
inline int Find(const T& Item)
{
for (int i = 0; i < NumElements; i++)
{
if (this->operator[](i) == Item)
return i;
}
return -1;
}
};

View File

@@ -0,0 +1,92 @@
// Copyright (c) 2024 Project Nova LLC
#pragma once
#include <Windows.h>
#include <cstdint>
class FMemory
{
public:
static inline void* (*_Realloc)(void*, size_t, int64_t);
static void Free(void* Data)
{
_Realloc(Data, 0, 0);
}
static void* Malloc(size_t Size)
{
return _Realloc(0, Size, 0);
}
static void* Realloc(void* Data, size_t NewSize)
{
return _Realloc(Data, NewSize, 0);
}
static void* Memmove(void* Dest, const void* Src, size_t Count)
{
return memmove(Dest, Src, Count);
}
static int Memcmp(const void* Buf1, const void* Buf2, size_t Count)
{
return memcmp(Buf1, Buf2, Count);
}
static void* Memset(void* Dest, uint8_t Char, size_t Count)
{
return memset(Dest, Char, Count);
}
template< class T >
static void Memset(T& Src, uint8_t ValueToSet)
{
Memset(&Src, ValueToSet, sizeof(T));
}
static void* Memzero(void* Dest, size_t Count)
{
return ZeroMemory(Dest, Count);
}
template <class T>
static void Memzero(T& Src)
{
Memzero(&Src, sizeof(T));
}
static void* Memcpy(void* Dest, const void* Src, size_t Count)
{
return memcpy(Dest, Src, Count);
}
template <class T>
static void Memcpy(T& Dest, const T& Src)
{
Memcpy(&Dest, &Src, sizeof(T));
}
static void* Calloc(size_t NumElements, size_t ElementSize)
{
auto TotalSize = NumElements * ElementSize;
auto Data = FMemory::Malloc(TotalSize);
if (!Data)
return NULL;
FMemory::Memzero(Data, TotalSize);
return Data;
}
static char* Strdup(const char* Str)
{
auto StrLen = strlen(Str) + 1;
auto StrDup = (char*)FMemory::Malloc(StrLen);
FMemory::Memcpy(StrDup, Str, StrLen);
return StrDup;
}
};

View File

@@ -0,0 +1,54 @@
// Copyright (c) 2024 Project Nova LLC
#pragma once
#include "Array.h"
#include "Memory.h"
class FString : private TArray<wchar_t>
{
public:
inline FString()
{
Data = nullptr;
NumElements = 0;
MaxElements = 0;
}
inline FString(const char* Other)
{
if (Other)
{
auto NumCharacters = (int)std::strlen(Other);
MaxElements = NumElements = NumCharacters + 1;
Data = static_cast<wchar_t*>(FMemory::Malloc(NumElements * sizeof(wchar_t)));
size_t ConvertedChars = 0;
mbstowcs_s(&ConvertedChars, Data, NumElements, Other, _TRUNCATE);
}
else
{
MaxElements = NumElements = 0;
Data = nullptr;
}
};
inline FString(const wchar_t* Other)
{
MaxElements = NumElements = *Other ? (int)std::wcslen(Other) + 1 : 0;
if (NumElements && Other)
{
Data = static_cast<wchar_t*>(FMemory::Malloc(NumElements * 2));
memcpy_s(Data, NumElements * 2, Other, NumElements * 2);
}
};
inline auto c_str()
{
return Data;
}
};

21
redirect/Main.cpp Normal file
View File

@@ -0,0 +1,21 @@
// Copyright (c) 2024 Project Nova LLC
#include "framework.h"
static void Main()
{
Sleep(7500);
Core::Init();
Sinum::Init();
}
bool DllMain(HMODULE hModule, DWORD dwReason, void* lpReserved)
{
if (dwReason == DLL_PROCESS_ATTACH)
{
Windows::Thread::Create(Main);
}
return true;
}

5
redirect/README.md Normal file
View File

@@ -0,0 +1,5 @@
# Sinum Windows
https://github.com/projectnovafn/Sinum/tree/main/Windows
Modified to point to http://localhost:3551

22
redirect/Sinum.sln Normal file
View File

@@ -0,0 +1,22 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.7.34031.279
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sinum", "Sinum.vcxproj", "{E7291B57-1B5B-497C-9C2E-C78A556A06CF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E7291B57-1B5B-497C-9C2E-C78A556A06CF}.Release|x64.ActiveCfg = Release|x64
{E7291B57-1B5B-497C-9C2E-C78A556A06CF}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {7975A2E1-0078-4AF8-AB10-0A71112857A5}
EndGlobalSection
EndGlobal

162
redirect/Sinum.vcxproj Normal file
View File

@@ -0,0 +1,162 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>17.0</VCProjectVersion>
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{e7291b57-1b5b-497c-9c2e-c78a556a06cf}</ProjectGuid>
<RootNamespace>Sinum</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;SINUM_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;SINUM_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<LanguageStandard>stdcpplatest</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;SINUM_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;SINUM_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<LanguageStandard>stdcpplatest</LanguageStandard>
<Optimization>MaxSpeed</Optimization>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="Core\Constants.h" />
<ClInclude Include="Core\Unreal\Array.h" />
<ClInclude Include="Core\Core.h" />
<ClInclude Include="Core\Unreal\Memory.h" />
<ClInclude Include="Core\Unreal\String.h" />
<ClInclude Include="framework.h" />
<ClInclude Include="Sinum\Sinum.h" />
<ClInclude Include="Utilities\memcury.h" />
<ClInclude Include="Utilities\Windows.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="Core\Core.cpp" />
<ClCompile Include="Main.cpp" />
<ClCompile Include="Sinum\Sinum.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
</Project>

View File

@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="framework.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Utilities\Windows.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Core\Unreal\Array.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Core\Constants.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Core\Unreal\String.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Core\Unreal\Memory.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Core\Core.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Sinum\Sinum.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Utilities\memcury.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Sinum\Sinum.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Core\Core.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>

View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
</Project>

40
redirect/Sinum/Sinum.cpp Normal file
View File

@@ -0,0 +1,40 @@
// Copyright (c) 2024 Project Nova LLC
#include "Sinum.h"
bool Sinum::ProcessRequestHook(FCurlHttpRequest* Request)
{
std::wstring URL(Request->GetURL().c_str());
size_t PathIndex = URL.find(L"ol.epicgames.com");
if (PathIndex != std::wstring::npos)
{
auto Path = URL.substr(PathIndex + 16);
auto NewURL = Constants::API_URL + Path;
Request->SetURL(NewURL.c_str());
}
return _ProcessRequest(Request);
}
void Sinum::Init()
{
auto StringRef = Memcury::Scanner::FindStringRef(Constants::ProcessRequest);
if (StringRef.IsValid())
{
_ProcessRequest = StringRef
.ScanFor({ 0x48, 0x81, 0xEC }, false)
.ScanFor({ 0x40 }, false)
.GetAs<decltype(_ProcessRequest)>();
}
else
{
_ProcessRequest = Memcury::Scanner::FindStringRef(Constants::ProcessRequest_C2)
.ScanFor({ 0x4C, 0x8B, 0xDC }, false)
.GetAs<decltype(_ProcessRequest)>();
}
*Memcury::Scanner::FindPointerRef(_ProcessRequest)
.GetAs<void**>() = ProcessRequestHook;
}

31
redirect/Sinum/Sinum.h Normal file
View File

@@ -0,0 +1,31 @@
// Copyright (c) 2024 Project Nova LLC
#pragma once
#include "../framework.h"
class FCurlHttpRequest
{
private:
void** VTable;
public:
FString GetURL()
{
FString Result;
return ((FString& (*)(FCurlHttpRequest*, FString&))(*VTable))(this, Result);
}
void SetURL(FString URL)
{
((void (*)(FCurlHttpRequest*, FString&))(VTable[10]))(this, URL);
}
};
namespace Sinum
{
static bool (*_ProcessRequest)(FCurlHttpRequest*);
static bool ProcessRequestHook(FCurlHttpRequest* Request);
void Init();
}

View File

@@ -0,0 +1,15 @@
// Copyright (c) 2024 Project Nova LLC
#pragma once
#include "../framework.h"
namespace Windows
{
namespace Thread
{
static HANDLE Create(void* Routine, void* Param = NULL)
{
return CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)Routine, Param, 0, NULL);
}
}
}

1210
redirect/Utilities/memcury.h Normal file

File diff suppressed because it is too large Load Diff

10
redirect/framework.h Normal file
View File

@@ -0,0 +1,10 @@
// Copyright (c) 2024 Project Nova LLC
#pragma once
#include <Windows.h>
#include "Utilities\memcury.h"
#include "Utilities\Windows.h"
#include "Core\Core.h"
#include "Sinum\Sinum.h"