Merge pull request #111 from block-core/Setting-UI/UX

Add NetworkMonitoringService to check Indexers and Relays in background

src/Angor/Client/Pages/Browse.razor

@@ -11,6 +11,7 @@
 @inject NavigationManager NavigationManager
 @inject IRelayService _RelayService
 @inject IIndexerService _IndexerService
+@inject INetworkService _NetworkService
 @inject IJSRuntime JS
 @inject ISerializer serializer
 
@@ -216,11 +217,93 @@ else
     protected override async Task OnInitializedAsync()
     {
         projects = SessionStorage.GetProjectIndexerData() ?? new List<ProjectIndexerData>();
-        if (!projects.Any())
+
+        if (projects.Any())
+        {
+            // Projects exist, initialize the search focus
+            await JS.InvokeVoidAsync("angor.initSearchFocus", "searchQuery");
+
+            // Check for indexer and relay availability in the background
+            _ = CheckIndexerAndRelayAvailability();
+        }
+        else
+        {
+            // No projects are cached, fetch new projects after ensuring services are available
+            await FetchAndEnsureServices();
+        }
+    }
+
+    private async Task FetchAndEnsureServices()
+    {
+        try
         {
+            _NetworkService.AddSettingsIfNotExist();
+            await _NetworkService.CheckServices(true);
+
+            var primaryIndexer = _NetworkService.GetPrimaryIndexer();
+            var primaryRelay = _NetworkService.GetPrimaryRelay();
+
+            if (primaryIndexer == null || primaryRelay == null)
+            {
+                notificationComponent.ShowNotificationMessage("No primary indexer or relay found. Please configure them in settings.");
+                return;
+            }
+
             await GetAllProjects();
         }
-        await JS.InvokeVoidAsync("angor.initSearchFocus", "searchQuery");
+        catch (Exception ex)
+        {
+            notificationComponent.ShowNotificationMessage($"Initialization failed: {ex.Message}");
+        }
+    }
+
+    private async Task CheckIndexerAndRelayAvailability()
+    {
+        try
+        {
+            // Attempt to retrieve primary indexer and relay
+            var primaryIndexer = _NetworkService.GetPrimaryIndexer();
+            var primaryRelay = _NetworkService.GetPrimaryRelay();
+
+            // Initialize flags to track service availability
+            bool indexerAvailable = false;
+            bool relayAvailable = false;
+
+            // Check if the primary indexer is available
+            if (primaryIndexer != null)
+            {
+                await _NetworkService.CheckServices(false); // Refresh service status
+                indexerAvailable = primaryIndexer.Status == UrlStatus.Online;
+                if (!indexerAvailable)
+                {
+                    notificationComponent.ShowNotificationMessage("Primary indexer is offline. Please check your network settings.");
+                }
+            }
+            else
+            {
+                notificationComponent.ShowNotificationMessage("No primary indexer configured. Please add one in settings.");
+            }
+
+            // Check if the primary relay is available
+            if (primaryRelay != null)
+            {
+                await _NetworkService.CheckServices(false); // Refresh service status
+                relayAvailable = primaryRelay.Status == UrlStatus.Online;
+                if (!relayAvailable)
+                {
+                    notificationComponent.ShowNotificationMessage("Primary relay is offline. Please check your relay settings.");
+                }
+            }
+            else
+            {
+                notificationComponent.ShowNotificationMessage("No primary relay configured. Please add one in settings.");
+            }
+        }
+        catch (Exception ex)
+        {
+            // General error handling if the service check fails
+            notificationComponent.ShowNotificationMessage($"Service check failed: {ex.Message}");
+        }
     }
 
     private void ToggleView()

src/Angor/Client/Pages/Settings.razor

@@ -203,9 +203,9 @@
                             <td>
                                 @if (indexer.IsPrimary)
                                 {
-                                     <span role="button">
+                                    <span role="button">
                                         <Icon IconName="primary" Height="24" Width="24"></Icon>
-                                     </span>
+                                    </span>
                                 }
                                 else
                                 {
@@ -286,7 +286,7 @@
                                 else
                                 {
                                     <span @onclick="() => SetPrimaryRelay(relay)" role="button">
-                                        <Icon IconName="set" Height="24" Width="24" ></Icon>
+                                        <Icon IconName="set" Height="24" Width="24"></Icon>
                                     </span>
                                 }
                             </td>
@@ -362,7 +362,7 @@
                                         </div>
                                     </div>
                                     <div class="modal-footer">
-                                        <button class="btn btn-danger" @onclick="WipteAllData">Wipe Storage</button>
+                                        <button class="btn btn-danger" @onclick="WipeAllData">Wipe Storage</button>
 
                                         <button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @onclick="() => showWipeallModal = false">Close</button>
                                     </div>
@@ -402,12 +402,25 @@
 
         networkType = _networkConfiguration.GetNetwork().Name;
 
+        _networkService.OnStatusChanged += UpdateUI;
+
         if (!networkType.ToLower().Contains("test"))
             selectedNetwork = "mainnet";
 
         return base.OnInitializedAsync();
     }
 
