Merge branch 'main' of https://github.com/pizzaboxer/bloxstrap into wip

Author: bdidk235

Bloxstrap/App.xaml.cs

@@ -65,6 +65,20 @@ public partial class App : Application
         );
 
         private static bool _showingExceptionDialog = false;
+
+        private static string? _webUrl = null;
+        public static string WebUrl
+        {
+            get {
+                if (_webUrl != null)
+                    return _webUrl;
+
+                string url = ConstructBloxstrapWebUrl();
+                if (Settings.Loaded) // only cache if settings are done loading
+                    _webUrl = url;
+                return url;
+            }
+        }
 
         public static void Terminate(ErrorCode exitCode = ErrorCode.ERROR_SUCCESS)
         {
@@ -126,6 +140,25 @@ public static void FinalizeExceptionHandling(Exception ex, bool log = true)
             Terminate(ErrorCode.ERROR_INSTALL_FAILURE);
         }
 
+        public static string ConstructBloxstrapWebUrl()
+        {
+            // dont let user switch web environment if debug mode is not on
+            if (Settings.Prop.WebEnvironment == WebEnvironment.Production || !Settings.Prop.DeveloperMode)
+                return "bloxstraplabs.com";
+
+            string? sub = Settings.Prop.WebEnvironment.GetDescription();
+            return $"web-{sub}.bloxstraplabs.com";
+        }
+
+        public static bool CanSendLogs()
+        {
+            // non developer mode always uses production
+            if (!Settings.Prop.DeveloperMode || Settings.Prop.WebEnvironment == WebEnvironment.Production)
+                return IsProductionBuild;
+
+            return true;
+        }
+
         public static async Task<GithubRelease?> GetLatestRelease()
         {
             const string LOG_IDENT = "App::GetLatestRelease";
@@ -157,7 +190,7 @@ public static async void SendStat(string key, string value)
 
             try
             {
-                await HttpClient.GetAsync($"https://bloxstraplabs.com/metrics/post?key={key}&value={value}");
+                await HttpClient.GetAsync($"https://{WebUrl}/metrics/post?key={key}&value={value}");
             }
             catch (Exception ex)
             {
@@ -167,13 +200,13 @@ public static async void SendStat(string key, string value)
 
         public static async void SendLog()
         {
-            if (!Settings.Prop.EnableAnalytics || !IsProductionBuild)
+            if (!Settings.Prop.EnableAnalytics || !CanSendLogs())
                 return;
 
             try
             {
                 await HttpClient.PostAsync(
-                    $"https://bloxstraplabs.com/metrics/post-exception", 
+                    $"https://{WebUrl}/metrics/post-exception", 
                     new StringContent(Logger.AsDocument)
                 );
             }
@@ -347,6 +380,9 @@ protected override void OnStartup(StartupEventArgs e)
                     Settings.Save();
                 }
 
+                Logger.WriteLine(LOG_IDENT, $"Developer mode: {Settings.Prop.DeveloperMode}");
+                Logger.WriteLine(LOG_IDENT, $"Web environment: {Settings.Prop.WebEnvironment}");
+
                 Locale.Set(Settings.Prop.Locale);
 
                 if (!LaunchSettings.BypassUpdateCheck)

Bloxstrap/Bootstrapper.cs

@@ -313,11 +313,14 @@ public async Task Run()
 
             if (!App.LaunchSettings.NoLaunchFlag.Active && !_cancelTokenSource.IsCancellationRequested)
             {
-                // show some balloon tips
-                if (!_packageExtractionSuccess)
-                    Frontend.ShowBalloonTip(Strings.Bootstrapper_ExtractionFailed_Title, Strings.Bootstrapper_ExtractionFailed_Message, ToolTipIcon.Warning);
-                else if (!allModificationsApplied)
-                    Frontend.ShowBalloonTip(Strings.Bootstrapper_ModificationsFailed_Title, Strings.Bootstrapper_ModificationsFailed_Message, ToolTipIcon.Warning);
+                if (!App.LaunchSettings.QuietFlag.Active)
+                {
+                    // show some balloon tips
+                    if (!_packageExtractionSuccess)
+                        Frontend.ShowBalloonTip(Strings.Bootstrapper_ExtractionFailed_Title, Strings.Bootstrapper_ExtractionFailed_Message, ToolTipIcon.Warning);
+                    else if (!allModificationsApplied)
+                        Frontend.ShowBalloonTip(Strings.Bootstrapper_ModificationsFailed_Title, Strings.Bootstrapper_ModificationsFailed_Message, ToolTipIcon.Warning);
+                }
 
                 StartRoblox();
             }
@@ -490,21 +493,48 @@ private bool IsEligibleForBackgroundUpdate()
             }
         }
 
