- fix: Message on error

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

@@ -2,6 +2,8 @@ using System;
 using Avalonia.Data.Converters;
 using Avalonia.Media;
 using Avalonia.Platform;
+using Nebula.Launcher.ViewModels.Pages;
+using Color = System.Drawing.Color;
 
 namespace Nebula.Launcher.Converters;
 
@@ -20,4 +22,7 @@ public static class TypeConverters
             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(ColorUtils.GetColorFromString);
 }

Nebula.Launcher/LauncherConVar.cs

@@ -3,6 +3,8 @@ using System.Globalization;
 using Nebula.Launcher.Models;
 using Nebula.Launcher.Models.Auth;
 using Nebula.Shared.ConfigMigrations;
+using Nebula.Shared.Configurations;
+using Nebula.Shared.Configurations.Migrations;
 using Nebula.Shared.Services;
 
 namespace Nebula.Launcher;

Nebula.Launcher/Models/Auth/ProfileAuthCredentials.cs

@@ -8,6 +8,5 @@ namespace Nebula.Launcher.Models.Auth;
 public sealed record ProfileAuthCredentials(
     AuthTokenCredentials Credentials, 
     string AuthName,
-    Color Color,
     [property: JsonIgnore] ICommand OnSelect = default!,
     [property: JsonIgnore] ICommand OnDelete = default!);

Nebula.Launcher/ProcessHelper/GameProcessStartInfoProvider.cs