+    private void UpdateUI()
+    {
+        settingsInfo = _clientStorage.GetSettingsInfo();
+        StateHasChanged();
+    }
+
+    public void Dispose()
+    {
+        _networkService.OnStatusChanged -= UpdateUI;
+    }
+
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
         if (firstRender)
@@ -565,21 +578,21 @@
         try
         {
             await _networkService.CheckServices(force);
-
             settingsInfo = _clientStorage.GetSettingsInfo();
         }
         catch (Exception e)
         {
-            Logger.LogError(e, e.Message);
-            notificationComponent.ShowErrorMessage(e.Message);
+            Logger.LogError(e, $"Error during Refresh: {e.Message}");
+            notificationComponent.ShowErrorMessage("Failed to refresh settings: " + e.Message);
         }
         finally
         {
             refreshSpinner = false;
+            StateHasChanged();
         }
     }
 
-    private void WipteAllData()
+    private void WipeAllData()
     {
         if (!confirmWipe)
         {

src/Angor/Client/Shared/MainLayout.razor

@@ -11,7 +11,7 @@
 @inject INetworkService _networkService
 @inject NavigationManager _navManager
 @inject NavMenuState NavMenuState;
-
+ 
 <div class="@($"{(isDarkTheme ? "dark" : "")}") sidenav-show bg-gray-100 @sidenavClass ">
     <aside class="sidenav navbar navbar-vertical navbar-expand-xs border-0 border-radius-xl my-3 fixed-start ms-3 b-shadow overflow-x-hidden" id="sidenav-main">
         <NavMenu ToggleSidenavCallback="ToggleSidenavMobile" ToggleSidenavTextCallback="ToggleSidenav" ToggleleLockMenuCallback="ToggleLockMenu" />
@@ -85,6 +85,10 @@
     {
         InitializeAppVersion();
         InitializeNetworkConfiguration();
+
+        _networkService.AddSettingsIfNotExist();
+        await _networkService.CheckServices(true);
+
         await LoadThemeFromStorage();
 
         await UpdateThemeIcon(isDarkTheme);
@@ -100,6 +104,9 @@
         if (version != null)
             _softwareVersion = version.ToString();
     }
+
+
+
 
     private void InitializeNetworkConfiguration()
     {

src/Angor/Server/FaucetController.cs

@@ -112,6 +112,8 @@ private AddressInfo GenerateAddressFromPubKey(int scanIndex, Network network, bo
 
     public class NetworkServiceMock : INetworkService
     {
+        public event Action OnStatusChanged;
+
         public Task CheckServices(bool force = false)
         {
             throw new NotImplementedException();

src/Angor/Shared/Services/INetworkService.cs

@@ -12,4 +12,6 @@ public interface INetworkService
     void CheckAndHandleError(HttpResponseMessage httpResponseMessage);
     void HandleException(Exception exception);
     void CheckAndSetNetwork(string url, string? setNetwork = null);
+    event Action OnStatusChanged;
+
 }

src/Angor/Shared/Services/NetworkService.cs

@@ -14,6 +14,8 @@ public class NetworkService : INetworkService
         private readonly HttpClient _httpClient;
         private readonly ILogger<NetworkService> _logger;
         private readonly INetworkConfiguration _networkConfiguration;
+        public event Action OnStatusChanged;
+
 
         public NetworkService(INetworkStorage networkStorage, HttpClient httpClient, ILogger<NetworkService> logger, INetworkConfiguration networkConfiguration)
         {
@@ -104,6 +106,7 @@ public async Task CheckServices(bool force = false)
                         {
                             _logger.LogError($"Failed to check indexer status url = {indexerUrl.Url}, StatusCode = {response.StatusCode}");
                         }
+                        OnStatusChanged?.Invoke();
                     }
                     catch (Exception ex)
                     {