+        private static void LaunchMultiInstanceWatcher()
+        {
+            const string LOG_IDENT = "Bootstrapper::LaunchMultiInstanceWatcher";
+
+            if (Utilities.DoesMutexExist("ROBLOX_singletonMutex"))
+            {
+                App.Logger.WriteLine(LOG_IDENT, "Roblox singleton mutex already exists");
+                return;
+            }
+
+            using EventWaitHandle initEventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, "Bloxstrap-MultiInstanceWatcherInitialisationFinished");
+            Process.Start(Paths.Process, "-multiinstancewatcher");
+
+            bool initSuccess = initEventHandle.WaitOne(TimeSpan.FromSeconds(2));
+            if (initSuccess)
+                App.Logger.WriteLine(LOG_IDENT, "Initialisation finished signalled, continuing.");
+            else
+                App.Logger.WriteLine(LOG_IDENT, "Did not receive the initialisation finished signal, continuing.");
+        }
+
         private void StartRoblox()
         {
             const string LOG_IDENT = "Bootstrapper::StartRoblox";
 
             SetStatus(Strings.Bootstrapper_Status_Starting);
 
-            if (_launchMode == LaunchMode.Player && App.Settings.Prop.ForceRobloxLanguage)
+            if (_launchMode == LaunchMode.Player)
             {
-                var match = Regex.Match(_launchCommandLine, "gameLocale:([a-z_]+)", RegexOptions.CultureInvariant);
+                // this needs to be done before roblox launches
+                if (App.Settings.Prop.MultiInstanceLaunching)
+                    LaunchMultiInstanceWatcher();
+
+                if (App.Settings.Prop.ForceRobloxLanguage)
+                {
+                    var match = Regex.Match(_launchCommandLine, "gameLocale:([a-z_]+)", RegexOptions.CultureInvariant);
 
-                if (match.Groups.Count == 2)
-                    _launchCommandLine = _launchCommandLine.Replace(
-                        "robloxLocale:en_us", 
-                        $"robloxLocale:{match.Groups[1].Value}", 
-                        StringComparison.OrdinalIgnoreCase);
+                    if (match.Groups.Count == 2)
+                        _launchCommandLine = _launchCommandLine.Replace(
+                            "robloxLocale:en_us",
+                            $"robloxLocale:{match.Groups[1].Value}",
+                            StringComparison.OrdinalIgnoreCase);
+                }
             }
 
             var startInfo = new ProcessStartInfo()
@@ -848,6 +878,12 @@ public static void CleanupVersionsFolder()
                 return;
             }
 
+            if (!Directory.Exists(Paths.Versions))
+            {
+                App.Logger.WriteLine(LOG_IDENT, "Versions directory does not exist, skipping cleanup.");
+                return;
+            }
+
             foreach (string dir in Directory.GetDirectories(Paths.Versions))
             {
                 string dirName = Path.GetFileName(dir);
@@ -866,7 +902,7 @@ public static void CleanupVersionsFolder()
                     {
                         Directory.Delete(dir, true);
                     }
-                    catch (IOException ex)
+                    catch (Exception ex)
                     {
                         App.Logger.WriteLine(LOG_IDENT, $"Failed to delete {dir}");
                         App.Logger.WriteException(LOG_IDENT, ex);
@@ -894,21 +930,19 @@ private void MigrateCompatibilityFlags()
             }
         }
 
