- fix: update resolver startup

.idea/.idea.Nebula/.idea/avalonia.xml

@@ -33,6 +33,7 @@
         <entry key="Nebula.Launcher/Views/Popup/ExceptionListView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/Popup/ExceptionView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/Popup/InfoPopupView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
+        <entry key="Nebula.Launcher/Views/Popup/IsLoginCredentialsNullPopupView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/Popup/LoadingContextView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/Popup/LogPopupView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/Popup/MessagePopupView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
@@ -44,6 +45,7 @@
         <entry key="Nebula.Launcher/Views/ServerListView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/Tabs/AccountInfoTab.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/Tabs/ServerListTab.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
+        <entry key="Nebula.Launcher/Views/VisualErrorView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.UpdateResolver/App.axaml" value="Nebula.UpdateResolver/Nebula.UpdateResolver.csproj" />
         <entry key="Nebula.UpdateResolver/MainWindow.axaml" value="Nebula.UpdateResolver/Nebula.UpdateResolver.csproj" />
       </map>

Nebula.Launcher/App.axaml.cs

@@ -28,14 +28,16 @@ public class App : Application
             {
                 case IClassicDesktopStyleApplicationLifetime desktop:
                     DisableAvaloniaDataAnnotationValidation();
-                    desktop.MainWindow = new MessageWindow(out provider);
+                    desktop.MainWindow = (Window)(provider = new MessageWindow());
                     break;
                 case ISingleViewApplicationLifetime singleViewPlatform:
-                    singleViewPlatform.MainView = new MessageView(out provider);
+                    singleViewPlatform.MainView = (Control)(provider = new MessageView());
                     break;
             }
             
-            provider?.ShowMessage("Launcher is already running.","hey shithead!");
+            provider?.ShowMessage(
+                "Error: An instance of the application is already running. Please close the existing instance before launching a new one.", 
+                "Duplicate instance detected.");
             
             return;
         }

Nebula.Launcher/Assets/lang/en-US.ftl

@@ -24,7 +24,10 @@ account-auth-server = Authentication Server
 account-auth-button = Authenticate  
 account-auth-save = Save Profile  
 account-auth-hello = Hello,  
+account-auth-current-server = Current server auth:
 account-auth-logout = Log out  
+auth-current-login-name = Current login {$auth_server}: {$login}
+auth-current-login-no-name = Profile not selected
 
 auth-processing = Processing authentication request...  
 auth-error = An authentication error has occurred.  
@@ -35,6 +38,7 @@ auth-name-resolution-error = Failed to resolve server address. Check your networ
 auth-secure-error = Failed to cinnect to the server using SSL
 auth-config-read = Reading authentication configuration...  
 auth-try-auth-config = Attempting to authenticate using saved configuration.
+auth-try-auth-profile = Attempting to authenticate using profile
 
 config-export-logs = Export logs
 config-open-data = Open data path
@@ -45,6 +49,7 @@ config-remove-content-all = Remove all content
 filter-roleplay = Roleplay
 filter-language = Language
 favorite-add = Add to favorites
+popup-add-favorite-invalid-ip = Please enter a valid IP
 servername-set = Set server name
 servername-clear = Clear server name
 twofa-enabled = You have two-factor authentication enabled. Please enter the code.
@@ -56,4 +61,12 @@ serverentry-map = Map
 serverentry-preset = Preset
 
 content-view-server = Server url
-content-view-path = Path
+content-view-path = Path
+
+popup-login-credentials-warning = Warning! No credentials provided!
+popup-login-credentials-warning-label = Warning! No credentials provided! The servers will not be able to let you in due to lack of authorization. Please keep this in mind.
+popup-login-credentials-warning-go-auth = Go to auth page
+popup-login-credentials-warning-cancel = Cancel
+popup-login-credentials-warning-proceed = Proceed
+
+goto-path-home = Root folder

Nebula.Launcher/Assets/lang/ru-RU.ftl

@@ -24,7 +24,10 @@ account-auth-server = Сервер аутентификации
 account-auth-button = Аутентифицировать  
 account-auth-save = Сохранить профиль  
 account-auth-hello = Привет,  
+account-auth-current-server = Текущий сервер авторизации:
 account-auth-logout = Выйти  
+auth-current-login-name = Текущий профиль {$auth_server}: {$login}
+auth-current-login-no-name = Профиль не выбран
 
 auth-processing = Обработка запроса аутентификации...  
 auth-error = Произошла ошибка аутентификации.  
@@ -35,6 +38,7 @@ auth-name-resolution-error = Не удалось разрешить адрес
 auth-secure-error = Не удалось подключиться к серверу по SSL. Проверьте сетевые настройки.
 auth-config-read = Чтение конфигурации аутентификации...  
 auth-try-auth-config = Попытка аутентификации с использованием сохраненной конфигурации.
+auth-try-auth-profile = Попытка аутентификации с использованием профиля
 
 config-export-logs = Экспортировать логи
 config-open-data = Открыть путь данных
@@ -45,6 +49,7 @@ config-remove-content-all = Удалить весь контент
 filter-roleplay = Ролевая игра
 filter-language = Язык
 favorite-add = Добавить в избранное
+popup-add-favorite-invalid-ip = Пожалуйста, введите валидный адрес
 servername-set = Установить имя сервера
 servername-clear = Очистить
 twofa-enabled = У вас включена двухфакторная аутентификация. Введите код.
@@ -56,4 +61,12 @@ serverentry-map = Карта
 serverentry-preset = Режим
 
 content-view-server = Сервер
-content-view-path = Путь
+content-view-path = Путь
+
+popup-login-credentials-warning = Предупреждение! Учетные данные не указаны!
+popup-login-credentials-warning-label = Предупреждение! Учетные данные не указаны! Серверы не смогут пропустить вас из-за отсутствия авторизации. Пожалуйста, имейте это в виду.
+popup-login-credentials-warning-go-auth = Перейти на страницу авторизации
+popup-login-credentials-warning-cancel = Отмена
+popup-login-credentials-warning-proceed = Продолжить
+
+goto-path-home = Корн. папка

Nebula.Launcher/ColorUtils.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Security.Cryptography;
+using System.Text;
+using Avalonia.Media;
+
+namespace Nebula.Launcher.ViewModels.Pages;
+
+public static class ColorUtils
+{
+    public static Color GetColorFromString(string input)
+    {
+        var hash = MD5.HashData(Encoding.UTF8.GetBytes(input));
+        
+        var r = byte.Clamp(hash[0], 10, 200);
+        var g = byte.Clamp(hash[1], 10, 100);
+        var b = byte.Clamp(hash[2], 10, 100);
+
+        return Color.FromArgb(Byte.MaxValue, r, g, b);
+    }
+}

Nebula.Launcher/Configurations/ArrayUnitConfigControl.cs

@@ -0,0 +1,99 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Layout;
+
+namespace Nebula.Launcher.ViewModels.Pages;
+
+public sealed class ArrayUnitConfigControl : Border, IConfigControl
+{
+    private readonly List<IConfigControl> _itemControls = [];
+    private readonly StackPanel _itemsPanel = new StackPanel() { Orientation = Orientation.Vertical };
+    private readonly Button _addButton = new Button() { Content = new Label()
+    {
+        Content = "Add Item"
+    }, Classes = { "ConfigBorder" }};
+    private readonly int _oldCount;
+    private readonly Type _elementType;
+    private readonly StackPanel _panel = new();
+
+    public string ConfigName { get; }
+    public bool Dirty => _itemControls.Any(dirty => dirty.Dirty) || _itemControls.Count != _oldCount;
+
+    public ArrayUnitConfigControl(string name, object value)
+    {
+        Classes.Add("ConfigBorder");
+        _elementType = value.GetType().GetElementType()!;
+        
+        ConfigName = name;
+        _panel.Orientation = Orientation.Vertical;
+        _panel.Spacing = 4f;
+        _itemsPanel.Spacing = 4f;
+
+        _panel.Children.Add(new Label { Content = name });
+        _panel.Children.Add(_itemsPanel);
+        _panel.Children.Add(_addButton);
+
+        _addButton.Click += (_, _) => AddItem(ConfigControlHelper.CreateDefaultValue(_elementType)!);
+        Child = _panel; 
+        SetValue(value);
+        _oldCount = _itemControls.Count;
+    }
+
+    private void AddItem(object value)
+    {
+        var itemPanel = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 2 };
+        var control = ConfigControlHelper.GetConfigControl(_itemControls.Count.ToString(), value);
+        var removeButton = new Button { Content = new Label(){ Content = "Remove" }, Classes = { "ConfigBorder" }};
+
+        removeButton.Click += (_, _) =>
+        {
+            _itemControls.Remove(control);
+            _itemsPanel.Children.Remove(itemPanel);
+        };
+        
+        ((Control)control).Margin = new Thickness(5);
+        itemPanel.Children.Add((Control)control);
+        itemPanel.Children.Add(removeButton);
+
+        _itemsPanel.Children.Add(itemPanel);
+        _itemControls.Add(control);
+    }
+
+    public void SetValue(object value)
+    {
+        _itemControls.Clear();
+        _itemsPanel.Children.Clear();
+
+        if (value is IEnumerable list)
+        {
+            foreach (var item in list)
+            {
+                AddItem(item);
+            }
+        }
+    }
+
+    public object GetValue()
+    {
+        return ConvertArray(_itemControls.Select(c => c.GetValue()).ToArray(), _elementType);
+    }
+    
+    public static Array ConvertArray(Array sourceArray, Type targetType)
+    {
+        int length = sourceArray.Length;
+        var newArray = Array.CreateInstance(targetType, length);
+
+        for (int i = 0; i < length; i++)
+        {
+            var value = sourceArray.GetValue(i);
+            var converted = Convert.ChangeType(value, targetType);
+            newArray.SetValue(converted, i);
+        }
+
+        return newArray;
+    }
+}

Nebula.Launcher/Configurations/ComplexConVarBinder.cs

@@ -0,0 +1,86 @@
+using System;
+using System.ComponentModel;
+using System.Threading;
+using System.Threading.Tasks;
+using Nebula.Shared.Configurations;
+
+namespace Nebula.Launcher.Configurations;
+
+public abstract class ComplexConVarBinder<T> : INotifyPropertyChanged, INotifyPropertyChanging
+{
+    private readonly ConVarObserver<T> _baseConVar;
+    private readonly Lock _lock = new();
+    private readonly SemaphoreSlim _valueChangeSemaphore = new(1, 1);
+
+    public T? Value
+    {
+        get
+        {
+            lock (_lock)
+            {
+                return _baseConVar.Value;
+            }
+        }
+        set
+        {
+            _ = SetValueAsync(value);
+        }
+    }
+    
+    public bool HasValue
+    {
+        get
+        {
+            lock (_lock)
+            {
+                return _baseConVar.HasValue;
+            }
+        }
+    }
+
+    protected ComplexConVarBinder(ConVarObserver<T> baseConVar)
+    {
+        _baseConVar = baseConVar ?? throw new ArgumentNullException(nameof(baseConVar));
+        _baseConVar.PropertyChanged += BaseConVarOnPropertyChanged;
+        _baseConVar.PropertyChanging += BaseConVarOnPropertyChanging;
+    }
+    
+
+    private async Task SetValueAsync(T? value)
+    {
+        await _valueChangeSemaphore.WaitAsync().ConfigureAwait(false);
+
+        try
+        {
+            var newValue = await OnValueChange(value).ConfigureAwait(false);
+
+            lock (_lock)
+            {
+                _baseConVar.Value = newValue;
+            }
+        }
+        finally
+        {
+            _valueChangeSemaphore.Release();
+        }
+    }
+
+    protected abstract Task<T?> OnValueChange(T? newValue);
+
+    private void BaseConVarOnPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(HasValue)));
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Value)));
+    }
+    
+    private void BaseConVarOnPropertyChanging(object? sender, PropertyChangingEventArgs e)
+    {
+        PropertyChanging?.Invoke(this, new PropertyChangingEventArgs(nameof(HasValue)));
+        PropertyChanging?.Invoke(this, new PropertyChangingEventArgs(nameof(Value)));
+    }
+    
+
+    public event PropertyChangedEventHandler? PropertyChanged;
+
+    public event PropertyChangingEventHandler? PropertyChanging;
+}

Nebula.Launcher/Configurations/ComplexUnitConfigControl.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Layout;
+
+namespace Nebula.Launcher.ViewModels.Pages;
+
+public sealed class ComplexUnitConfigControl : Border, IConfigControl
+{
+    private readonly List<(PropertyInfo, IConfigControl)> _units = [];
+    
+    private Type _objectType = typeof(object);
+
+    private readonly StackPanel _panel = new();
+    
+    public string ConfigName { get; }
+    public bool Dirty => _units.Any(dirty => dirty.Item2.Dirty);
+
+    public ComplexUnitConfigControl(string name, object obj)
+    {
+        Classes.Add("ConfigBorder");
+        _panel.Orientation = Orientation.Vertical;
+        _panel.Spacing = 4f;
+        ConfigName = name;
+        Child = _panel;
+        SetValue(obj);
+    }
+
+    public void SetValue(object value)
+    {
+        _units.Clear();
+        _panel.Children.Clear();
+        _objectType = value.GetType();
+        
+        _panel.Children.Add(new Label()
+        {
+            Content = ConfigName
+        });
+        
+        foreach (var propInfo in _objectType.GetProperties())
+        {
+            if(propInfo.PropertyType.IsInterface) 
+                continue;
+            
+            var propValue = propInfo.GetValue(value);
+
+            var control = ConfigControlHelper.GetConfigControl(propInfo.Name, propValue!);
+            
+            ((Control)control).Margin = new Thickness(5);
+            _panel.Children.Add((Control)control);
+            _units.Add((propInfo,control));
+        }
+    }
+
+    public object GetValue()
+    {
+        var obj = ConfigControlHelper.CreateDefaultValue(_objectType);
+        foreach (var (fieldInfo, configControl) in _units)
+        {
+            fieldInfo.SetValue(obj, configControl.GetValue());
+        }
+
+        return obj!;
+    }
+}

Nebula.Launcher/Configurations/ConfigControlHelper.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Linq;
+
+namespace Nebula.Launcher.ViewModels.Pages;
+
+public static class ConfigControlHelper{
+    public static IConfigControl GetConfigControl(string name,object value)
+    {
+        switch (value)
+        {
+            case string stringValue:
+                return new StringUnitConfigControl(name, stringValue);
+            case int intValue:
+                return new IntUnitConfigControl(name, intValue);
+            case float floatValue:
+                return new FloatUnitConfigControl(name, floatValue);
+        }
+        
+        var valueType = value.GetType();
+
+        if (valueType.IsArray)
+            return new ArrayUnitConfigControl(name, value);
+        
+        return new ComplexUnitConfigControl(name, value);
+    }
+
+    public static object? CreateDefaultValue(Type type)
+    {
+        if(type.IsValueType)
+            return Activator.CreateInstance(type);
+        
+        var ctor = type.GetConstructors().First();
+        var parameters = ctor.GetParameters()
+            .Select(p => CreateDefaultValue(p.ParameterType))
+            .ToArray();
+        
+        return ctor.Invoke(parameters);
+    }
+}

Nebula.Launcher/Configurations/FloatUnitConfigControl.cs

@@ -0,0 +1,19 @@
+using System.Globalization;
+
+namespace Nebula.Launcher.ViewModels.Pages;
+
+public sealed class FloatUnitConfigControl(string name, float value) : UnitConfigControl<float>(name, value)
+{
+
+    public CultureInfo CultureInfo = CultureInfo.InvariantCulture;
+
+    public override void SetConfValue(float value)
+    {
+        ConfigValue = value.ToString(CultureInfo);
+    }
+
+    public override float GetConfValue()
+    {
+        return float.Parse(ConfigValue, CultureInfo);
+    }
+}

Nebula.Launcher/Configurations/IConfigControl.cs

@@ -0,0 +1,9 @@
+namespace Nebula.Launcher.ViewModels.Pages;
+
+public interface IConfigControl
+{
+    public string ConfigName { get; }
+    public bool Dirty {get;}
+    public abstract void SetValue(object value);
+    public abstract object GetValue();
+}

Nebula.Launcher/Configurations/IntUnitConfigControl.cs

@@ -0,0 +1,14 @@
+namespace Nebula.Launcher.ViewModels.Pages;
+
+public sealed class IntUnitConfigControl(string name, int value) : UnitConfigControl<int>(name, value)
+{
+    public override void SetConfValue(int value)
+    {
+        ConfigValue = value.ToString();
+    }
+
+    public override int GetConfValue()
+    {
+        return int.Parse(ConfigValue);
+    }
+}

Nebula.Launcher/Configurations/StringUnitConfigControl.cs

