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

Author: bdidk235

Bloxstrap/AppData/CommonAppData.cs

@@ -42,13 +42,13 @@ public abstract class CommonAppData
         };
 
         public virtual string ExecutableName { get; } = null!;
-        
-        public virtual string Directory { get; } = null!;
 
-        public string LockFilePath => Path.Combine(Directory, "Bloxstrap.lock");
-        
+        public string Directory => Path.Combine(Paths.Versions, State.VersionGuid);
+
         public string ExecutablePath => Path.Combine(Directory, ExecutableName);
-        
+
+        public virtual AppState State { get; } = null!;
+
         public virtual IReadOnlyDictionary<string, string> PackageDirectoryMap { get; set; }
 
 

Bloxstrap/AppData/IAppData.cs

@@ -12,10 +12,6 @@ internal interface IAppData
 
         string Directory { get; }
 
-        string OldDirectory { get; }
-
-        string LockFilePath { get; }
-
         string ExecutablePath { get; }
 
         AppState State { get; }

Bloxstrap/AppData/RobloxPlayerData.cs

@@ -16,11 +16,7 @@ public class RobloxPlayerData : CommonAppData, IAppData
 
         public override string ExecutableName => "RobloxPlayerBeta.exe";
 
-        public override string Directory => Path.Combine(Paths.Roblox, "Player");
-
-        public string OldDirectory => Path.Combine(Paths.Roblox, "Player.old");
-
-        public AppState State => App.State.Prop.Player;
+        public override AppState State => App.State.Prop.Player;
 
         public override IReadOnlyDictionary<string, string> PackageDirectoryMap { get; set; } = new Dictionary<string, string>()
         {

Bloxstrap/AppData/RobloxStudioData.cs

@@ -10,11 +10,7 @@ public class RobloxStudioData : CommonAppData, IAppData
 
         public override string ExecutableName => "RobloxStudioBeta.exe";
 
-        public override string Directory => Path.Combine(Paths.Roblox, "Studio");
-
-        public string OldDirectory => Path.Combine(Paths.Roblox, "Studio.old");
-
-        public AppState State => App.State.Prop.Studio;
+        public override AppState State => App.State.Prop.Studio;
 
         public override IReadOnlyDictionary<string, string> PackageDirectoryMap { get; set; } = new Dictionary<string, string>()
         {

Bloxstrap/Bloxstrap.csproj

@@ -7,8 +7,8 @@
     <UseWPF>true</UseWPF>
     <UseWindowsForms>True</UseWindowsForms>
     <ApplicationIcon>Bloxstrap.ico</ApplicationIcon>
-    <Version>2.8.1</Version>
-    <FileVersion>2.8.1</FileVersion>
+    <Version>2.8.2</Version>
+    <FileVersion>2.8.2</FileVersion>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>

Bloxstrap/Bootstrapper.cs

@@ -68,6 +68,7 @@ private List<string> _modManifest
         }
 
         private string _latestVersionGuid = null!;
+        private string _latestVersionDirectory = null!;
         private PackageManifest _versionPackageManifest = null!;
 
         private bool _isInstalling = false;
@@ -76,7 +77,7 @@ private List<string> _modManifest
         private double _taskbarProgressMaximum;
         private long _totalDownloadedBytes = 0;
 
-        private bool _mustUpgrade => String.IsNullOrEmpty(AppData.State.VersionGuid) || File.Exists(AppData.LockFilePath) || !File.Exists(AppData.ExecutablePath);
+        private bool _mustUpgrade => String.IsNullOrEmpty(AppData.State.VersionGuid) || !File.Exists(AppData.ExecutablePath);
         private bool _noConnection = false;
 
         private AsyncMutex? _mutex;
@@ -331,6 +332,7 @@ private async Task GetLatestVersionInfo()
             key.SetValueSafe("www.roblox.com", Deployment.IsDefaultChannel ? "" : Deployment.Channel);
 
             _latestVersionGuid = clientVersion.VersionGuid;
+            _latestVersionDirectory = Path.Combine(Paths.Versions, _latestVersionGuid);
 
             string pkgManifestUrl = Deployment.GetLocation($"/{_latestVersionGuid}-rbxPkgManifest.txt");
             var pkgManifestData = await App.HttpClient.GetStringAsync(pkgManifestUrl);
@@ -531,18 +533,13 @@ public void Cancel()
                 try
                 {
                     // clean up install
-                    if (Directory.Exists(AppData.Directory))
-                        Directory.Delete(AppData.Directory, true);
+                    if (Directory.Exists(_latestVersionDirectory))
+                        Directory.Delete(_latestVersionDirectory, true);
                 }
                 catch (Exception ex)
                 {
                     App.Logger.WriteLine(LOG_IDENT, "Could not fully clean up installation!");
                     App.Logger.WriteException(LOG_IDENT, ex);
-
-                    // assurance to make sure the next launch does a fresh install
-                    // we probably shouldn't be using the lockfile to do this, but meh
-                    var lockFile = new FileInfo(AppData.LockFilePath);
-                    lockFile.Create().Dispose();
                 }
             }
             else if (_appPid != 0)
