Reapply "Small fix"

This reverts commit 7fe2e63.

Author: MusyaCliento

Marsey/MarseyPatcher.cs

@@ -137,7 +137,6 @@ private void ExecPatcher()
 
     private void Afterparty()
     {
-        // TODO: Test if GameAssemblies.ClientInitialized works here
         while (!GameAssemblies.ClientInitialized()) // Wait until EntryPoint is just about to start
         {
             Thread.Sleep(125);

SS14.Launcher/ConfigConstants.cs

@@ -53,8 +53,7 @@ public static class ConfigConstants
     public static readonly UrlFallbackSet RobustBuildsManifest = RobustBuildsBaseUrl + "manifest.json";
     public static readonly UrlFallbackSet RobustModulesManifest = RobustBuildsBaseUrl + "modules.json";
 
-    // How long to keep cached copies of Robust manifests.
-    // TODO: Take this from Cache-Control header responses instead.
+    // Default cache duration for Robust manifests when response headers don't specify caching.
     public static readonly TimeSpan RobustManifestCacheTime = TimeSpan.FromMinutes(15);
 
     public static readonly UrlFallbackSet UrlLauncherInfo = LauncherDataBaseUrl + "info.json";

SS14.Launcher/Helpers.cs

@@ -155,7 +155,12 @@ public static async Task<T> AsJson<T>(this HttpContent content) where T : notnul
 
     public static unsafe void MarkDirectoryCompress(string path)
     {
-        // TODO: Linux: chattr +c
+        if (OperatingSystem.IsLinux())
+        {
+            TryEnableLinuxDirectoryCompression(path);
+            return;
+        }
+
         if (!OperatingSystem.IsWindows())
             return;
 
@@ -187,6 +192,43 @@ public static unsafe void MarkDirectoryCompress(string path)
         }
     }
 
+    private static void TryEnableLinuxDirectoryCompression(string path)
+    {
+        try
+        {
+            var psi = new ProcessStartInfo("chattr")
+            {
+                RedirectStandardError = true,
+                RedirectStandardOutput = true,
+                UseShellExecute = false
+            };
+            psi.ArgumentList.Add("+c");
+            psi.ArgumentList.Add(path);
+
+            using var proc = Process.Start(psi);
+            if (proc == null)
+            {
+                Log.Debug("Failed to start chattr for {Path}", path);
+                return;
+            }
+
+            if (!proc.WaitForExit(2000))
+            {
+                Log.Debug("chattr timed out for {Path}", path);
+                return;
+            }
+
+            if (proc.ExitCode != 0)
+            {
+                Log.Debug("chattr exited with code {ExitCode} for {Path}", proc.ExitCode, path);
+            }
+        }
+        catch (Exception e)
+        {
+            Log.Debug(e, "Failed to enable chattr +c for {Path}", path);
+        }
+    }
+
     public static void ChmodPlusX(string path)
     {
         var f = new UnixFileInfo(path);

SS14.Launcher/LauncherDiagnostics.cs

@@ -1,11 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.IO;
 using System.Runtime;
 using System.Runtime.InteropServices;
 using System.Runtime.Intrinsics.Arm;
 using System.Runtime.Intrinsics.X86;
 using System.Text;
+using Microsoft.Win32;
 using Serilog;
 using SQLitePCL;
 using X86Aes = System.Runtime.Intrinsics.X86.Aes;
@@ -138,7 +140,9 @@ public static string GetProcessorModel()
                 return name;
         }
 
-        // TODO: ask OS as fallback for when x86 CPUID isn't available on Windows and Linux.
+        var osName = GetProcessorModelFromOs();
+        if (osName != null)
+            return osName;
 
         return "Unknown processor model";
     }
@@ -191,6 +195,56 @@ public static string GetProcessorModel()
         }
     }
 
