Bump version

bug fix in WebsocketView(Model), optimization and others

Needlework.Net.Desktop/Needlework.Net.Desktop.csproj

@@ -11,8 +11,8 @@
     <AvaloniaXamlIlDebuggerLaunch>False</AvaloniaXamlIlDebuggerLaunch>
 	<ApplicationIcon>app.ico</ApplicationIcon>
     <AssemblyName>NeedleworkDotNet</AssemblyName>
-    <AssemblyVersion>0.4.1.0</AssemblyVersion>
-    <FileVersion>0.4.1.0</FileVersion>
+    <AssemblyVersion>0.5.1.0</AssemblyVersion>
+    <FileVersion>$(AssemblyVersion)</FileVersion>
     <AvaloniaXamlVerboseExceptions>False</AvaloniaXamlVerboseExceptions>
   </PropertyGroup>
 

Needlework.Net.Desktop/ViewModels/ConsoleViewModel.cs

@@ -8,7 +8,6 @@ using Needlework.Net.Desktop.Services;
 using System;
 using System.Net.Http;
 using System.Text.Json;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace Needlework.Net.Desktop.ViewModels
@@ -16,10 +15,10 @@ namespace Needlework.Net.Desktop.ViewModels
     public partial class ConsoleViewModel : PageBase, IRecipient<DataReadyMessage>
     {
         public IAvaloniaReadOnlyList<string> RequestMethods { get; } = new AvaloniaList<string>(["GET", "POST", "PUT", "DELETE", "HEAD", "PATCH", "OPTIONS", "TRACE"]);
+        public IAvaloniaList<string> RequestPaths { get; } = new AvaloniaList<string>();
 
         [ObservableProperty] private bool _isBusy = true;
         [ObservableProperty] private bool _isRequestBusy = false;
-        [ObservableProperty] private IAvaloniaReadOnlyList<string> _requestPaths = new AvaloniaList<string>();
         [ObservableProperty] private string? _requestMethodSelected = "GET";
         [ObservableProperty] private string? _requestPath = null;
         [ObservableProperty] private string? _requestBody = null;
@@ -59,19 +58,19 @@ namespace Needlework.Net.Desktop.ViewModels
 
                 var processInfo = Connector.GetProcessInfo();
                 var requestBody = WeakReferenceMessenger.Default.Send(new ContentRequestMessage(), "ConsoleRequestEditor").Response;
-                var content = new StringContent(Regex.Replace(requestBody, @"\s+", ""), new System.Net.Http.Headers.MediaTypeHeaderValue("application/json"));
-                var response = await Connector.SendAsync(method, RequestPath, content) ?? throw new Exception("Response is null.");
+                var content = new StringContent(requestBody, new System.Net.Http.Headers.MediaTypeHeaderValue("application/json"));
+                var response = await Connector.SendAsync(method, RequestPath, content);
                 var riotAuthentication = new RiotAuthentication(processInfo.RemotingAuthToken);
-                var body = await response.Content.ReadAsStringAsync();
-
-                body = !string.IsNullOrEmpty(body) ? JsonSerializer.Serialize(JsonSerializer.Deserialize<object>(body), App.JsonSerializerOptions) : string.Empty;
+                var responseBody = await response.Content.ReadAsByteArrayAsync();
+  
+                var body = responseBody.Length > 0 ? JsonSerializer.Serialize(JsonSerializer.Deserialize<object>(responseBody), App.JsonSerializerOptions) : string.Empty;
                 if (body.Length >= App.MaxCharacters)
                 {
                     WindowService.ShowOopsiesWindow(body);
                     WeakReferenceMessenger.Default.Send(new ResponseUpdatedMessage(string.Empty), nameof(ConsoleViewModel));
                 }
                 else WeakReferenceMessenger.Default.Send(new ResponseUpdatedMessage(body), nameof(ConsoleViewModel));
-
+               
                 ResponseStatus = $"{(int)response.StatusCode} {response.StatusCode.ToString()}";
                 ResponsePath = $"https://127.0.0.1:{processInfo.AppPort}{RequestPath}";
                 ResponseAuthorization = $"Basic {riotAuthentication.Value}";
@@ -94,7 +93,8 @@ namespace Needlework.Net.Desktop.ViewModels
         {
             Avalonia.Threading.Dispatcher.UIThread.Invoke(() =>
             {
-                RequestPaths = new AvaloniaList<string>([.. message.Value.Paths]);
+                RequestPaths.Clear();
+                RequestPaths.AddRange(message.Value.Paths);
                 IsBusy = false;
             });
         }

Needlework.Net.Desktop/ViewModels/EndpointViewModel.cs

@@ -2,6 +2,8 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
 using Needlework.Net.Desktop.Messages;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace Needlework.Net.Desktop.ViewModels
@@ -12,11 +14,11 @@ namespace Needlework.Net.Desktop.ViewModels
         public string Title => Endpoint;
 
 
-        [ObservableProperty] private IAvaloniaReadOnlyList<PathOperationViewModel> _pathOperations;
+        public IAvaloniaReadOnlyList<PathOperationViewModel> PathOperations { get; }
         [ObservableProperty] private PathOperationViewModel? _selectedPathOperation;
 
         [ObservableProperty] private string? _search;
-        [ObservableProperty] private IAvaloniaReadOnlyList<PathOperationViewModel> _filteredPathOperations;
+        public IAvaloniaList<PathOperationViewModel> FilteredPathOperations { get; }
 
         public EndpointViewModel(string endpoint)
         {
@@ -29,13 +31,14 @@ namespace Needlework.Net.Desktop.ViewModels
 
         partial void OnSearchChanged(string? value)
         {
+            FilteredPathOperations.Clear();
+
             if (string.IsNullOrWhiteSpace(value))
             {
-                FilteredPathOperations = new AvaloniaList<PathOperationViewModel>(PathOperations);
+                FilteredPathOperations.AddRange(PathOperations);
                 return;
             }
-
-            FilteredPathOperations = new AvaloniaList<PathOperationViewModel>(PathOperations.Where(o => o.Path.ToLower().Contains(value.ToLower())));
+            FilteredPathOperations.AddRange(PathOperations.Where(o => o.Path.Contains(value, StringComparison.InvariantCultureIgnoreCase)));
         }
 
         partial void OnSelectedPathOperationChanged(PathOperationViewModel? value)

Needlework.Net.Desktop/ViewModels/EndpointsViewModel.cs

@@ -15,11 +15,11 @@ namespace Needlework.Net.Desktop.ViewModels
 
         public string Title => "Endpoints";
         public Action<ObservableObject> OnClicked;
+        public IAvaloniaList<string> Plugins { get; } = new AvaloniaList<string>();
+        public IAvaloniaList<string> Query { get; } = new AvaloniaList<string>();
 
-        [ObservableProperty] private IAvaloniaReadOnlyList<string> _plugins = new AvaloniaList<string>();
         [ObservableProperty] private bool _isBusy = true;
         [ObservableProperty] private string _search = string.Empty;
-        [ObservableProperty] private IAvaloniaReadOnlyList<string> _query = new AvaloniaList<string>();
         [ObservableProperty] private string? _selectedQuery = string.Empty;
 
         public EndpointsViewModel(HttpClient httpClient, Action<ObservableObject> onClicked)
@@ -33,16 +33,19 @@ namespace Needlework.Net.Desktop.ViewModels
         public void Receive(DataReadyMessage message)
         {
             IsBusy = false;
-            Plugins = new AvaloniaList<string>([.. message.Value.Plugins.Keys]);
-            Query = new AvaloniaList<string>([.. Plugins]);
+            Plugins.Clear();
+            Plugins.AddRange(message.Value.Plugins.Keys);
+            Query.Clear();
+            Query.AddRange(Plugins);
         }
 
         partial void OnSearchChanged(string value)
         {
+            Query.Clear();
             if (!string.IsNullOrEmpty(Search))
-                Query = new AvaloniaList<string>(Plugins.Where(x => x.Contains(value)));
+                Query.AddRange(Plugins.Where(x => x.Contains(value, StringComparison.InvariantCultureIgnoreCase)));
             else
-                Query = Plugins;
+                Query.AddRange(Plugins);
         }
 
         [RelayCommand]

Needlework.Net.Desktop/ViewModels/MainWindowViewModel.cs

@@ -63,7 +63,7 @@ namespace Needlework.Net.Desktop.ViewModels
 
         private void ProcessEvents(object? obj)
         {
-            while (true)
+            while (!IsUpdateShown)
             {
                 Task.Run(CheckLatestVersionAsync);
 
@@ -84,7 +84,7 @@ namespace Needlework.Net.Desktop.ViewModels
 
                 var currentVersion = int.Parse(Version.Replace(".", ""));
 
-                if (release.IsLatest(currentVersion) && !IsUpdateShown)
+                if (release.IsLatest(currentVersion))
                 {
                     Avalonia.Threading.Dispatcher.UIThread.Post(async () =>
                     {

Needlework.Net.Desktop/ViewModels/OperationViewModel.cs

@@ -73,11 +73,20 @@ namespace Needlework.Net.Desktop.ViewModels
             {
                 var type = template[i];
                 if (!type.Contains("#")) continue;
-                if (requestClasses.Where(c => c.Id == type.Replace("#", string.Empty)).Any())
+
+                var foundClass = requestClasses.Where(c => c.Id == type.Replace("#", string.Empty));
+                if (foundClass.Any())
                 {
-                    AvaloniaList<PropertyClassViewModel> classes = [.. requestClasses];
-                    classes.Remove(rootClass);
-                    template[i] = string.Join(string.Empty, CreateTemplate(classes));
+                    if (foundClass.First().PropertyEnums.Any())
+                    {
+                        template[i] = string.Join(string.Empty, CreateTemplate([.. foundClass]));
+                    }
+                    else
+                    {
+                        AvaloniaList<PropertyClassViewModel> classes = [.. requestClasses];
+                        classes.Remove(rootClass);
+                        template[i] = string.Join(string.Empty, CreateTemplate(classes));
+                    }
                 }
                 else
                 {

Needlework.Net.Desktop/ViewModels/PathOperationViewModel.cs

@@ -7,8 +7,8 @@ using Needlework.Net.Core;
 using Needlework.Net.Desktop.Messages;
 using System;
 using System.Net.Http;
+using System.Text;
 using System.Text.Json;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace Needlework.Net.Desktop.ViewModels
@@ -32,14 +32,18 @@ namespace Needlework.Net.Desktop.ViewModels
         public PathOperationViewModel(PathOperation pathOperation)
         {
             Method = pathOperation.Method.ToUpper();
-            Color = new SolidColorBrush(GetColor(pathOperation.Method.ToUpper()));
+            Color = new SolidColorBrush(GetColor(Method));
             Path = pathOperation.Path;
             Operation = new OperationViewModel(pathOperation.Operation);
             ProcessInfo = GetProcessInfo();
-            ResponsePath = ProcessInfo != null ? $"https://127.0.0.1:{ProcessInfo.AppPort}{Path}" : null;
-            ResponseUsername = ProcessInfo != null ? new RiotAuthentication(ProcessInfo.RemotingAuthToken).Username : null;
-            ResponsePassword = ProcessInfo != null ? new RiotAuthentication(ProcessInfo.RemotingAuthToken).Password : null;
-            ResponseAuthorization = ProcessInfo != null ? $"Basic {new RiotAuthentication(ProcessInfo.RemotingAuthToken).Value}" : null;
+            if (ProcessInfo != null)
+            {
+                ResponsePath = $"https://127.0.0.1:{ProcessInfo.AppPort}{Path}";
+                var riotAuth = new RiotAuthentication(ProcessInfo.RemotingAuthToken);
+                ResponseUsername = riotAuth.Username;
+                ResponsePassword = riotAuth.Password;
+                ResponseAuthorization = $"Basic {riotAuth.Value}";
+            }
         }
 
         private ProcessInfo? GetProcessInfo()
@@ -60,7 +64,7 @@ namespace Needlework.Net.Desktop.ViewModels
             {
                 IsBusy = true;
 
-                var method = Method.ToUpper() switch
+                var method = Method switch
                 {
                     "GET" => HttpMethod.Get,
                     "POST" => HttpMethod.Post,
@@ -74,30 +78,32 @@ namespace Needlework.Net.Desktop.ViewModels
                 };
 
                 var processInfo = Connector.GetProcessInfo();
-                var path = Path;
+                var sb = new StringBuilder(Path);
                 foreach (var pathParameter in Operation.PathParameters)
                 {
-                    path = path.Replace($"{{{pathParameter.Name}}}", pathParameter.Value);
+                    sb.Replace($"{{{pathParameter.Name}}}", pathParameter.Value);
                 }
 
-                var query = "";
+                var firstQueryAdded = false;
                 foreach (var queryParameter in Operation.QueryParameters)
                 {
-                    if (query.Length != 0 && !string.IsNullOrWhiteSpace(queryParameter.Value))
-                        query += $"&{queryParameter.Name}={Uri.EscapeDataString(queryParameter.Value)}";
-                    else if (query.Length == 0 && !string.IsNullOrWhiteSpace(queryParameter.Value))
-                        query += $"?{queryParameter.Name}={Uri.EscapeDataString(queryParameter.Value)}";
+                    if (!string.IsNullOrWhiteSpace(queryParameter.Value))
+                    {
+                        sb.Append(firstQueryAdded ? '&' : '?');
+                        firstQueryAdded = true;
+                        sb.Append($"{queryParameter.Name}={Uri.EscapeDataString(queryParameter.Value)}");
+                    }
                 }
-                var uri = $"{path}{query}";
+                var uri = sb.ToString();
 
                 var requestBody = WeakReferenceMessenger.Default.Send(new ContentRequestMessage(), "EndpointRequestEditor").Response;
-                var content = new StringContent(Regex.Replace(requestBody, @"\s+", ""), new System.Net.Http.Headers.MediaTypeHeaderValue("application/json"));
+                var content = new StringContent(requestBody, new System.Net.Http.Headers.MediaTypeHeaderValue("application/json"));
 
-                var response = await Connector.SendAsync(method, $"{uri}", content) ?? throw new Exception("Response is null.");
+                var response = await Connector.SendAsync(method, uri, content);
                 var riotAuthentication = new RiotAuthentication(processInfo.RemotingAuthToken);
-                var responseBody = await response.Content.ReadAsStringAsync();
+                var responseBytes = await response.Content.ReadAsByteArrayAsync();
 
-                responseBody = !string.IsNullOrEmpty(responseBody) ? JsonSerializer.Serialize(JsonSerializer.Deserialize<object>(responseBody), App.JsonSerializerOptions) : string.Empty;
+                var responseBody = responseBytes.Length > 0 ? JsonSerializer.Serialize(JsonSerializer.Deserialize<object>(responseBytes), App.JsonSerializerOptions) : string.Empty;
                 if (responseBody.Length >= App.MaxCharacters)
                 {
                     WeakReferenceMessenger.Default.Send(new OopsiesWindowRequestedMessage(responseBody));

Needlework.Net.Desktop/ViewModels/WebsocketViewModel.cs

@@ -17,8 +17,9 @@ namespace Needlework.Net.Desktop.ViewModels
 {
     public partial class WebsocketViewModel : PageBase
     {
-        [NotifyPropertyChangedFor(nameof(FilteredEventLog))]
-        [ObservableProperty] private ObservableCollection<string> _eventLog = [];
+        public ObservableCollection<string> EventLog { get; } = [];
+        public SemaphoreSlim EventLogLock { get; } = new(1, 1);
+
         [NotifyPropertyChangedFor(nameof(FilteredEventLog))]
         [ObservableProperty] private string _search = string.Empty;
         [ObservableProperty] private bool _isAttach = true;
@@ -31,12 +32,12 @@ namespace Needlework.Net.Desktop.ViewModels
 
         public WindowService WindowService { get; }
 
-        public List<string> FilteredEventLog => string.IsNullOrWhiteSpace(Search) ? [.. EventLog] : [.. EventLog.Where(x => x.ToLower().Contains(Search.ToLower()))];
+        public IReadOnlyList<string> FilteredEventLog => string.IsNullOrWhiteSpace(Search) ? EventLog : [.. EventLog.Where(x => x.Contains(Search, StringComparison.InvariantCultureIgnoreCase))];
 
         public WebsocketViewModel(WindowService windowService) : base("Event Viewer", "plug", -100)
         {
             WindowService = windowService;
-
+            EventLog.CollectionChanged += (s, e) => OnPropertyChanged(nameof(FilteredEventLog));
             var thread = new Thread(InitializeWebsocket) { IsBackground = true };
             thread.Start();
         }
@@ -65,7 +66,8 @@ namespace Needlework.Net.Desktop.ViewModels
         [RelayCommand]
         private void Clear()
         {
-            EventLog = [];
+            _events.Clear();
+            EventLog.Clear();
         }
 
         partial void OnSelectedEventLogChanged(string? value)
@@ -94,30 +96,35 @@ namespace Needlework.Net.Desktop.ViewModels
 
         private void OnMessage(EventMessage message)
         {
-            Avalonia.Threading.Dispatcher.UIThread.Invoke(() =>
+            Avalonia.Threading.Dispatcher.UIThread.Invoke(async () =>
             {
                 if (!IsAttach) return;
 
                 var line = $"{DateTime.Now:HH:mm:ss.fff} {message.Data?.EventType.ToUpper()} {message.Data?.Uri}";
-                var log = EventLog.ToList();
                 Trace.WriteLine($"Message: {line}");
-                if (log.Count < 1000)
-                {
-                    log.Add(line);
-                    _events[line] = message;
-                }
-                else
-                {
-                    var key = $"{log[0]}";
-                    log.RemoveAt(0);
-                    _events.Remove(key);
 
-                    log.Add(line);
-                    _events[line] = message;
-                }
+                await EventLogLock.WaitAsync();
+                try
+                {
+                    if (EventLog.Count < 1000)
+                    {
+                        EventLog.Add(line);
+                        _events[line] = message;
+                    }
+                    else
+                    {
+                        var key = EventLog[0];
+                        EventLog.RemoveAt(0);
+                        _events.Remove(key);
 
-                EventLog = []; // This is a hack needed to update for ListBox
-                EventLog = new ObservableCollection<string>(log);
+                        EventLog.Add(line);
+                        _events[line] = message;
+                    }
+                }
+                finally
+                {
+                    EventLogLock.Release();
+                }
             });
         }
     }

Needlework.Net.Desktop/Views/EndpointView.axaml

@@ -55,11 +55,11 @@
 						<Grid
 						RowDefinitions="*"
 						ColumnDefinitions="auto,*">
-							<Button
+							<TextBlock
 								VerticalAlignment="Center"
-								Classes="Flat"
+								TextAlignment="Center"
 								Margin="0 0 8 0"
-								Content="{Binding Method}"
+								Text="{Binding Method}"
 								Background="{Binding Color}"
 								FontSize="8"
 								Width="50"

Needlework.Net.Desktop/Views/MainWindow.axaml

@@ -14,7 +14,7 @@
         Title="Needlework.Net"
 		Icon="/Assets/app.ico"
         Width="1280"
-        Height="720">
+        Height="720">	
 	<Grid RowDefinitions="auto,*">
 		<Grid ColumnDefinitions="auto,auto,*,auto"
 			  Background="Transparent"
@@ -83,6 +83,7 @@
 						<DataTemplate>
 							<Border Margin="4">
 								<ui:InfoBar
+								Background="{DynamicResource SolidBackgroundFillColorBaseBrush}"
 								Title="{Binding Title}"
 								IsOpen="{Binding IsOpen}"
 								Severity="{Binding Severity}"

Needlework.Net.Desktop/Views/WebsocketView.axaml.cs

@@ -7,6 +7,7 @@ using CommunityToolkit.Mvvm.Messaging;
 using Needlework.Net.Desktop.Extensions;
 using Needlework.Net.Desktop.Messages;
 using Needlework.Net.Desktop.ViewModels;
+using System;
 using TextMateSharp.Grammars;
 
 namespace Needlework.Net.Desktop.Views;
@@ -14,6 +15,8 @@ namespace Needlework.Net.Desktop.Views;
 public partial class WebsocketView : UserControl, IRecipient<ResponseUpdatedMessage>
 {
     private TextEditor? _responseEditor;
+    public WebsocketViewModel? _viewModel;
+    private ListBox? _viewer;
 
     public WebsocketView()
     {
@@ -29,9 +32,9 @@ public partial class WebsocketView : UserControl, IRecipient<ResponseUpdatedMess
     {
         base.OnApplyTemplate(e);
 
-        var vm = (WebsocketViewModel)DataContext!;
-        var viewer = this.FindControl<ListBox>("EventViewer");
-        viewer!.PropertyChanged += (s, e) => { if (vm.IsTail) viewer.ScrollIntoView(vm.EventLog.Count - 1); };
+        _viewModel = (WebsocketViewModel)DataContext!;
+        _viewer = this.FindControl<ListBox>("EventViewer");
+        _viewModel.EventLog.CollectionChanged += EventLog_CollectionChanged; ;
 
         _responseEditor = this.FindControl<TextEditor>("ResponseEditor");
         _responseEditor?.ApplyJsonEditorSettings();
@@ -41,6 +44,26 @@ public partial class WebsocketView : UserControl, IRecipient<ResponseUpdatedMess
         OnBaseThemeChanged(Application.Current!.ActualThemeVariant);
     }
 
+    private void EventLog_CollectionChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+    {
+        Avalonia.Threading.Dispatcher.UIThread.Post(async () =>
+        {
+            if (_viewModel!.IsTail)
+            {
+                await _viewModel.EventLogLock.WaitAsync();
+                try
+                {
+                    _viewer!.ScrollIntoView(_viewModel.EventLog.Count - 1);
+                }
+                catch (InvalidOperationException) { }
+                finally
+                {
+                    _viewModel.EventLogLock.Release();
+                }
+            }
+        });
+    }
+
     private void OnBaseThemeChanged(ThemeVariant currentTheme)
     {