@@ -0,0 +1,14 @@
+namespace Nebula.Launcher.ViewModels.Pages;
+
+public sealed class StringUnitConfigControl(string name, string value) : UnitConfigControl<string>(name, value)
+{
+    public override void SetConfValue(string value)
+    {
+        ConfigValue = value;
+    }
+
+    public override string GetConfValue()
+    {
+        return ConfigValue;
+    }
+}

Nebula.Launcher/Configurations/UnitConfigControl.cs

@@ -0,0 +1,53 @@
+using Avalonia.Controls;
+using Avalonia.Layout;
+
+namespace Nebula.Launcher.ViewModels.Pages;
+
+public abstract class UnitConfigControl<T> : Border, IConfigControl where T : notnull
+{
+    private readonly Label _nameLabel = new();
+    private readonly TextBox _valueLabel = new();
+    private string _originalValue;
+
+    private StackPanel _panel = new();
+    
+    public string ConfigName { get; }
+   
+    public bool Dirty => _originalValue != ConfigValue;
+
+    protected string ConfigValue
+    {
+        get => _valueLabel.Text ?? string.Empty;
+        set => _valueLabel.Text = value;
+    }
+
+    public UnitConfigControl(string name, T value)
+    {
+        Classes.Add("ConfigBorder");
+        ConfigName = name;
+        _panel.Orientation = Orientation.Horizontal;
+        _panel.Children.Add(_nameLabel);
+        _panel.Children.Add(_valueLabel);
+        
+        _nameLabel.Content = name;
+        _nameLabel.VerticalAlignment = VerticalAlignment.Center;
+        Child = _panel;
+        
+        SetConfValue(value);
+        _originalValue = ConfigValue;
+    }
+
+    public abstract void SetConfValue(T value);
+
+    public abstract T GetConfValue();
+    
+    public void SetValue(object value)
+    {
+        SetConfValue((T)value);
+    }
+
+    public object GetValue()
+    {
+        return GetConfValue()!;
+    }
+}

Nebula.Launcher/Converters/TypeConverters.cs

@@ -1,11 +1,13 @@
-using Avalonia;
+using System;
-using Avalonia.Controls;
 using Avalonia.Data.Converters;
 using Avalonia.Media;
+using Avalonia.Platform;
+using Nebula.Launcher.ViewModels.Pages;
+using Color = System.Drawing.Color;
 
 namespace Nebula.Launcher.Converters;
 
-public class TypeConverters
+public static class TypeConverters
 {
     public static FuncValueConverter<string, string?> IconConverter { get; } =
         new(iconKey =>
@@ -13,4 +15,14 @@ public class TypeConverters
             if (iconKey == null) return null;
             return $"/Assets/svg/{iconKey}.svg";
         });
+    
+    public static FuncValueConverter<string, IImage?> ImageConverter { get; } =
+        new(iconKey =>
+        {
+            if (iconKey == null) return null;
+            return new Avalonia.Media.Imaging.Bitmap(AssetLoader.Open(new Uri($"avares://Nebula.Launcher/Assets/error_presentation/{iconKey}.png")));
+        });
+
+    public static FuncValueConverter<string, Avalonia.Media.Color> NameColorRepresentation { get; } =
+        new((str)=>ColorUtils.GetColorFromString(str ?? throw new ArgumentNullException(nameof(str),"Name of color is null!")));
 }

Nebula.Launcher/LauncherConVar.cs

@@ -2,7 +2,9 @@ using System.Collections.Generic;
 using System.Globalization;
 using Nebula.Launcher.Models;
 using Nebula.Launcher.Models.Auth;
-using Nebula.Launcher.ViewModels.Pages;
+using Nebula.Shared.ConfigMigrations;
+using Nebula.Shared.Configurations;
+using Nebula.Shared.Configurations.Migrations;
 using Nebula.Shared.Services;
 
 namespace Nebula.Launcher;
@@ -11,11 +13,16 @@ public static class LauncherConVar
 {
     public static readonly ConVar<bool> DoMigration =
         ConVarBuilder.Build("migration.doMigrate", true);
-    public static readonly ConVar<ProfileAuthCredentials[]> AuthProfiles =
+    
-        ConVarBuilder.Build<ProfileAuthCredentials[]>("auth.profiles.v2", []);
+    public static readonly ConVar<AuthTokenCredentials[]> AuthProfiles =
+        ConVarBuilder.BuildWithMigration<AuthTokenCredentials[]>("auth.profiles.v3", 
+            MigrationQueueBuilder.Instance
+                .With(new ProfileMigrationV2("auth.profiles.v2","auth.profiles.v3"))
+                .Build(), 
+            []);
 
-    public static readonly ConVar<CurrentAuthInfo?> AuthCurrent =
+    public static readonly ConVar<AuthTokenCredentials?> AuthCurrent =
-        ConVarBuilder.Build<CurrentAuthInfo?>("auth.current.v2");
+        ConVarBuilder.Build<AuthTokenCredentials?>("auth.current.v2");
     
     public static readonly ConVar<string[]> Favorites =
         ConVarBuilder.Build<string[]>("server.favorites", []);
@@ -29,18 +36,22 @@ public static class LauncherConVar
             "WizDen", 
             [
                 "https://harpy.durenko.tatar/auth-api/",
+                "https://auth.spacestation14.com/",
                 "https://auth.fallback.spacestation14.com/",
+            ]),
+        new AuthServerCredentials(
+            "SimpleStation", 
+            [
+                "https://auth.simplestation.org/",
             ])
     ]);
     
     public static readonly ConVar<ServerHubRecord[]> Hub = ConVarBuilder.Build<ServerHubRecord[]>("launcher.hub.v2", [
         new ServerHubRecord("WizDen", "https://harpy.durenko.tatar/hub-api/api/servers"),
-        new ServerHubRecord("AltHub","https://web.networkgamez.com/api/servers")
+        new ServerHubRecord("AltHub","https://hub.singularity14.co.uk/api/servers")
     ]);
 
     public static readonly ConVar<string> CurrentLang = ConVarBuilder.Build<string>("launcher.language", CultureInfo.CurrentCulture.Name);
     public static readonly ConVar<string> ILSpyUrl = ConVarBuilder.Build<string>("decompiler.url",
     "https://github.com/icsharpcode/ILSpy/releases/download/v9.0/ILSpy_binaries_9.0.0.7889-x64.zip");
-    
-    
 }

Nebula.Launcher/MessageBox/MessageView.axaml

@@ -2,16 +2,9 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:views="clr-namespace:Nebula.Launcher.Views"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             Width="600"
+            
-             Height="400"
              x:Class="Nebula.Launcher.MessageBox.MessageView">
-    <Grid RowDefinitions="50,*" ColumnDefinitions="*">
+    <views:VisualErrorView x:Name="ErrorView"/>
-        <Border Grid.Column="0" Background="#222222" Padding="10" BorderBrush="#444444" BorderThickness="0,0,0,3">
-            <Label VerticalAlignment="Center" x:Name="Title">Text</Label>
-        </Border>
-        <Panel Margin="5" Grid.Row="1">
-            <Label x:Name="Message">Message</Label>
-        </Panel>
-    </Grid>
 </UserControl>

Nebula.Launcher/MessageBox/MessageView.axaml.cs

@@ -1,21 +1,22 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
+using Nebula.Launcher.ViewModels;
 
 namespace Nebula.Launcher.MessageBox;
 
 public partial class MessageView : UserControl, IMessageContainerProvider
 {
-    public MessageView(out IMessageContainerProvider provider)
+    private readonly VisualErrorViewModel _context;
+    public MessageView()
     {
         InitializeComponent();
-        provider = this;
+        _context = new VisualErrorViewModel();
+        ErrorView.Content = _context;
     }
 
     public void ShowMessage(string message, string title)
     {
-        Title.Content = title;
+        _context.Title = title;
-        Message.Content = message;
+        _context.Description = message;
     }
 }
 

Nebula.Launcher/MessageBox/MessageWindow.axaml

@@ -3,10 +3,52 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:messageBox="clr-namespace:Nebula.Launcher.MessageBox"
-        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+        SystemDecorations="BorderOnly"
+        mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="260"
         Width="600"
-        Height="400"
+        Height="260"
+        CanResize="False"
         x:Class="Nebula.Launcher.MessageBox.MessageWindow"
         Title="MessageWindow">
-    
+     <Grid ColumnDefinitions="*" RowDefinitions="30,*">
+            <messageBox:MessageView
+                Grid.Column="0"
+                Grid.Row="0"
+                Grid.RowSpan="2"
+                x:Name="MessageView" />
+            <Border
+                
+                BorderThickness="0,0,0,2"
+                CornerRadius="0"
+                Grid.Column="0"
+                Grid.Row="0">
+                <Border.BorderBrush>
+                    <LinearGradientBrush EndPoint="100%,50%" StartPoint="0%,50%">
+                        <GradientStop Color="#222222" Offset="0.0" />
+                        <GradientStop Color="#442222" Offset="1.0" />
+                    </LinearGradientBrush>
+                </Border.BorderBrush>
+                <Panel
+                    Height="30"
+                    PointerPressed="InputElement_OnPointerPressed">
+                    <TextBlock
+                        FontSize="10"
+                        Foreground="White"
+                        IsVisible="False"
+                        Margin="15,0"
+                        Text="Nebula Launcher"
+                        VerticalAlignment="Center" />
+                    <StackPanel
+                        HorizontalAlignment="Right"
+                        Margin="5,0,5,0"
+                        Orientation="Horizontal"
+                        Spacing="8">
+                        <Button
+                            Click="Close_Click"
+                            Content="🗙"
+                            Foreground="Azure" />
+                    </StackPanel>
+                </Panel>
+            </Border>
+        </Grid>
 </Window>

Nebula.Launcher/MessageBox/MessageWindow.axaml.cs

@@ -1,12 +1,28 @@
 using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
 
 namespace Nebula.Launcher.MessageBox;
 
-public partial class MessageWindow : Window
+public partial class MessageWindow : Window, IMessageContainerProvider
 { 
-    public MessageWindow(out IMessageContainerProvider provider)
+    public MessageWindow()
     {
         InitializeComponent();
-        Content = new MessageView(out provider);
+    }
+
+    public void ShowMessage(string message, string title)
+    {
+        MessageView.ShowMessage(message, title);
+    }
+    
+    private void Close_Click(object? sender, RoutedEventArgs e)
+    {
+        Close();
+    }
+
+    private void InputElement_OnPointerPressed(object? sender, PointerPressedEventArgs e)
+    {
+        BeginMoveDrag(e);
     }
 }

Nebula.Launcher/Models/Auth/ProfileAuthCredentials.cs

@@ -1,11 +1,12 @@
 using System.Text.Json.Serialization;
 using System.Windows.Input;
+using Avalonia.Media;
+using Nebula.Shared.Services;
 
 namespace Nebula.Launcher.Models.Auth;
 
 public sealed record ProfileAuthCredentials(
-    string Login,
+    AuthTokenCredentials Credentials, 
-    string Password,
+    string AuthName,
-    string AuthServer,
     [property: JsonIgnore] ICommand OnSelect = default!,
     [property: JsonIgnore] ICommand OnDelete = default!);

Nebula.Launcher/ProcessHelper/GameProcessStartInfoProvider.cs

@@ -3,6 +3,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using System.Threading.Tasks;
+using Nebula.Launcher.ViewModels.Pages;
 using Nebula.Shared;
 using Nebula.Shared.Models;
 using Nebula.Shared.Services;
@@ -10,7 +11,7 @@ using Nebula.Shared.Services;
 namespace Nebula.Launcher.ProcessHelper;
 
 [ServiceRegister(isSingleton:false)]