-        private void KillRunningRobloxInDirectory(string path)
+        private static void KillRobloxPlayers()
         {
-            const string LOG_IDENT = "Bootstrapper::KillRunningRobloxInDirectory";
+            const string LOG_IDENT = "Bootstrapper::KillRobloxPlayers";
 
             List<Process> processes = new List<Process>();
-            processes.AddRange(Process.GetProcessesByName(IsStudioLaunch ? "RobloxStudioBeta" : "RobloxPlayerBeta"));
-            processes.AddRange(Process.GetProcessesByName("RobloxCrashHandler"));
+            processes.AddRange(Process.GetProcessesByName("RobloxPlayerBeta"));
+            processes.AddRange(Process.GetProcessesByName("RobloxCrashHandler")); // roblox studio doesnt depend on crash handler being open, so this should be fine
 
             foreach (Process process in processes)
             {
                 try
                 {
-                    string? processPath = process.MainModule?.FileName;
-                    if (processPath != null && processPath.StartsWith(path))
-                        process.Kill();
+                    process.Kill();
                 }
                 catch (Exception ex)
                 {
@@ -1130,6 +1164,8 @@ private async Task UpgradeRoblox()
 
             App.Logger.WriteLine(LOG_IDENT, $"Registered as {totalSize} KB");
 
+            App.State.Prop.ForceReinstall = false;
+
             App.State.Save();
             App.RobloxState.Save();
 

Bloxstrap/Enums/WebEnvironment.cs

@@ -0,0 +1,26 @@
+using System.ComponentModel;
+
+namespace Bloxstrap.Enums
+{
+    [JsonConverter(typeof(JsonStringEnumConverter))]
+    public enum WebEnvironment
+    {
+        [Description("prod")]
+        Production,
+
+        [Description("stage")]
+        Staging,
+
+        [Description("dev")]
+        Dev,
+
+        [Description("pizza")]
+        DevPizza,
+
+        [Description("matt")]
+        DevMatt,
+
+        [Description("local")]
+        Local
+    }
+}

Bloxstrap/Extensions/CustomThemeTemplateEx.cs

@@ -1,10 +1,36 @@
-namespace Bloxstrap.Extensions
+using System.Text;
+
+namespace Bloxstrap.Extensions
 {
     static class CustomThemeTemplateEx
     {
+        const string EXAMPLES_URL = "https://github.com/bloxstraplabs/custom-bootstrapper-examples";
+
         public static string GetFileName(this CustomThemeTemplate template)
         {
             return $"CustomBootstrapperTemplate_{template}.xml";
         }
+
+        public static string GetFileContents(this CustomThemeTemplate template)
+        {
+            string contents = Encoding.UTF8.GetString(Resource.Get(template.GetFileName()).Result);
+
+            switch (template)
+            {
+                case CustomThemeTemplate.Blank:
+                    {
+                        string moreText = string.Format(Strings.CustomTheme_Templates_Blank_MoreExamples, EXAMPLES_URL);
+                        return contents.Replace("{0}", Strings.CustomTheme_Templates_Blank_UIElements).Replace("{1}", moreText);
+                    }
+                case CustomThemeTemplate.Simple:
+                    {
+                        string moreText = string.Format(Strings.CustomTheme_Templates_Simple_MoreExamples, EXAMPLES_URL);
+                        return contents.Replace("{0}", moreText);
+                    }
+                default:
+                    Debug.Assert(false);
+                    return contents;
+            }
+        }
     }
 }

Bloxstrap/Extensions/TEnumEx.cs

@@ -0,0 +1,22 @@
+using System.ComponentModel;
+using System.Reflection;
+
+namespace Bloxstrap.Extensions
+{
+    internal static class TEnumEx
+    {
+        public static string? GetDescription<TEnum>(this TEnum e)
+        {
+            string? enumName = e?.ToString();
+            if (enumName == null)
+                return null;
+
+            FieldInfo? field = e?.GetType().GetField(enumName);
+            if (field == null)
+                return null;
+
+            DescriptionAttribute? attribute = field.GetCustomAttribute<DescriptionAttribute>();
+            return attribute?.Description;
+        }
+    }
+}

Bloxstrap/Installer.cs

@@ -5,6 +5,12 @@ namespace Bloxstrap
 {
     internal class Installer
     {
+        /// <summary>
+        /// Should this version automatically open the release notes page?
+        /// Recommended for major updates only.
+        /// </summary>
+        private const bool OpenReleaseNotes = true;
+
         private static string DesktopShortcut => Path.Combine(Paths.Desktop, $"{App.ProjectName}.lnk");
 
         private static string StartMenuShortcut => Path.Combine(Paths.WindowsStartMenu, $"{App.ProjectName}.lnk");
@@ -593,10 +599,10 @@ public static void HandleUpgrade()
                         App.RobloxState.Prop.Studio = App.State.Prop.GetDeprecatedStudio()!;
 
                     if (App.State.Prop.GetDeprecatedPlayerModManifest() != null)
-                        App.RobloxState.Prop.ModManifest = App.State.Prop.GetDeprecatedPlayerModManifest()!;
+                        App.RobloxState.Prop.PlayerModManifest = App.State.Prop.GetDeprecatedPlayerModManifest()!;
 
                     if (App.State.Prop.GetDeprecatedStudioModManifest() != null)
-                        App.RobloxState.Prop.ModManifest = App.State.Prop.GetDeprecatedStudioModManifest()!;
+                        App.RobloxState.Prop.StudioModManifest = App.State.Prop.GetDeprecatedStudioModManifest()!;
                 }
 
                 App.Settings.Save();

Bloxstrap/JsonManager.cs

@@ -13,6 +13,8 @@ namespace Bloxstrap
         /// </summary>
         public string? LastFileHash { get; private set; }
 
+        public bool Loaded { get; set; } = false;
+
         public virtual string ClassName => typeof(T).Name;
 
         public virtual string FileLocation => Path.Combine(Paths.Base, $"{ClassName}.json");
@@ -35,6 +37,7 @@ public virtual void Load(bool alertFailure = true)
                     throw new ArgumentNullException("Deserialization returned null");
 
                 Prop = settings;
+                Loaded = true;
                 LastFileHash = MD5Hash.FromString(contents);
 
                 App.Logger.WriteLine(LOG_IDENT, "Loaded successfully!");

Bloxstrap/LaunchHandler.cs

@@ -59,6 +59,11 @@ public static void ProcessLaunchArgs()
                 App.Logger.WriteLine(LOG_IDENT, "Opening watcher");
                 LaunchWatcher();
             }
+            else if (App.LaunchSettings.MultiInstanceWatcherFlag.Active)
+            {
+                App.Logger.WriteLine(LOG_IDENT, "Opening multi-instance watcher");
+                LaunchMultiInstanceWatcher();
+            }
             else if (App.LaunchSettings.BackgroundUpdaterFlag.Active)
             {
                 App.Logger.WriteLine(LOG_IDENT, "Opening background updater");
@@ -223,7 +228,7 @@ public static void LaunchRoblox(LaunchMode launchMode)
                 App.Terminate(ErrorCode.ERROR_FILE_NOT_FOUND);
             }
 
-            if (App.Settings.Prop.ConfirmLaunches && Mutex.TryOpenExisting("ROBLOX_singletonMutex", out var _))
+            if (App.Settings.Prop.ConfirmLaunches && Mutex.TryOpenExisting("ROBLOX_singletonMutex", out var _) && !App.Settings.Prop.MultiInstanceLaunching)
             {
                 // this currently doesn't work very well since it relies on checking the existence of the singleton mutex
                 // which often hangs around for a few seconds after the window closes
@@ -302,6 +307,28 @@ public static void LaunchWatcher()
             });
         }
 
+        public static void LaunchMultiInstanceWatcher()
+        {
+            const string LOG_IDENT = "LaunchHandler::LaunchMultiInstanceWatcher";
+
+            App.Logger.WriteLine(LOG_IDENT, "Starting multi-instance watcher");
+
+            Task.Run(MultiInstanceWatcher.Run).ContinueWith(t =>
+            {
+                App.Logger.WriteLine(LOG_IDENT, "Multi instance watcher task has finished");
+
+                if (t.IsFaulted)
+                {
+                    App.Logger.WriteLine(LOG_IDENT, "An exception occurred when running the multi-instance watcher");
+
+                    if (t.Exception is not null)
+                        App.FinalizeExceptionHandling(t.Exception);
+                }
+
+                App.Terminate();
+            });
+        }
+
         public static void LaunchBackgroundUpdater()
         {
             const string LOG_IDENT = "LaunchHandler::LaunchBackgroundUpdater";