@@ -667,69 +664,67 @@ private async Task<bool> CheckForUpdates()
 
             return false;
         }
-#endregion
+        #endregion
 
         #region Roblox Install
-        private async Task UpgradeRoblox()
+        private void CleanupVersionsFolder()
         {
-            const string LOG_IDENT = "Bootstrapper::UpgradeRoblox";
-
-            if (String.IsNullOrEmpty(AppData.State.VersionGuid))
-                SetStatus(Strings.Bootstrapper_Status_Installing);
-            else
-                SetStatus(Strings.Bootstrapper_Status_Upgrading);
+            const string LOG_IDENT = "Bootstrapper::CleanupVersionsFolder";
 
-            Directory.CreateDirectory(Paths.Base);
-            Directory.CreateDirectory(Paths.Downloads);
-            Directory.CreateDirectory(Paths.Roblox);
-
-            if (Directory.Exists(AppData.Directory))
+            foreach (string dir in Directory.GetDirectories(Paths.Versions))
             {
-                if (Directory.Exists(AppData.OldDirectory))
-                    Directory.Delete(AppData.OldDirectory, true);
+                string dirName = Path.GetFileName(dir);
 
-                try
+                if (dirName != App.State.Prop.Player.VersionGuid && dirName != App.State.Prop.Studio.VersionGuid)
                 {
-                    // test to see if any files are in use
-                    // if you have a better way to check for this, please let me know!
-                    Directory.Move(AppData.Directory, AppData.OldDirectory);
-                }
-                catch (Exception ex)
-                {
-                    App.Logger.WriteLine(LOG_IDENT, "Could not clear old files, aborting update.");
-                    App.Logger.WriteException(LOG_IDENT, ex);
-
-                    // 0x80070020 is the HRESULT that indicates that a process is still running
-                    // (either RobloxPlayerBeta or RobloxCrashHandler), so we'll silently ignore it
-                    if ((uint)ex.HResult != 0x80070020)
+                    try
                     {
-                        // ensure no files are marked as read-only for good measure
-                        foreach (var file in Directory.GetFiles(AppData.Directory, "*", SearchOption.AllDirectories))
-                            Filesystem.AssertReadOnly(file);
+                        Directory.Delete(dir, true);
+                    }
+                    catch (IOException ex)
+                    {
+                        App.Logger.WriteLine(LOG_IDENT, $"Failed to delete {dir}");
+                        App.Logger.WriteException(LOG_IDENT, ex);
+                    }
+                }
+            }
+        }
 
-                        Frontend.ShowMessageBox(
-                            Strings.Bootstrapper_FilesInUse, 
-                            _mustUpgrade ? MessageBoxImage.Error : MessageBoxImage.Warning
-                        );
+        private void MigrateCompatibilityFlags()
+        {
+            const string LOG_IDENT = "Bootstrapper::MigrateCompatibilityFlags";
 
-                        if (_mustUpgrade)
-                            App.Terminate(ErrorCode.ERROR_CANCELLED);
-                    }
+            string oldClientLocation = Path.Combine(Paths.Versions, AppData.State.VersionGuid, AppData.ExecutableName);
+            string newClientLocation = Path.Combine(_latestVersionDirectory, AppData.ExecutableName);
 
-                    return;
-                }
+            // move old compatibility flags for the old location
+            using RegistryKey appFlagsKey = Registry.CurrentUser.CreateSubKey($"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Layers");
+            string? appFlags = appFlagsKey.GetValue(oldClientLocation) as string;
 