-public sealed class GameProcessStartInfoProvider(DotnetResolverService resolverService, AuthService authService) : 
+public sealed class GameProcessStartInfoProvider(DotnetResolverService resolverService, AccountInfoViewModel accountInfoViewModel) : 
     DotnetProcessStartInfoProviderBase(resolverService)
 {
     private string? _publicKey;
@@ -34,7 +35,7 @@ public sealed class GameProcessStartInfoProvider(DotnetResolverService resolverS
     {
         var baseStart = await base.GetProcessStartInfo();
         
-        var authProv = authService.SelectedAuth;
+        var authProv = accountInfoViewModel.Credentials.Value;
         if(authProv is null) 
             throw new Exception("Client is without selected auth");
 

Nebula.Launcher/ProcessHelper/GameRunnerPreparer.cs

@@ -9,7 +9,7 @@ using Nebula.Shared.Services;
 namespace Nebula.Launcher.ProcessHelper;
 
 [ServiceRegister]
-public sealed class GameRunnerPreparer(IServiceProvider provider, ContentService contentService, EngineService engineService, DebugService debugService)
+public sealed class GameRunnerPreparer(IServiceProvider provider, ContentService contentService, EngineService engineService)
 {
     public async Task<ProcessRunHandler<GameProcessStartInfoProvider>> GetGameProcessStartInfoProvider(RobustUrl address, ILoadingHandler loadingHandler, CancellationToken cancellationToken = default)
     {

Nebula.Launcher/Services/LocalisationService.cs

@@ -14,7 +14,8 @@ namespace Nebula.Launcher.Services;
 public partial class LocalisationService
 {
     [GenerateProperty] private ConfigurationService ConfigurationService { get; }
-
+    [GenerateProperty] private DebugService DebugService { get; }
+    
     private CultureInfo _currentCultureInfo = CultureInfo.CurrentCulture;
     private static MessageContext? _currentMessageContext;
 
@@ -42,6 +43,7 @@ public partial class LocalisationService
 
             _currentMessageContext = mc;
         } catch (Exception e) {
+            DebugService.GetLogger("localisationService").Error(e);
             LoadLanguage(CultureInfo.GetCultureInfo("en-US"));
         }
     }
@@ -51,28 +53,27 @@ public partial class LocalisationService
         Initialise();
     }
 
-    public static string GetString(string locale)
+    public static string GetString(string locale, Dictionary<string, object>? options = null)
     {
         if (_currentMessageContext is null)
         {
-            Console.WriteLine("ERROR SHIT BITHC!");
             return locale;
         }
         var message = _currentMessageContext.GetMessage(locale);
         if (message == null) return locale;
-        return _currentMessageContext.Format(message, new Dictionary<string, object>());
+        return _currentMessageContext.Format(message, options ?? []);
     }
 }
 
 public class LocaledText : MarkupExtension
 {
     public string Key { get; set; } 
+    public Dictionary<string, object>? Options { get; set; }
 
     public LocaledText(string key) => Key = key;
 
     public override object ProvideValue(IServiceProvider serviceProvider)
     {
-        // Fetch the localized string using the key
+        return LocalisationService.GetString(Key, Options);
-        return LocalisationService.GetString(Key);
     }
 }

Nebula.Launcher/ViewModels/MainViewModel.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
+using Avalonia.Logging;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Nebula.Launcher.Models;
@@ -40,8 +41,10 @@ public partial class MainViewModel : ViewModelBase
     [ObservableProperty] private bool _isPopupClosable = true;
     [ObservableProperty] private bool _popup;
     [ObservableProperty] private ListItemTemplate? _selectedListItem;
-
+    [ObservableProperty] private string? _loginText = LocalisationService.GetString("auth-current-login-no-name");
-    [GenerateProperty] private LocalisationService LocalisationService { get; }
+    
+    [GenerateProperty] private LocalisationService LocalisationService { get; } // Не убирать! Без этой хуйни вся локализация идет в пизду!
+    [GenerateProperty] private AccountInfoViewModel AccountInfoViewModel { get; }
     [GenerateProperty] private DebugService DebugService { get; } = default!;
     [GenerateProperty] private PopupMessageService PopupMessageService { get; } = default!;
     [GenerateProperty] private ContentService ContentService { get; } = default!;
@@ -56,7 +59,7 @@ public partial class MainViewModel : ViewModelBase
     {
         Items = new ObservableCollection<ListItemTemplate>(_templates.Select(a=>
         {
-            return new ListItemTemplate(a.ModelType, a.IconKey, LocalisationService.GetString(a.Label));
+            return a with { Label = LocalisationService.GetString(a.Label) };
         }
         ));
         RequirePage<AccountInfoViewModel>();
@@ -64,6 +67,15 @@ public partial class MainViewModel : ViewModelBase
 
     protected override void Initialise()
     {
+        AccountInfoViewModel.Credentials.PropertyChanged += (_, args) =>
+        {
+            if (args.PropertyName is not nameof(AccountInfoViewModel.Credentials.Value)) 
+                return;
+            UpdateCredentialsInfo();
+        };
+
+        UpdateCredentialsInfo();
+
         _logger = DebugService.GetLogger(this);
 
         using var stream = typeof(MainViewModel).Assembly
@@ -79,6 +91,11 @@ public partial class MainViewModel : ViewModelBase
         
         CheckMigration();
         
+        var loadingHandler = ViewHelperService.GetViewModel<LoadingContextViewModel>();
+        loadingHandler.LoadingName = LocalisationService.GetString("migration-config-task");
+        loadingHandler.IsCancellable = false;
+        ConfigurationService.MigrateConfigs(loadingHandler);
+        
         if (!VCRuntimeDllChecker.AreVCRuntimeDllsPresent())
         {
             OnPopupRequired(LocalisationService.GetString("vcruntime-check-error"));
@@ -86,6 +103,27 @@ public partial class MainViewModel : ViewModelBase
         }
     }
 
+    private void UpdateCredentialsInfo()
+    {
+        if(AccountInfoViewModel.Credentials.HasValue)
+        {
+            LoginText =
+                LocalisationService.GetString("auth-current-login-name",
+                    new Dictionary<string, object>
+                    {
+                        { "login", AccountInfoViewModel.Credentials.Value?.Login ?? "" },
+                        {
+                            "auth_server",
+                            AccountInfoViewModel.GetServerAuthName(AccountInfoViewModel.Credentials.Value) ?? ""
+                        }
+                    });
+        }
+        else
+        {
+            LoginText =  LocalisationService.GetString("auth-current-login-no-name");
+        }
+    }
+
     private void CheckMigration()
     {
         if (!ConfigurationService.GetConfigValue(LauncherConVar.DoMigration))
@@ -163,6 +201,16 @@ public partial class MainViewModel : ViewModelBase
         Popup = true;
     }
 
+    public void OpenAuthPage()
+    {
+        RequirePage<AccountInfoViewModel>();
+    }
+
+    public void OpenRootPath()
+    {
+        ExplorerHelper.OpenFolder(FileService.RootPath);
+    }
+
     public void OpenLink()
     {
         Helper.OpenBrowser("https://durenko.tatar/nebula");

Nebula.Launcher/ViewModels/Pages/AccountInfoViewModel.cs

@@ -5,11 +5,13 @@ using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
+using Nebula.Launcher.Configurations;
 using Nebula.Launcher.Models.Auth;
 using Nebula.Launcher.Services;
 using Nebula.Launcher.ViewModels.Popup;
 using Nebula.Launcher.Views.Pages;
+using Nebula.Shared.Configurations;
+using Nebula.Shared.Models.Auth;
 using Nebula.Shared.Services;
 using Nebula.Shared.Services.Logging;
 using Nebula.Shared.Utils;
@@ -22,22 +24,16 @@ namespace Nebula.Launcher.ViewModels.Pages;
 public partial class AccountInfoViewModel : ViewModelBase
 {
     [ObservableProperty] private bool _authMenuExpand;
-
     [ObservableProperty] private bool _authUrlConfigExpand;
-
     [ObservableProperty] private int _authViewSpan = 1;
-
     [ObservableProperty] private string _currentAuthServer = string.Empty;
-
     [ObservableProperty] private string _currentLogin = string.Empty;
-
     [ObservableProperty] private string _currentPassword = string.Empty;
-
     [ObservableProperty] private bool _isLogged;
     [ObservableProperty] private bool _doRetryAuth;
+    [ObservableProperty] private AuthServerCredentials _authItemSelect;
 
     private bool _isProfilesEmpty;
-    [GenerateProperty] private LocalisationService LocalisationService { get; }
     [GenerateProperty] private PopupMessageService PopupMessageService { get; } = default!;
     [GenerateProperty] private ConfigurationService ConfigurationService { get; } = default!;
     [GenerateProperty] private DebugService DebugService { get; }
@@ -47,35 +43,28 @@ public partial class AccountInfoViewModel : ViewModelBase
     public ObservableCollection<ProfileAuthCredentials> Accounts { get; } = new();
     public ObservableCollection<AuthServerCredentials> AuthUrls { get; } = new();
 
-    [ObservableProperty] private AuthServerCredentials _authItemSelect;
+    public ComplexConVarBinder<AuthTokenCredentials?> Credentials { get; private set; }
 
     private ILogger _logger;
-
+    
     //Design think
     protected override void InitialiseInDesignMode()
     {
-        AddAccount(new AuthLoginPassword("Binka", "12341", ""));
-        AddAccount(new AuthLoginPassword("Binka", "12341", ""));
-        
         AuthUrls.Add(new AuthServerCredentials("Test",["example.com"]));
+        
+        AddAccount(new AuthTokenCredentials(Guid.Empty, LoginToken.Empty, "Binka", "example.com"));
+        AddAccount(new AuthTokenCredentials(Guid.Empty, LoginToken.Empty, "Binka", ""));
     }
-
+    
     //Real think
     protected override void Initialise()
     {
         _logger = DebugService.GetLogger(this);
+        Credentials = new AuthTokenCredentialsVar(this);
         Task.Run(ReadAuthConfig);
+        Credentials.Value = Credentials.Value;
     }
-
+    
-    public void AuthByProfile(ProfileAuthCredentials credentials)
-    {
-        CurrentLogin = credentials.Login;
-        CurrentPassword = credentials.Password;
-        CurrentAuthServer = credentials.AuthServer;
-        
-        DoAuth();
-    }
-
     public void DoAuth(string? code = null)
     {
         var message = ViewHelperService.GetViewModel<InfoPopupViewModel>();
@@ -93,48 +82,32 @@ public partial class AccountInfoViewModel : ViewModelBase
         Task.Run(async () =>
         {
             Exception? exception = null;
+            
             foreach (var server in serverCandidates)
             {
                 try
                 {
-                    await CatchAuthError(async () => await TryAuth(CurrentLogin, CurrentPassword, server, code), ()=> message.Dispose());
+                    await CatchAuthError(async() =>
+                    {
+                        Credentials.Value = await AuthService.Auth(CurrentLogin, CurrentPassword, server, code);
+                    }, ()=> message.Dispose());        
                     break;
                 }
                 catch (Exception ex)
                 {
-                    var unexpectedError = new Exception(LocalisationService.GetString("auth-error"), ex);
+                    exception = new Exception(LocalisationService.GetString("auth-error"), ex);
-                    _logger.Error(unexpectedError);
-                    PopupMessageService.Popup(unexpectedError);
                 }
             }
             
             message.Dispose();
 
-            if (!IsLogged)
+            if (exception != null)
             {
-                PopupMessageService.Popup(exception ?? new Exception(LocalisationService.GetString("auth-error")));
+                PopupMessageService.Popup(new Exception("Error while auth", exception));
             }
         });
     }
 
-    private async Task TryAuth(CurrentAuthInfo currentAuthInfo)
-    {
-        CurrentLogin = currentAuthInfo.Login;
-        CurrentAuthServer = currentAuthInfo.AuthServer;
-        await AuthService.SetAuth(currentAuthInfo);
-        IsLogged = true;
-    }
-
-    private async Task TryAuth(string login, string password, string authServer, string? code)
-    {
-        await AuthService.Auth(new AuthLoginPassword(login, password, authServer), code);
-        CurrentLogin = login;
-        CurrentPassword = password;
-        CurrentAuthServer = authServer;
-        IsLogged = true;
-        ConfigurationService.SetConfigValue(LauncherConVar.AuthCurrent, AuthService.SelectedAuth);
-    }
-
     private async Task CatchAuthError(Func<Task> a, Action? onError)
     {
         DoRetryAuth = false;
@@ -151,15 +124,24 @@ public partial class AccountInfoViewModel : ViewModelBase
                 case AuthenticateDenyCode.TfaRequired:
                 case AuthenticateDenyCode.TfaInvalid:
                     var p = ViewHelperService.GetViewModel<TfaViewModel>();
-                    p.OnTfaEntered += OnTfaEntered;
                     PopupMessageService.Popup(p);
                     _logger.Log("TFA required");
                     break;
                 case AuthenticateDenyCode.InvalidCredentials:
                     PopupError(LocalisationService.GetString("auth-invalid-credentials"), e);
                     break;
+                case AuthenticateDenyCode.AccountLocked:
+                    PopupError(LocalisationService.GetString("auth-account-locked"), e);
+                    break;
+                case AuthenticateDenyCode.AccountUnconfirmed:
+                    PopupError(LocalisationService.GetString("auth-account-unconfirmed"), e);
+                    break;
+                case AuthenticateDenyCode.None:
+                    PopupError(LocalisationService.GetString("auth-none"),e);
+                    break;
                 default:
-                    throw;
+                    PopupError(LocalisationService.GetString("auth-error-fuck"), e);
+                    break;
             }
         }
         catch (HttpRequestException e)
@@ -171,17 +153,41 @@ public partial class AccountInfoViewModel : ViewModelBase
                     PopupError(LocalisationService.GetString("auth-connection-error"), e);
                     DoRetryAuth = true;
                     break;
-
                 case HttpRequestError.NameResolutionError:
                     PopupError(LocalisationService.GetString("auth-name-resolution-error"), e);
                     DoRetryAuth = true;
                     break;
-                
                 case HttpRequestError.SecureConnectionError:
                     PopupError(LocalisationService.GetString("auth-secure-error"), e);
                     DoRetryAuth = true;
                     break;
-
+                case HttpRequestError.UserAuthenticationError:
+                    PopupError(LocalisationService.GetString("auth-user-authentication-error"), e);
+                    break;
+                case HttpRequestError.Unknown:
+                    PopupError(LocalisationService.GetString("auth-unknown"), e);
+                    break;
+                case HttpRequestError.HttpProtocolError:
+                    PopupError(LocalisationService.GetString("auth-http-protocol-error"), e);
+                    break;
+                case HttpRequestError.ExtendedConnectNotSupported:
+                    PopupError(LocalisationService.GetString("auth-extended-connect-not-support"), e);
+                    break;
+                case HttpRequestError.VersionNegotiationError:
+                    PopupError(LocalisationService.GetString("auth-version-negotiation-error"), e);
+                    break;
+                case HttpRequestError.ProxyTunnelError:
+                    PopupError(LocalisationService.GetString("auth-proxy-tunnel-error"), e);
+                    break;
+                case HttpRequestError.InvalidResponse:
+                    PopupError(LocalisationService.GetString("auth-invalid-response"), e);
+                    break;
+                case HttpRequestError.ResponseEnded:
+                    PopupError(LocalisationService.GetString("auth-response-ended"), e);
+                    break;
+                case HttpRequestError.ConfigurationLimitExceeded:
+                    PopupError(LocalisationService.GetString("auth-configuration-limit-exceeded"), e);
+                    break;
                 default:
                     var authError = new Exception(LocalisationService.GetString("auth-error"), e);
                     _logger.Error(authError);
@@ -198,8 +204,14 @@ public partial class AccountInfoViewModel : ViewModelBase
 
     public void Logout()
     {
-        IsLogged = false;
+        Credentials.Value = null;
-        AuthService.ClearAuth();
+        CurrentAuthServer = "";
+    }
+
+    public string GetServerAuthName(AuthTokenCredentials? credentials)
+    {
+        if (credentials is null) return "";
+        return AuthUrls.FirstOrDefault(p => p.Servers.Contains(credentials.AuthServer))?.Name ?? "CustomAuth";
     }
 
     private void UpdateAuthMenu()
@@ -210,15 +222,16 @@ public partial class AccountInfoViewModel : ViewModelBase
             AuthViewSpan = 1;
     }
 
-    private void AddAccount(AuthLoginPassword authLoginPassword)
+    private void AddAccount(AuthTokenCredentials credentials)
     {
         var onDelete = new DelegateCommand<ProfileAuthCredentials>(OnDeleteProfile);
-        var onSelect = new DelegateCommand<ProfileAuthCredentials>(AuthByProfile);
+        var onSelect = new DelegateCommand<ProfileAuthCredentials>((p) => Credentials.Value = p.Credentials);
+        
+        var serverName = GetServerAuthName(credentials);
 
         var alpm = new ProfileAuthCredentials(
-            authLoginPassword.Login,
+            credentials,
-            authLoginPassword.Password,
+            serverName, 
-            authLoginPassword.AuthServer,
             onSelect,
             onDelete);
 
@@ -228,58 +241,84 @@ public partial class AccountInfoViewModel : ViewModelBase
         Accounts.Add(alpm);
     }
 
-    private void ReadAuthConfig()
+    private async Task ReadAuthConfig()
     {
         var message = ViewHelperService.GetViewModel<InfoPopupViewModel>();
         message.InfoText = LocalisationService.GetString("auth-config-read");
         message.IsInfoClosable = false;
         PopupMessageService.Popup(message);
-        foreach (var profile in
+        
-                 ConfigurationService.GetConfigValue(LauncherConVar.AuthProfiles)!)
+        _logger.Log("Reading auth config");
-            AddAccount(new AuthLoginPassword(profile.Login, profile.Password, profile.AuthServer));
+        
-
-        if (Accounts.Count == 0) UpdateAuthMenu();
-
         AuthUrls.Clear();
         var authUrls = ConfigurationService.GetConfigValue(LauncherConVar.AuthServers)!;
         foreach (var url in authUrls) AuthUrls.Add(url);
         if(authUrls.Length > 0) AuthItemSelect = authUrls[0];
-        message.Dispose();
+        
+        var profileCandidates = new List<AuthTokenCredentials>();
 
-        DoCurrentAuth();
+        foreach (var profile in
-    }
+                 ConfigurationService.GetConfigValue(LauncherConVar.AuthProfiles)!)
-
-    public async void DoCurrentAuth()
-    {
-        var message = ViewHelperService.GetViewModel<InfoPopupViewModel>();
-        message.InfoText = LocalisationService.GetString("auth-try-auth-config");
-        message.IsInfoClosable = false;
-        PopupMessageService.Popup(message);
-
-        var currProfile = ConfigurationService.GetConfigValue(LauncherConVar.AuthCurrent);
-
-        if (currProfile != null)
         {
-            try
+            _logger.Log($"Reading profile {profile.Login}");
+            var checkedCredit = await CheckOrRenewToken(profile);
+            if(checkedCredit is null)
             {
-                await CatchAuthError(async () => await TryAuth(currProfile), () => message.Dispose());
+                _logger.Error($"Profile {profile.Login} is not available");
-            }
+                continue;
-            catch (Exception ex)
-            {
-                var unexpectedError = new Exception(LocalisationService.GetString("auth-error"), ex);
-                _logger.Error(unexpectedError);
-                PopupMessageService.Popup(unexpectedError);
-                return;
             }
+            
+            _logger.Log($"Profile {profile.Login} is available");
+            profileCandidates.Add(checkedCredit);
+            AddAccount(checkedCredit);
         }
+        
+        ConfigurationService.SetConfigValue(LauncherConVar.AuthProfiles, profileCandidates.ToArray());
 
+        if (Accounts.Count == 0) UpdateAuthMenu();
+        
         message.Dispose();
     }
 
-    [RelayCommand]
+    public void DoCurrentAuth()
-    private void OnSaveProfile()
     {
-        AddAccount(new AuthLoginPassword(CurrentLogin, CurrentPassword, CurrentAuthServer));
+        DoAuth();
+    }
+
+    private async Task<AuthTokenCredentials?> CheckOrRenewToken(AuthTokenCredentials? authTokenCredentials)
+    {
+        if(authTokenCredentials is null) 
+            return null;
+
+        var daysLeft = (int)(authTokenCredentials.Token.ExpireTime - DateTime.Now).TotalDays;
+        
+        if(daysLeft >= 4)
+        {
+            _logger.Log("Token " + authTokenCredentials.Login + " is active, "+daysLeft+" days left, undo renewing!");
+            return authTokenCredentials;
+        }
+        
+        try
+        {
+            _logger.Log($"Renewing token for {authTokenCredentials.Login}");
+            return await ExceptionHelper.TryRun(() => AuthService.Refresh(authTokenCredentials),3, (attempt, e) =>
+            {
+                _logger.Error(new Exception("Error while renewing, attempts: " + attempt, e));
+            });
+        }
+        catch (Exception e)
+        {
+            var unexpectedError = new Exception(LocalisationService.GetString("auth-error"), e);
+            _logger.Error(unexpectedError);
+            return authTokenCredentials;
+        }
+    }
+    
+    public void OnSaveProfile()
+    {
+        if(Credentials.Value is null) return;
+        
+        AddAccount(Credentials.Value);
         _isProfilesEmpty = Accounts.Count == 0;
         UpdateAuthMenu();
         DirtyProfile();
@@ -303,15 +342,13 @@ public partial class AccountInfoViewModel : ViewModelBase
         messageView.IsInfoClosable = true;
         PopupMessageService.Popup(messageView);
     }
-
+    
-    [RelayCommand]
+    public void OnExpandAuthUrl()
-    private void OnExpandAuthUrl()
     {
         AuthUrlConfigExpand = !AuthUrlConfigExpand;
     }
-
+    
-    [RelayCommand]
+    public void OnExpandAuthView()
-    private void OnExpandAuthView()
     {
         AuthMenuExpand = !AuthMenuExpand;
         UpdateAuthMenu();
@@ -320,6 +357,77 @@ public partial class AccountInfoViewModel : ViewModelBase
     private void DirtyProfile()
     {
         ConfigurationService.SetConfigValue(LauncherConVar.AuthProfiles,
-            Accounts.ToArray());
+            Accounts.Select(a => a.Credentials).ToArray());
     }
-}
+    
+    public sealed class AuthTokenCredentialsVar(AccountInfoViewModel accountInfoViewModel)
+        : ComplexConVarBinder<AuthTokenCredentials?>(
+            accountInfoViewModel.ConfigurationService.SubscribeVarChanged(LauncherConVar.AuthCurrent))
+    {
+        protected override async Task<AuthTokenCredentials?> OnValueChange(AuthTokenCredentials? currProfile)
+        {
+            if (currProfile is null)
+            {
+                accountInfoViewModel.IsLogged = false;
+                accountInfoViewModel._logger.Log("clearing credentials");
+                return null;
+            }
+        
+            var message = accountInfoViewModel.ViewHelperService.GetViewModel<InfoPopupViewModel>();
+            message.InfoText = LocalisationService.GetString("auth-try-auth-config");
+            message.IsInfoClosable = false;
+            accountInfoViewModel.PopupMessageService.Popup(message);
+      
+            accountInfoViewModel._logger.Log($"trying auth with {currProfile.Login}");
+
+            var errorRun = false;
+
+            currProfile = await accountInfoViewModel.CheckOrRenewToken(currProfile);
+
+            if (currProfile is null)
+            {
+                message.Dispose();
+                
+                accountInfoViewModel._logger.Log("profile credentials update required!");
+                
+                accountInfoViewModel.PopupMessageService.Popup("profile credentials update required!");
+                
+                accountInfoViewModel.IsLogged = false;
+                return null;
+            }
+            
+            try
+            {
+                await accountInfoViewModel.CatchAuthError(async () =>
+                {
+                    await accountInfoViewModel.AuthService.EnsureToken(currProfile);
+                }, () =>
+                {
+                    message.Dispose();
+                    errorRun = true;
+                });
+                message.Dispose();
+            }
+            catch (Exception ex)
+            {
+                accountInfoViewModel.CurrentLogin = currProfile.Login;
+                accountInfoViewModel.CurrentAuthServer = currProfile.AuthServer;
+                var unexpectedError = new Exception(LocalisationService.GetString("auth-error"), ex);
+                accountInfoViewModel._logger.Error(unexpectedError);
+                accountInfoViewModel.PopupMessageService.Popup(unexpectedError);
+                errorRun = true;
+            }
+
+            if (errorRun)
+            {
+                accountInfoViewModel.IsLogged = false;
+                return null;
+            }
+        
+            accountInfoViewModel.IsLogged = true;
+            
+            return currProfile;
+        }
+    }
+}
+

Nebula.Launcher/ViewModels/Pages/ConfigurationViewModel.cs

@@ -1,21 +1,14 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Globalization;
 using System.IO;
 using System.IO.Compression;
-using System.Linq;
-using System.Reflection;
-using System.Threading;
 using System.Threading.Tasks;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Layout;
 using Nebula.Launcher.Services;
 using Nebula.Launcher.ViewModels.Popup;
 using Nebula.Launcher.Views.Pages;
 using Nebula.Shared;
+using Nebula.Shared.Configurations;
 using Nebula.Shared.Services;
 using Nebula.Shared.ViewHelper;
 
@@ -119,288 +112,4 @@ public partial class ConfigurationViewModel : ViewModelBase
     {
         InitConfiguration();
     }
-}
-
-public static class ConfigControlHelper{
-    public static IConfigControl GetConfigControl(string name,object value)
-    {
-        switch (value)
-        {
-            case string stringValue:
-                return new StringUnitConfigControl(name, stringValue);
-            case int intValue:
-                return new IntUnitConfigControl(name, intValue);
-            case float floatValue:
-                return new FloatUnitConfigControl(name, floatValue);
-        }
-        
-        var valueType = value.GetType();
-
-        if (valueType.IsArray)
-            return new ArrayUnitConfigControl(name, value);
-        
-        return new ComplexUnitConfigControl(name, value);
-    }
-
-    public static object? CreateDefaultValue(Type type)
-    {
-        if(type.IsValueType)
-            return Activator.CreateInstance(type);
-        
-        var ctor = type.GetConstructors().First();
-        var parameters = ctor.GetParameters()
-            .Select(p => CreateDefaultValue(p.ParameterType))
-            .ToArray();
-        
-        return ctor.Invoke(parameters);
-    }
-}
-
-public sealed class ComplexUnitConfigControl : Border, IConfigControl
-{
-    private readonly List<(PropertyInfo, IConfigControl)> _units = [];
-    
-    private Type _objectType = typeof(object);
-
-    private readonly StackPanel _panel = new();
-    
-    public string ConfigName { get; }
-    public bool Dirty => _units.Any(dirty => dirty.Item2.Dirty);
-
-    public ComplexUnitConfigControl(string name, object obj)
-    {
-        Classes.Add("ConfigBorder");
-        _panel.Orientation = Orientation.Vertical;
-        _panel.Spacing = 4f;
-        ConfigName = name;
-        Child = _panel;
-        SetValue(obj);
-    }
-
-    public void SetValue(object value)
-    {
-        _units.Clear();
-        _panel.Children.Clear();
-        _objectType = value.GetType();
-        
-        _panel.Children.Add(new Label()
-        {
-            Content = ConfigName
-        });
-        
-        foreach (var propInfo in _objectType.GetProperties())
-        {
-            if(propInfo.PropertyType.IsInterface) 
-                continue;
-            
-            var propValue = propInfo.GetValue(value);
-
-            var control = ConfigControlHelper.GetConfigControl(propInfo.Name, propValue);
-            
-            ((Control)control).Margin = new Thickness(5);
-            _panel.Children.Add((Control)control);
-            _units.Add((propInfo,control));
-        }
-    }
-
-    public object GetValue()
-    {
-        var obj = ConfigControlHelper.CreateDefaultValue(_objectType);
-        foreach (var (fieldInfo, configControl) in _units)
-        {
-            fieldInfo.SetValue(obj, configControl.GetValue());
-        }
-
-        return obj;
-    }
-}
-
-public sealed class ArrayUnitConfigControl : Border, IConfigControl
-{
-    private readonly List<IConfigControl> _itemControls = [];
-    private readonly StackPanel _itemsPanel = new StackPanel() { Orientation = Orientation.Vertical };
-    private readonly Button _addButton = new Button() { Content = new Label()
-    {
-        Content = "Add Item"
-    }, Classes = { "ConfigBorder" }};
-    private readonly int _oldCount;
-    private readonly Type _elementType;
-    private readonly StackPanel _panel = new();
-
-    public string ConfigName { get; }
-    public bool Dirty => _itemControls.Any(dirty => dirty.Dirty) || _itemControls.Count != _oldCount;
-
-    public ArrayUnitConfigControl(string name, object value)
-    {
-        Classes.Add("ConfigBorder");
-        _elementType = value.GetType().GetElementType()!;
-        
-        ConfigName = name;
-        _panel.Orientation = Orientation.Vertical;
-        _panel.Spacing = 4f;
-        _itemsPanel.Spacing = 4f;
-
-        _panel.Children.Add(new Label { Content = name });
-        _panel.Children.Add(_itemsPanel);
-        _panel.Children.Add(_addButton);
-
-        _addButton.Click += (_, _) => AddItem(ConfigControlHelper.CreateDefaultValue(_elementType)!);
-        Child = _panel; 
-        SetValue(value);
-        _oldCount = _itemControls.Count;
-    }
-
-    private void AddItem(object value)
-    {
-        var itemPanel = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 2 };
-        var control = ConfigControlHelper.GetConfigControl(_itemControls.Count.ToString(), value);
-        var removeButton = new Button { Content = new Label(){ Content = "Remove" }, Classes = { "ConfigBorder" }};
-
-        removeButton.Click += (_, _) =>
-        {
-            _itemControls.Remove(control);
-            _itemsPanel.Children.Remove(itemPanel);
-        };
-        
-        ((Control)control).Margin = new Thickness(5);
-        itemPanel.Children.Add((Control)control);
-        itemPanel.Children.Add(removeButton);
-
-        _itemsPanel.Children.Add(itemPanel);
-        _itemControls.Add(control);
-    }
-
-    public void SetValue(object value)
-    {
-        _itemControls.Clear();
-        _itemsPanel.Children.Clear();
-
-        if (value is IEnumerable list)
-        {
-            foreach (var item in list)
-            {
-                AddItem(item);
-            }
-        }
-    }
-
-    public object GetValue()
-    {
-        return ConvertArray(_itemControls.Select(c => c.GetValue()).ToArray(), _elementType);
-    }
-    
-    public static Array ConvertArray(Array sourceArray, Type targetType)
-    {
-        int length = sourceArray.Length;
-        var newArray = Array.CreateInstance(targetType, length);
-
-        for (int i = 0; i < length; i++)
-        {
-            var value = sourceArray.GetValue(i);
-            var converted = Convert.ChangeType(value, targetType);
-            newArray.SetValue(converted, i);
-        }
-
-        return newArray;
-    }
-}
-
-public abstract class UnitConfigControl<T> : Border, IConfigControl where T : notnull
-{
-    private readonly Label _nameLabel = new();
-    private readonly TextBox _valueLabel = new();
-    private string _originalValue;
-
-    private StackPanel _panel = new();
-    
-    public string ConfigName { get; }
-   
-    public bool Dirty => _originalValue != ConfigValue;
-
-    protected string ConfigValue
-    {
-        get => _valueLabel.Text ?? string.Empty;
-        set => _valueLabel.Text = value;
-    }
-
-    public UnitConfigControl(string name, T value)
-    {
-        Classes.Add("ConfigBorder");
-        ConfigName = name;
-        _panel.Orientation = Orientation.Horizontal;
-        _panel.Children.Add(_nameLabel);
-        _panel.Children.Add(_valueLabel);
-        
-        _nameLabel.Content = name;
-        _nameLabel.VerticalAlignment = VerticalAlignment.Center;
-        Child = _panel;
-        
-        SetConfValue(value);
-        _originalValue = ConfigValue;
-    }
-
-    public abstract void SetConfValue(T value);
-
-    public abstract T GetConfValue();
-    
-    public void SetValue(object value)
-    {
-        SetConfValue((T)value);
-    }
-
-    public object GetValue()
-    {
-        return GetConfValue()!;
-    }
-}
-
-public sealed class StringUnitConfigControl(string name, string value) : UnitConfigControl<string>(name, value)
-{
-    public override void SetConfValue(string value)
-    {
-        ConfigValue = value;
-    }
-
-    public override string GetConfValue()
-    {
-        return ConfigValue;
-    }
-}
-
-public sealed class IntUnitConfigControl(string name, int value) : UnitConfigControl<int>(name, value)
-{
-    public override void SetConfValue(int value)
-    {
-        ConfigValue = value.ToString();
-    }
-
-    public override int GetConfValue()
-    {
-        return int.Parse(ConfigValue);
-    }
-}
-
-public sealed class FloatUnitConfigControl(string name, float value) : UnitConfigControl<float>(name, value)
-{
-
-    public CultureInfo CultureInfo = CultureInfo.InvariantCulture;
-
-    public override void SetConfValue(float value)
-    {
-        ConfigValue = value.ToString(CultureInfo);
-    }
-
-    public override float GetConfValue()
-    {
-        return float.Parse(ConfigValue, CultureInfo);
-    }
-}
-
-
-public interface IConfigControl
-{
-    public string ConfigName { get; }
-    public bool Dirty {get;}
-    public abstract void SetValue(object value);
-    public abstract object GetValue();
 }

