refactor: change dependency from GrrrLCU to Briar

Needlework.Net/Needlework.Net.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -27,7 +27,7 @@
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.3" />
     <PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.3" />
     <PackageReference Include="AvaloniaEdit.TextMate" Version="11.1.0" />
-    <PackageReference Include="BlossomiShymae.GrrrLCU" Version="0.14.0" />
+    <PackageReference Include="BlossomiShymae.Briar" Version="0.1.0" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
     <PackageReference Include="FluentAvaloniaUI" Version="2.1.0" />
     <PackageReference Include="Material.Icons.Avalonia" Version="2.1.10" />

Needlework.Net/Program.cs

@@ -4,11 +4,9 @@ using Needlework.Net.Extensions;
 using Needlework.Net.Services;
 using Needlework.Net.ViewModels.MainWindow;
 using Needlework.Net.ViewModels.Pages;
-using Needlework.Net.ViewModels.Pages.Endpoints;
 using Projektanker.Icons.Avalonia;
 using Projektanker.Icons.Avalonia.FontAwesome;
 using System;
-using System.Net.Http;
 using System.Threading.Tasks;
 
 namespace Needlework.Net;
@@ -60,14 +58,6 @@ class Program
         builder.AddSingleton<DataSource>();
         builder.AddSingletonsFromAssemblies<PageBase>();
         builder.AddHttpClient();
-        builder.AddHttpClient(nameof(EndpointsTabViewModel)).ConfigurePrimaryHttpMessageHandler(() => // Insecure SSL for Game Client API
-        {
-            var handler = new HttpClientHandler
-            {
-                ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator
-            };
-            return handler;
-        });
         builder.AddLogging(Logger.Setup);
 
         var services = builder.BuildServiceProvider();

Needlework.Net/ViewModels/MainWindow/MainWindowViewModel.cs

@@ -1,5 +1,6 @@
 using Avalonia.Collections;
-using BlossomiShymae.GrrrLCU;
+using BlossomiShymae.Briar;
+using BlossomiShymae.Briar.Utils;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;

Needlework.Net/ViewModels/Pages/ConsoleViewModel.cs

@@ -4,7 +4,6 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.Logging;
 using Needlework.Net.ViewModels.Shared;
-using System.Net.Http;
 using System.Threading.Tasks;
 
 namespace Needlework.Net.ViewModels.Pages;
@@ -19,9 +18,9 @@ public partial class ConsoleViewModel : PageBase
 
     private readonly DataSource _dataSource;
 
-    public ConsoleViewModel(ILogger<RequestViewModel> requestViewModelLogger, DataSource dataSource, HttpClient httpClient) : base("Console", "terminal", -200)
+    public ConsoleViewModel(ILogger<RequestViewModel> requestViewModelLogger, DataSource dataSource) : base("Console", "terminal", -200)
     {
-        _request = new(requestViewModelLogger, Endpoints.Tab.LCU, httpClient);
+        _request = new(requestViewModelLogger, Endpoints.Tab.LCU);
         _dataSource = dataSource;
     }
 

Needlework.Net/ViewModels/Pages/Endpoints/EndpointViewModel.cs

@@ -21,10 +21,10 @@ public partial class EndpointViewModel : ObservableObject
 
     public event EventHandler<string>? PathOperationSelected;
 
-    public EndpointViewModel(string endpoint, ILogger<RequestViewModel> requestViewModelLogger, Models.Document document, Tab tab, System.Net.Http.HttpClient httpClient)
+    public EndpointViewModel(string endpoint, ILogger<RequestViewModel> requestViewModelLogger, Models.Document document, Tab tab)
     {
         Endpoint = endpoint;
-        PathOperations = new AvaloniaList<PathOperationViewModel>(document.Plugins[endpoint].Select(x => new PathOperationViewModel(x, requestViewModelLogger, document, tab, httpClient)));
+        PathOperations = new AvaloniaList<PathOperationViewModel>(document.Plugins[endpoint].Select(x => new PathOperationViewModel(x, requestViewModelLogger, document, tab)));
         FilteredPathOperations = new AvaloniaList<PathOperationViewModel>(PathOperations);
     }
 

Needlework.Net/ViewModels/Pages/Endpoints/EndpointsNavigationViewModel.cs

@@ -18,9 +18,9 @@ public partial class EndpointsNavigationViewModel : ObservableObject
     private readonly Action<string?, Guid> _onEndpointNavigation;
     private readonly Tab _tab;
 