-                Directory.Delete(AppData.OldDirectory, true);
+            if (appFlags is not null)
+            {
+                App.Logger.WriteLine(LOG_IDENT, $"Migrating app compatibility flags from {oldClientLocation} to {newClientLocation}...");
+                appFlagsKey.SetValueSafe(newClientLocation, appFlags);
+                appFlagsKey.DeleteValueSafe(oldClientLocation);
             }
+        }
 
-            _isInstalling = true;
+        private async Task UpgradeRoblox()
+        {
+            const string LOG_IDENT = "Bootstrapper::UpgradeRoblox";
+
+            if (String.IsNullOrEmpty(AppData.State.VersionGuid))
+                SetStatus(Strings.Bootstrapper_Status_Installing);
+            else
+                SetStatus(Strings.Bootstrapper_Status_Upgrading);
 
-            Directory.CreateDirectory(AppData.Directory);
+            Directory.CreateDirectory(Paths.Base);
+            Directory.CreateDirectory(Paths.Downloads);
+            Directory.CreateDirectory(Paths.Versions);
+
+            _isInstalling = true;
 
-            // installer lock, it should only be present while roblox is in the process of upgrading
-            // if it's present while we're launching, then it's an unfinished install and must be reinstalled
-            var lockFile = new FileInfo(AppData.LockFilePath);
-            lockFile.Create().Dispose();
+            Directory.CreateDirectory(_latestVersionDirectory);
 
             var cachedPackageHashes = Directory.GetFiles(Paths.Downloads).Select(x => Path.GetFileName(x));
 
@@ -797,7 +792,7 @@ private async Task UpgradeRoblox()
             await Task.WhenAll(extractionTasks);
 
             App.Logger.WriteLine(LOG_IDENT, "Writing AppSettings.xml...");
-            await File.WriteAllTextAsync(Path.Combine(AppData.Directory, "AppSettings.xml"), AppSettings);
+            await File.WriteAllTextAsync(Path.Combine(_latestVersionDirectory, "AppSettings.xml"), AppSettings);
 
             if (_cancelTokenSource.IsCancellationRequested)
                 return;
@@ -832,7 +827,7 @@ private async Task UpgradeRoblox()
                             return;
                         }
 
-                        string baseDirectory = Path.Combine(AppData.Directory, AppData.PackageDirectoryMap[package.Name]);
+                        string baseDirectory = Path.Combine(_latestVersionDirectory, AppData.PackageDirectoryMap[package.Name]);
 
                         ExtractPackage(package);
 
@@ -856,13 +851,17 @@ private async Task UpgradeRoblox()
 
             // finishing and cleanup
 
+            MigrateCompatibilityFlags();
+
             AppData.State.VersionGuid = _latestVersionGuid;
 
             AppData.State.PackageHashes.Clear();
 
             foreach (var package in _versionPackageManifest)
                 AppData.State.PackageHashes.Add(package.Name, package.Signature);
 
+            CleanupVersionsFolder();
+
             var allPackageHashes = new List<string>();
 
             allPackageHashes.AddRange(App.State.Prop.Player.PackageHashes.Values);
@@ -903,8 +902,6 @@ private async Task UpgradeRoblox()
 
             App.State.Save();
 
-            lockFile.Delete();
-
             _isInstalling = false;
         }
 
@@ -938,7 +935,17 @@ private async Task ApplyModifications()
 
                 const string path = "rbxasset://fonts/CustomFont.ttf";
 