Nebula.Launcher/ViewModels/Pages/ContentBrowserViewModel.cs

@@ -416,7 +416,20 @@ public abstract class BaseFolderContentEntry : ViewModelBase, IContentEntry
     private Dictionary<string, IContentEntry> _childs = [];
 
     public string IconPath => "/Assets/svg/folder.svg";
-    public IContentHolder Holder { get; private set; }
+    
+    private IContentHolder? _holder = null;
+    public IContentHolder Holder
+    {
+        get
+        {
+            if(_holder == null) 
+                throw new InvalidOperationException(
+                    GetType().Name + " was not initialised! Call Init(IContentHolder holder, string? name = null) before using it.");
+            
+            return _holder;
+        }
+    }
+
     public IContentEntry? Parent { get; set; }
     public string? Name { get; private set; }
     
@@ -432,7 +445,7 @@ public abstract class BaseFolderContentEntry : ViewModelBase, IContentEntry
     public void Init(IContentHolder holder, string? name = null)
     {
         Name = name;
-        Holder = holder;
+        _holder = holder;
     }
 
     public T AddChild<T>(T child) where T: IContentEntry

Nebula.Launcher/ViewModels/Popup/AddFavoriteViewModel.cs

@@ -42,6 +42,9 @@ public partial class AddFavoriteViewModel : PopupViewModelBase
     {
         try
         {
+            if(string.IsNullOrWhiteSpace(IpInput))
+                throw new Exception(LocalisationService.GetString("popup-add-favorite-invalid-ip"));
+            
             var uri = IpInput.ToRobustUrl();
             FavoriteServerListProvider.AddFavorite(uri);
             Dispose();

Nebula.Launcher/ViewModels/Popup/IsLoginCredentialsNullPopup.cs

@@ -0,0 +1,50 @@
+using Nebula.Launcher.Services;
+using Nebula.Launcher.ViewModels.Pages;
+using Nebula.Launcher.Views.Popup;
+using Nebula.Shared.Services;
+using Nebula.Shared.ViewHelper;
+
+namespace Nebula.Launcher.ViewModels.Popup;
+
+[ConstructGenerator, ViewModelRegister(typeof(IsLoginCredentialsNullPopupView))]
+public partial class IsLoginCredentialsNullPopupViewModel : PopupViewModelBase
+{
+    private ServerEntryModelView _entry;
+    
+    [GenerateProperty] public override PopupMessageService PopupMessageService { get; }
+    [GenerateProperty, DesignConstruct] private ViewHelperService ViewHelperService { get; }
+    
+    protected override void InitialiseInDesignMode()
+    {
+    }
+
+    protected override void Initialise()
+    {
+    }
+
+    public IsLoginCredentialsNullPopupViewModel WithServerEntry(ServerEntryModelView entryModelView)
+    {
+        _entry = entryModelView;
+        return this;
+    }
+
+    public void Proceed()
+    {
+        _entry.RunInstanceIgnoreAuth();
+        Dispose();
+    }
+
+    public void Cancel()
+    {
+        Dispose();
+    }
+
+    public void GotoAuthPage()
+    {
+        ViewHelperService.GetViewModel<MainViewModel>().RequirePage<AccountInfoViewModel>();
+        Dispose();
+    }
+    
+    public override string Title => LocalisationService.GetString("popup-login-credentials-warning");
+    public override bool IsClosable => true;
+}

Nebula.Launcher/ViewModels/Popup/LoadingContextViewModel.cs

@@ -15,8 +15,8 @@ public sealed partial class LoadingContextViewModel : PopupViewModelBase, ILoadi
     [GenerateProperty] public CancellationService CancellationService { get; }
     
     [ObservableProperty] private int _currJobs;
-
     [ObservableProperty] private int _resolvedJobs;
+    [ObservableProperty] private string _message = string.Empty;
 
     public string LoadingName { get; set; } = LocalisationService.GetString("popup-loading");
     public bool IsCancellable { get; set; } = true;
@@ -44,6 +44,11 @@ public sealed partial class LoadingContextViewModel : PopupViewModelBase, ILoadi
         return ResolvedJobs;
     }
 
+    public void SetLoadingMessage(string message)
+    {
+        Message = message + "\n" + Message;
+    }
+
     public void Cancel(){
         if(!IsCancellable) return;
         CancellationService.Cancel();
@@ -56,5 +61,30 @@ public sealed partial class LoadingContextViewModel : PopupViewModelBase, ILoadi
 
     protected override void InitialiseInDesignMode()
     {
+        SetJobsCount(5);
+        SetResolvedJobsCount(2);
+        string[] debugMessages = {
+            "Debug: Starting phase 1...",
+            "Debug: Loading assets...",
+            "Debug: Connecting to server...",
+            "Debug: Fetching user data...",
+            "Debug: Applying configurations...",
+            "Debug: Starting phase 2...",
+            "Debug: Rendering UI...",
+            "Debug: Preparing scene...",
+            "Debug: Initializing components...",
+            "Debug: Running diagnostics...",
+            "Debug: Checking dependencies...",
+            "Debug: Verifying files...",
+            "Debug: Cleaning up cache...",
+            "Debug: Finalizing setup...",
+            "Debug: Setup complete.",
+            "Debug: Ready for launch."
+        };
+
+        foreach (string message in debugMessages)
+        {
+            SetLoadingMessage(message);
+        }
     }
 }

Nebula.Launcher/ViewModels/Popup/PopupViewModelBase.cs

@@ -12,6 +12,9 @@ public abstract class PopupViewModelBase : ViewModelBase, IDisposable
 
     public void Dispose()
     {
+        OnDispose();
         PopupMessageService.ClosePopup(this);
     }
+
+    protected virtual void OnDispose(){}
 }