@@ -35,7 +35,7 @@ public sealed class GameProcessStartInfoProvider(DotnetResolverService resolverS
     {
         var baseStart = await base.GetProcessStartInfo();
         
-        var authProv = accountInfoViewModel.Credentials;
+        var authProv = accountInfoViewModel.Credentials.Value;
         if(authProv is null) 
             throw new Exception("Client is without selected auth");
 

Nebula.Launcher/Services/LocalisationService.cs

@@ -68,12 +68,16 @@ public partial class LocalisationService
 public class LocaledText : MarkupExtension
 {
     public string Key { get; set; } 
+    public Dictionary<string, object>? Options { get; set; }
 
     public LocaledText(string key) => Key = key;
 
+    public LocaledText()
+    {
+    }
+
     public override object ProvideValue(IServiceProvider serviceProvider)
     {
-        // Fetch the localized string using the key
-        return LocalisationService.GetString(Key);
+        return LocalisationService.GetString(Key, Options);
     }
 }

Nebula.Launcher/ViewModels/MainViewModel.cs

@@ -40,16 +40,8 @@ public partial class MainViewModel : ViewModelBase
     [ObservableProperty] private bool _isPopupClosable = true;
     [ObservableProperty] private bool _popup;
     [ObservableProperty] private ListItemTemplate? _selectedListItem;
-
-    public bool IsLoggedIn => AccountInfoViewModel.Credentials is not null;
+    [ObservableProperty] private string? _loginText = LocalisationService.GetString("auth-current-login-no-name");
     
-    public string LoginText => LocalisationService.GetString("auth-current-login-name", 
-        new Dictionary<string, object>
-    {
-        { "login", AccountInfoViewModel.Credentials?.Login ?? "" },
-        { "auth_server", AccountInfoViewModel.CurrentAuthServerName}
-    });
-
     [GenerateProperty] private LocalisationService LocalisationService { get; } // Не убирать! Без этой хуйни вся локализация идет в пизду!
     [GenerateProperty] private AccountInfoViewModel AccountInfoViewModel { get; }
     [GenerateProperty] private DebugService DebugService { get; } = default!;
@@ -74,15 +66,29 @@ public partial class MainViewModel : ViewModelBase
 
     protected override void Initialise()
     {
-        AccountInfoViewModel.PropertyChanged += (sender, args) =>
+        AccountInfoViewModel.Credentials.PropertyChanged += (_, args) =>
         {
-            if (args.PropertyName != nameof(AccountInfoViewModel.Credentials)) 
-                return;
+            if (args.PropertyName is not nameof(AccountInfoViewModel.Credentials.Value)) return;
             
-            OnPropertyChanged(nameof(LoginText));
-            OnPropertyChanged(nameof(IsLoggedIn));
+            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");
+            }
         };
-        
+
         _logger = DebugService.GetLogger(this);
 
         using var stream = typeof(MainViewModel).Assembly

Nebula.Launcher/ViewModels/Pages/AccountInfoViewModel.cs

@@ -3,16 +3,14 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Net.Http;
-using System.Security.Cryptography;
-using System.Text;
 using System.Threading.Tasks;
-using Avalonia.Media;
 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;
@@ -33,7 +31,6 @@ public partial class AccountInfoViewModel : ViewModelBase
     [ObservableProperty] private string _currentPassword = string.Empty;
     [ObservableProperty] private bool _isLogged;
     [ObservableProperty] private bool _doRetryAuth;
-    [ObservableProperty] private AuthTokenCredentials? _credentials;
     [ObservableProperty] private AuthServerCredentials _authItemSelect;
 
     private bool _isProfilesEmpty;
@@ -45,15 +42,11 @@ public partial class AccountInfoViewModel : ViewModelBase
 
     public ObservableCollection<ProfileAuthCredentials> Accounts { get; } = new();
     public ObservableCollection<AuthServerCredentials> AuthUrls { get; } = new();
-    public string CurrentAuthServerName => GetServerAuthName(Credentials);
+
+    public ComplexConVarBinder<AuthTokenCredentials?> Credentials { get; private set; }
 
     private ILogger _logger;
     
-    partial void OnCredentialsChanged(AuthTokenCredentials? value)
-    {
-        OnPropertyChanged(nameof(CurrentAuthServerName));
-    }
-
     //Design think
     protected override void InitialiseInDesignMode()
     {
@@ -62,41 +55,16 @@ public partial class AccountInfoViewModel : ViewModelBase
         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 async void AuthByProfile(ProfileAuthCredentials credentials)
-    {
-        var message = ViewHelperService.GetViewModel<InfoPopupViewModel>();
-        message.InfoText = LocalisationService.GetString("auth-try-auth-profile");
-        message.IsInfoClosable = false;
-        PopupMessageService.Popup(message);
-        
-        try
-        {
-            await CatchAuthError(async () => await TryAuth(credentials.Credentials), () => message.Dispose());
-        }
-        catch (Exception ex)
-        {
-            CurrentLogin = credentials.Credentials.Login;
-            CurrentAuthServer = credentials.Credentials.AuthServer;
-            
-            var unexpectedError = new Exception(LocalisationService.GetString("auth-error"), ex);
-            _logger.Error(unexpectedError);
-            PopupMessageService.Popup(unexpectedError);
-            return;
-        }
-        
-        ConfigurationService.SetConfigValue(LauncherConVar.AuthCurrent, Credentials);
-        
-        message.Dispose();
-    }
-
+    
     public void DoAuth(string? code = null)
     {
         var message = ViewHelperService.GetViewModel<InfoPopupViewModel>();
@@ -114,54 +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);
-                    _logger.Error(unexpectedError);
-                    PopupMessageService.Popup(unexpectedError);
+                    exception = new Exception(LocalisationService.GetString("auth-error"), ex);
                 }
             }
             
             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(AuthTokenCredentials authTokenCredentials)
-    {
-        CurrentLogin = authTokenCredentials.Login;
-        CurrentAuthServer = authTokenCredentials.AuthServer;
-        await SetAuth(authTokenCredentials);
-        IsLogged = true;
-    }
-
-    private async Task SetAuth(AuthTokenCredentials authTokenCredentials)
-    {
-        await AuthService.EnsureToken(authTokenCredentials);
-        Credentials = authTokenCredentials;
-    }
-
-    private async Task TryAuth(string login, string password, string authServer, string? code)
-    {
-        Credentials = await AuthService.Auth(login, password, authServer, code);
-        CurrentLogin = login;
-        CurrentPassword = password;
-        CurrentAuthServer = authServer;
-        IsLogged = true;
-        ConfigurationService.SetConfigValue(LauncherConVar.AuthCurrent, Credentials);
-    }
-
     private async Task CatchAuthError(Func<Task> a, Action? onError)
     {
         DoRetryAuth = false;
@@ -178,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)
@@ -198,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);
@@ -225,8 +204,7 @@ public partial class AccountInfoViewModel : ViewModelBase
 
     public void Logout()
     {
-        IsLogged = false;
-        Credentials = null;
+        Credentials.Value = null;
         CurrentAuthServer = "";
     }
 
@@ -247,14 +225,13 @@ public partial class AccountInfoViewModel : ViewModelBase
     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(
             credentials,
             serverName, 
-            ColorUtils.GetColorFromString(credentials.AuthServer),
             onSelect,
             onDelete);
 
@@ -264,62 +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);
         
+        _logger.Log("Reading auth config");
+        
         AuthUrls.Clear();
         var authUrls = ConfigurationService.GetConfigValue(LauncherConVar.AuthServers)!;
         foreach (var url in authUrls) AuthUrls.Add(url);
         if(authUrls.Length > 0) AuthItemSelect = authUrls[0];
         