-                foreach (string jsonFilePath in Directory.GetFiles(Path.Combine(AppData.Directory, "content\\fonts\\families")))
+                // lets make sure the content/fonts/families path exists in the version directory
+                string contentFolder = Path.Combine(_latestVersionDirectory, "content");
+                Directory.CreateDirectory(contentFolder);
+
+                string fontsFolder = Path.Combine(contentFolder, "fonts");
+                Directory.CreateDirectory(fontsFolder);
+
+                string familiesFolder = Path.Combine(fontsFolder, "families");
+                Directory.CreateDirectory(familiesFolder);
+
+                foreach (string jsonFilePath in Directory.GetFiles(familiesFolder))
                 {
                     string jsonFilename = Path.GetFileName(jsonFilePath);
                     string modFilepath = Path.Combine(modFontFamiliesFolder, jsonFilename);
@@ -999,7 +1006,7 @@ private async Task ApplyModifications()
                 modFolderFiles.Add(relativeFile);
 
                 string fileModFolder = Path.Combine(_playerModFolder, relativeFile);
-                string fileVersionFolder = Path.Combine(AppData.Directory, relativeFile);
+                string fileVersionFolder = Path.Combine(_latestVersionDirectory, relativeFile);
 
                 if (File.Exists(fileVersionFolder) && MD5Hash.FromFile(fileModFolder) == MD5Hash.FromFile(fileVersionFolder))
                 {
@@ -1035,7 +1042,7 @@ private async Task ApplyModifications()
                 {
                     App.Logger.WriteLine(LOG_IDENT, $"{fileLocation} was removed as a mod but does not belong to a package");
 
-                    string versionFileLocation = Path.Combine(AppData.Directory, fileLocation);
+                    string versionFileLocation = Path.Combine(_latestVersionDirectory, fileLocation);
 
                     if (File.Exists(versionFileLocation))
                         File.Delete(versionFileLocation);
@@ -1223,7 +1230,7 @@ private void ExtractPackage(Package package, List<string>? files = null)
                 return;
             }
 
-            string packageFolder = Path.Combine(AppData.Directory, packageDir);
+            string packageFolder = Path.Combine(_latestVersionDirectory, packageDir);
             string? fileFilter = null;
 
             // for sharpziplib, each file in the filter needs to be a regex

Bloxstrap/Extensions/RegistryKeyEx.cs

@@ -17,5 +17,19 @@ public static void SetValueSafe(this RegistryKey registryKey, string? name, obje
                 App.Terminate(ErrorCode.ERROR_INSTALL_FAILURE);
             }
         }
+
+        public static void DeleteValueSafe(this RegistryKey registryKey, string name)
+        {
+            try
+            {
+                App.Logger.WriteLine("RegistryKeyEx::DeleteValueSafe", $"Deleting {registryKey}\\{name}");
+                registryKey.DeleteValue(name);
+            }
+            catch (UnauthorizedAccessException)
+            {
+                Frontend.ShowMessageBox(Strings.Dialog_RegistryWriteError, System.Windows.MessageBoxImage.Error);
+                App.Terminate(ErrorCode.ERROR_INSTALL_FAILURE);
+            }
+        }
     }
 }

Bloxstrap/Installer.cs

@@ -287,8 +287,8 @@ public static void DoUninstall(bool keepData)
 
                 () => File.Delete(StartMenuShortcut),
 
+                () => Directory.Delete(Paths.Versions, true),
                 () => Directory.Delete(Paths.Downloads, true),
-                () => Directory.Delete(Paths.Roblox, true),
 
                 () => File.Delete(App.State.FileLocation)
             };
@@ -549,15 +549,6 @@ public static void HandleUpgrade()
 
                     App.FastFlags.SetValue("FFlagDisableNewIGMinDUA", null);
                     App.FastFlags.SetValue("FFlagFixGraphicsQuality", null);
-
-                    try
-                    {
-                        Directory.Delete(Path.Combine(Paths.Base, "Versions"), true);
-                    }
-                    catch (Exception ex)
-                    {
-                        App.Logger.WriteException(LOG_IDENT, ex);
-                    }
                 }
 
                 if (Utilities.CompareVersions(existingVer, "2.8.1") == VersionComparison.LessThan)
@@ -574,6 +565,17 @@ public static void HandleUpgrade()
                     App.FastFlags.SetValue("FFlagEnableInGameMenuChromeABTest4", null);
                 }
 
+                if (Utilities.CompareVersions(existingVer, "2.8.2") == VersionComparison.LessThan)
+                {
+                    try
+                    {
+                        Directory.Delete(Path.Combine(Paths.Base, "Roblox"), true);
+                    }
+                    catch (Exception ex)
+                    {
+                        App.Logger.WriteException(LOG_IDENT, ex);
+                    }
+                }
 
                 App.Settings.Save();
                 App.FastFlags.Save();

Bloxstrap/JsonManager.cs

@@ -65,7 +65,7 @@ public virtual void Save()
             {
                 File.WriteAllText(FileLocation, JsonSerializer.Serialize(Prop, new JsonSerializerOptions { WriteIndented = true }));
             }
-            catch (IOException ex)
+            catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
             {
                 App.Logger.WriteLine(LOG_IDENT, "Failed to save");
                 App.Logger.WriteException(LOG_IDENT, ex);