Nebula.Launcher/ViewModels/Popup/TfaViewModel.cs

@@ -1,5 +1,6 @@
 using System;
 using Nebula.Launcher.Services;
+using Nebula.Launcher.ViewModels.Pages;
 using Nebula.Launcher.Views.Popup;
 using Nebula.Shared.Services;
 using Nebula.Shared.ViewHelper;
@@ -9,7 +10,10 @@ namespace Nebula.Launcher.ViewModels.Popup;
 [ConstructGenerator, ViewModelRegister(typeof(TfaView))]
 public partial class TfaViewModel : PopupViewModelBase
 {
-    public Action<string>? OnTfaEntered;
+    [GenerateProperty] public override PopupMessageService PopupMessageService { get; }
+    [GenerateProperty] public AccountInfoViewModel AccountInfo { get; }
+    public override string Title => LocalisationService.GetString("popup-twofa");
+    public override bool IsClosable => true;
     
     protected override void InitialiseInDesignMode()
     {
@@ -21,11 +25,7 @@ public partial class TfaViewModel : PopupViewModelBase
 
     public void OnTfaEnter(string code)
     {
-        OnTfaEntered?.Invoke(code);
+        AccountInfo.DoAuth(code);
         Dispose();
     }
-
-    [GenerateProperty] public override PopupMessageService PopupMessageService { get; }
-    public override string Title => LocalisationService.GetString("popup-twofa");
-    public override bool IsClosable => true;
 }

Nebula.Launcher/ViewModels/ServerEntryModelView.cs

@@ -47,7 +47,7 @@ public partial class ServerEntryModelView : ViewModelBase, IFilterConsumer, ILis
 
     public LogPopupModelView CurrLog;
     public RobustUrl Address { get; private set; }
-    [GenerateProperty] private ConfigurationService ConfigurationService { get; } = default!;
+    [GenerateProperty] private AccountInfoViewModel AccountInfoViewModel { get; }
     [GenerateProperty] private CancellationService CancellationService { get; } = default!;
     [GenerateProperty] private DebugService DebugService { get; } = default!;
     [GenerateProperty] private PopupMessageService PopupMessageService { get; } = default!;
@@ -163,24 +163,51 @@ public partial class ServerEntryModelView : ViewModelBase, IFilterConsumer, ILis
     public void RunInstance()
     { 
         CurrLog.Clear();
-        Task.Run(RunInstanceAsync);
+        Task.Run(async ()=> await RunInstanceAsync());
     }
 
-    private async void RunInstanceAsync()
+    public void RunInstanceIgnoreAuth()
     {
-        using var loadingContext = ViewHelperService.GetViewModel<LoadingContextViewModel>();
+        CurrLog.Clear();
-        loadingContext.LoadingName = "Loading instance...";
+        Task.Run(async ()=> await RunInstanceAsync(true));
-        ((ILoadingHandler)loadingContext).AppendJob();
+    }
 
-        PopupMessageService.Popup(loadingContext);
+    private async Task RunInstanceAsync(bool ignoreLoginCredentials = false)
-        _currentInstance = 
+    {
-            await GameRunnerPreparer.GetGameProcessStartInfoProvider(Address, loadingContext, CancellationService.Token);
+        _logger.Log("Running instance..." + RealName);
+        if (!ignoreLoginCredentials && AccountInfoViewModel.Credentials.Value is null)
+        {
+            var warningContext = ViewHelperService.GetViewModel<IsLoginCredentialsNullPopupViewModel>()
+                .WithServerEntry(this);
             
-        _currentInstance.RegisterLogger(_currentContentLogConsumer);
+            PopupMessageService.Popup(warningContext);
-        _currentInstance.RegisterLogger(new DebugLoggerBridge(DebugService.GetLogger($"PROCESS_{Random.Shared.Next(65535)}")));
+            return;
-        _currentInstance.OnProcessExited += OnProcessExited;
+        }
-        RunVisible = false;
+
-        _currentInstance.Start();
+        try
+        {
+            using var loadingContext = ViewHelperService.GetViewModel<LoadingContextViewModel>();
+            loadingContext.LoadingName = "Loading instance...";
+            ((ILoadingHandler)loadingContext).AppendJob();
+
+            PopupMessageService.Popup(loadingContext);
+            _currentInstance = 
+                await GameRunnerPreparer.GetGameProcessStartInfoProvider(Address, loadingContext, CancellationService.Token);
+            _logger.Log("Preparing instance...");
+            _currentInstance.RegisterLogger(_currentContentLogConsumer);
+            _currentInstance.RegisterLogger(new DebugLoggerBridge(DebugService.GetLogger($"PROCESS_{Random.Shared.Next(65535)}")));
+            _currentInstance.OnProcessExited += OnProcessExited;
+            RunVisible = false;
+            _currentInstance.Start();
+            _logger.Log("Starting instance..." + RealName);
+        }
+        catch (Exception e)
+        {
+            var error = new Exception("Error while attempt run instance", e);
+            _logger.Error(error);
+            PopupMessageService.Popup(error);
+            RunVisible = true;
+        }
     }
 
     private void OnProcessExited(ProcessRunHandler<GameProcessStartInfoProvider> obj)

Nebula.Launcher/ViewModels/VisualErrorViewModel.cs

@@ -0,0 +1,22 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using Nebula.Launcher.Views;
+using Nebula.Shared.ViewHelper;
+
+namespace Nebula.Launcher.ViewModels;
+
+
+[ViewModelRegister(typeof(VisualErrorView))]
+public partial class VisualErrorViewModel : ViewModelBase
+{
+    [ObservableProperty] private string _imgPath = "cinka";
+    [ObservableProperty] private string _title = "Error";
+    [ObservableProperty] private string _description = "This is an error.";
+    
+    protected override void InitialiseInDesignMode()
+    {
+    }
+
+    protected override void Initialise()
+    {
+    }
+}

Nebula.Launcher/Views/MainView.axaml

@@ -10,7 +10,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:viewModels="clr-namespace:Nebula.Launcher.ViewModels"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:models1="clr-namespace:Nebula.Launcher.Models">
+    xmlns:models1="clr-namespace:Nebula.Launcher.Models"
+    xmlns:services="clr-namespace:Nebula.Launcher.Services">
     <Design.DataContext>
         <viewModels:MainViewModel />
     </Design.DataContext>
@@ -120,7 +121,41 @@
                                 https://durenko.tatar/nebula/
                             </TextBlock>
                         </Button>
-                        <TextBlock HorizontalAlignment="Right" VerticalAlignment="Center" Text="{Binding VersionInfo}"/>
+                        <StackPanel Spacing="5" HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal">
+                            <Button 
+                                Margin="0" 
+                                Padding="0" 
+                                CornerRadius="0"
+                                Command="{Binding OpenAuthPage}">
+                                <StackPanel Spacing="5" Orientation="Horizontal">
+                                    <Svg
+                                        Height="40"
+                                        Path="/Assets/svg/user.svg"
+                                        Width="10" />
+                                    <Panel>
+                                        <TextBlock 
+                                            Foreground="#777777" 
+                                            Text="{Binding LoginText}"/>
+                                    </Panel>
+                                </StackPanel>
+                            </Button>
+                            <TextBlock>|</TextBlock>
+                            <Button 
+                                Margin="0" 
+                                Padding="0" 
+                                CornerRadius="0"
+                                Command="{Binding OpenRootPath}">
+                                <StackPanel Orientation="Horizontal" Spacing="5">
+                                    <Svg
+                                        Height="40"
+                                        Path="/Assets/svg/folder.svg"
+                                        Width="10" />
+                                    <TextBlock Foreground="#777777" Text="{services:LocaledText goto-path-home}"/>
+                                </StackPanel>
+                            </Button>
+                            <TextBlock>|</TextBlock>
+                            <TextBlock Text="{Binding VersionInfo}"/>
+                        </StackPanel>
                     </Panel>
                 </Label>
             </Border>

Nebula.Launcher/Views/Pages/AccountInfoView.axaml

@@ -1,6 +1,6 @@
 <UserControl
     d:DesignHeight="450"
-    d:DesignWidth="800"
+    d:DesignWidth="1000"
     mc:Ignorable="d"
     x:Class="Nebula.Launcher.Views.Pages.AccountInfoView"
     x:DataType="pages:AccountInfoViewModel"
@@ -10,7 +10,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:pages="clr-namespace:Nebula.Launcher.ViewModels.Pages"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:auth="clr-namespace:Nebula.Launcher.Models.Auth">
+    xmlns:auth="clr-namespace:Nebula.Launcher.Models.Auth"
+    xmlns:converters="clr-namespace:Nebula.Launcher.Converters">
     <Design.DataContext>
         <pages:AccountInfoViewModel />
     </Design.DataContext>
@@ -39,39 +40,57 @@
                     Padding="0">
                     <ItemsControl.ItemTemplate>
                         <DataTemplate DataType="{x:Type auth:ProfileAuthCredentials}">
-                            <Border
+                            <Grid ColumnDefinitions="4*,*">
-                                BoxShadow="0 1 15 -2 #121212"
+                                <Border 
-                                CornerRadius="0,10,0,10"
+                                    BoxShadow="0 1 15 -2 #121212"
-                                Margin="5,5,5,0"
+                                    CornerRadius="0,10,0,10"
-                                VerticalAlignment="Center">
+                                    Margin="5,5,5,0">
-                                <Border.Background>
+                                    <Border.Background>
-                                    <LinearGradientBrush EndPoint="50%,100%" StartPoint="50%,0%">
+                                        <LinearGradientBrush EndPoint="100%,50%" StartPoint="20%,50%">
-                                        <GradientStop Color="#292222" Offset="0.0" />
+                                            <GradientStop Color="{Binding Credentials.AuthServer, 
-                                        <GradientStop Color="#222222" Offset="1.0" />
+                                            Converter={x:Static converters:TypeConverters.NameColorRepresentation}}" Offset="0.0" />
-                                    </LinearGradientBrush>
+                                            <GradientStop Color="#222222" Offset="1.0" />
-                                </Border.Background>
+                                        </LinearGradientBrush>
-                                <Panel>
+                                    </Border.Background>
-                                    <StackPanel Margin="10,5,5,5" Orientation="Horizontal">
+                                    <Label>
+                                        <TextBlock Text="{Binding AuthName}" Margin="5"/>
+                                    </Label>
+                                </Border>
+                                <Border Grid.Column="0"
+                                    CornerRadius="0,10,0,10"
+                                    Margin="5,5,5,0">
+                                    <Border.Background>
+                                        <LinearGradientBrush EndPoint="100%,50%" StartPoint="20%,50%">
+                                            <GradientStop Color="#aa222222" Offset="0.0" />
+                                            <GradientStop Color="#222222" Offset="0.4" />
+                                        </LinearGradientBrush>
+                                    </Border.Background>
+                                    <Button 
+                                        HorizontalAlignment="Stretch" 
+                                        Command="{Binding OnSelect}">
                                         <Label>
-                                            <TextBlock Text="{Binding Login}" />
+                                            <TextBlock Text="{Binding Credentials.Login}" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,5,0"/>
                                         </Label>
-                                    </StackPanel>
+                                    </Button>
-                                    <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+                                </Border>
-                                        <Button
+                                <Border 
-                                            Command="{Binding OnSelect}"
+                                    BoxShadow="0 1 15 -2 #121212"
-                                            CornerRadius="0,0,0,10"
+                                    CornerRadius="0,10,0,10"
-                                            Padding="5">
+                                    Margin="0,5,5,0" Grid.Column="1" Padding="0">
-                                            <customControls:LocalizedLabel LocalId="account-profile-select"/>
+                                    <Border.Background>
-                                        </Button>
+                                        <LinearGradientBrush EndPoint="100%,50%" StartPoint="20%,50%">
-                                        <Button
+                                            <GradientStop Color="#292222" Offset="1.0" />
-                                            Command="{Binding OnDelete}"
+                                            <GradientStop Color="#222222" Offset="1.0" />
-                                            CornerRadius="0,10,0,0"
+                                        </LinearGradientBrush>
-                                            Padding="5">
+                                    </Border.Background>
-                                            <customControls:LocalizedLabel LocalId="account-profile-delete"/>
+                                    <Button Command="{Binding OnDelete}" CornerRadius="0,10,0,10" HorizontalAlignment="Stretch">
-                                        </Button>
+                                        <Svg
-                                    </StackPanel>
+                                            Height="15"
-                                </Panel>
+                                            Path="/Assets/svg/delete.svg"
-                            </Border>
+                                            Width="15" />
+                                    </Button>
+                                </Border>
+                            </Grid>
                         </DataTemplate>
                     </ItemsControl.ItemTemplate>
                 </ItemsControl>
@@ -121,7 +140,7 @@
                             </StackPanel>
                             <StackPanel Orientation="Horizontal">
                                 <customControls:LocalizedLabel VerticalAlignment="Center" LocalId="account-auth-server"/>
-                                <Button Command="{Binding ExpandAuthUrlCommand}" VerticalAlignment="Stretch">
+                                <Button Command="{Binding OnExpandAuthUrl}" VerticalAlignment="Stretch">
                                     <Label>+</Label>
                                 </Button>
                             </StackPanel>
@@ -156,15 +175,7 @@
                                 <customControls:LocalizedLabel LocalId="account-auth-button"/>
                             </Button>
                         </Border>
-                        <Border BoxShadow="{StaticResource DefaultShadow}">
+                        <Button Command="{Binding OnExpandAuthView}" HorizontalAlignment="Right">
-                            <Button 
-                                Command="{Binding SaveProfileCommand}" 
-                                HorizontalAlignment="Stretch"
-                                HorizontalContentAlignment="Center">
-                                <customControls:LocalizedLabel LocalId="account-auth-save"/>
-                            </Button>
-                        </Border>
-                        <Button Command="{Binding ExpandAuthViewCommand}" HorizontalAlignment="Right">
                             <Label>
                                 >
                             </Label>
@@ -177,9 +188,15 @@
                             Margin="0,0,0,20"
                             Path="/Assets/svg/user.svg" />
                         <Label>
-                            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                            <StackPanel>
-                                <customControls:LocalizedLabel LocalId="account-auth-hello"/>
+                                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Spacing="5">
-                                <TextBlock Text="{Binding CurrentLogin}" />
+                                    <customControls:LocalizedLabel LocalId="account-auth-hello"/>
+                                    <TextBlock Text="{Binding Credentials.Value.Login}" />
+                                </StackPanel>
+                                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Spacing="5">
+                                    <customControls:LocalizedLabel LocalId="account-auth-current-server"/>
+                                    <TextBlock Text="{Binding Credentials.Value.AuthServer}" />
+                                </StackPanel>
                             </StackPanel>
                         </Label>
                         <StackPanel
@@ -193,7 +210,7 @@
                                 </Button>
                             </Border>
                             <Border BoxShadow="{StaticResource DefaultShadow}">
-                                <Button Command="{Binding SaveProfileCommand}">
+                                <Button Command="{Binding OnSaveProfile}">
                                     <customControls:LocalizedLabel LocalId="account-auth-save"/>
                                 </Button>
                             </Border>

Nebula.Launcher/Views/Popup/IsLoginCredentialsNullPopupView.axaml

@@ -0,0 +1,35 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:popup="clr-namespace:Nebula.Launcher.ViewModels.Popup"
+             xmlns:controls="clr-namespace:Nebula.Launcher.Controls"
+             xmlns:services="clr-namespace:Nebula.Launcher.Services"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Nebula.Launcher.Views.Popup.IsLoginCredentialsNullPopupView"
+             x:DataType="popup:IsLoginCredentialsNullPopupViewModel">
+    <Design.DataContext>
+        <popup:IsLoginCredentialsNullPopupViewModel />
+    </Design.DataContext>
+    
+    <StackPanel Margin="15" Orientation="Vertical" Spacing="15">
+        <TextBlock HorizontalAlignment="Center" Text="{services:LocaledText popup-login-credentials-warning-label}" TextWrapping="Wrap"/>
+        <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Spacing="5">
+            <Border Background="{StaticResource DefaultSelected}" BoxShadow="{StaticResource DefaultShadow}">
+                <Button Command="{Binding GotoAuthPage}">
+                    <TextBlock Text="{services:LocaledText popup-login-credentials-warning-go-auth}"/>
+                </Button>
+            </Border>
+            <Border Background="{StaticResource DefaultSelected}" BoxShadow="{StaticResource DefaultShadow}">
+                <Button Command="{Binding Cancel}">
+                    <TextBlock Text="{services:LocaledText popup-login-credentials-warning-cancel}"/>
+                </Button>
+            </Border>
+            <Border Background="{StaticResource DefaultSelected}" BoxShadow="{StaticResource DefaultShadow}">
+                <Button Command="{Binding Proceed}">
+                    <TextBlock Text="{services:LocaledText popup-login-credentials-warning-proceed}"/>
+                </Button>
+            </Border>
+        </StackPanel>
+    </StackPanel>
+</UserControl>