-    public EndpointsNavigationViewModel(IAvaloniaList<string> plugins, Action<string?, Guid> onEndpointNavigation, ILogger<RequestViewModel> requestViewModelLogger, Models.Document document, Tab tab, System.Net.Http.HttpClient httpClient)
+    public EndpointsNavigationViewModel(IAvaloniaList<string> plugins, Action<string?, Guid> onEndpointNavigation, ILogger<RequestViewModel> requestViewModelLogger, Models.Document document, Tab tab)
     {
-        _activeViewModel = _endpointsViewModel = new EndpointsViewModel(plugins, OnClicked, requestViewModelLogger, document, tab, httpClient);
+        _activeViewModel = _endpointsViewModel = new EndpointsViewModel(plugins, OnClicked, requestViewModelLogger, document, tab);
         _onEndpointNavigation = onEndpointNavigation;
         _tab = tab;
         _title = GetTitle(tab);

Needlework.Net/ViewModels/Pages/Endpoints/EndpointsTabViewModel.cs

@@ -7,7 +7,6 @@ using Microsoft.Extensions.Logging;
 using Needlework.Net.Models;
 using Needlework.Net.ViewModels.Shared;
 using System;
-using System.Net.Http;
 using System.Threading.Tasks;
 
 namespace Needlework.Net.ViewModels.Pages.Endpoints;
@@ -27,13 +26,11 @@ public partial class EndpointsTabViewModel : PageBase
 
     private readonly ILogger<RequestViewModel> _requestViewModelLogger;
     private readonly DataSource _dataSource;
-    private readonly HttpClient _httpClient;
 
-    public EndpointsTabViewModel(ILogger<RequestViewModel> requestViewModelLogger, DataSource dataSource, IHttpClientFactory httpClientFactory) : base("Endpoints", "list-alt", -500)
+    public EndpointsTabViewModel(ILogger<RequestViewModel> requestViewModelLogger, DataSource dataSource) : base("Endpoints", "list-alt", -500)
     {
         _requestViewModelLogger = requestViewModelLogger;
         _dataSource = dataSource;
-        _httpClient = httpClientFactory.CreateClient(nameof(EndpointsTabViewModel));
     }
     public override async Task InitializeAsync()
     {
@@ -55,7 +52,7 @@ public partial class EndpointsTabViewModel : PageBase
         Plugins.Clear();
         Plugins.AddRange(document.Plugins.Keys);
 
-        var vm = new EndpointsNavigationViewModel(Plugins, OnEndpointNavigation, _requestViewModelLogger, document, tab, _httpClient);
+        var vm = new EndpointsNavigationViewModel(Plugins, OnEndpointNavigation, _requestViewModelLogger, document, tab);
         Endpoints.Add(new()
         {
             Content = vm,

Needlework.Net/ViewModels/Pages/Endpoints/EndpointsViewModel.cs

@@ -6,7 +6,6 @@ using Needlework.Net.Models;
 using Needlework.Net.ViewModels.Shared;
 using System;
 using System.Linq;
-using System.Net.Http;
 
 namespace Needlework.Net.ViewModels.Pages.Endpoints;
 
@@ -23,9 +22,8 @@ public partial class EndpointsViewModel : ObservableObject
     private readonly ILogger<RequestViewModel> _requestViewModelLogger;
     private readonly Document _document;
     private readonly Tab _tab;
-    private readonly HttpClient _httpClient;
 
-    public EndpointsViewModel(IAvaloniaList<string> plugins, Action<ObservableObject> onClicked, ILogger<RequestViewModel> requestViewModelLogger, Models.Document document, Tab tab, System.Net.Http.HttpClient httpClient)
+    public EndpointsViewModel(IAvaloniaList<string> plugins, Action<ObservableObject> onClicked, ILogger<RequestViewModel> requestViewModelLogger, Models.Document document, Tab tab)
     {
         Plugins = new AvaloniaList<string>(plugins);
         Query = new AvaloniaList<string>(plugins);
@@ -33,7 +31,6 @@ public partial class EndpointsViewModel : ObservableObject
         _requestViewModelLogger = requestViewModelLogger;
         _document = document;
         _tab = tab;
-        _httpClient = httpClient;
     }
 
     partial void OnSearchChanged(string value)
@@ -50,6 +47,6 @@ public partial class EndpointsViewModel : ObservableObject
     {
         if (string.IsNullOrEmpty(value)) return;
 
-        OnClicked.Invoke(new EndpointViewModel(value, _requestViewModelLogger, _document, _tab, _httpClient));
+        OnClicked.Invoke(new EndpointViewModel(value, _requestViewModelLogger, _document, _tab));
     }
 }

Needlework.Net/ViewModels/Pages/Endpoints/PathOperationViewModel.cs

@@ -20,11 +20,11 @@ public partial class PathOperationViewModel : ObservableObject
     [ObservableProperty] private bool _isBusy;
     [ObservableProperty] private Lazy<RequestViewModel> _request;
 
-    public PathOperationViewModel(PathOperation pathOperation, ILogger<RequestViewModel> requestViewModelLogger, Document document, Tab tab, System.Net.Http.HttpClient httpClient)
+    public PathOperationViewModel(PathOperation pathOperation, ILogger<RequestViewModel> requestViewModelLogger, Document document, Tab tab)
     {
         Path = pathOperation.Path;
         Operation = new OperationViewModel(pathOperation.Operation, document);
-        Request = new(() => new RequestViewModel(requestViewModelLogger, tab, httpClient)
+        Request = new(() => new RequestViewModel(requestViewModelLogger, tab)
         {
             Method = pathOperation.Method.ToUpper()
         });

Needlework.Net/ViewModels/Pages/Endpoints/ResponseViewModel.cs

@@ -1,4 +1,4 @@
-using BlossomiShymae.GrrrLCU;
+using BlossomiShymae.Briar.Utils;
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace Needlework.Net.ViewModels.Pages.Endpoints;

Needlework.Net/ViewModels/Pages/Websocket/EventViewModel.cs

@@ -1,4 +1,4 @@
-using BlossomiShymae.GrrrLCU;
+using BlossomiShymae.Briar.WebSocket.Events;
 using CommunityToolkit.Mvvm.ComponentModel;
 using System;
 

Needlework.Net/ViewModels/Pages/Websocket/WebsocketViewModel.cs

@@ -1,5 +1,6 @@
 using Avalonia.Collections;
-using BlossomiShymae.GrrrLCU;
+using BlossomiShymae.Briar;
+using BlossomiShymae.Briar.WebSocket.Events;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;

Needlework.Net/ViewModels/Shared/RequestViewModel.cs

@@ -1,5 +1,6 @@
 using Avalonia.Media;
-using BlossomiShymae.GrrrLCU;
+using BlossomiShymae.Briar;
+using BlossomiShymae.Briar.Utils;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.Extensions.Logging;
@@ -35,13 +36,11 @@ public partial class RequestViewModel : ObservableObject
 
     private readonly ILogger<RequestViewModel> _logger;
     private readonly Tab _tab;
-    private readonly HttpClient _httpClient;
 
-    public RequestViewModel(ILogger<RequestViewModel> logger, Pages.Endpoints.Tab tab, HttpClient httpClient)
+    public RequestViewModel(ILogger<RequestViewModel> logger, Pages.Endpoints.Tab tab)
     {
         _logger = logger;
         _tab = tab;
-        _httpClient = httpClient;
     }
 
     partial void OnMethodChanged(string? oldValue, string? newValue)
@@ -78,8 +77,8 @@ public partial class RequestViewModel : ObservableObject
             _logger.LogDebug("Sending request: {Tuple}", (Method, RequestPath));
             RequestText?.Invoke(this, this);
             var content = new StringContent(RequestBody ?? string.Empty, new System.Net.Http.Headers.MediaTypeHeaderValue("application/json"));
-            var responsePath = $"https://127.0.0.1:2999{RequestPath}";
+            var client = Connector.GetGameHttpClientInstance();
-            var response = await _httpClient.SendAsync(new HttpRequestMessage(method, responsePath) { Content = content });
+            var response = await client.SendAsync(new HttpRequestMessage(method, RequestPath) { Content = content });
             var responseBody = await response.Content.ReadAsByteArrayAsync();
 
             var body = responseBody.Length > 0 ? JsonSerializer.Serialize(JsonSerializer.Deserialize<object>(responseBody), App.JsonSerializerOptions) : string.Empty;
@@ -95,7 +94,7 @@ public partial class RequestViewModel : ObservableObject
             }
 
             ResponseStatus = $"{(int)response.StatusCode} {response.StatusCode.ToString()}";
-            ResponsePath = responsePath;
+            ResponsePath = $"https://127.0.0.1:2999{RequestPath}";
 
         }
         catch (Exception ex)