+        var profileCandidates = new List<AuthTokenCredentials>();
+
         foreach (var profile in
                  ConfigurationService.GetConfigValue(LauncherConVar.AuthProfiles)!)
-            AddAccount(profile);
+        {
+            _logger.Log($"Reading profile {profile.Login}");
+            var checkedCredit = await CheckOrRenewToken(profile);
+            if(checkedCredit is null)
+            {
+                _logger.Error($"Profile {profile.Login} is not available");
+                continue;
+            }
+            
+            _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();
-
-        DoCurrentAuth();
     }
 
-    public async void DoCurrentAuth()
+    public 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
-            {
-                await CatchAuthError(async () => await TryAuth(currProfile), () => message.Dispose());
-            }
-            catch (Exception ex)
-            {
-                var unexpectedError = new Exception(LocalisationService.GetString("auth-error"), ex);
-                _logger.Error(unexpectedError);
-                PopupMessageService.Popup(unexpectedError);
-                return;
-            }
-        }
-
-        message.Dispose();
+        DoAuth();
     }
 
-    [RelayCommand]
-    private void OnSaveProfile()
+    private async Task<AuthTokenCredentials?> CheckOrRenewToken(AuthTokenCredentials? authTokenCredentials)
     {
-        if(Credentials is null) return;
+        if(authTokenCredentials is null) 
+            return null;
+
+        var daysLeft = (int)(authTokenCredentials.Token.ExpireTime - DateTime.Now).TotalDays;
         
-        AddAccount(Credentials);
+        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();
@@ -343,15 +342,13 @@ public partial class AccountInfoViewModel : ViewModelBase
         messageView.IsInfoClosable = true;
         PopupMessageService.Popup(messageView);
     }
-
-    [RelayCommand]
-    private void OnExpandAuthUrl()
+    
+    public void OnExpandAuthUrl()
     {
         AuthUrlConfigExpand = !AuthUrlConfigExpand;
     }
-
-    [RelayCommand]
-    private void OnExpandAuthView()
+    
+    public void OnExpandAuthView()
     {
         AuthMenuExpand = !AuthMenuExpand;
         UpdateAuthMenu();
@@ -362,18 +359,75 @@ public partial class AccountInfoViewModel : ViewModelBase
         ConfigurationService.SetConfigValue(LauncherConVar.AuthProfiles,
             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;
+        }
+    }
 }
 
-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/ViewModels/Pages/ConfigurationViewModel.cs

@@ -1,20 +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.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;
 
@@ -118,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/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

@@ -174,7 +174,8 @@ public partial class ServerEntryModelView : ViewModelBase, IFilterConsumer, ILis
 
     private async Task RunInstanceAsync(bool ignoreLoginCredentials = false)
     {
-        if (!ignoreLoginCredentials && AccountInfoViewModel.Credentials is null)
+        _logger.Log("Running instance..." + RealName);
+        if (!ignoreLoginCredentials && AccountInfoViewModel.Credentials.Value is null)
         {
             var warningContext = ViewHelperService.GetViewModel<IsLoginCredentialsNullPopupViewModel>()
                 .WithServerEntry(this);
@@ -182,20 +183,31 @@ public partial class ServerEntryModelView : ViewModelBase, IFilterConsumer, ILis
             PopupMessageService.Popup(warningContext);
             return;
         }
-        
-        using var loadingContext = ViewHelperService.GetViewModel<LoadingContextViewModel>();
-        loadingContext.LoadingName = "Loading instance...";
-        ((ILoadingHandler)loadingContext).AppendJob();
 
-        PopupMessageService.Popup(loadingContext);
-        _currentInstance = 
-            await GameRunnerPreparer.GetGameProcessStartInfoProvider(Address, loadingContext, CancellationService.Token);
-            
-        _currentInstance.RegisterLogger(_currentContentLogConsumer);
-        _currentInstance.RegisterLogger(new DebugLoggerBridge(DebugService.GetLogger($"PROCESS_{Random.Shared.Next(65535)}")));
-        _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/Views/MainView.axaml

@@ -133,8 +133,9 @@
                                         Path="/Assets/svg/user.svg"
                                         Width="10" />
                                     <Panel>
-                                        <TextBlock Foreground="#777777" IsVisible="{Binding IsLoggedIn}" Text="{Binding LoginText}"/>
-                                        <TextBlock Foreground="#777777" IsVisible="{Binding !IsLoggedIn}" Text="{services:LocaledText auth-current-login-no-name}"/>
+                                        <TextBlock 
+                                            Foreground="#777777" 
+                                            Text="{Binding LoginText}"/>
                                     </Panel>
                                 </StackPanel>
                             </Button>

Nebula.Launcher/Views/Pages/AccountInfoView.axaml

@@ -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>
@@ -46,7 +47,8 @@
                                     Margin="5,5,5,0">
                                     <Border.Background>
                                         <LinearGradientBrush EndPoint="100%,50%" StartPoint="20%,50%">
-                                            <GradientStop Color="{Binding Color}" Offset="0.0" />
+                                            <GradientStop Color="{Binding Credentials.AuthServer, 
+                                            Converter={x:Static converters:TypeConverters.NameColorRepresentation}}" Offset="0.0" />
                                             <GradientStop Color="#222222" Offset="1.0" />
                                         </LinearGradientBrush>
                                     </Border.Background>