Nebula.Launcher/Views/Popup/IsLoginCredentialsNullPopupView.axaml.cs

@@ -0,0 +1,11 @@
+using Avalonia.Controls;
+
+namespace Nebula.Launcher.Views.Popup;
+
+public partial class IsLoginCredentialsNullPopupView : UserControl
+{
+    public IsLoginCredentialsNullPopupView()
+    {
+        InitializeComponent();
+    }
+}

Nebula.Launcher/Views/Popup/LoadingContextView.axaml

@@ -33,5 +33,10 @@
                 <customControls:LocalizedLabel LocalId="task-cancel"/> 
             </Button>
         </Panel>
+        <Panel>
+            <Border Background="{StaticResource DefaultForeground}" MinHeight="210">
+                <TextBlock TextWrapping="Wrap" Text="{Binding Message}" MaxLines="10" Margin="15"/>
+            </Border>
+        </Panel>
     </StackPanel>
 </UserControl>

Nebula.Launcher/Views/VisualErrorView.axaml

@@ -0,0 +1,39 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:viewModels="clr-namespace:Nebula.Launcher.ViewModels"
+             xmlns:converters="clr-namespace:Nebula.Launcher.Converters"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:DataType="viewModels:VisualErrorViewModel"
+             x:Class="Nebula.Launcher.Views.VisualErrorView">
+    <Design.DataContext>
+        <viewModels:VisualErrorViewModel />
+    </Design.DataContext>
+    <Grid RowDefinitions="30,*" ColumnDefinitions="200,*">
+        <Border Grid.Row="1" Grid.Column="0" 
+                CornerRadius="10,0,0,10" 
+                BorderThickness="0,0,2,0" 
+                BorderBrush="{StaticResource DefaultForeground}">
+            <Image Source="{Binding ImgPath, Converter={x:Static converters:TypeConverters.ImageConverter}}" Width="200" Height="200"/>
+        </Border>
+        <Border Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" CornerRadius="10,10,0,0">
+            <Border.Background>
+                <LinearGradientBrush EndPoint="100%,50%" StartPoint="10%,20%">
+                    <GradientStop Color="#FF6B6B" Offset="0.0" />
+                    <GradientStop Color="#FF8E53" Offset="0.3" />
+                    <GradientStop Color="#FF5E3A" Offset="0.6" />
+                    <GradientStop Color="#FF5e5e" Offset="1.0" />
+                </LinearGradientBrush>
+            </Border.Background>
+            <Label HorizontalAlignment="Center"><TextBlock Text="{Binding Title}"/></Label>
+        </Border>
+        <TextBlock 
+            Grid.Row="1" 
+            Grid.Column="1" 
+            Margin="15" 
+            HorizontalAlignment="Center" 
+            TextWrapping="Wrap"
+            Text="{Binding Description}"/>
+    </Grid>
+</UserControl>

Nebula.Launcher/Views/VisualErrorView.axaml.cs

@@ -0,0 +1,11 @@
+using Avalonia.Controls;
+
+namespace Nebula.Launcher.Views;
+
+public partial class VisualErrorView : UserControl
+{
+    public VisualErrorView()
+    {
+        InitializeComponent();
+    }
+}

Nebula.Runner/App.cs

@@ -2,15 +2,18 @@ using Nebula.Runner.Services;
 using Nebula.Shared;
 using Nebula.Shared.Models;
 using Nebula.Shared.Services;
+using Nebula.Shared.Services.Logging;
 using Nebula.Shared.Utils;
 using Robust.LoaderApi;
 
 namespace Nebula.Runner;
 
 [ServiceRegister]
-public sealed class App(RunnerService runnerService, ContentService contentService)
+public sealed class App(RunnerService runnerService, ContentService contentService, DebugService debugService)
     : IRedialApi
 {
+    public ILogger logger = debugService.GetLogger("Runner");
+    
     public void Redial(Uri uri, string text = "")
     {
     }
@@ -21,91 +24,37 @@ public sealed class App(RunnerService runnerService, ContentService contentServi
         var urlraw = Environment.GetEnvironmentVariable("GAME_URL") ?? "ss14://localhost";
 
         var url = urlraw.ToRobustUrl();
-
-        using var cancelTokenSource = new CancellationTokenSource();
-        var buildInfo = await contentService.GetBuildInfo(url, cancelTokenSource.Token);
-
-
-        var args = new List<string>
-        {
-            "--username", login,
-            "--cvar", "launch.launcher=true"
-        };
-
-        var connectionString = url.ToString();
-        if (!string.IsNullOrEmpty(buildInfo.BuildInfo.ConnectAddress))
-            connectionString = buildInfo.BuildInfo.ConnectAddress;
         
-        args.Add("--launcher");
+        try
+        {
+            using var cancelTokenSource = new CancellationTokenSource();
+            var buildInfo = await contentService.GetBuildInfo(url, cancelTokenSource.Token);
 
-        args.Add("--connect-address");
-        args.Add(connectionString);
 
-        args.Add("--ss14-address");
+            var args = new List<string>
-        args.Add(url.ToString());
+            {
+                "--username", login,
+                "--cvar", "launch.launcher=true"
+            };
 
-        await runnerService.Run(args.ToArray(), buildInfo, this, new ConsoleLoadingHandler(), cancelTokenSource.Token);
+            var connectionString = url.ToString();
+            if (!string.IsNullOrEmpty(buildInfo.BuildInfo.ConnectAddress))
+                connectionString = buildInfo.BuildInfo.ConnectAddress;
+        
+            args.Add("--launcher");
+
+            args.Add("--connect-address");
+            args.Add(connectionString);
+
+            args.Add("--ss14-address");
+            args.Add(url.ToString());
+
+            await runnerService.Run(args.ToArray(), buildInfo, this, new ConsoleLoadingHandler(), cancelTokenSource.Token);
+        }
+        catch (Exception e)
+        {
+            logger.Error(e);
+            throw;
+        }
     }
 }
-
-public sealed class ConsoleLoadingHandler : ILoadingHandler
-{
-    private int _currJobs;
-
-    private float _percent;
-    private int _resolvedJobs;
-
-    public void SetJobsCount(int count)
-    {
-        _currJobs = count;
-
-        UpdatePercent();
-        Draw();
-    }
-
-    public int GetJobsCount()
-    {
-        return _currJobs;
-    }
-
-    public void SetResolvedJobsCount(int count)
-    {
-        _resolvedJobs = count;
-
-        UpdatePercent();
-        Draw();
-    }
-
-    public int GetResolvedJobsCount()
-    {
-        return _resolvedJobs;
-    }
-
-    private void UpdatePercent()
-    {
-        if (_currJobs == 0)
-        {
-            _percent = 0;
-            return;
-        }
-
-        if (_resolvedJobs > _currJobs) return;
-
-        _percent = _resolvedJobs / (float)_currJobs;
-    }
-
-    private void Draw()
-    {
-        var barCount = 10;
-        var fullCount = (int)(barCount * _percent);
-        var emptyCount = barCount - fullCount;
-
-        Console.Write("\r");
-
-        for (var i = 0; i < fullCount; i++) Console.Write("#");
-
-        for (var i = 0; i < emptyCount; i++) Console.Write(" ");
-
-        Console.Write($"\t {_resolvedJobs}/{_currJobs}");
-    }
-}

Nebula.Runner/Program.cs

@@ -1,6 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
 using Nebula.Shared;
-using Nebula.Shared.Services;
 
 namespace Nebula.Runner;
 

Nebula.Runner/Services/RunnerService.cs

@@ -93,7 +93,8 @@ public static class MetricsEnabledPatcher
         var harmony = harmonyService.Instance.Harmony;
         
         var targetType = reflectionService.GetType("Robust.Shared.GameObjects.EntitySystemManager");
-        var targetMethod = targetType.GetProperty("MetricsEnabled").GetGetMethod();
+        var targetMethod = targetType.GetProperty("MetricsEnabled")?.GetGetMethod() ?? 
+                           throw new Exception("target method is null.. huh.. do we have patch a right think?");
         
         var prefix = typeof(MetricsEnabledPatcher).GetMethod(nameof(MetricsEnabledGetterPrefix),
             BindingFlags.Static | BindingFlags.NonPublic);

Nebula.Shared/ConfigMigrations/ProfileMigration.cs

@@ -0,0 +1,40 @@
+using Microsoft.Extensions.DependencyInjection;
+using Nebula.Shared.Configurations.Migrations;
+using Nebula.Shared.Models;
+using Nebula.Shared.Services;
+
+namespace Nebula.Shared.ConfigMigrations;
+
+public class ProfileMigrationV2(string oldName, string newName)
+    : BaseConfigurationMigration<ProfileAuthCredentialsV2[], AuthTokenCredentials[]>(oldName, newName)
+{
+    protected override async Task<AuthTokenCredentials[]> Migrate(IServiceProvider serviceProvider, ProfileAuthCredentialsV2[] oldValue, ILoadingHandler loadingHandler)
+    {
+        loadingHandler.SetLoadingMessage("Migrating Profile V2 -> V3");
+        var list = new List<AuthTokenCredentials>();
+        var authService = serviceProvider.GetRequiredService<AuthService>();
+        var logger = serviceProvider.GetRequiredService<DebugService>().GetLogger("ProfileMigrationV2");
+        foreach (var oldCredentials in oldValue)
+        {
+            try
+            {
+                loadingHandler.SetLoadingMessage($"Migrating {oldCredentials.Login}");
+                var newCred = await authService.Auth(oldCredentials.Login, oldCredentials.Password, oldCredentials.AuthServer);
+                list.Add(newCred);
+            }
+            catch (Exception e)
+            {
+                logger.Error(e);
+                loadingHandler.SetLoadingMessage(e.Message);
+            }
+        }
+
+        loadingHandler.SetLoadingMessage("Migration done!");
+        return list.ToArray();
+    }
+}
+
+public sealed record ProfileAuthCredentialsV2(
+    string Login,
+    string Password,
+    string AuthServer);

Nebula.Shared/Configurations/ConVar.cs

@@ -0,0 +1,18 @@
+using Nebula.Shared.Services;
+
+namespace Nebula.Shared.Configurations;
+
+public class ConVar<T>
+{
+    internal ConfigurationService.OnConfigurationChangedDelegate<T?>? OnValueChanged;
+    
+    public ConVar(string name, T? defaultValue = default)
+    {
+        Name = name ?? throw new ArgumentNullException(nameof(name));
+        DefaultValue = defaultValue;
+    }
+
+    public string Name { get; }
+    public Type Type => typeof(T);
+    public T? DefaultValue { get; }
+}

Nebula.Shared/Configurations/ConVarBuilder.cs

@@ -0,0 +1,25 @@
+using Nebula.Shared.Configurations.Migrations;
+using Nebula.Shared.Services;
+
+namespace Nebula.Shared.Configurations;
+
+public static class ConVarBuilder
+{
+    public static ConVar<T> Build<T>(string name, T? defaultValue = default)
+    {
+        if (string.IsNullOrWhiteSpace(name))
+            throw new ArgumentException("ConVar name cannot be null or whitespace.", nameof(name));
+
+        return new ConVar<T>(name, defaultValue);
+    }
+
+    public static ConVar<T> BuildWithMigration<T>(string name, IConfigurationMigration migration, T? defaultValue = default)
+    {
+        if (string.IsNullOrWhiteSpace(name))
+            throw new ArgumentException("ConVar name cannot be null or whitespace.", nameof(name));
+        
+        ConfigurationService.AddConfigurationMigration(migration);
+
+        return new ConVar<T>(name, defaultValue);
+    }
+}

Nebula.Shared/Configurations/ConVarObserver.cs

@@ -0,0 +1,67 @@
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using Nebula.Shared.Services;
+
+namespace Nebula.Shared.Configurations;
+
+public sealed class ConVarObserver<T> : IDisposable, INotifyPropertyChanged, INotifyPropertyChanging
+{
+    private readonly ConVar<T> _convar;
+    private readonly ConfigurationService _configurationService;
+    
+    private T? _value;
+    private ConfigurationService.OnConfigurationChangedDelegate<T> _delegate;
+
+    public bool HasValue => Value != null;
+
+    public T? Value
+    {
+        get => _value; 
+        set => _configurationService.SetConfigValue(_convar, value);
+    }
+
+    public ConVarObserver(ConVar<T> convar, ConfigurationService configurationService)
+    {
+        _convar = convar;
+        _convar.OnValueChanged += OnValueChanged;
+        _configurationService = configurationService;
+        _delegate += OnValueChanged;
+        
+        OnValueChanged(configurationService.GetConfigValue(_convar));
+    }
+
+    private void OnValueChanged(T? value)
+    {
+        OnPropertyChanging(nameof(Value));
+        OnPropertyChanging(nameof(HasValue));
+        
+        if(value is null && _value is null)
+            return;
+        if (_value is not null && _value.Equals(value))
+            return;
+        
+        _value = value;
+        OnPropertyChanged(nameof(Value));
+        OnPropertyChanged(nameof(HasValue));
+    }
+
+    public void Dispose()
+    {
+        _convar.OnValueChanged -= OnValueChanged;
+    }
+    
+    public static implicit operator T? (ConVarObserver<T> convar) => convar.Value;
+
+    public event PropertyChangingEventHandler? PropertyChanging;
+    public event PropertyChangedEventHandler? PropertyChanged;
+
+    private void OnPropertyChanged([CallerMemberName] string? propertyName = null)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
+    private void OnPropertyChanging([CallerMemberName] string? propertyName = null)
+    {
+        PropertyChanging?.Invoke(this, new PropertyChangingEventArgs(propertyName));
+    }
+    
+}

Nebula.Shared/Configurations/Migrations/BaseConfigurationMigration.cs

@@ -0,0 +1,28 @@
+using Nebula.Shared.Models;
+using Nebula.Shared.Services;
+
+namespace Nebula.Shared.Configurations.Migrations;
+
+public abstract class BaseConfigurationMigration<T1,T2> : IConfigurationMigration
+{
+    protected ConVar<T1> OldConVar;
+    protected ConVar<T2> NewConVar;
+    
+    public BaseConfigurationMigration(string oldName, string newName)
+    {
+        OldConVar = ConVarBuilder.Build<T1>(oldName);
+        NewConVar = ConVarBuilder.Build<T2>(newName);
+    }
+
+    public async Task DoMigrate(ConfigurationService configurationService, IServiceProvider serviceProvider, ILoadingHandler loadingHandler)
+    {
+        var oldValue = configurationService.GetConfigValue(OldConVar);
+        if(oldValue == null) return;
+        
+        var newValue = await Migrate(serviceProvider, oldValue, loadingHandler);
+        configurationService.SetConfigValue(NewConVar, newValue);
+        configurationService.ClearConfigValue(OldConVar);
+    }
+
+    protected abstract Task<T2> Migrate(IServiceProvider serviceProvider, T1 oldValue, ILoadingHandler loadingHandler);
+}

Nebula.Shared/Configurations/Migrations/IConfigurationMigration.cs

@@ -0,0 +1,9 @@
+using Nebula.Shared.Models;
+using Nebula.Shared.Services;
+
+namespace Nebula.Shared.Configurations.Migrations;
+
+public interface IConfigurationMigration
+{
+    public Task DoMigrate(ConfigurationService configurationService, IServiceProvider serviceProvider, ILoadingHandler loadingHandler);
+}

Nebula.Shared/Configurations/Migrations/MigrationQueue.cs

@@ -0,0 +1,15 @@
+using Nebula.Shared.Models;
+using Nebula.Shared.Services;
+
+namespace Nebula.Shared.Configurations.Migrations;
+
+public class MigrationQueue(List<IConfigurationMigration> migrations) : IConfigurationMigration
+{
+    public async Task DoMigrate(ConfigurationService configurationService, IServiceProvider serviceProvider , ILoadingHandler loadingHandler)
+    {
+        foreach (var migration in migrations)
+        {
+            await migration.DoMigrate(configurationService, serviceProvider, loadingHandler);
+        }
+    }
+}

