SPAWNRYS/bloxstrap
1
0
Fork 0
mirror of https://github.com/bloxstraplabs/bloxstrap.git synced 2025-04-18 16:41:36 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve Roblox launch detection

Browse Source
This commit is contained in:
pizzaboxer 2024-10-24 23:34:51 +01:00
parent d9a84f4cf9
commit 6dc8e286ce
No known key found for this signature in database
GPG Key ID: 59D4A1DBAD0F2BA8
4 changed files with 55 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bloxstrap/AppData/IAppData.cs
View File

@ -10,8 +10,6 @@
string ExecutableName { get; } string ExecutableName { get; }
string StartEvent { get; }
string Directory { get; } string Directory { get; }
string LockFilePath { get; } string LockFilePath { get; }

2
Bloxstrap/AppData/RobloxPlayerData.cs
View File

@ -16,8 +16,6 @@ namespace Bloxstrap.AppData
public override string ExecutableName => "RobloxPlayerBeta.exe"; public override string ExecutableName => "RobloxPlayerBeta.exe";
public string StartEvent => "www.roblox.com/robloxStartedEvent";
public override string Directory => Path.Combine(Paths.Roblox, "Player"); public override string Directory => Path.Combine(Paths.Roblox, "Player");
public AppState State => App.State.Prop.Player; public AppState State => App.State.Prop.Player;

2
Bloxstrap/AppData/RobloxStudioData.cs
View File

@ -10,8 +10,6 @@
public override string ExecutableName => "RobloxStudioBeta.exe"; public override string ExecutableName => "RobloxStudioBeta.exe";
public string StartEvent => "www.roblox.com/robloxStudioStartedEvent";
public override string Directory => Path.Combine(Paths.Roblox, "Studio"); public override string Directory => Path.Combine(Paths.Roblox, "Studio");
public AppState State => App.State.Prop.Studio; public AppState State => App.State.Prop.Studio;

122
Bloxstrap/Bootstrapper.cs
View File

@ -319,20 +319,15 @@ namespace Bloxstrap
SetStatus(Strings.Bootstrapper_Status_Starting); SetStatus(Strings.Bootstrapper_Status_Starting);
if (_launchMode == LaunchMode.Player) if (_launchMode == LaunchMode.Player && App.Settings.Prop.ForceRobloxLanguage)
{ {
if (App.Settings.Prop.ForceRobloxLanguage) var match = Regex.Match(_launchCommandLine, "gameLocale:([a-z_]+)", RegexOptions.CultureInvariant);
{
var match = Regex.Match(_launchCommandLine, "gameLocale:([a-z_]+)", RegexOptions.CultureInvariant);
if (match.Groups.Count == 2) if (match.Groups.Count == 2)
_launchCommandLine = _launchCommandLine.Replace("robloxLocale:en_us", $"robloxLocale:{match.Groups[1].Value}", StringComparison.InvariantCultureIgnoreCase); _launchCommandLine = _launchCommandLine.Replace(
} "robloxLocale:en_us",
$"robloxLocale:{match.Groups[1].Value}",
if (!String.IsNullOrEmpty(_launchCommandLine)) StringComparison.OrdinalIgnoreCase);
_launchCommandLine += " ";
_launchCommandLine += "-isInstallerLaunch";
} }
var startInfo = new ProcessStartInfo() var startInfo = new ProcessStartInfo()
@ -350,66 +345,56 @@ namespace Bloxstrap
string? logFileName = null; string? logFileName = null;
using (var startEvent = new EventWaitHandle(false, EventResetMode.ManualReset, AppData.StartEvent)) string rbxLogDir = Path.Combine(Paths.LocalAppData, "Roblox\\logs");
if (!Directory.Exists(rbxLogDir))
Directory.CreateDirectory(rbxLogDir);
var logWatcher = new FileSystemWatcher()
{ {
startEvent.Reset(); Path = rbxLogDir,
Filter = "*.log",
EnableRaisingEvents = true
};
string rbxLogDir = Path.Combine(Paths.LocalAppData, "Roblox\\logs"); var logCreatedEvent = new AutoResetEvent(false);
if (!Directory.Exists(rbxLogDir)) logWatcher.Created += (_, e) =>
Directory.CreateDirectory(rbxLogDir); {
logWatcher.EnableRaisingEvents = false;
logFileName = e.FullPath;
logCreatedEvent.Set();
};
var logWatcher = new FileSystemWatcher() // v2.2.0 - byfron will trip if we keep a process handle open for over a minute, so we're doing this now
{ try
Path = rbxLogDir, {
Filter = "*.log", using var process = Process.Start(startInfo)!;
EnableRaisingEvents = true _appPid = process.Id;
};
var logCreatedEvent = new AutoResetEvent(false);
logWatcher.Created += (_, e) =>
{
logWatcher.EnableRaisingEvents = false;
logFileName = e.FullPath;
logCreatedEvent.Set();
};
// v2.2.0 - byfron will trip if we keep a process handle open for over a minute, so we're doing this now
try
{
using var process = Process.Start(startInfo)!;
_appPid = process.Id;
}
catch (Exception)
{
// attempt a reinstall on next launch
File.Delete(AppData.ExecutablePath);
throw;
}
App.Logger.WriteLine(LOG_IDENT, $"Started Roblox (PID {_appPid}), waiting for start event");
if (startEvent.WaitOne(TimeSpan.FromSeconds(5)))
App.Logger.WriteLine(LOG_IDENT, "Start event signalled");
else
App.Logger.WriteLine(LOG_IDENT, "Start event not signalled, implying successful launch");
logCreatedEvent.WaitOne(TimeSpan.FromSeconds(5));
if (String.IsNullOrEmpty(logFileName))
{
App.Logger.WriteLine(LOG_IDENT, "Unable to identify log file");
Frontend.ShowPlayerErrorDialog();
return;
}
else
{
App.Logger.WriteLine(LOG_IDENT, $"Got log file as {logFileName}");
}
_mutex?.ReleaseAsync();
} }
catch (Exception)
{
// attempt a reinstall on next launch
File.Delete(AppData.ExecutablePath);
throw;
}
App.Logger.WriteLine(LOG_IDENT, $"Started Roblox (PID {_appPid}), waiting for log file");
logCreatedEvent.WaitOne(TimeSpan.FromSeconds(15));
if (String.IsNullOrEmpty(logFileName))
{
App.Logger.WriteLine(LOG_IDENT, "Unable to identify log file");
Frontend.ShowPlayerErrorDialog();
return;
}
else
{
App.Logger.WriteLine(LOG_IDENT, $"Got log file as {logFileName}");
}
_mutex?.ReleaseAsync();
if (IsStudioLaunch) if (IsStudioLaunch)
return; return;
@ -466,6 +451,9 @@ namespace Bloxstrap
if (ipl.IsAcquired) if (ipl.IsAcquired)
Process.Start(Paths.Process, args); Process.Start(Paths.Process, args);
} }
// average grace time between log being created and the window being shown
Thread.Sleep(2000);
} }
public void Cancel() public void Cancel()