@@ -138,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>
@@ -173,7 +175,7 @@
                                 <customControls:LocalizedLabel LocalId="account-auth-button"/>
                             </Button>
                         </Border>
-                        <Button Command="{Binding ExpandAuthViewCommand}" HorizontalAlignment="Right">
+                        <Button Command="{Binding OnExpandAuthView}" HorizontalAlignment="Right">
                             <Label>
                                 >
                             </Label>
@@ -189,11 +191,11 @@
                             <StackPanel>
                                 <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Spacing="5">
                                     <customControls:LocalizedLabel LocalId="account-auth-hello"/>
-                                    <TextBlock Text="{Binding CurrentLogin}" />
+                                    <TextBlock Text="{Binding Credentials.Value.Login}" />
                                 </StackPanel>
                                 <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Spacing="5">
                                     <customControls:LocalizedLabel LocalId="account-auth-current-server"/>
-                                    <TextBlock Text="{Binding CurrentAuthServerName}" />
+                                    <TextBlock Text="{Binding Credentials.Value.AuthServer}" />
                                 </StackPanel>
                             </StackPanel>
                         </Label>
@@ -208,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.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,29 +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");
-        args.Add(url.ToString());
+            var args = new List<string>
+            {
+                "--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;
+        }
     }
 }

Nebula.Shared/ConfigMigrations/ProfileMigration.cs

@@ -1,4 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
+using Nebula.Shared.Configurations.Migrations;
 using Nebula.Shared.Models;
 using Nebula.Shared.Services;
 

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/Services/AuthService.cs

@@ -50,6 +50,21 @@ public class AuthService(
         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 AuthTokenCredentials(Guid UserId, LoginToken Token, string Login, string AuthServer);
@@ -59,6 +74,19 @@ 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))]
@@ -71,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,107 +1,13 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
-using Microsoft.Extensions.DependencyInjection;
+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);
-    }
-
-    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);
-    }
-}
-
-public interface IConfigurationMigration
-{
-    public Task DoMigrate(ConfigurationService configurationService, IServiceProvider serviceProvider, ILoadingHandler loadingHandler);
-}
-
-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);
-}
-
-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);
-        }
-    }
-}
-
-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);
-    }
-}
-
 [ServiceRegister]
 public class ConfigurationService
 {
@@ -142,15 +48,22 @@ public class ConfigurationService
         });
     }
 
-    public ConfigChangeSubscriberDisposable<T> SubscribeVarChanged<T>(ConVar<T> convar, OnConfigurationChangedDelegate<T?> @delegate, bool invokeNow = false)
+    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)
@@ -252,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/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.GetLogger("DebugService").Log("Initializing debug service " + (DoFileLog ? "with file logging" : "without file logging"));
+        Root = new ServiceLogger("Root", _path);
+        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())
-        {
-            file.Delete(); 
-        }
-        foreach (var dir in di.GetDirectories())
-        {
-            dir.Delete(true); 
-        }
+        foreach (var file in di.GetFiles()) 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; }
-    
-    private Dictionary<string, ServiceLogger> Childs { get; init; } = new();
-    
-    private FileStream? _fileStream;
-    private StreamWriter? _streamWriter;
-    private readonly string _path;
+    public ServiceLogger? Root { get; private set; }
+
+    public string Category { get; init; }
+    private ConcurrentDictionary<string, ServiceLogger> Childs { get; } = new();
 
-    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)
-    {
-        if(!DebugService.DoFileLog) return;
-        _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;
+        Console.WriteLine(output);
+
+        LogToFile(output);
     }
 
     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/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.sln.DotSettings.user

@@ -45,6 +45,7 @@
 	<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>
@@ -54,6 +55,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>