Nebula.Shared/Configurations/Migrations/MigrationQueueBuilder.cs

@@ -0,0 +1,19 @@
+namespace Nebula.Shared.Configurations.Migrations;
+
+public class MigrationQueueBuilder
+{
+    public static MigrationQueueBuilder Instance => new();
+    
+    private readonly List<IConfigurationMigration> _migrations = [];
+
+    public MigrationQueueBuilder With(IConfigurationMigration migration)
+    {
+        _migrations.Add(migration);
+        return this;
+    }
+
+    public MigrationQueue Build()
+    {
+        return new MigrationQueue(_migrations);
+    }
+}

Nebula.Shared/CurrentConVar.cs

@@ -1,3 +1,4 @@
+using Nebula.Shared.Configurations;
 using Nebula.Shared.Models;
 using Nebula.Shared.Services;
 

Nebula.Shared/Models/Auth/LoginToken.cs

@@ -1,3 +1,6 @@
 namespace Nebula.Shared.Models.Auth;
 
-public sealed record LoginToken(string Token, DateTimeOffset ExpireTime);
+public sealed record LoginToken(string Token, DateTimeOffset ExpireTime)
+{
+    public static LoginToken Empty = new(string.Empty, DateTimeOffset.Now);
+}

Nebula.Shared/Models/ILoadingHandler.cs

@@ -7,6 +7,7 @@ public interface ILoadingHandler
 
     public void SetResolvedJobsCount(int count);
     public int GetResolvedJobsCount();