+    private static string? GetProcessorModelFromOs()
+    {
+        if (OperatingSystem.IsWindows())
+        {
+            try
+            {
+                using var key = Registry.LocalMachine.OpenSubKey(
+                    @"HARDWARE\DESCRIPTION\System\CentralProcessor\0",
+                    writable: false);
+                var value = key?.GetValue("ProcessorNameString") as string;
+                if (!string.IsNullOrWhiteSpace(value))
+                    return value.Trim();
+            }
+            catch (Exception e)
+            {
+                Log.Debug(e, "Failed to read CPU model from registry");
+            }
+
+            var env = Environment.GetEnvironmentVariable("PROCESSOR_IDENTIFIER");
+            if (!string.IsNullOrWhiteSpace(env))
+                return env.Trim();
+        }
+
+        if (OperatingSystem.IsLinux())
+        {
+            try
+            {
+                foreach (var line in File.ReadLines("/proc/cpuinfo"))
+                {
+                    if (!line.StartsWith("model name", StringComparison.OrdinalIgnoreCase))
+                        continue;
+
+                    var sep = line.IndexOf(':');
+                    if (sep < 0)
+                        continue;
+
+                    var name = line[(sep + 1)..].Trim();
+                    if (!string.IsNullOrWhiteSpace(name))
+                        return name;
+                }
+            }
+            catch (Exception e)
+            {
+                Log.Debug(e, "Failed to read CPU model from /proc/cpuinfo");
+            }
+        }
+
+        return null;
+    }
+
     [DllImport("libc", SetLastError = true)]
     private static extern unsafe int sysctlbyname(
         byte* name,

SS14.Launcher/Models/Connector.cs

@@ -394,6 +394,7 @@ private async Task LaunchClientWrap(
         Uri? parsedAddr,
         bool contentBundle)
     {
+        await _loginManager.WaitForTokenRefreshAsync();
 
         var cVars = new List<(string, string)>();
 
@@ -811,7 +812,6 @@ private async Task Marsify()
         MarseyCleanup();
     }
 
-    // TODO: Make this a json or something like holy shit
     private async Task ConfigureMarsey()
     {
         // Prepare environment variables
@@ -843,7 +843,7 @@ private async Task ConfigureMarsey()
         };
 
         // Serialize environment variables
-        string serializedEnvVars = string.Join(";", envVars.Select(kv => $"{kv.Key}={kv.Value}"));
+        string serializedEnvVars = JsonSerializer.Serialize(envVars);
 
         await SendConfig(serializedEnvVars);
     }

SS14.Launcher/Models/Data/DataManager.cs

@@ -55,10 +55,8 @@ public sealed class DataManager : ReactiveObject
 
     private readonly Dictionary<string, CVarEntry> _configEntries = new();
 
-    // TODO: I got lazy and this is a flat list.
-    // This probably results in some bad O(n*m) behavior.
-    // I don't care for now.
     private readonly List<InstalledEngineModule> _modules = new();
+    private readonly HashSet<EngineModuleKey> _moduleLookup = new();
 
     private readonly List<DbCommand> _dbCommandQueue = new();
     private readonly SemaphoreSlim _dbWritingSemaphore = new(1);
@@ -133,6 +131,7 @@ public Guid? SelectedLoginId
     public IObservableCache<LoginInfo, Guid> Logins => _logins;
     public IObservableCache<InstalledEngineVersion, string> EngineInstallations => _engineInstallations;
     public IEnumerable<InstalledEngineModule> EngineModules => _modules;
+    public bool HasEngineModule(string name, string version) => _moduleLookup.Contains(new EngineModuleKey(name, version));
     public ICollection<ServerFilter> Filters { get; }
     public ICollection<Hub> Hubs { get; }
 
@@ -180,12 +179,18 @@ public void RemoveEngineInstallation(InstalledEngineVersion version)
 
     public void AddEngineModule(InstalledEngineModule module)
     {
+        if (!_moduleLookup.Add(new EngineModuleKey(module.Name, module.Version)))
+            return;
+
         _modules.Add(module);
         AddDbCommand(c => c.Execute("INSERT INTO EngineModule VALUES (@Name, @Version)", module));
     }
 
     public void RemoveEngineModule(InstalledEngineModule module)
     {
+        if (!_moduleLookup.Remove(new EngineModuleKey(module.Name, module.Version)))
+            return;
+
         _modules.Remove(module);
         AddDbCommand(c => c.Execute("DELETE FROM EngineModule WHERE Name = @Name AND Version = @Version", module));
     }
@@ -317,7 +322,12 @@ private void LoadSqliteConfig(SqliteConnection sqliteConnection)
             sqliteConnection.Query<InstalledEngineVersion>("SELECT Version,Signature FROM EngineInstallation"));
 
         // Engine modules
-        _modules.AddRange(sqliteConnection.Query<InstalledEngineModule>("SELECT Name, Version FROM EngineModule"));
+        var loadedModules = sqliteConnection.Query<InstalledEngineModule>("SELECT Name, Version FROM EngineModule");
+        foreach (var module in loadedModules)
+        {
+            _modules.Add(module);
+            _moduleLookup.Add(new EngineModuleKey(module.Name, module.Version));
+        }
 
         // Load CVars.
         var configRows = sqliteConnection.Query<(string, object?)>("SELECT Key, Value FROM Config");
@@ -616,6 +626,8 @@ public void FireValueChanged()
         }
     }
 