+    public void SetLoadingMessage(string message);
 
     public void AppendJob(int count = 1)
     {

Nebula.Shared/Services/AuthService.cs

@@ -1,6 +1,5 @@
 using System.Net;
 using System.Net.Http.Headers;
-using System.Text.Json;
 using System.Text.Json.Serialization;
 using Nebula.Shared.Models.Auth;
 using Nebula.Shared.Services.Logging;
@@ -15,15 +14,10 @@ public class AuthService(
     CancellationService cancellationService)
 {
     private readonly HttpClient _httpClient = new();
-    public CurrentAuthInfo? SelectedAuth { get; private set; }
     private readonly ILogger _logger = debugService.GetLogger("AuthService");
 
-    public async Task Auth(AuthLoginPassword authLoginPassword, string? code = null)
+    public async Task<AuthTokenCredentials> Auth(string login, string password, string authServer, string? code = null)
     {
-        var authServer = authLoginPassword.AuthServer;
-        var login = authLoginPassword.Login;
-        var password = authLoginPassword.Password;
-
         _logger.Debug($"Auth to {authServer}api/auth/authenticate {login}");
 
         var authUrl = new Uri($"{authServer}api/auth/authenticate");
@@ -34,8 +28,8 @@ public class AuthService(
                 await restService.PostAsync<AuthenticateResponse, AuthenticateRequest>(
                     new AuthenticateRequest(login, null, password, code), authUrl, cancellationService.Token);
 
-            SelectedAuth = new CurrentAuthInfo(result.UserId,
+            return new AuthTokenCredentials(result.UserId,
-                new LoginToken(result.Token, result.ExpireTime), authLoginPassword.Login, authLoginPassword.AuthServer);
+                new LoginToken(result.Token, result.ExpireTime), login, authServer);
         }
         catch (RestRequestException e)
         {
@@ -48,38 +42,51 @@ public class AuthService(
         }
     }
 
-    public void ClearAuth()
+    public async Task EnsureToken(AuthTokenCredentials tokenCredentials)
     {
-        SelectedAuth = null;
+        var authUrl = new Uri($"{tokenCredentials.AuthServer}api/auth/ping");
-    }
-
-    public async Task SetAuth(CurrentAuthInfo info)
-    {
-        SelectedAuth = info;
-        await EnsureToken();
-    }
-
-    public async Task EnsureToken()
-    {
-        if (SelectedAuth is null) throw new Exception("Auth info is not set!");
-
-        var authUrl = new Uri($"{SelectedAuth.AuthServer}api/auth/ping");
 
         using var requestMessage = new HttpRequestMessage(HttpMethod.Get, authUrl);
-        requestMessage.Headers.Authorization = new AuthenticationHeaderValue("SS14Auth", SelectedAuth.Token.Token);
+        requestMessage.Headers.Authorization = new AuthenticationHeaderValue("SS14Auth", tokenCredentials.Token.Token);
         using var resp = await _httpClient.SendAsync(requestMessage, cancellationService.Token);
     }
+    
+    public async Task Logout(AuthTokenCredentials tokenCredentials)
+    {
+        var authUrl = new Uri($"{tokenCredentials.AuthServer}api/auth/logout");
+        await restService.PostAsync<NullResponse, TokenRequest>(TokenRequest.From(tokenCredentials), authUrl, cancellationService.Token);
+    }
+
+    public async Task<AuthTokenCredentials> Refresh(AuthTokenCredentials tokenCredentials)
+    {
+        var authUrl = new Uri($"{tokenCredentials.AuthServer}api/auth/refresh");
+        var newToken = await restService.PostAsync<LoginToken, TokenRequest>(
+            TokenRequest.From(tokenCredentials), authUrl, cancellationService.Token);
+        
+        return tokenCredentials with { Token = newToken };
+    }
 }
 
-public sealed record CurrentAuthInfo(Guid UserId, LoginToken Token, string Login, string AuthServer);
+public sealed record AuthTokenCredentials(Guid UserId, LoginToken Token, string Login, string AuthServer);
-
-public record AuthLoginPassword(string Login, string Password, string AuthServer);
 
 public sealed record AuthDenyError(string[] Errors, AuthenticateDenyCode Code);
 
 public sealed class AuthException(AuthDenyError error) : Exception
 {
     public AuthDenyError Error { get; } = error;
+
+    public override string Message
+    {
+        get
+        {
+            var str = "Error while logging in. Please try again. " + Error.Code;
+            foreach (var error in Error.Errors)
+            {
+                str += "\n" + error;
+            }
+            return str;
+        }
+    }
 }
 
 [JsonConverter(typeof(JsonStringEnumConverter))]
@@ -92,3 +99,14 @@ public enum AuthenticateDenyCode
         TfaInvalid         =  4,
         AccountLocked      =  5,
 }
+
+public sealed record TokenRequest(string Token)
+{
+    public static TokenRequest From(AuthTokenCredentials authTokenCredentials)
+    {
+        return new TokenRequest(authTokenCredentials.Token.Token);
+    }
+    
+    public static TokenRequest Empty { get; } = new TokenRequest("");
+    
+}

Nebula.Shared/Services/ConfigurationService.cs

@@ -1,61 +1,69 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
+using Nebula.Shared.Configurations;
+using Nebula.Shared.Configurations.Migrations;
 using Nebula.Shared.FileApis.Interfaces;
+using Nebula.Shared.Models;
 using Nebula.Shared.Services.Logging;
-using Robust.LoaderApi;
 
 namespace Nebula.Shared.Services;
 
-public class ConVar<T>
-{
-    internal ConfigurationService.OnConfigurationChangedDelegate<T?>? OnValueChanged;
-    
-    public ConVar(string name, T? defaultValue = default)
-    {
-        Name = name ?? throw new ArgumentNullException(nameof(name));
-        DefaultValue = defaultValue;
-    }
-
-    public string Name { get; }
-    public Type Type => typeof(T);
-    public T? DefaultValue { get; }
-}
-
-public static class ConVarBuilder
-{
-    public static ConVar<T> Build<T>(string name, T? defaultValue = default)
-    {
-        if (string.IsNullOrWhiteSpace(name))
-            throw new ArgumentException("ConVar name cannot be null or whitespace.", nameof(name));
-
-        return new ConVar<T>(name, defaultValue);
-    }
-}
-
 [ServiceRegister]
 public class ConfigurationService
 {
+    private readonly IServiceProvider _serviceProvider;
+    private static List<IConfigurationMigration> _migrations = [];
+
+    public static void AddConfigurationMigration(IConfigurationMigration configurationMigration)
+    {
+        _migrations.Add(configurationMigration);
+    }
+    
     public delegate void OnConfigurationChangedDelegate<in T>(T value);
     
-    public IReadWriteFileApi ConfigurationApi { get; init; }
+    public IReadWriteFileApi ConfigurationApi { get; }
     
     private readonly ILogger _logger;
 
-    public ConfigurationService(FileService fileService, DebugService debugService)
+    public ConfigurationService(FileService fileService, DebugService debugService, IServiceProvider serviceProvider)
     {
+        _serviceProvider = serviceProvider;
         _logger = debugService.GetLogger(this);
         ConfigurationApi = fileService.CreateFileApi("config");
     }
 
-    public ConfigChangeSubscriberDisposable<T> SubscribeVarChanged<T>(ConVar<T> convar, OnConfigurationChangedDelegate<T?> @delegate, bool invokeNow = false)
+    public void MigrateConfigs(ILoadingHandler loadingHandler)
+    {
+        Task.Run(async () =>
+        {
+            foreach (var migration in _migrations)
+            {
+                await migration.DoMigrate(this, _serviceProvider, loadingHandler);
+            }
+
+            if (loadingHandler is IDisposable disposable)
+            {
+                disposable.Dispose();
+            }
+        });
+    }
+
+    public ConVarObserver<T> SubscribeVarChanged<T>(ConVar<T> convar, OnConfigurationChangedDelegate<T?> @delegate, bool invokeNow = false)
     {
         convar.OnValueChanged += @delegate;
         if (invokeNow)
         {
             @delegate(GetConfigValue(convar));
         }
-        
+
-        return new ConfigChangeSubscriberDisposable<T>(convar, @delegate);
+        var delegation = SubscribeVarChanged<T>(convar);
+        delegation.PropertyChanged += (_, _) => @delegate(delegation.Value);
+        return delegation;
+    }
+
+    public ConVarObserver<T> SubscribeVarChanged<T>(ConVar<T> convar)
+    {
+        return new ConVarObserver<T>(convar, this);
     }
     
     public T? GetConfigValue<T>(ConVar<T> conVar)
@@ -112,12 +120,17 @@ public class ConfigurationService
         return false;
     }
 
+    public void ClearConfigValue<T>(ConVar<T> conVar)
+    {
+        ConfigurationApi.Remove(GetFileName(conVar));
+        conVar.OnValueChanged?.Invoke(conVar.DefaultValue);
+    }
+
     public void SetConfigValue<T>(ConVar<T> conVar, T? value)
     {
         if (value == null)
         {
-            ConfigurationApi.Remove(GetFileName(conVar));
+            ClearConfigValue(conVar);
-            conVar.OnValueChanged?.Invoke(conVar.DefaultValue);
             return;
         }
 
@@ -152,20 +165,4 @@ public class ConfigurationService
     {
         return $"{conVar.Name}.json";
     }
-}
-
-public sealed class ConfigChangeSubscriberDisposable<T> : IDisposable
-{
-    private readonly ConVar<T> _convar;
-    private readonly ConfigurationService.OnConfigurationChangedDelegate<T> _delegate;
-
-    public ConfigChangeSubscriberDisposable(ConVar<T> convar, ConfigurationService.OnConfigurationChangedDelegate<T> @delegate)
-    {
-        _convar = convar;
-        _delegate = @delegate;
-    }
-    public void Dispose()
-    {
-        _convar.OnValueChanged -= _delegate;
-    }
 }

Nebula.Shared/Services/ContentService.Download.cs

@@ -52,6 +52,7 @@ public partial class ContentService
 
         items = allItems.Where(a=> !hashApi.Has(a)).ToList();
 
+        loadingHandler.SetLoadingMessage("Download Count:" + items.Count);
         _logger.Log("Download Count:" + items.Count);
         await Download(downloadUri, items, hashApi, loadingHandler, cancellationToken);
 
@@ -62,6 +63,7 @@ public partial class ContentService
         CancellationToken cancellationToken)
     {
         _logger.Log("Getting manifest: " + info.Hash);
+        loadingHandler.SetLoadingMessage("Getting manifest: " + info.Hash);
 
         if (ManifestFileApi.TryOpen(info.Hash, out var stream))
         {
@@ -72,6 +74,7 @@ public partial class ContentService
         SetServerHash(info.ManifestUri.ToString(), info.Hash);
 
         _logger.Log("Fetching manifest from: " + info.ManifestUri);
+        loadingHandler.SetLoadingMessage("Fetching manifest from: " + info.ManifestUri);
 
         var response = await _http.GetAsync(info.ManifestUri, cancellationToken);
         if (!response.IsSuccessStatusCode) throw new Exception();
@@ -127,6 +130,7 @@ public partial class ContentService
 
         var downloadJobWatch = loadingHandler.GetQueryJob();
 
+        loadingHandler.SetLoadingMessage("Downloading from: " + contentCdn);
         _logger.Log("Downloading from: " + contentCdn);
 
         var requestBody = new byte[toDownload.Count * 4];
@@ -151,7 +155,7 @@ public partial class ContentService
 
         if (cancellationToken.IsCancellationRequested)
         {
-            _logger.Log("Downloading is cancelled!");
+            _logger.Log("Downloading cancelled!");
             return;
         }
 
@@ -201,7 +205,7 @@ public partial class ContentService
             {
                 if (cancellationToken.IsCancellationRequested)
                 {
-                    _logger.Log("Downloading is cancelled!");
+                    _logger.Log("Downloading cancelled!");
                     decompressContext?.Dispose();
                     compressContext?.Dispose();
                     return;

Nebula.Shared/Services/DebugService.cs

@@ -1,7 +1,6 @@
+using System.Collections.Concurrent;
 using System.Reflection;
-using Nebula.Shared.FileApis;
 using Nebula.Shared.Services.Logging;
-using Robust.LoaderApi;
 
 namespace Nebula.Shared.Services;
 
@@ -9,16 +8,23 @@ namespace Nebula.Shared.Services;
 public class DebugService : IDisposable
 {
     public static bool DoFileLog;
-    private ServiceLogger Root {get; set;}
 
     private readonly string _path =
         Path.Combine(FileService.RootPath, "log", Assembly.GetEntryAssembly()?.GetName().Name ?? "App");
-    
+
     public DebugService()
     {
         ClearLog();
-        Root = new ServiceLogger("Root",_path);
+        Root = new ServiceLogger("Root", _path);
-        Root.GetLogger("DebugService").Log("Initializing debug service " + (DoFileLog ? "with file logging" : "without file logging"));
+        Root.GetLogger("DebugService")
+            .Log("Initializing debug service " + (DoFileLog ? "with file logging" : "without file logging"));
+    }
+
+    private ServiceLogger Root { get; }
+
+    public void Dispose()
+    {
+        Root.Dispose();
     }
 
     public ILogger GetLogger(string loggerName)
@@ -31,25 +37,14 @@ public class DebugService : IDisposable
         return Root.GetLogger(objectToLog.GetType().Name);
     }
 
-    public void Dispose()
-    {
-        Root.Dispose();
-    }
-
     private void ClearLog()
     {
-        if(!Directory.Exists(_path)) 
+        if (!Directory.Exists(_path))
             return;
         var di = new DirectoryInfo(_path);
 
-        foreach (var file in di.GetFiles())
+        foreach (var file in di.GetFiles()) file.Delete();
-        {
+        foreach (var dir in di.GetDirectories()) dir.Delete(true);
-            file.Delete(); 
-        }
-        foreach (var dir in di.GetDirectories())
-        {
-            dir.Delete(true); 
-        }
     }
 }
 
@@ -63,101 +58,101 @@ public enum LoggerCategory
 internal class ServiceLogger : ILogger
 {
     private readonly string _directory;
-    public ServiceLogger? Root { get; private set; }
+    private readonly string _path;
+
     public ServiceLogger(string category, string directory)
     {
         _directory = directory;
         Category = category;
 
         if (!DebugService.DoFileLog) return;
-        
+
-        if(!Directory.Exists(directory)) Directory.CreateDirectory(directory);
+        if (!Directory.Exists(directory)) Directory.CreateDirectory(directory);
 
         _path = Path.Combine(directory, $"{Category}.log");
-        
+
         File.Create(_path).Dispose();
     }
 
-    public string Category { get; init; }
+    public ServiceLogger? Root { get; private set; }
-    
+
-    private Dictionary<string, ServiceLogger> Childs { get; init; } = new();
+    public string Category { get; init; }
-    
+    private ConcurrentDictionary<string, ServiceLogger> Childs { get; } = new();
-    private FileStream? _fileStream;
-    private StreamWriter? _streamWriter;
-    private readonly string _path;
 
-    public ServiceLogger GetLogger(string category)
-    {
-        if (Childs.TryGetValue(category, out var logger))
-            return logger;
-        
-        logger = new ServiceLogger(category, _directory);
-        logger.Root = this;
-        Childs.Add(category, logger);
-        return logger;
-    }
-    
     public void Log(LoggerCategory loggerCategory, string message)
     {
-        var output = DebugService.DoFileLog 
+        var output = DebugService.DoFileLog
             ? $"[{DateTime.Now.ToUniversalTime():yyyy-MM-dd HH:mm:ss}][{Enum.GetName(loggerCategory)}][{Category}]: {message}"
             : message;
-        
-        Console.WriteLine(output);
-        
-        LogToFile(output);
-    }
 
-    private void LogToFile(string output)
+        Console.WriteLine(output);
-    {
+
-        if(!DebugService.DoFileLog) return;
+        LogToFile(output);
-        _fileStream = File.Open(_path, FileMode.Append, FileAccess.Write, FileShare.ReadWrite);
-        _streamWriter = new StreamWriter(_fileStream);
-        Root?.LogToFile(output);
-        _streamWriter.WriteLine(output);
-        _streamWriter.Flush();
-        
-        _streamWriter.Dispose();
-        _fileStream.Dispose();
-        
-        _fileStream = null;
-        _streamWriter = null;
     }
 
     public void Dispose()
     {
         if (!DebugService.DoFileLog) return;
-        
+
-        _streamWriter?.Dispose();
-        _fileStream?.Dispose();
         foreach (var (_, child) in Childs)
         {
             child.Dispose();
         }
-        Childs.Clear();
+
+        Childs.Clear(); // Not strictly necessary, but keeps intent clear
+    }
+
+    public ServiceLogger GetLogger(string category)
+    {
+        return Childs.GetOrAdd(category, key =>
+        {
+            var logger = new ServiceLogger(key, _directory)
+            {
+                Root = this
+            };
+            return logger;
+        });
+    }
+
+    private void LogToFile(string output)
+    {
+        if (!DebugService.DoFileLog) return;
+
+        try
+        {
+            Root?.LogToFile(output); // Log to parent first
+
+            using var fileStream = File.Open(_path, FileMode.Append, FileAccess.Write, FileShare.ReadWrite);
+            using var streamWriter = new StreamWriter(fileStream);
+            streamWriter.WriteLine(output);
+        }
+        catch (IOException ex)
+        {
+            Console.WriteLine($"[Logging Error] Failed to write log: {ex.Message}");
+        }
     }
 }
 
 public static class LoggerExtensions
 {
-    public static void Debug(this ILogger logger,string message)
+    public static void Debug(this ILogger logger, string message)
     {
         logger.Log(LoggerCategory.Debug, message);
     }
 
-    public static void Error(this ILogger logger,string message)
+    public static void Error(this ILogger logger, string message)
     {
         logger.Log(LoggerCategory.Error, message);
     }
 
-    public static void Log(this ILogger logger,string message)
+    public static void Log(this ILogger logger, string message)
     {
         logger.Log(LoggerCategory.Log, message);
     }
 
-    public static void Error(this ILogger logger,Exception e)
+    public static void Error(this ILogger logger, Exception e)
     {
-        Error(logger,e.Message + "\r\n" + e.StackTrace);
+        Error(logger, e.Message + "\r\n" + e.StackTrace);
         if (e.InnerException != null)
             Error(logger, e.InnerException);
     }

Nebula.Shared/Services/EngineService.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using Nebula.Shared.Configurations;
 using Nebula.Shared.FileApis;
 using Nebula.Shared.FileApis.Interfaces;
 using Nebula.Shared.Models;

Nebula.Shared/Services/FileService.cs

@@ -122,6 +122,11 @@ public sealed class ConsoleLoadingHandler : ILoadingHandler
         return _resolvedJobs;
     }
 
+    public void SetLoadingMessage(string message)
+    {
+        
+    }
+
     private void UpdatePercent()
     {
         if (_currJobs == 0)

Nebula.Shared/Services/RestService.cs

@@ -32,7 +32,32 @@ public class RestService
         var response = await _client.GetAsync(uri, cancellationToken);
         return await ReadResult<T>(response, cancellationToken, uri);
     }
+    
+    public async Task<K> PostAsync<K, T>(T information, Uri uri, CancellationToken cancellationToken) where K : notnull
+    {
+        var json = JsonSerializer.Serialize(information, _serializerOptions);
+        var content = new StringContent(json, Encoding.UTF8, "application/json");
+        var response = await _client.PostAsync(uri, content, cancellationToken);
+        return await ReadResult<K>(response, cancellationToken, uri);
+    }
 
+    [Pure]
+    public async Task<T> PostAsync<T>(Stream stream, string fileName, Uri uri, CancellationToken cancellationToken) where T : notnull
+    {
+        using var multipartFormContent =
+            new MultipartFormDataContent("Upload----" + DateTime.Now.ToString(CultureInfo.InvariantCulture));
+        multipartFormContent.Add(new StreamContent(stream), "formFile", fileName);
+        var response = await _client.PostAsync(uri, multipartFormContent, cancellationToken);
+        return await ReadResult<T>(response, cancellationToken, uri);
+    }
+
+    [Pure]
+    public async Task<T> DeleteAsync<T>(Uri uri, CancellationToken cancellationToken) where T : notnull
+    {
+        var response = await _client.DeleteAsync(uri, cancellationToken);
+        return await ReadResult<T>(response, cancellationToken, uri);
+    }
+    
     [Pure]
     public async Task<T> GetAsyncDefault<T>(Uri uri, T defaultValue, CancellationToken cancellationToken) where T : notnull
     {
@@ -47,38 +72,15 @@ public class RestService
         }
     }
 
-    [Pure]
-    public async Task<K> PostAsync<K, T>(T information, Uri uri, CancellationToken cancellationToken) where K : notnull
-    {
-        var json = JsonSerializer.Serialize(information, _serializerOptions);
-        var content = new StringContent(json, Encoding.UTF8, "application/json");
-        var response = await _client.PostAsync(uri, content, cancellationToken);
-        return await ReadResult<K>(response, cancellationToken, uri);
-    }
-
-    [Pure]
-    public async Task<T> PostAsync<T>(Stream stream, Uri uri, CancellationToken cancellationToken) where T : notnull
-    {
-        using var multipartFormContent =
-            new MultipartFormDataContent("Upload----" + DateTime.Now.ToString(CultureInfo.InvariantCulture));
-        multipartFormContent.Add(new StreamContent(stream), "formFile", "image.png");
-        var response = await _client.PostAsync(uri, multipartFormContent, cancellationToken);
-        return await ReadResult<T>(response, cancellationToken, uri);
-    }
-
-    [Pure]
-    public async Task<T> DeleteAsync<T>(Uri uri, CancellationToken cancellationToken) where T : notnull
-    {
-        var response = await _client.DeleteAsync(uri, cancellationToken);
-        return await ReadResult<T>(response, cancellationToken, uri);
-    }
-
     [Pure]
     private async Task<T> ReadResult<T>(HttpResponseMessage response, CancellationToken cancellationToken, Uri uri) where T : notnull
     {
-        var content = await response.Content.ReadAsStringAsync(cancellationToken);
+        if (typeof(T) == typeof(NullResponse) && new NullResponse() is T nullResponse)
+        {
+            return nullResponse;
+        }
         
-        if (typeof(T) == typeof(string) && content is T t)
+        if (typeof(T) == typeof(string) && await response.Content.ReadAsStringAsync(cancellationToken) is T t)
             return t;
         
         if (response.IsSuccessStatusCode)
@@ -90,6 +92,10 @@ public class RestService
     }
 }
 
+public sealed class NullResponse
+{
+}
+
 public sealed class RestRequestException(HttpContent content, HttpStatusCode statusCode, string message) : Exception(message)
 {
     public HttpStatusCode StatusCode { get; } = statusCode;

Nebula.Shared/Utils/ExceptionHelper.cs

@@ -0,0 +1,19 @@
+namespace Nebula.Shared.Utils;
+
+public static class ExceptionHelper
+{
+    public static Task<T> TryRun<T>(Func<Task<T>> func, int attempts = 3, Action<int, Exception>? attemptsCallback = null)
+    {
+        try
+        {
+            return func.Invoke();
+        }
+        catch (Exception e)
+        {
+            if (attempts <= 0) throw new("Attempts was expired! ", e);
+            attempts--;
+            attemptsCallback?.Invoke(attempts, e);
+            return TryRun(func, attempts);
+        }
+    }
+}

Nebula.UnitTest/NebulaSharedTests/ConfigurationServiceTests.cs

@@ -1,4 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
+using Nebula.Shared.Configurations;
 using Nebula.Shared.Services;
 
 namespace Nebula.UnitTest.NebulaSharedTests;

Nebula.UpdateResolver/App.axaml.cs

@@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 
@@ -13,8 +14,6 @@ public partial class App : Application
 
     public override void OnFrameworkInitializationCompleted()
     {
-     
-        
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
             desktop.MainWindow = new MainWindow();

Nebula.UpdateResolver/MainWindow.axaml.cs

@@ -36,7 +36,11 @@ public partial class MainWindow : Window
             Console.WriteLine(messageOut);
             LogStr += messageOut + "\n";
         };
-        Start();
+        LogStandalone.Log("Starting up");
+        if (!Design.IsDesignMode)
+            _ = Start();
+        else
+            LogStandalone.Log("Debug information", 51);
     }
 
     private async Task Start()

Nebula.sln.DotSettings.user

@@ -1,6 +1,7 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AArchiving_002EUtils_002EWindows_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F27e9f12ad1e4318b9b02849ec3e6a502fa3ee761c4f0522ba756ab30cde1c_003FArchiving_002EUtils_002EWindows_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAssembly_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F501151723a8d43558c75acbd334f26322066fa4b1c82b1297291314bf92ff_003FAssembly_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAuthenticationHeaderValue_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F88b338246f59cffdb6f3dc3d8dbcfc169599dc71d6f44a8f2732983db7f73a_003FAuthenticationHeaderValue_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAvaloniaXamlLoader_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F80462644bd1cc7e0b229dc4f5752b48c01cb67b46ae563b1b5078cc2556b98_003FAvaloniaXamlLoader_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABorder_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F5fda7f1253ea19edc15f91b94a33322b857f1a9319fbffea8d26e9d304178_003FBorder_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABrushes_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F86e7f7d5cebacb8f8e37f52cb9a1f6a4b8933239631e3d969a4bc881ae92f9_003FBrushes_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
@@ -19,6 +20,8 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFileShare_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fa6b7f037ba7b44df80b8d3aa7e58eeb2e8e938_003F54_003Fc3f4f140_003FFileShare_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFile_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F3f31e7e8aa33de883c2ccfa62a9c81bfc246c36e825b489476f9472032e512_003FFile_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFrozenDictionary_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F89dff9063ddb01ff8125b579122b88bf4de94526490d77bcbbef7d0ee662a_003FFrozenDictionary_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFuncValueConverter_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fe91c13e7e24d7ba324e0e6eb12a24ea8c7761299d3c4703e55c86dd120835e61_003FFuncValueConverter_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFunc_00601_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fa6b7f037ba7b44df80b8d3aa7e58eeb2e8e938_003Fab_003F4dac48f4_003FFunc_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFuture_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fb3575a2f41d7c2dbfaa36e866b8a361e11dd7223ff82bc574c1d5d4b7522f735_003FFuture_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHttpClient_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fc439425da351c75ac7d966a1cc8324b51a9c471865af79d2f2f3fcb65e392_003FHttpClient_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHttpContent_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F9657cc383c70851dc2bdcf91eff27f21196844abfe552fc9c3243ff36974cd_003FHttpContent_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
@@ -26,20 +29,26 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHttpMessageHandler_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Ffcc079c54e9940c5ac59f0141dda9ad01b4928_003Fa7_003F885f5fd9_003FHttpMessageHandler_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHttpMessageHandler_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F5ec756ee3c4a8815819863993a738eedef67396d5517846a3eed524729bb9_003FHttpMessageHandler_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHttpMessageInvoker_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Ffcc079c54e9940c5ac59f0141dda9ad01b4928_003Fb5_003F70346b10_003FHttpMessageInvoker_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHttpRequestHeaders_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F5f9b1c879b45ff7e03890c1477da12b182b50f33d473239e11396c66179557_003FHttpRequestHeaders_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHttpRequestMessage_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F86529590f9604f327a3b1b19aec3ff2310f0654aa06bb8cef2e3d820ea3bfd_003FHttpRequestMessage_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHttpResponseMessage_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F4cfeb8b377bc81e1fbb5f7d7a02492cb6ac23e88c8c9d7155944f0716f3d4b_003FHttpResponseMessage_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIDispatcherImpl_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F22d92db124764b1ab49745245c66f01b1e1a00_003F0f_003F01061787_003FIDispatcherImpl_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIDisposable_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fa6b7f037ba7b44df80b8d3aa7e58eeb2e8e938_003F98_003Fd1b23281_003FIDisposable_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AImage_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F2b95745d8f2ddf7b8ad6130e01c5b2782e253ff11247a9aeefcef47277b1ab_003FImage_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIndex_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F2a1a813823579c69832f1304f97761e7be433bd6aa928f351d138050b56a38_003FIndex_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AInt32_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fa882d183338544fdbcbdfc7b6d3dcb78916630765551644a221b5be9c45a121b_003FInt32_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AInterop_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fc4d71b51722245ae8cde97bfd996e68386928_003F3a_003F004a1338_003FInterop_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AJsonSerializer_002ERead_002EString_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F27c4858128168eda568c1334d70d5241efb9461e2a3209258a04deee5d9c367_003FJsonSerializer_002ERead_002EString_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AKnownHeader_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F1079f3c57a31ec97cba3b6ebb3d45c5a4afcdf6fa483a4db57c3d58ea59d7a9_003FKnownHeader_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AListBox_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F3a6cdc26ff4d30986a9a16b6bbc9bb6a7f2657431c82cde5c66dd377cf51e2b_003FListBox_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMetricServer_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb07ddb833489431aae882d295a4e94797e00_003Fcf_003F23af7cad_003FMetricServer_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMetricServer_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F66d3496ea2e7f3cbfb5f2ba1362869af0588ac72e87912659693443b5b7c3a_003FMetricServer_002Ecs_002Fz_003A2_002D1/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMetrics_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb07ddb833489431aae882d295a4e94797e00_003F0f_003Fc9e3d448_003FMetrics_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANativeLibrary_002ECoreCLR_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F88c2c65e1618f68cb5969f70dfc0986e9571015ac8d487b18d26e89c926264_003FNativeLibrary_002ECoreCLR_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANativeLibrary_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F49393f3cda2f9a5c2fa811fc9179dcbaf5bd94d9dc8afc76aaff2bc23287f3_003FNativeLibrary_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANullable_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F5acc345db3c207bc9d886a36ff14867ef8d65557432172c2a42f19aeac04d1b_003FNullable_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AObservableCollection_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F3e2c48e6b3ec8b39cf721287f93972c7f3df25d306753bcc539eaad73126c68_003FObservableCollection_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AObservableObject_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F3e432edeee9469b7cfdb81d6e6bd278cf57afb9e54ab75649b8bb2f52cdde69_003FObservableObject_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003APanel_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F9b699722324e3615b57977447b25bf953fccb2d6e912ae584f16b7e691ad9d3_003FPanel_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AParallel_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F36fd1a9641998bb3afbf2091e26eafa6aaafabcb494bc746c0ba7471db513143_003FParallel_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AParallel_002EForEachAsync_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fc1d1ed6be2d5d4de542b4af5b36e82f6d1d1a389a35a4e4f9748d137d1c651_003FParallel_002EForEachAsync_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
@@ -47,6 +56,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003APerfCounterCollector_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb07ddb833489431aae882d295a4e94797e00_003F4f_003F4c0b90e8_003FPerfCounterCollector_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AProcessStartInfo_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fc5ffb8c166be164bc221db4c64e826a1e8ff54f2f1c9ee8e7f9cfabce707fa4_003FProcessStartInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003APropertyInfo_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F408236be4b0703755f3ed96daaae245919a792d65ce5eaa672d9fa945b1f_003FPropertyInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ARelayCommand_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F20c0f49b8854743afaecc2f359655fdbfc6c5264f49e9eb333686e85a87bf_003FRelayCommand_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AScrollBar_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fda7bce95d5f888176a5f93c8965e402ca33cba794ac7e7aa776363c664488d_003FScrollBar_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AServiceCollectionContainerBuilderExtensions_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fa8ceca48b7b645dd875a40ee6d28725416d08_003F1b_003F6cd78dc8_003FServiceCollectionContainerBuilderExtensions_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AServiceProviderServiceExtensions_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003FCinka_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4f1fdec7cbfe4433a7ec3a6d1bd0e54210118_003F04_003Fe2f5322d_003FServiceProviderServiceExtensions_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>