+    private readonly record struct EngineModuleKey(string Name, string Version);
+
     private sealed class ServerFilterCollection : ICollection<ServerFilter>
     {
         private readonly DataManager _parent;

SS14.Launcher/Models/EngineManager/EngineManagerDynamic.Manifest.cs

@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Net.Http;
 using System.Net.Http.Json;
+using System.Net.Http.Headers;
 using System.Text.Json.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
@@ -19,6 +21,8 @@ public sealed partial class EngineManagerDynamic
 
     private Dictionary<string, VersionInfo>? _cachedRobustVersionInfo;
     private TimeSpan _robustCacheValidUntil;
+    private EntityTagHeaderValue? _cachedManifestEtag;
+    private DateTimeOffset? _cachedManifestLastModified;
 
     /// <summary>
     /// Look up information about an engine version.
@@ -67,17 +71,42 @@ public sealed partial class EngineManagerDynamic
 
     private async Task UpdateBuildManifest(CancellationToken cancel)
     {
-        // TODO: If-Modified-Since and If-None-Match request conditions.
-
         Log.Debug("Loading manifest from {manifestUrl}...", ConfigConstants.RobustBuildsManifest);
         using var timeoutCts = CancellationTokenSource.CreateLinkedTokenSource(cancel);
         timeoutCts.CancelAfter(ManifestLoadTimeout);
 
         try
         {
+            using var response = await ConfigConstants.RobustBuildsManifest.SendAsync(
+                _http,
+                url =>
+                {
+                    var req = new HttpRequestMessage(HttpMethod.Get, url);
+                    if (_cachedManifestEtag != null)
+                        req.Headers.IfNoneMatch.Add(_cachedManifestEtag);
+                    if (_cachedManifestLastModified != null)
+                        req.Headers.IfModifiedSince = _cachedManifestLastModified;
+                    return req;
+                },
+                timeoutCts.Token);
+
+            if (response.StatusCode == System.Net.HttpStatusCode.NotModified && _cachedRobustVersionInfo != null)
+            {
+                Log.Debug("Manifest not modified, using cached copy");
+                _robustCacheValidUntil = _manifestStopwatch.Elapsed + GetManifestCacheDuration(response);
+                return;
+            }
+
+            response.EnsureSuccessStatusCode();
+
+            _cachedManifestEtag = response.Headers.ETag;
+            _cachedManifestLastModified = response.Content.Headers.LastModified;
+
             _cachedRobustVersionInfo =
-                await ConfigConstants.RobustBuildsManifest.GetFromJsonAsync<Dictionary<string, VersionInfo>>(
-                    _http, timeoutCts.Token);
+                await response.Content.ReadFromJsonAsync<Dictionary<string, VersionInfo>>(timeoutCts.Token)
+                ?? throw new InvalidOperationException("Robust manifest response was empty.");
+
+            _robustCacheValidUntil = _manifestStopwatch.Elapsed + GetManifestCacheDuration(response);
         }
         catch (OperationCanceledException e) when (!cancel.IsCancellationRequested && timeoutCts.IsCancellationRequested)
         {
@@ -86,8 +115,25 @@ await ConfigConstants.RobustBuildsManifest.GetFromJsonAsync<Dictionary<string, V
                 "Check your proxy/tunnel stability or disable proxy for launcher downloads.",
                 e);
         }
+    }
+
+    private static TimeSpan GetManifestCacheDuration(HttpResponseMessage? response)
+    {
+        if (response?.Headers.CacheControl?.NoStore == true || response?.Headers.CacheControl?.NoCache == true)
+            return TimeSpan.Zero;
+
+        var maxAge = response?.Headers.CacheControl?.MaxAge;
+        if (maxAge.HasValue)
+            return maxAge.Value;
+
+        if (response?.Content.Headers.Expires is { } expires)
+        {
+            var delta = expires - DateTimeOffset.UtcNow;
+            if (delta > TimeSpan.Zero)
+                return delta;
+        }
 
-        _robustCacheValidUntil = _manifestStopwatch.Elapsed + ConfigConstants.RobustManifestCacheTime;
+        return ConfigConstants.RobustManifestCacheTime;
     }
 
     private FoundVersionInfo? FindVersionInfoInCached(string version, bool followRedirects)

SS14.Launcher/Models/EngineManager/EngineManagerDynamic.cs

@@ -169,7 +169,7 @@ public async Task<bool> DownloadModuleIfNecessary(
 
         Log.Debug("Selected module {ModuleName} {ModuleVersion}", moduleName, moduleVersion);
 
-        var alreadyInstalled = _cfg.EngineModules.Any(m => m.Name == moduleName && m.Version == moduleVersion);
+        var alreadyInstalled = _cfg.HasEngineModule(moduleName, moduleVersion);
 
         if (alreadyInstalled)
         {