45 Commits

Author SHA1 Message Date
estrogen elf
2cc0f829b5 chore: fix package downgrade 2025-07-03 15:12:57 -05:00
estrogen elf
cdd66aff6c chore: remove unused dependency 2025-07-03 14:58:14 -05:00
estrogen elf
159c30a491 chore: update Briar 2025-07-03 10:18:42 -05:00
estrogen elf
77673d70e9 feat: use %appdata% for kv store 2025-06-23 11:46:33 -05:00
estrogen elf
471559d987 refactor: page factory and less mvvm-breaking 2025-06-23 09:37:30 -05:00
estrogen elf
c78f75a332 refactor: datamodels and service name 2025-06-22 19:10:36 -05:00
estrogen elf
73787608c4 feat: add settings page 2025-06-22 16:14:04 -05:00
estrogen elf
8845431126 fix: home page scroll 2025-06-19 18:14:11 -05:00
estrogen elf
352de3cdea feat: update home layout 2025-06-19 11:09:53 -05:00
estrogen elf
be81fc7d57 refactor: constants 2025-06-19 07:35:19 -05:00
estrogen elf
d526354fea feat: use file kv-store for updates 2025-06-19 07:12:52 -05:00
estrogen elf
4dc2d74ccf feat: use file kv-store for posts 2025-06-18 16:57:25 -05:00
estrogen elf
116c798db3 fix: reduce memory usage 2025-06-18 02:12:49 -05:00
estrogen elf
e193eb990a fix: wrong binding for IsVisible 2025-06-18 01:46:20 -05:00
estrogen elf
f7882392fd feat: add HextechDocs posts carousel 2025-06-18 01:40:07 -05:00
estrogen elf
f9285a2bef feat: display clicked schema to pane 2025-06-17 22:52:14 -05:00
estrogen elf
b56c18a552 fix: use virtualization for endpoints list 2025-06-17 22:20:27 -05:00
estrogen elf
b35099e5ab fix: case of empty content schema 2025-06-17 22:16:13 -05:00
estrogen elf
876f50607f fix: change schemas list to prevent layout cycle 2025-06-17 21:50:53 -05:00
estrogen elf
57334535cf feat: save offsets in viewmodels 2025-06-17 13:37:03 -05:00
estrogen elf
910d26c00d refactor: remove control cache to fix bugs 2025-06-17 11:51:08 -05:00
estrogen elf
50cc15cafb feat: remove expander from schema item 2025-06-17 11:44:06 -05:00
estrogen elf
748a620bff feat: display all schemas on load and empty search 2025-06-16 23:41:32 -05:00
estrogen elf
3802a6f8fa fix: schema type bugs 2025-06-16 17:28:20 -05:00
estrogen elf
83a73b2746 fix: schema nav position 2025-06-16 03:27:59 -05:00
estrogen elf
5a4a2f05f3 refactor: remove magic from view locator 2025-06-16 02:50:05 -05:00
estrogen elf
e195665ab1 fix: schema panel scroll issue 2025-06-16 01:05:34 -05:00
estrogen elf
8c8befe9ca refactor: use LRU for control cache 2025-06-16 01:00:27 -05:00
estrogen elf
a74c18ac39 feat: add schemas page 2025-06-15 21:40:48 -05:00
estrogen elf
cbc3c42116 feat: add schema search pane 2025-06-15 14:00:58 -05:00
estrogen elf
b74437d05e fix: consistent card styles 2025-06-14 01:56:14 -05:00
estrogen elf
d527226c7a feat: update styling for libraries 2025-06-14 01:51:38 -05:00
estrogen elf
a7a4992907 refactor: use HyperlinkButton 2025-06-14 01:33:28 -05:00
estrogen elf
22ad838362 fix: broken links 2025-06-13 23:59:06 -05:00
estrogen elf
ac6632b4c3 fix: styling for endpoint list 2025-06-13 23:57:11 -05:00
estrogen elf
c571f5a1de fix: crash when encountering GetLolVanguardV1Notification 2025-06-13 23:49:13 -05:00
estrogen elf
53a393ee1a refactor: use icons from Icons.Avalonia 2025-06-13 23:31:17 -05:00
estrogen elf
79776ab848 refactor: use provided Windows 11 check 2025-06-13 22:57:22 -05:00
estrogen elf
a9aaa426d3 refactor: code/folder structure, remove hacks 2025-06-13 22:52:58 -05:00
estrogen elf
06dcadd94f build: update dependencies, add cache package 2025-06-12 21:14:26 -05:00
estrogen elf
e95aa987a1 feat: add MacOS platform options 2025-06-01 16:40:33 -05:00
estrogen elf
7997cf222c feat: update Briar 2025-06-01 16:34:23 -05:00
estrogen elf
a321d84757 feat: increment version 2025-05-31 21:28:36 -05:00
estrogen elf
4bef9a20dd refactor: change dependency from GrrrLCU to Briar 2025-05-31 21:28:11 -05:00
estrogen elf
fb5fbe1fea fix: encode Swagger URL, add Markdown copy 2025-05-31 17:24:43 -05:00
123 changed files with 5033 additions and 1758 deletions

5
.gitignore vendored
View File

@@ -34,6 +34,7 @@ bld/
[Oo]bj/ [Oo]bj/
[Ll]og/ [Ll]og/
[Ll]ogs/ [Ll]ogs/
[Dd]ata/
# Visual Studio 2015/2017 cache/options directory # Visual Studio 2015/2017 cache/options directory
.vs/ .vs/
@@ -482,3 +483,7 @@ $RECYCLE.BIN/
# Vim temporary swap files # Vim temporary swap files
*.swp *.swp
*.sqlite
*.sqlite-shm
*.sqlite-wal

View File

@@ -7,10 +7,6 @@
xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
RequestedThemeVariant="Dark"> RequestedThemeVariant="Dark">
<!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. --> <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
<Application.DataTemplates>
<local:ViewLocator/>
</Application.DataTemplates>
<Application.Styles> <Application.Styles>
<sty:FluentAvaloniaTheme PreferSystemTheme="False" PreferUserAccentColor="False" /> <sty:FluentAvaloniaTheme PreferSystemTheme="False" PreferUserAccentColor="False" />
<materialIcons:MaterialIconStyles /> <materialIcons:MaterialIconStyles />
@@ -21,7 +17,7 @@
</Application.Styles> </Application.Styles>
<Application.Resources> <Application.Resources>
<converters:EnumerableBoolConverter x:Key="EnumerableBoolConverter"/> <converters:EnumerableToVisibility x:Key="EnumerableToVisibilityConverter"/>
<converters:NullBoolConverter x:Key="NullBoolConverter"/> <converters:NullableToVisibility x:Key="NullableToVisibilityConverter"/>
</Application.Resources> </Application.Resources>
</Application> </Application>

View File

@@ -1,18 +1,43 @@
using Akavache;
using Avalonia; using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Controls.Templates;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Needlework.Net.Constants;
using Needlework.Net.Extensions;
using Needlework.Net.ViewModels.MainWindow; using Needlework.Net.ViewModels.MainWindow;
using Needlework.Net.ViewModels.Pages;
using Needlework.Net.Views.MainWindow; using Needlework.Net.Views.MainWindow;
using System; using System;
using System.Reactive.Linq;
using System.Text.Json; using System.Text.Json;
namespace Needlework.Net; namespace Needlework.Net;
public partial class App(IServiceProvider serviceProvider) : Application public partial class App : Application, IEnableLogger
{ {
private readonly IServiceProvider _serviceProvider = serviceProvider; private readonly IDataTemplate _viewLocator;
private readonly IBlobCache _blobCache;
private readonly PageFactory _pageFactory;
private readonly MainWindowViewModel _mainWindowViewModel;
public App(IServiceProvider serviceProvider)
{
_viewLocator = serviceProvider.GetRequiredService<IDataTemplate>();
_blobCache = serviceProvider.GetRequiredService<IBlobCache>();
_pageFactory = serviceProvider.GetRequiredService<PageFactory>();
_mainWindowViewModel = serviceProvider.GetRequiredService<MainWindowViewModel>();
this.Log()
.Debug("NeedleworkDotNet version: {Version}", AppInfo.Version);
this.Log()
.Debug("OS description: {Description}", System.Runtime.InteropServices.RuntimeInformation.OSDescription);
}
public static JsonSerializerOptions JsonSerializerOptions { get; } = new() public static JsonSerializerOptions JsonSerializerOptions { get; } = new()
{ {
@@ -26,6 +51,7 @@ public partial class App(IServiceProvider serviceProvider) : Application
public override void Initialize() public override void Initialize()
{ {
DataTemplates.Add(_viewLocator);
AvaloniaXamlLoader.Load(this); AvaloniaXamlLoader.Load(this);
} }
@@ -33,11 +59,13 @@ public partial class App(IServiceProvider serviceProvider) : Application
{ {
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
{ {
desktop.MainWindow = new MainWindowView() desktop.MainWindow = new MainWindowView(_mainWindowViewModel, _pageFactory);
{
DataContext = _serviceProvider.GetRequiredService<MainWindowViewModel>()
};
MainWindow = desktop.MainWindow; MainWindow = desktop.MainWindow;
desktop.ShutdownRequested += (_, _) =>
{
_blobCache.Flush().Wait();
_blobCache.Dispose();
};
} }
base.OnFrameworkInitializationCompleted(); base.OnFrameworkInitializationCompleted();

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 938 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 79 KiB

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,11 @@
using System.Reflection;
namespace Needlework.Net.Constants
{
public static class AppInfo
{
public static readonly string Name = "Needlework.Net";
public static readonly string Version = Assembly.GetEntryAssembly()?.GetName().Version?.ToString() ?? "0.0.0.0";
}
}

View File

@@ -0,0 +1,9 @@
namespace Needlework.Net.Constants
{
public static class BlobCacheKeys
{
public static readonly string GithubLatestRelease = nameof(GithubLatestRelease);
public static readonly string AppSettings = nameof(AppSettings);
}
}

View File

@@ -0,0 +1,11 @@
namespace Needlework.Net.Constants
{
public static class FlurlClientKeys
{
public static readonly string GithubClient = nameof(GithubClient);
public static readonly string GithubUserContentClient = nameof(GithubUserContentClient);
public static readonly string Client = nameof(Client);
}
}

View File

@@ -0,0 +1,9 @@
using System;
namespace Needlework.Net.Constants
{
public static class Intervals
{
public static readonly TimeSpan CheckForUpdates = TimeSpan.FromMinutes(60);
}
}

View File

@@ -9,8 +9,8 @@
<!-- Set Defaults --> <!-- Set Defaults -->
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<Border Padding="16" <Border Padding="12"
CornerRadius="16,16,16,16" CornerRadius="4"
Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"> Background="{DynamicResource CardBackgroundFillColorDefaultBrush}">
<ContentPresenter Content="{TemplateBinding Content}"/> <ContentPresenter Content="{TemplateBinding Content}"/>
</Border> </Border>

View File

@@ -21,7 +21,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<Grid> <Grid>
<Border CornerRadius="16,16,16,16" <Border CornerRadius="4"
Background="{DynamicResource CardBackgroundFillColorDefaultBrush}" Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
Margin="0 50 0 0" Margin="0 50 0 0"
Padding="16 66 16 16"> Padding="16 66 16 16">

View File

@@ -6,7 +6,7 @@ using System.Linq;
namespace Needlework.Net.Converters namespace Needlework.Net.Converters
{ {
public class EnumerableBoolConverter : IValueConverter public class EnumerableToVisibility : IValueConverter
{ {
public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture) public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
{ {

View File

@@ -4,7 +4,7 @@ using System.Globalization;
namespace Needlework.Net.Converters namespace Needlework.Net.Converters
{ {
public class NullBoolConverter : IValueConverter public class NullableToVisibility : IValueConverter
{ {
public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture) public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
{ {

View File

@@ -0,0 +1,13 @@
using CommunityToolkit.Mvvm.ComponentModel;
namespace Needlework.Net.DataModels
{
public partial class AppSettings : ObservableObject
{
[ObservableProperty]
private bool _isCheckForUpdates = true;
[ObservableProperty]
private bool _isCheckForSchema = true;
}
}

View File

@@ -1,12 +1,12 @@
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace Needlework.Net.Models namespace Needlework.Net.DataModels
{ {
public class GithubRelease public class GithubRelease
{ {
[JsonPropertyName("tag_name")] [JsonPropertyName("tag_name")]
public string TagName { get; set; } = string.Empty; public string TagName { get; set; } = string.Empty;
public bool IsLatest(int version) => int.Parse(TagName.Replace(".", "")) > version; public bool IsLatest(string assemblyVersion) => int.Parse(TagName.Replace(".", "")) > int.Parse(assemblyVersion.ToString().Replace(".", ""));
} }
} }

View File

@@ -0,0 +1,13 @@
namespace Needlework.Net.DataModels
{
public class HextechDocsPost
{
public required string Path { get; init; }
public required string Title { get; init; }
public required string Excerpt { get; init; }
public string Url => $"https://hextechdocs.dev{Path}";
}
}

View File

@@ -1,60 +0,0 @@
using Microsoft.Extensions.Logging;
using Microsoft.OpenApi.Readers;
using Needlework.Net.Models;
using System;
using System.Net.Http;
using System.Threading.Tasks;
namespace Needlework.Net
{
public class DataSource
{
private readonly ILogger<DataSource> _logger;
private readonly HttpClient _httpClient;
private Document? _lcuSchemaDocument;
private Document? _lolClientDocument;
private readonly TaskCompletionSource<bool> _taskCompletionSource = new();
public DataSource(HttpClient httpClient, ILogger<DataSource> logger)
{
_httpClient = httpClient;
_logger = logger;
}
public async Task<Document> GetLcuSchemaDocumentAsync()
{
await _taskCompletionSource.Task;
return _lcuSchemaDocument ?? throw new InvalidOperationException();
}
public async Task<Document> GetLolClientDocumentAsync()
{
await _taskCompletionSource.Task;
return _lolClientDocument ?? throw new InvalidOperationException();
}
public async Task InitializeAsync()
{
try
{
var reader = new OpenApiStreamReader();
var lcuSchemaStream = await _httpClient.GetStreamAsync("https://raw.githubusercontent.com/dysolix/hasagi-types/main/swagger.json");
var lcuSchemaRaw = reader.Read(lcuSchemaStream, out var _);
_lcuSchemaDocument = new Document(lcuSchemaRaw);
var lolClientStream = await _httpClient.GetStreamAsync("https://raw.githubusercontent.com/AlsoSylv/Irelia/refs/heads/master/schemas/game_schema.json");
var lolClientRaw = reader.Read(lolClientStream, out var _);
_lolClientDocument = new Document(lolClientRaw);
}
catch (Exception ex)
{
_logger.LogError(ex, "Failed to initialize DataSource");
}
finally
{
_taskCompletionSource.SetResult(true);
}
}
}
}

View File

@@ -0,0 +1,16 @@
using Serilog;
namespace Needlework.Net.Extensions
{
public static class EnableLoggerExtensions
{
private static readonly ILogger _logger = new LoggerConfiguration()
.MinimumLevel.Debug()
.WriteTo.File(outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {SourceContext} {Message:lj}{NewLine}{Exception}", path: "Logs/debug-.log", rollingInterval: RollingInterval.Day, shared: true)
.CreateLogger();
public static ILogger Log(this IEnableLogger? context) => _logger.ForContext(context?.GetType() ?? typeof(Program));
}
public interface IEnableLogger;
}

View File

@@ -1,22 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
namespace Needlework.Net.Extensions
{
public static class ServiceCollectionExtensions
{
public static IServiceCollection AddSingletonsFromAssemblies<T>(this ServiceCollection services)
{
var types = AppDomain.CurrentDomain.GetAssemblies()
.SelectMany(s => s.GetTypes())
.Where(p => !p.IsAbstract && typeof(T).IsAssignableFrom(p));
foreach (var type in types) services.AddSingleton(typeof(T), type);
return services;
}
}
}

View File

@@ -0,0 +1,288 @@
using Microsoft.OpenApi.Models;
using Needlework.Net.Models;
using Needlework.Net.ViewModels.Pages.Endpoints;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Text.Json;
namespace Needlework.Net.Helpers
{
public static class OpenApiHelpers
{
public static string GetReturnType(OpenApiResponses responses)
{
if (!TryGetResponse(responses, out var response))
return "none";
if (TryGetApplicationJsonMedia(response, out var media))
{
var schema = media.Schema;
return GetSchemaType(schema);
}
return "none";
}
public static bool TryGetApplicationJsonMedia(OpenApiResponse response, [NotNullWhen(true)] out OpenApiMediaType? media) // Because GetLolGameflowV1SpectateDelayedLaunch has an empty schema with no type...
{
var flag = false;
if (response.Content.TryGetValue("application/json", out var _media))
{
if (_media?.Schema?.Type != null)
{
media = _media;
flag = true;
}
else
{
media = null;
}
}
else
{
media = null;
}
return flag;
}
public static bool TryGetApplicationJsonMedia(OpenApiRequestBody requestBody, [NotNullWhen(true)] out OpenApiMediaType? media)
{
var flag = false;
if (requestBody.Content.TryGetValue("application/json", out var _media))
{
if (_media?.Schema?.Type != null)
{
media = _media;
flag = true;
}
else
{
media = null;
}
}
else
{
media = null;
}
return flag;
}
public static string GetSchemaType(OpenApiSchema? schema)
{
if (schema == null) return "object"; // Because GetLolVanguardV1Notification exists where it has a required parameter without a type...
if (schema.Reference != null) return schema.Reference.Id;
if (schema.Type == "object" && schema.AdditionalProperties?.Reference != null) return schema.AdditionalProperties.Reference.Id;
if (schema.Type == "integer" || schema.Type == "number") return $"{schema.Type}:{schema.Format}";
if (schema.Type == "array" && schema.AdditionalProperties?.Reference != null) return $"{schema.AdditionalProperties.Reference.Id}[]";
if (schema.Type == "array" && schema.AdditionalProperties?.Type != null) return $"{schema.AdditionalProperties.Type}[]";
if (schema.Type == "array" && schema.Items.Reference != null) return $"{schema.Items.Reference.Id}[]";
if (schema.Type == "array" && (schema.Items.Type == "integer" || schema.Items.Type == "number")) return $"{schema.Items.Type}:{schema.Items.Format}[]";
if (schema.Type == "array") return $"{schema.Items.Type}[]";
return schema.Type;
}
public static List<string> CreateTemplate(List<PropertyClassViewModel> requestClasses)
{
if (requestClasses.Count == 0) return [];
List<string> template = [];
template.Add("{");
var rootClass = requestClasses.First();
if (rootClass.PropertyEnums.Any()) return [rootClass.PropertyEnums.First().Values];
var propertyFields = rootClass.PropertyFields;
for (int i = 0; i < propertyFields.Count; i++)
{
template.Add($"\"{propertyFields[i].Name}\"");
template.Add(":");
template.Add($"#{propertyFields[i].Type}");
if (i == propertyFields.Count - 1) template.Add("}");
else template.Add(",");
}
for (int i = 0; i < template.Count; i++)
{
var type = template[i];
if (!type.Contains("#")) continue;
var foundClass = requestClasses.Where(c => c.Id == type.Replace("#", string.Empty));
if (foundClass.Any())
{
if (foundClass.First().PropertyEnums.Any())
{
template[i] = string.Join(string.Empty, CreateTemplate([.. foundClass]));
}
else
{
List<PropertyClassViewModel> classes = [.. requestClasses];
classes.Remove(rootClass);
template[i] = string.Join(string.Empty, CreateTemplate(classes));
}
}
else
{
template[i] = GetRequestDefaultValue(type);
}
}
return template;
}
public static string GetComponentId(OpenApiSchema schema)
{
string componentId;
if (schema.Reference != null) componentId = schema.Reference.Id;
else if (schema.Items != null) componentId = schema.Items.Reference.Id;
else componentId = schema.AdditionalProperties.Reference.Id;
return componentId;
}
public static List<ParameterViewModel> GetParameters(List<OpenApiParameter> parameters, ParameterLocation location)
{
var pathParameters = new List<ParameterViewModel>();
foreach (var parameter in parameters)
{
if (parameter.In != location) continue;
pathParameters.Add(new ParameterViewModel(parameter.Name, GetSchemaType(parameter.Schema), parameter.Required));
}
return pathParameters;
}
public static string? GetRequestBodyType(OpenApiRequestBody? requestBody)
{
if (requestBody == null) return null;
if (requestBody.Content.TryGetValue("application/json", out var media))
{
var schema = media.Schema;
if (schema == null) return null; // Because "PostLolAccountVerificationV1SendDeactivationPin" exists where the media body is empty...
return GetSchemaType(schema);
}
return null;
}
public static List<PropertyClassViewModel> GetRequestClasses(OpenApiRequestBody? requestBody, Document document)
{
if (requestBody == null) return [];
if (TryGetApplicationJsonMedia(requestBody, out var media))
{
var rawDocument = document.OpenApiDocument;
var schema = media.Schema;
if (schema == null) return [];
var type = GetSchemaType(media.Schema);
if (IsComponent(type))
{
var componentId = GetComponentId(schema);
var componentSchema = rawDocument.Components.Schemas[componentId];
List<PropertyClassViewModel> propertyClasses = [];
WalkSchema(componentSchema, propertyClasses, rawDocument);
return propertyClasses;
}
}
return [];
}
public static string GetRequestDefaultValue(string type)
{
var defaultValue = string.Empty;
if (type.Contains("[]")) defaultValue = "[]";
else if (type.Contains("string")) defaultValue = "\"\"";
else if (type.Contains("boolean")) defaultValue = "false";
else if (type.Contains("integer")) defaultValue = "0";
else if (type.Contains("double") || type.Contains("float")) defaultValue = "0.0";
else if (type.Contains("object")) defaultValue = "{}";
return defaultValue;
}
public static string? GetRequestTemplate(OpenApiRequestBody? requestBody, Document document)
{
var requestClasses = GetRequestClasses(requestBody, document);
if (requestClasses.Count == 0)
{
var type = GetRequestBodyType(requestBody);
if (type == null) return null;
return GetRequestDefaultValue(type);
}
var template = CreateTemplate(requestClasses);
return JsonSerializer.Serialize(JsonSerializer.Deserialize<object>(string.Join(string.Empty, template)), App.JsonSerializerOptions);
}
public static List<PropertyClassViewModel> GetResponseClasses(OpenApiResponses responses, Document document)
{
if (!TryGetResponse(responses, out var response))
return [];
if (TryGetApplicationJsonMedia(response, out var media))
{
var rawDocument = document.OpenApiDocument;
var schema = media.Schema;
if (schema == null) return [];
List<PropertyClassViewModel> propertyClasses = [];
WalkSchema(schema, propertyClasses, rawDocument);
return propertyClasses;
}
return [];
}
public static bool IsComponent(string type)
{
return !(type.Contains("object")
|| type.Contains("array")
|| type.Contains("bool")
|| type.Contains("string")
|| type.Contains("integer")
|| type.Contains("number"));
}
public static bool TryGetResponse(OpenApiResponses responses, [NotNullWhen(true)] out OpenApiResponse? response)
{
response = null;
var flag = false;
if (responses.TryGetValue("2XX", out var x))
{
response = x;
flag = true;
}
else if (responses.TryGetValue("200", out var y))
{
response = y;
flag = true;
}
return flag;
}
public static void WalkSchema(OpenApiSchema schema, List<PropertyClassViewModel> propertyClasses, OpenApiDocument document)
{
var type = GetSchemaType(schema);
if (IsComponent(type))
{
string componentId = GetComponentId(schema);
var componentSchema = document.Components.Schemas[componentId];
var responseClass = new PropertyClassViewModel(componentId, componentSchema.Properties, componentSchema.Enum);
if (propertyClasses.Where(c => c.Id == componentId).Any()) return; // Avoid adding duplicate schemas in classes
propertyClasses.Add(responseClass);
foreach ((var _, var property) in componentSchema.Properties)
// Check for self-references like "LolLootLootOddsResponse"
// I blame dubble
if (IsComponent(GetSchemaType(property)) && componentId != GetComponentId(property))
WalkSchema(property, propertyClasses, document);
}
}
public static PropertyClassViewModel WalkSchema(OpenApiSchema schema, OpenApiDocument document)
{
string componentId = GetComponentId(schema);
var componentSchema = document.Components.Schemas[componentId];
var propertyClass = new PropertyClassViewModel(componentId, componentSchema.Properties, componentSchema.Enum);
return propertyClass;
}
}
}

View File

@@ -1,27 +0,0 @@
using Microsoft.Extensions.Logging;
using Serilog;
using System;
using System.IO;
using System.Reflection;
namespace Needlework.Net
{
public static class Logger
{
public static void Setup(ILoggingBuilder builder)
{
var logger = new LoggerConfiguration()
.MinimumLevel.Debug()
.WriteTo.File("Logs/debug-", rollingInterval: RollingInterval.Day, shared: true)
.CreateLogger();
logger.Debug("NeedleworkDotNet version: {Version}", Assembly.GetEntryAssembly()?.GetName().Version?.ToString() ?? "0.0.0.0");
logger.Debug("OS description: {Description}", System.Runtime.InteropServices.RuntimeInformation.OSDescription);
builder.AddSerilog(logger);
}
public static void LogFatal(UnhandledExceptionEventArgs e)
{
File.WriteAllText($"Logs/fatal-{DateTime.Now:HHmmssfff}", e.ExceptionObject.ToString());
}
}
}

View File

@@ -1,9 +0,0 @@
using CommunityToolkit.Mvvm.Messaging.Messages;
using Needlework.Net.ViewModels.MainWindow;
namespace Needlework.Net.Messages
{
public class InfoBarUpdateMessage(InfoBarViewModel vm) : ValueChangedMessage<InfoBarViewModel>(vm)
{
}
}

View File

@@ -1,9 +1,31 @@
namespace Needlework.Net.Models; using System.Collections.Generic;
using System.Text.Json.Serialization;
namespace Needlework.Net.Models;
public class Library public class Library
{ {
[JsonPropertyName("repo")]
public required string Repo { get; init; } public required string Repo { get; init; }
[JsonPropertyName("description")]
public string? Description { get; init; } public string? Description { get; init; }
[JsonPropertyName("language")]
public required string Language { get; init; } public required string Language { get; init; }
public required string Link { get; init; }
[JsonPropertyName("owner")]
public required string Owner { get; init; }
[JsonPropertyName("tags")]
public List<string> Tags { get; init; } = [];
public string Link
{
get
{
if (Owner.Equals("jellies")) return $"https://github.com/elliejs/{Repo}";
return $"https://github.com/{Owner}/{Repo}";
}
}
} }

View File

@@ -0,0 +1,9 @@
using FluentAvalonia.UI.Controls;
using System;
namespace Needlework.Net.Models
{
public record Notification(string Title, string Message, InfoBarSeverity InfoBarSeverity, TimeSpan? Duration = null, string? Url = null)
{
}
}

View File

@@ -0,0 +1,8 @@
using Needlework.Net.ViewModels.Pages.Endpoints;
namespace Needlework.Net.Models
{
public record SchemaPaneItem(string Key, Tab Tab)
{
}
}

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<BuiltInComInteropSupport>true</BuiltInComInteropSupport> <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
<ApplicationManifest>app.manifest</ApplicationManifest> <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -11,37 +11,44 @@
<AvaloniaXamlIlDebuggerLaunch>False</AvaloniaXamlIlDebuggerLaunch> <AvaloniaXamlIlDebuggerLaunch>False</AvaloniaXamlIlDebuggerLaunch>
<ApplicationIcon>app.ico</ApplicationIcon> <ApplicationIcon>app.ico</ApplicationIcon>
<AssemblyName>NeedleworkDotNet</AssemblyName> <AssemblyName>NeedleworkDotNet</AssemblyName>
<AssemblyVersion>0.12.0.0</AssemblyVersion> <AssemblyVersion>0.13.0.0</AssemblyVersion>
<FileVersion>$(AssemblyVersion)</FileVersion> <FileVersion>$(AssemblyVersion)</FileVersion>
<AvaloniaXamlVerboseExceptions>False</AvaloniaXamlVerboseExceptions> <AvaloniaXamlVerboseExceptions>False</AvaloniaXamlVerboseExceptions>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="11.1.3" /> <PackageReference Include="akavache" Version="10.2.41" />
<PackageReference Include="Avalonia.AvaloniaEdit" Version="11.1.0" /> <PackageReference Include="AngleSharp" Version="1.3.0" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.1.3" /> <PackageReference Include="Avalonia" Version="11.2.8" />
<PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.1.3" /> <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.3.0" />
<PackageReference Include="Avalonia.Desktop" Version="11.1.3" /> <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.2.8" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.3" /> <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.1.5" />
<PackageReference Include="Avalonia.Desktop" Version="11.2.8" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.8" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.--> <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.3" /> <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.8" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.3" /> <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.8" />
<PackageReference Include="AvaloniaEdit.TextMate" Version="11.1.0" /> <PackageReference Include="AvaloniaEdit.TextMate" Version="11.3.0" />
<PackageReference Include="BlossomiShymae.GrrrLCU" Version="0.14.0" /> <PackageReference Include="BlossomiShymae.Briar" Version="0.2.2" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" /> <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="FluentAvaloniaUI" Version="2.1.0" /> <PackageReference Include="DebounceThrottle" Version="3.0.1" />
<PackageReference Include="Material.Icons.Avalonia" Version="2.1.10" /> <PackageReference Include="FastCache.Cached" Version="1.8.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" /> <PackageReference Include="FluentAvaloniaUI" Version="2.3.0" />
<PackageReference Include="Flurl" Version="4.0.0" />
<PackageReference Include="Flurl.Http" Version="4.0.2" />
<PackageReference Include="Material.Icons.Avalonia" Version="2.4.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.6" />
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" /> <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
<PackageReference Include="Microsoft.OpenApi" Version="1.6.22" /> <PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.3" />
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.22" /> <PackageReference Include="Microsoft.OpenApi" Version="1.6.24" />
<PackageReference Include="Projektanker.Icons.Avalonia" Version="9.4.0" /> <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.24" />
<PackageReference Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.4.0" /> <PackageReference Include="Projektanker.Icons.Avalonia" Version="9.6.2" />
<PackageReference Include="Serilog" Version="4.2.0" /> <PackageReference Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.6.2" />
<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.0" /> <PackageReference Include="Serilog" Version="4.3.0" />
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" /> <PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" />
<PackageReference Include="TextMateSharp.Grammars" Version="1.0.65" /> <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageReference Include="TextMateSharp.Grammars" Version="1.0.69" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@@ -66,15 +73,28 @@
<Compile Update="Views\MainWindow\MainWindowView.axaml.cs"> <Compile Update="Views\MainWindow\MainWindowView.axaml.cs">
<DependentUpon>MainWindowView.axaml</DependentUpon> <DependentUpon>MainWindowView.axaml</DependentUpon>
</Compile> </Compile>
<Compile Update="Views\Pages\Endpoints\EndpointsNavigationView.axaml.cs"> <Compile Update="Views\Pages\Endpoints\EndpointListView.axaml.cs">
<DependentUpon>EndpointsNavigationView.axaml</DependentUpon> <DependentUpon>EndpointListView.axaml</DependentUpon>
</Compile> </Compile>
<Compile Update="Views\Pages\Endpoints\EndpointView.axaml.cs"> <Compile Update="Views\Pages\Endpoints\EndpointsView.axaml.cs">
<DependentUpon>EndpointView.axaml</DependentUpon> <DependentUpon>EndpointsView.axaml</DependentUpon>
</Compile>
<Compile Update="Views\Pages\Endpoints\PluginView.axaml.cs">
<DependentUpon>PluginView.axaml</DependentUpon>
</Compile>
<Compile Update="Views\Pages\Schemas\SchemaSearchDetailsView.axaml.cs">
<DependentUpon>SchemaSearchDetailsView.axaml</DependentUpon>
</Compile>
<Compile Update="Views\Pages\WebSocket\WebsocketView.axaml.cs">
<DependentUpon>WebSocketView.axaml</DependentUpon>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Assets\Users\" /> <Folder Include="Assets\Users\" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="ViewModels\Pages\Schemas\SchemaSearchDetailsViewModel.cs" />
</ItemGroup>
</Project> </Project>

View File

@@ -1,15 +1,34 @@
using Avalonia; using Akavache;
using Akavache.Sqlite3;
using Avalonia;
using Avalonia.Controls.Templates;
using Flurl.Http.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Needlework.Net.Constants;
using Needlework.Net.Extensions; using Needlework.Net.Extensions;
using Needlework.Net.Services; using Needlework.Net.Services;
using Needlework.Net.ViewModels.MainWindow; using Needlework.Net.ViewModels.MainWindow;
using Needlework.Net.ViewModels.Pages; using Needlework.Net.ViewModels.Pages;
using Needlework.Net.ViewModels.Pages.About;
using Needlework.Net.ViewModels.Pages.Console;
using Needlework.Net.ViewModels.Pages.Endpoints; using Needlework.Net.ViewModels.Pages.Endpoints;
using Needlework.Net.ViewModels.Pages.Home;
using Needlework.Net.ViewModels.Pages.Schemas;
using Needlework.Net.ViewModels.Pages.Settings;
using Needlework.Net.ViewModels.Pages.WebSocket;
using Needlework.Net.Views.MainWindow;
using Needlework.Net.Views.Pages.About;
using Needlework.Net.Views.Pages.Console;
using Needlework.Net.Views.Pages.Endpoints;
using Needlework.Net.Views.Pages.Home;
using Needlework.Net.Views.Pages.Schemas;
using Needlework.Net.Views.Pages.Settings;
using Needlework.Net.Views.Pages.WebSocket;
using Projektanker.Icons.Avalonia; using Projektanker.Icons.Avalonia;
using Projektanker.Icons.Avalonia.FontAwesome; using Projektanker.Icons.Avalonia.FontAwesome;
using Serilog;
using System; using System;
using System.Net.Http; using System.IO;
using System.Threading.Tasks;
namespace Needlework.Net; namespace Needlework.Net;
@@ -24,58 +43,110 @@ class Program
AppDomain.CurrentDomain.UnhandledException += Program_UnhandledException; AppDomain.CurrentDomain.UnhandledException += Program_UnhandledException;
BuildAvaloniaApp() BuildAvaloniaApp()
.StartWithClassicDesktopLifetime(args); .StartWithClassicDesktopLifetime(args);
} }
// Avalonia configuration, don't remove; also used by visual designer. // Avalonia configuration, don't remove; also used by visual designer.
public static AppBuilder BuildAvaloniaApp() public static AppBuilder BuildAvaloniaApp()
{ {
IconProvider.Current IconProvider.Current.Register<FontAwesomeIconProvider>();
.Register<FontAwesomeIconProvider>();
var services = BuildServices();
Task.Run(async () => await InitializeDataSourceAsync(services));
return AppBuilder.Configure(() => new App(services)) return AppBuilder.Configure(() => new App(BuildServices()))
.UsePlatformDetect() .UsePlatformDetect()
.WithInterFont() .WithInterFont()
.LogToTrace() .With(new Win32PlatformOptions { CompositionMode = [Win32CompositionMode.WinUIComposition, Win32CompositionMode.DirectComposition] })
.With(new Win32PlatformOptions .With(new MacOSPlatformOptions { ShowInDock = true, })
{ .LogToTrace();
CompositionMode = [Win32CompositionMode.WinUIComposition, Win32CompositionMode.DirectComposition]
});
}
private static async Task InitializeDataSourceAsync(IServiceProvider services)
{
var dataSource = services.GetRequiredService<DataSource>();
await dataSource.InitializeAsync();
} }
private static IServiceProvider BuildServices() private static IServiceProvider BuildServices()
{ {
var builder = new ServiceCollection(); var builder = new ServiceCollection();
builder.AddSingleton<MainWindowViewModel>(); AddViews(builder);
builder.AddSingleton<DialogService>(); AddViewModels(builder);
builder.AddSingleton<DataSource>(); AddServices(builder);
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(); return builder.BuildServiceProvider();
return services; }
private static void AddViews(ServiceCollection builder)
{
var locator = new ViewLocator();
// MAIN WINDOW
locator.Register<NotificationViewModel>(() => new NotificationView());
locator.Register<ViewModels.MainWindow.SchemaSearchDetailsViewModel>(() => new Views.MainWindow.SchemaSearchDetailsView());
locator.Register<SchemaViewModel>(() => new SchemaView());
// ABOUT
locator.Register<AboutViewModel>(() => new AboutView());
// CONSOLE
locator.Register<ConsoleViewModel>(() => new ConsoleView());
// ENDPOINTS
locator.Register<EndpointListViewModel>(() => new EndpointListView());
locator.Register<EndpointSearchDetailsViewModel>(() => new EndpointSearchDetailsView());
locator.Register<EndpointsViewModel>(() => new EndpointsView());
locator.Register<EndpointTabItemContentViewModel>(() => new EndpointTabItemContentView());
locator.Register<PathOperationViewModel>(() => new PathOperationView());
locator.Register<PluginViewModel>(() => new PluginView());
locator.Register<PropertyClassViewModel>(() => new PropertyClassView());
// HOME
locator.Register<HomeViewModel>(() => new HomeView());
locator.Register<LibraryViewModel>(() => new LibraryView());
locator.Register<HextechDocsPostViewModel>(() => new HextechDocsPostView());
// SCHEMAS
locator.Register<SchemasViewModel>(() => new SchemasView());
locator.Register<ViewModels.Pages.Schemas.SchemaSearchDetailsViewModel>(() => new Views.Pages.Schemas.SchemaSearchDetailsView());
// WEBSOCKET
locator.Register<WebSocketViewModel>(() => new WebSocketView());
locator.Register<EventViewModel>(() => new EventView());
// SETTINGS
locator.Register<SettingsViewModel>(() => new SettingsView());
builder.AddSingleton<IDataTemplate>(locator);
}
private static void AddServices(ServiceCollection builder)
{
builder.AddSingleton<DialogService>();
builder.AddSingleton<DocumentService>();
builder.AddSingleton<NotificationService>();
builder.AddSingleton<SchemaPaneService>();
builder.AddSingleton<HextechDocsService>();
builder.AddSingleton<GithubService>();
builder.AddSingleton<IBlobCache>((_) =>
{
var appDataFolder = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
appDataFolder = string.IsNullOrEmpty(appDataFolder) ? "AppData" : appDataFolder;
var appFolder = Path.Join(appDataFolder, AppInfo.Name);
Directory.CreateDirectory(appFolder);
var filePath = Path.Join(appFolder, "cache.sqlite");
return new SqlRawPersistentBlobCache(filePath);
});
builder.AddSingleton<IFlurlClientCache>(new FlurlClientCache()
.Add(FlurlClientKeys.GithubClient, "https://api.github.com")
.Add(FlurlClientKeys.GithubUserContentClient, "https://raw.githubusercontent.com")
.Add(FlurlClientKeys.Client));
builder.AddLogging((builder) => builder.AddSerilog(EnableLoggerExtensions.Log(null)));
}
private static void AddViewModels(ServiceCollection builder)
{
builder.AddSingleton<MainWindowViewModel>();
builder.AddSingleton<PageBase, HomeViewModel>();
builder.AddSingleton<PageBase, ConsoleViewModel>();
builder.AddSingleton<PageBase, EndpointsViewModel>();
builder.AddSingleton<PageBase, WebSocketViewModel>();
builder.AddSingleton<PageBase, SchemasViewModel>();
builder.AddSingleton<PageBase, AboutViewModel>();
builder.AddSingleton<PageBase, SettingsViewModel>();
builder.AddSingleton<PageFactory>();
} }
private static void Program_UnhandledException(object sender, UnhandledExceptionEventArgs e) private static void Program_UnhandledException(object sender, UnhandledExceptionEventArgs e)
{ {
Logger.LogFatal(e); File.WriteAllText($"Logs/fatal-{DateTime.Now:yyyyMMdd}.log", e.ExceptionObject.ToString());
} }
} }

View File

@@ -0,0 +1,65 @@
using FastCache;
using Flurl.Http;
using Flurl.Http.Configuration;
using Microsoft.OpenApi.Readers;
using Needlework.Net.Constants;
using Needlework.Net.Extensions;
using Needlework.Net.Models;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace Needlework.Net
{
public class DocumentService : IEnableLogger
{
private readonly OpenApiStreamReader _reader = new();
private readonly IFlurlClient _githubUserContentClient;
public DocumentService(IFlurlClientCache clients)
{
_githubUserContentClient = clients.Get(FlurlClientKeys.GithubUserContentClient);
}
public async Task<Document> GetLcuSchemaDocumentAsync(CancellationToken cancellationToken = default)
{
if (Cached<Document>.TryGet(nameof(GetLcuSchemaDocumentAsync), out var cached))
{
return cached;
}
var lcuSchemaStream = await _githubUserContentClient.Request("/dysolix/hasagi-types/main/swagger.json")
.GetStreamAsync(cancellationToken: cancellationToken);
var lcuSchemaRaw = _reader.Read(lcuSchemaStream, out var diagnostic);
foreach (var error in diagnostic.Errors)
{
this.Log()
.Warning("Diagnostic error: {Message}", error);
}
var document = new Document(lcuSchemaRaw);
return cached.Save(document, TimeSpan.FromMinutes(60));
}
public async Task<Document> GetLolClientDocumentAsync(CancellationToken cancellationToken = default)
{
if (Cached<Document>.TryGet(nameof(GetLolClientDocumentAsync), out var cached))
{
return cached;
}
var lolClientStream = await _githubUserContentClient.Request("/AlsoSylv/Irelia/refs/heads/master/schemas/game_schema.json")
.GetStreamAsync(cancellationToken: cancellationToken);
var lolClientRaw = _reader.Read(lolClientStream, out var diagnostic);
foreach (var error in diagnostic.Errors)
{
this.Log()
.Warning("Diagnostic error: {Message}", error);
}
var document = new Document(lolClientRaw);
return cached.Save(document, TimeSpan.FromMinutes(60));
}
}
}

View File

@@ -0,0 +1,42 @@
using Akavache;
using Flurl.Http;
using Flurl.Http.Configuration;
using Needlework.Net.Constants;
using Needlework.Net.DataModels;
using Needlework.Net.Extensions;
using System;
using System.Reactive.Linq;
using System.Threading.Tasks;
namespace Needlework.Net.Services
{
public class GithubService : IEnableLogger
{
private readonly IFlurlClient _githubClient;
private readonly IFlurlClient _githubUserContentClient;
private readonly IBlobCache _blobCache;
public GithubService(IBlobCache blobCache, IFlurlClientCache clients)
{
_githubClient = clients.Get(FlurlClientKeys.GithubClient);
_githubUserContentClient = clients.Get(FlurlClientKeys.GithubUserContentClient);
_blobCache = blobCache;
}
public async Task<GithubRelease> GetLatestReleaseAsync()
{
return await _blobCache.GetOrFetchObject(BlobCacheKeys.GithubLatestRelease, async () =>
{
this.Log()
.Debug("Downloading latest release info from GitHub...");
var release = await _githubClient
.Request("/repos/BlossomiShymae/Needlework.Net/releases/latest")
.WithHeader("User-Agent", $"{AppInfo.Name}/{AppInfo.Version}")
.GetJsonAsync<GithubRelease>();
return release;
}, DateTimeOffset.Now + Intervals.CheckForUpdates);
}
}
}

View File

@@ -0,0 +1,49 @@
using Akavache;
using AngleSharp;
using Needlework.Net.DataModels;
using Needlework.Net.Extensions;
using System;
using System.Collections.Generic;
using System.Reactive.Linq;
using System.Threading.Tasks;
namespace Needlework.Net.Services
{
public class HextechDocsService : IEnableLogger
{
private readonly IBrowsingContext _context = BrowsingContext.New(Configuration.Default.WithDefaultLoader());
private readonly IBlobCache _blobCache;
public HextechDocsService(IBlobCache blobCache)
{
_blobCache = blobCache;
}
public async Task<List<HextechDocsPost>> GetPostsAsync()
{
return await _blobCache.GetOrFetchObject("HextechDocsPosts", async () =>
{
this.Log()
.Debug("Downloading HextechDocs posts...");
var document = await _context.OpenAsync("https://hextechdocs.dev/tag/lcu/");
var elements = document.QuerySelectorAll("article.post-card");
var posts = new List<HextechDocsPost>();
foreach (var element in elements)
{
var path = element.QuerySelector("a.post-card-content-link")!.GetAttribute("href")!;
var title = element.QuerySelector(".post-card-title")!.TextContent;
var excerpt = element.QuerySelector(".post-card-excerpt > p")!.TextContent;
var post = new HextechDocsPost()
{
Path = path,
Title = title,
Excerpt = excerpt,
};
posts.Add(post);
}
return posts;
}, DateTimeOffset.Now + TimeSpan.FromHours(12));
}
}
}

View File

@@ -0,0 +1,20 @@
using FluentAvalonia.UI.Controls;
using Needlework.Net.Models;
using System;
using System.Reactive.Subjects;
namespace Needlework.Net.Services
{
public class NotificationService
{
private readonly Subject<Notification> _notificationSubject = new();
public IObservable<Notification> Notifications { get { return _notificationSubject; } }
public void Notify(string title, string message, InfoBarSeverity severity, TimeSpan? duration = null, string? url = null)
{
var notification = new Notification(title, message, severity, duration, url);
_notificationSubject.OnNext(notification);
}
}
}

View File

@@ -0,0 +1,20 @@
using Needlework.Net.Models;
using Needlework.Net.ViewModels.Pages.Endpoints;
using System;
using System.Reactive.Subjects;
namespace Needlework.Net.Services
{
public class SchemaPaneService
{
private readonly Subject<SchemaPaneItem> _schemaPaneItemsSubject = new();
public IObservable<SchemaPaneItem> SchemaPaneItems { get { return _schemaPaneItemsSubject; } }
public void Add(string key, Tab tab)
{
var schemaPaneItem = new SchemaPaneItem(key, tab);
_schemaPaneItemsSubject.OnNext(schemaPaneItem);
}
}
}

View File

@@ -3,45 +3,28 @@ using Avalonia.Controls.Templates;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Linq;
using System.Reflection;
namespace Needlework.Net namespace Needlework.Net
{ {
public class ViewLocator : IDataTemplate public class ViewLocator : IDataTemplate
{ {
private readonly Dictionary<object, Control> _controlCache = []; private readonly Dictionary<Type, Func<Control>> _viewRegister = [];
public void Register<T>(Func<Control> viewActivator)
where T : INotifyPropertyChanged
{
_viewRegister[typeof(T)] = viewActivator;
}
public Control Build(object? data) public Control Build(object? data)
{ {
var name = data?.GetType().Name; if (!_viewRegister.TryGetValue(data!.GetType(), out var activator))
if (name is null)
{ {
return new TextBlock { Text = "Data is null or has no name." }; throw new Exception("Data type has no registered view activator.");
}
if (!name.Contains("ViewModel"))
{
return new TextBlock { Text = "Data name must end with ViewModel." };
} }
name = name.Replace("ViewModel", "View"); var res = activator();
var type = Assembly.GetExecutingAssembly() res!.DataContext = data;
.GetTypes()
.Where(t => t.Name == name)
.FirstOrDefault();
if (type is null)
{
return new TextBlock { Text = $"No view for {name}." };
}
if (!_controlCache.TryGetValue(data!, out var res))
{
res ??= (Control)Activator.CreateInstance(type)!;
_controlCache[data!] = res;
}
res.DataContext = data;
return res; return res;
} }

View File

@@ -1,26 +0,0 @@
using Avalonia.Controls;
using CommunityToolkit.Mvvm.ComponentModel;
using FluentAvalonia.UI.Controls;
using System;
namespace Needlework.Net.ViewModels.MainWindow;
public partial class InfoBarViewModel : ObservableObject
{
[ObservableProperty] private string _title;
[ObservableProperty] private bool _isOpen;
[ObservableProperty] private string _message;
[ObservableProperty] private InfoBarSeverity _severity;
[ObservableProperty] private TimeSpan _duration;
[ObservableProperty] private Control? _actionButton;
public InfoBarViewModel(string title, bool isOpen, string message, InfoBarSeverity severity, TimeSpan duration, Control? actionButton = null)
{
_title = title;
_isOpen = isOpen;
_message = message;
_severity = severity;
_duration = duration;
_actionButton = actionButton;
}
}

View File

@@ -1,217 +1,201 @@
using Avalonia.Collections; using Avalonia.Threading;
using BlossomiShymae.GrrrLCU;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input; using CommunityToolkit.Mvvm.Input;
using CommunityToolkit.Mvvm.Messaging; using CommunityToolkit.Mvvm.Messaging;
using FluentAvalonia.UI.Controls; using Needlework.Net.Constants;
using Microsoft.Extensions.Logging; using Needlework.Net.Extensions;
using Needlework.Net.Helpers;
using Needlework.Net.Messages; using Needlework.Net.Messages;
using Needlework.Net.Models;
using Needlework.Net.Services; using Needlework.Net.Services;
using Needlework.Net.ViewModels.Pages;
using Needlework.Net.Views.MainWindow; using Needlework.Net.Views.MainWindow;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Net.Http; using System.Reactive.Linq;
using System.Net.Http.Json; using System.Threading;
using System.Reflection;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Timers;
namespace Needlework.Net.ViewModels.MainWindow; namespace Needlework.Net.ViewModels.MainWindow;
public partial class MainWindowViewModel public partial class MainWindowViewModel
: ObservableObject, IRecipient<InfoBarUpdateMessage>, IRecipient<OopsiesDialogRequestedMessage> : ObservableObject, IRecipient<OopsiesDialogRequestedMessage>, IEnableLogger
{ {
public IAvaloniaReadOnlyList<NavigationViewItem> MenuItems { get; } private readonly DocumentService _documentService;
[ObservableProperty] private NavigationViewItem _selectedMenuItem;
[ObservableProperty] private PageBase _currentPage;
public string Version { get; } = Assembly.GetEntryAssembly()?.GetName().Version?.ToString() ?? "0.0.0.0"; private readonly NotificationService _notificationService;
[ObservableProperty] private bool _isUpdateShown = false;
[ObservableProperty] private string _schemaVersion = "N/A"; private readonly DialogService _dialogService;
[ObservableProperty] private string _schemaVersionLatest = "N/A";
public HttpClient HttpClient { get; } private readonly SchemaPaneService _schemaPaneService;
public DialogService DialogService { get; }
private readonly DataSource _dataSource; public MainWindowViewModel(DialogService dialogService, DocumentService documentService, NotificationService notificationService, SchemaPaneService schemaPaneService)
[ObservableProperty] private bool _isBusy = true;
[ObservableProperty] private ObservableCollection<InfoBarViewModel> _infoBarItems = [];
private readonly ILogger<MainWindowViewModel> _logger;
private readonly System.Timers.Timer _latestUpdateTimer = new()
{ {
Interval = TimeSpan.FromMinutes(10).TotalMilliseconds, _dialogService = dialogService;
Enabled = true _documentService = documentService;
}; _notificationService = notificationService;
_schemaPaneService = schemaPaneService;
private readonly System.Timers.Timer _schemaVersionTimer = new() _notificationService.Notifications.Subscribe(async notification =>
{ {
Interval = TimeSpan.FromSeconds(5).TotalMilliseconds, var vm = new NotificationViewModel(notification);
Enabled = true Notifications.Add(vm);
}; await Task.Delay(notification.Duration ?? TimeSpan.FromSeconds(10));
private bool _isSchemaVersionChecked = false; Notifications.Remove(vm);
});
public MainWindowViewModel(IEnumerable<PageBase> pages, HttpClient httpClient, DialogService dialogService, ILogger<MainWindowViewModel> logger, DataSource dataSource) _schemaPaneService.SchemaPaneItems.Subscribe(async item =>
{ {
_logger = logger; var document = item.Tab switch
_dataSource = dataSource;
MenuItems = new AvaloniaList<NavigationViewItem>(pages
.OrderBy(p => p.Index)
.ThenBy(p => p.DisplayName)
.Select(p => new NavigationViewItem()
{ {
Content = p.DisplayName, Pages.Endpoints.Tab.LCU => await documentService.GetLcuSchemaDocumentAsync(),
Tag = p, Pages.Endpoints.Tab.GameClient => await documentService.GetLolClientDocumentAsync(),
IconSource = new BitmapIconSource() { UriSource = new Uri($"avares://NeedleworkDotNet/Assets/Icons/{p.Icon}.png") } _ => throw new NotImplementedException()
})); };
SelectedMenuItem = MenuItems[0]; var propertyClassViewModel = OpenApiHelpers.WalkSchema(document.OpenApiDocument.Components.Schemas[item.Key], document.OpenApiDocument);
CurrentPage = (PageBase)MenuItems[0].Tag!; var schemaViewModel = new SchemaViewModel(propertyClassViewModel);
if (Schemas.ToList().Find(schema => schema.Id == schemaViewModel.Id) == null)
{
Schemas.Add(schemaViewModel);
IsPaneOpen = true;
HttpClient = httpClient; OpenSchemaPaneCommand.NotifyCanExecuteChanged();
DialogService = dialogService; CloseSchemaAllCommand.NotifyCanExecuteChanged();
}
});
WeakReferenceMessenger.Default.RegisterAll(this); WeakReferenceMessenger.Default.RegisterAll(this);
_latestUpdateTimer.Elapsed += OnLatestUpdateTimerElapsed;
_schemaVersionTimer.Elapsed += OnSchemaVersionTimerElapsed;
_latestUpdateTimer.Start();
_schemaVersionTimer.Start();
OnLatestUpdateTimerElapsed(null, null);
OnSchemaVersionTimerElapsed(null, null);
} }
partial void OnSelectedMenuItemChanged(NavigationViewItem value) [ObservableProperty]
private bool _isPaneOpen;
[ObservableProperty]
private ObservableCollection<SchemaViewModel> _schemas = [];
[ObservableProperty]
private SchemaViewModel? _selectedSchema;
[ObservableProperty]
private ObservableCollection<NotificationViewModel> _notifications = [];
[ObservableProperty]
private SchemaSearchDetailsViewModel? _selectedSchemaSearchDetails;
public string AppName => AppInfo.Name;
public string Title => $"{AppInfo.Name} {AppInfo.Version}";
partial void OnSelectedSchemaSearchDetailsChanged(SchemaSearchDetailsViewModel? value)
{ {
if (value.Tag is PageBase page) if (value == null) return;
Task.Run(async () =>
{ {
CurrentPage = page; var document = value.Tab switch
if (!page.IsInitialized)
{ {
Task.Run(page.InitializeAsync); Pages.Endpoints.Tab.LCU => await _documentService.GetLcuSchemaDocumentAsync(),
} Pages.Endpoints.Tab.GameClient => await _documentService.GetLolClientDocumentAsync(),
} _ => throw new NotImplementedException()
} };
var propertyClassViewModel = OpenApiHelpers.WalkSchema(document.OpenApiDocument.Components.Schemas[value.Key], document.OpenApiDocument);
private async void OnSchemaVersionTimerElapsed(object? sender, ElapsedEventArgs? e) var schemaViewModel = new SchemaViewModel(propertyClassViewModel);
{ Dispatcher.UIThread.Post(() =>
if (!ProcessFinder.IsPortOpen()) return;
var lcuSchemaDocument = await _dataSource.GetLcuSchemaDocumentAsync();
try
{
var client = Connector.GetLcuHttpClientInstance();
var currentSemVer = lcuSchemaDocument.Info.Version.Split('.');
var systemBuild = await client.GetFromJsonAsync<SystemBuild>("/system/v1/builds") ?? throw new NullReferenceException();
var latestSemVer = systemBuild.Version.Split('.');
if (!_isSchemaVersionChecked)
{ {
_logger.LogInformation("LCU Schema (current): {Version}", lcuSchemaDocument.Info.Version); if (Schemas.ToList().Find(schema => schema.Id == schemaViewModel.Id) == null)
_logger.LogInformation("LCU Schema (latest): {Version}", systemBuild.Version);
_isSchemaVersionChecked = true;
}
bool isVersionMatching = currentSemVer[0] == latestSemVer[0] && currentSemVer[1] == latestSemVer[1]; // Compare major and minor versions
if (!isVersionMatching)
{
Avalonia.Threading.Dispatcher.UIThread.Post(async () =>
{ {
await ShowInfoBarAsync(new("Newer System Build", true, $"LCU Schema is possibly outdated compared to latest system build. Consider submitting a pull request on dysolix/hasagi-types.\nCurrent: {string.Join(".", currentSemVer)}\nLatest: {string.Join(".", latestSemVer)}", InfoBarSeverity.Warning, TimeSpan.FromSeconds(60), new Avalonia.Controls.Button() Schemas.Add(schemaViewModel);
{ IsPaneOpen = true;
Command = OpenUrlCommand,
CommandParameter = "https://github.com/dysolix/hasagi-types#updating-the-types",
Content = "Submit PR"
}));
});
_schemaVersionTimer.Elapsed -= OnSchemaVersionTimerElapsed; OpenSchemaPaneCommand.NotifyCanExecuteChanged();
_schemaVersionTimer.Stop(); CloseSchemaAllCommand.NotifyCanExecuteChanged();
} }
} });
catch (Exception ex) });
}
partial void OnSelectedSchemaChanged(SchemaViewModel? value)
{
CloseSchemaCommand.NotifyCanExecuteChanged();
}
partial void OnSchemasChanged(ObservableCollection<SchemaViewModel> value)
{
if (!value.Any())
{ {
_logger.LogError(ex, "Schema version check failed"); IsPaneOpen = false;
} }
} }
private async void OnLatestUpdateTimerElapsed(object? sender, ElapsedEventArgs? e) public async Task<IEnumerable<object>> PopulateAsync(string? searchText, CancellationToken cancellationToken)
{ {
try if (searchText == null) return [];
var lcuSchemaDocument = await _documentService.GetLcuSchemaDocumentAsync(cancellationToken);
var gameClientDocument = await _documentService.GetLolClientDocumentAsync(cancellationToken);
var lcuResults = lcuSchemaDocument.OpenApiDocument.Components.Schemas.Keys.Where(key => key.Contains(searchText, StringComparison.OrdinalIgnoreCase))
.Select(key => new SchemaSearchDetailsViewModel(key, Pages.Endpoints.Tab.LCU));
var gameClientResults = gameClientDocument.OpenApiDocument.Components.Schemas.Keys.Where(key => key.Contains(searchText, StringComparison.OrdinalIgnoreCase))
.Select(key => new SchemaSearchDetailsViewModel(key, Pages.Endpoints.Tab.GameClient));
return Enumerable.Concat(lcuResults, gameClientResults);
}
[RelayCommand(CanExecute = nameof(CanOpenSchemaPane))]
private void OpenSchemaPane()
{
IsPaneOpen = !IsPaneOpen;
}
private bool CanOpenSchemaPane()
{
return Schemas.Any();
}
[RelayCommand(CanExecute = nameof(CanCloseSchema))]
private void CloseSchema()
{
if (SelectedSchema is SchemaViewModel selection)
{ {
var request = new HttpRequestMessage(HttpMethod.Get, "https://api.github.com/repos/BlossomiShymae/Needlework.Net/releases/latest"); SelectedSchema = null;
request.Headers.UserAgent.Add(new System.Net.Http.Headers.ProductInfoHeaderValue("Needlework.Net", Version)); Schemas = new ObservableCollection<SchemaViewModel>(Schemas.Where(schema => schema != selection));
var response = await HttpClient.SendAsync(request); OpenSchemaPaneCommand.NotifyCanExecuteChanged();
var release = await response.Content.ReadFromJsonAsync<GithubRelease>(); CloseSchemaCommand.NotifyCanExecuteChanged();
if (release == null) CloseSchemaAllCommand.NotifyCanExecuteChanged();
{
_logger.LogWarning("Release response is null");
return;
}
var currentVersion = int.Parse(Version.Replace(".", ""));
if (release.IsLatest(currentVersion))
{
Avalonia.Threading.Dispatcher.UIThread.Post(async () =>
{
await ShowInfoBarAsync(new("Needlework.Net Update", true, $"There is a new version available: {release.TagName}.", InfoBarSeverity.Informational, TimeSpan.FromSeconds(30), new Avalonia.Controls.Button()
{
Command = OpenUrlCommand,
CommandParameter = "https://github.com/BlossomiShymae/Needlework.Net/releases",
Content = "Download"
}));
});
_latestUpdateTimer.Elapsed -= OnLatestUpdateTimerElapsed;
_latestUpdateTimer.Stop();
}
}
catch (Exception ex)
{
_logger.LogError(ex, "Failed to check for latest version");
} }
} }
private bool CanCloseSchema()
{
return SelectedSchema != null;
}
[RelayCommand(CanExecute = nameof(CanCloseSchemaAll))]
private void CloseSchemaAll()
{
SelectedSchema = null;
Schemas = [];
OpenSchemaPaneCommand.NotifyCanExecuteChanged();
CloseSchemaCommand.NotifyCanExecuteChanged();
CloseSchemaAllCommand.NotifyCanExecuteChanged();
}
private bool CanCloseSchemaAll()
{
return Schemas.Any();
}
[RelayCommand] [RelayCommand]
private void OpenUrl(string url) private void OpenUrl(string url)
{ {
var process = new Process() var process = new Process() { StartInfo = new ProcessStartInfo(url) { UseShellExecute = true } };
{
StartInfo = new ProcessStartInfo(url)
{
UseShellExecute = true
}
};
process.Start(); process.Start();
} }
public void Receive(InfoBarUpdateMessage message)
{
Avalonia.Threading.Dispatcher.UIThread.Post(async () => await ShowInfoBarAsync(message.Value));
}
private async Task ShowInfoBarAsync(InfoBarViewModel vm)
{
InfoBarItems.Add(vm);
await Task.Delay(vm.Duration);
InfoBarItems.Remove(vm);
}
public void Receive(OopsiesDialogRequestedMessage message) public void Receive(OopsiesDialogRequestedMessage message)
{ {
Avalonia.Threading.Dispatcher.UIThread.Invoke(async () => await DialogService.ShowAsync<OopsiesDialog>(message.Value)); Avalonia.Threading.Dispatcher.UIThread.Invoke(async () => await _dialogService.ShowAsync<OopsiesDialog>(message.Value));
} }
} }

View File

@@ -0,0 +1,27 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Needlework.Net.Models;
using System.Diagnostics;
namespace Needlework.Net.ViewModels.MainWindow
{
public partial class NotificationViewModel : ObservableObject
{
public NotificationViewModel(Notification notification)
{
Notification = notification;
IsButtonVisible = !string.IsNullOrEmpty(notification.Url);
}
public bool IsButtonVisible { get; }
public Notification Notification { get; }
[RelayCommand]
public void OpenUrl()
{
var process = new Process() { StartInfo = new() { UseShellExecute = true } };
process.Start();
}
}
}

View File

@@ -0,0 +1,25 @@
using CommunityToolkit.Mvvm.ComponentModel;
using Needlework.Net.ViewModels.Pages.Endpoints;
namespace Needlework.Net.ViewModels.MainWindow
{
public partial class SchemaSearchDetailsViewModel : ObservableObject
{
public SchemaSearchDetailsViewModel(string key, Tab tab)
{
Tab = tab;
Key = key;
}
public string Key { get; }
public Tab Tab { get; }
public string Document => Tab switch
{
Tab.LCU => "LCU",
Tab.GameClient => "Game Client",
_ => throw new System.NotImplementedException()
};
}
}

View File

@@ -0,0 +1,22 @@
using CommunityToolkit.Mvvm.ComponentModel;
using Needlework.Net.ViewModels.Pages.Endpoints;
using System.Collections.Generic;
namespace Needlework.Net.ViewModels.MainWindow
{
public partial class SchemaViewModel : ObservableObject
{
public SchemaViewModel(PropertyClassViewModel vm)
{
Id = vm.Id;
PropertyFields = vm.PropertyFields;
PropertyEnums = vm.PropertyEnums;
}
public string Id { get; }
public List<PropertyFieldViewModel> PropertyFields { get; } = [];
public List<PropertyEnumViewModel> PropertyEnums { get; } = [];
}
}

View File

@@ -0,0 +1,24 @@
using CommunityToolkit.Mvvm.Input;
using System.Diagnostics;
using System.Threading.Tasks;
namespace Needlework.Net.ViewModels.Pages.About;
public partial class AboutViewModel : PageBase
{
public AboutViewModel() : base("About", "fa-solid fa-circle-info")
{
}
public override Task InitializeAsync()
{
return Task.CompletedTask;
}
[RelayCommand]
private void OpenUrl(string url)
{
var process = new Process() { StartInfo = new ProcessStartInfo(url) { UseShellExecute = true } };
process.Start();
}
}

View File

@@ -1,32 +0,0 @@
using CommunityToolkit.Mvvm.Input;
using System.Diagnostics;
using System.Net.Http;
using System.Threading.Tasks;
namespace Needlework.Net.ViewModels.Pages;
public partial class AboutViewModel : PageBase
{
public HttpClient HttpClient { get; }
public AboutViewModel(HttpClient httpClient) : base("About", "info-circle")
{
HttpClient = httpClient;
}
public override Task InitializeAsync()
{
IsInitialized = true;
return Task.CompletedTask;
}
[RelayCommand]
private void OpenUrl(string url)
{
var process = new Process()
{
StartInfo = new ProcessStartInfo(url) { UseShellExecute = true }
};
process.Start();
}
}

View File

@@ -0,0 +1,45 @@
using Avalonia.Threading;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Needlework.Net.Services;
using Needlework.Net.ViewModels.Shared;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace Needlework.Net.ViewModels.Pages.Console;
public partial class ConsoleViewModel : PageBase
{
private readonly DocumentService _documentService;
public ConsoleViewModel(DocumentService documentService, NotificationService notificationService) : base("Console", "fa-solid fa-terminal")
{
_request = new(notificationService, Endpoints.Tab.LCU);
_documentService = documentService;
}
public List<string> RequestMethods { get; } = ["GET", "POST", "PUT", "DELETE", "HEAD", "PATCH", "OPTIONS", "TRACE"];
public List<string> RequestPaths { get; } = [];
[ObservableProperty] private bool _isBusy = true;
[ObservableProperty] private RequestViewModel _request;
public override async Task InitializeAsync()
{
var document = await _documentService.GetLcuSchemaDocumentAsync();
Dispatcher.UIThread.Invoke(() =>
{
RequestPaths.Clear();
RequestPaths.AddRange(document.Paths);
});
IsBusy = false;
}
[RelayCommand]
private async Task SendRequest()
{
await Request.ExecuteAsync();
}
}

View File

@@ -1,45 +0,0 @@
using Avalonia.Collections;
using Avalonia.Threading;
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;
public partial class ConsoleViewModel : PageBase
{
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 RequestViewModel _request;
private readonly DataSource _dataSource;
public ConsoleViewModel(ILogger<RequestViewModel> requestViewModelLogger, DataSource dataSource, HttpClient httpClient) : base("Console", "terminal", -200)
{
_request = new(requestViewModelLogger, Endpoints.Tab.LCU, httpClient);
_dataSource = dataSource;
}
public override async Task InitializeAsync()
{
var document = await _dataSource.GetLcuSchemaDocumentAsync();
Dispatcher.UIThread.Invoke(() =>
{
RequestPaths.Clear();
RequestPaths.AddRange(document.Paths);
});
IsBusy = false;
IsInitialized = true;
}
[RelayCommand]
private async Task SendRequest()
{
await Request.ExecuteAsync();
}
}

View File

@@ -0,0 +1,68 @@
using Avalonia;
using AvaloniaEdit.Utils;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Needlework.Net.Models;
using Needlework.Net.Services;
using System;
using System.Collections.ObjectModel;
using System.Linq;
namespace Needlework.Net.ViewModels.Pages.Endpoints;
public partial class EndpointListViewModel : ObservableObject
{
private readonly Document _document;
private readonly Tab _tab;
private readonly Action<ObservableObject> _onClicked;
private readonly ObservableCollection<string> _plugins;
private readonly NotificationService _notificationService;
public EndpointListViewModel(NotificationService notificationService, ObservableCollection<string> plugins, Action<ObservableObject> onClicked, Models.Document document, Tab tab)
{
_plugins = new ObservableCollection<string>(plugins);
_document = document;
_tab = tab;
_onClicked = onClicked;
_notificationService = notificationService;
Plugins = EndpointSearchDetails = new ObservableCollection<EndpointSearchDetailsViewModel>(plugins.Select(plugin => new EndpointSearchDetailsViewModel(notificationService, document, tab, onClicked, plugin)));
}
public ObservableCollection<EndpointSearchDetailsViewModel> Plugins { get; }
[ObservableProperty]
private ObservableCollection<EndpointSearchDetailsViewModel> _endpointSearchDetails = [];
[ObservableProperty]
private string _search = string.Empty;
[ObservableProperty]
private Vector _offset = new();
partial void OnSearchChanged(string value)
{
EndpointSearchDetails.Clear();
if (!string.IsNullOrEmpty(Search))
{
EndpointSearchDetails.AddRange(_plugins.Where(plugin => plugin.Contains(value, StringComparison.InvariantCultureIgnoreCase))
.Select(plugin => new EndpointSearchDetailsViewModel(_notificationService, _document, _tab, _onClicked, plugin)));
}
else
{
EndpointSearchDetails.AddRange(
_plugins.Select(plugin => new EndpointSearchDetailsViewModel(_notificationService, _document, _tab, _onClicked, plugin)));
}
}
[RelayCommand]
private void OpenEndpoint(string? value)
{
if (string.IsNullOrEmpty(value)) return;
_onClicked.Invoke(new PluginViewModel(_notificationService, value, _document, _tab));
}
}

View File

@@ -0,0 +1,38 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Needlework.Net.Models;
using Needlework.Net.Services;
using System;
namespace Needlework.Net.ViewModels.Pages.Endpoints
{
public partial class EndpointSearchDetailsViewModel : ObservableObject
{
private readonly Document _document;
private readonly Tab _tab;
private readonly Action<ObservableObject> _onClicked;
private readonly NotificationService _notificationService;
public EndpointSearchDetailsViewModel(Services.NotificationService notificationService, Document document, Tab tab, Action<ObservableObject> onClicked, string? plugin)
{
_document = document;
_tab = tab;
_onClicked = onClicked;
_plugin = plugin;
_notificationService = notificationService;
}
[ObservableProperty]
private string? _plugin;
[RelayCommand]
private void OpenEndpoint()
{
if (string.IsNullOrEmpty(Plugin)) return;
_onClicked.Invoke(new PluginViewModel(_notificationService, Plugin, _document, _tab));
}
}
}

View File

@@ -1,31 +1,36 @@
using Avalonia.Collections; using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input; using CommunityToolkit.Mvvm.Input;
using Microsoft.Extensions.Logging;
using Needlework.Net.ViewModels.Shared;
using System; using System;
using System.Collections.ObjectModel;
namespace Needlework.Net.ViewModels.Pages.Endpoints; namespace Needlework.Net.ViewModels.Pages.Endpoints;
public partial class EndpointsNavigationViewModel : ObservableObject public partial class EndpointTabItemContentViewModel : ObservableObject
{ {
public Guid Guid { get; } = Guid.NewGuid();
[ObservableProperty] private ObservableObject _activeViewModel;
[ObservableProperty] private ObservableObject _endpointsViewModel;
[ObservableProperty] private string _title;
private readonly Action<string?, Guid> _onEndpointNavigation; private readonly Action<string?, Guid> _onEndpointNavigation;
private readonly Tab _tab; 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 EndpointTabItemContentViewModel(Services.NotificationService notificationService, ObservableCollection<string> plugins, Action<string?, Guid> onEndpointNavigation, IAsyncRelayCommand addEndpointCommand, Models.Document document, Tab tab)
{ {
_activeViewModel = _endpointsViewModel = new EndpointsViewModel(plugins, OnClicked, requestViewModelLogger, document, tab, httpClient); _activeViewModel = _endpointsViewModel = new EndpointListViewModel(notificationService, new ObservableCollection<string>(plugins), OnClicked, document, tab);
_onEndpointNavigation = onEndpointNavigation; _onEndpointNavigation = onEndpointNavigation;
_tab = tab; _tab = tab;
_title = GetTitle(tab); _title = GetTitle(tab);
AddEndpointCommand = addEndpointCommand;
} }
public Guid Guid { get; } = Guid.NewGuid();
public IAsyncRelayCommand AddEndpointCommand { get; }
[ObservableProperty] private ObservableObject _activeViewModel;
[ObservableProperty] private ObservableObject _endpointsViewModel;
[ObservableProperty] private string _title;
private string GetTitle(Tab tab) private string GetTitle(Tab tab)
{ {
return tab switch return tab switch
@@ -39,7 +44,7 @@ public partial class EndpointsNavigationViewModel : ObservableObject
private void OnClicked(ObservableObject viewModel) private void OnClicked(ObservableObject viewModel)
{ {
ActiveViewModel = viewModel; ActiveViewModel = viewModel;
if (viewModel is EndpointViewModel endpoint) if (viewModel is PluginViewModel endpoint)
{ {
Title = $"{GetTitle(_tab)} - {endpoint.Title}"; Title = $"{GetTitle(_tab)} - {endpoint.Title}";
_onEndpointNavigation.Invoke(endpoint.Title, Guid); _onEndpointNavigation.Invoke(endpoint.Title, Guid);

View File

@@ -0,0 +1,12 @@
using CommunityToolkit.Mvvm.ComponentModel;
using FluentAvalonia.UI.Controls;
namespace Needlework.Net.ViewModels.Pages.Endpoints;
public partial class EndpointTabItemViewModel : ObservableObject
{
[ObservableProperty] private string _header = string.Empty;
public IconSource IconSource { get; set; } = new SymbolIconSource() { Symbol = Symbol.Document, FontSize = 20.0, Foreground = Avalonia.Media.Brushes.White };
public bool Selected { get; set; } = false;
public required EndpointTabItemContentViewModel Content { get; init; }
}

View File

@@ -1,48 +0,0 @@
using Avalonia.Collections;
using CommunityToolkit.Mvvm.ComponentModel;
using Microsoft.Extensions.Logging;
using Needlework.Net.ViewModels.Shared;
using System;
using System.Linq;
namespace Needlework.Net.ViewModels.Pages.Endpoints;
public partial class EndpointViewModel : ObservableObject
{
public string Endpoint { get; }
public string Title => Endpoint;
public IAvaloniaReadOnlyList<PathOperationViewModel> PathOperations { get; }
[ObservableProperty] private PathOperationViewModel? _selectedPathOperation;
[ObservableProperty] private string? _search;
public IAvaloniaList<PathOperationViewModel> FilteredPathOperations { get; }
public event EventHandler<string>? PathOperationSelected;
public EndpointViewModel(string endpoint, ILogger<RequestViewModel> requestViewModelLogger, Models.Document document, Tab tab, System.Net.Http.HttpClient httpClient)
{
Endpoint = endpoint;
PathOperations = new AvaloniaList<PathOperationViewModel>(document.Plugins[endpoint].Select(x => new PathOperationViewModel(x, requestViewModelLogger, document, tab, httpClient)));
FilteredPathOperations = new AvaloniaList<PathOperationViewModel>(PathOperations);
}
partial void OnSearchChanged(string? value)
{
FilteredPathOperations.Clear();
if (string.IsNullOrWhiteSpace(value))
{
FilteredPathOperations.AddRange(PathOperations);
return;
}
FilteredPathOperations.AddRange(PathOperations.Where(o => o.Path.Contains(value, StringComparison.InvariantCultureIgnoreCase)));
}
partial void OnSelectedPathOperationChanged(PathOperationViewModel? value)
{
if (value == null) return;
PathOperationSelected?.Invoke(this, value.Operation.RequestTemplate ?? string.Empty);
}
}

View File

@@ -1,86 +0,0 @@
using Avalonia.Collections;
using Avalonia.Threading;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using FluentAvalonia.UI.Controls;
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;
public enum Tab
{
LCU,
GameClient
}
public partial class EndpointsTabViewModel : PageBase
{
public IAvaloniaList<string> Plugins { get; } = new AvaloniaList<string>();
public IAvaloniaList<EndpointItem> Endpoints { get; } = new AvaloniaList<EndpointItem>();
[ObservableProperty] private bool _isBusy = true;
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)
{
_requestViewModelLogger = requestViewModelLogger;
_dataSource = dataSource;
_httpClient = httpClientFactory.CreateClient(nameof(EndpointsTabViewModel));
}
public override async Task InitializeAsync()
{
await Dispatcher.UIThread.Invoke(async () => await AddEndpoint(Tab.LCU));
IsBusy = false;
IsInitialized = true;
}
[RelayCommand]
private async Task AddEndpoint(Tab tab)
{
Document document = tab switch
{
Tab.LCU => await _dataSource.GetLcuSchemaDocumentAsync(),
Tab.GameClient => await _dataSource.GetLolClientDocumentAsync(),
_ => throw new NotImplementedException(),
};
Plugins.Clear();
Plugins.AddRange(document.Plugins.Keys);
var vm = new EndpointsNavigationViewModel(Plugins, OnEndpointNavigation, _requestViewModelLogger, document, tab, _httpClient);
Endpoints.Add(new()
{
Content = vm,
Header = vm.Title,
Selected = true
});
}
private void OnEndpointNavigation(string? title, Guid guid)
{
foreach (var endpoint in Endpoints)
{
if (endpoint.Content.Guid.Equals(guid))
{
endpoint.Header = endpoint.Content.Title;
break;
}
}
}
}
public partial class EndpointItem : ObservableObject
{
[ObservableProperty] private string _header = string.Empty;
public IconSource IconSource { get; set; } = new SymbolIconSource() { Symbol = Symbol.Document, FontSize = 20.0, Foreground = Avalonia.Media.Brushes.White };
public bool Selected { get; set; } = false;
public required EndpointsNavigationViewModel Content { get; init; }
}

View File

@@ -1,55 +1,78 @@
using Avalonia.Collections; using Avalonia.Threading;
using AvaloniaEdit.Utils;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input; using CommunityToolkit.Mvvm.Input;
using Microsoft.Extensions.Logging;
using Needlework.Net.Models; using Needlework.Net.Models;
using Needlework.Net.ViewModels.Shared; using Needlework.Net.Services;
using System; using System;
using System.Linq; using System.Collections.ObjectModel;
using System.Net.Http; using System.Threading.Tasks;
namespace Needlework.Net.ViewModels.Pages.Endpoints; namespace Needlework.Net.ViewModels.Pages.Endpoints;
public partial class EndpointsViewModel : ObservableObject public enum Tab
{ {
public IAvaloniaList<string> Plugins { get; } LCU,
public IAvaloniaList<string> Query { get; } GameClient
}
[ObservableProperty] private string _search = string.Empty; public partial class EndpointsViewModel : PageBase
[ObservableProperty] private string? _selectedQuery = string.Empty; {
private readonly DocumentService _documentService;
public Action<ObservableObject> OnClicked { get; } private readonly NotificationService _notificationService;
private readonly ILogger<RequestViewModel> _requestViewModelLogger; public EndpointsViewModel(DocumentService documentService, NotificationService notificationService) : base("Endpoints", "fa-solid fa-rectangle-list")
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)
{ {
Plugins = new AvaloniaList<string>(plugins); _documentService = documentService;
Query = new AvaloniaList<string>(plugins); _notificationService = notificationService;
OnClicked = onClicked;
_requestViewModelLogger = requestViewModelLogger;
_document = document;
_tab = tab;
_httpClient = httpClient;
} }
partial void OnSearchChanged(string value) public ObservableCollection<string> Plugins { get; } = [];
public ObservableCollection<EndpointTabItemViewModel> Endpoints { get; } = [];
[ObservableProperty] private bool _isBusy = true;
public override async Task InitializeAsync()
{ {
Query.Clear(); await AddEndpoint(Tab.LCU);
if (!string.IsNullOrEmpty(Search)) IsBusy = false;
Query.AddRange(Plugins.Where(x => x.Contains(value, StringComparison.InvariantCultureIgnoreCase)));
else
Query.AddRange(Plugins);
} }
[RelayCommand] [RelayCommand]
private void OpenEndpoint(string? value) private async Task AddEndpoint(Tab tab)
{ {
if (string.IsNullOrEmpty(value)) return; Document document = tab switch
{
Tab.LCU => await _documentService.GetLcuSchemaDocumentAsync(),
Tab.GameClient => await _documentService.GetLolClientDocumentAsync(),
_ => throw new NotImplementedException(),
};
OnClicked.Invoke(new EndpointViewModel(value, _requestViewModelLogger, _document, _tab, _httpClient)); await Dispatcher.UIThread.InvokeAsync(() =>
{
Plugins.Clear();
Plugins.AddRange(document.Plugins.Keys);
var vm = new EndpointTabItemContentViewModel(_notificationService, Plugins, OnEndpointNavigation, AddEndpointCommand, document, tab);
Endpoints.Add(new()
{
Content = vm,
Header = vm.Title,
Selected = true
});
});
}
private void OnEndpointNavigation(string? title, Guid guid)
{
foreach (var endpoint in Endpoints)
{
if (endpoint.Content.Guid.Equals(guid))
{
endpoint.Header = endpoint.Content.Title;
break;
}
}
} }
} }

View File

@@ -1,259 +1,44 @@
using Avalonia.Collections; using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.ComponentModel;
using Microsoft.OpenApi.Models; using Microsoft.OpenApi.Models;
using Needlework.Net.Models; using Needlework.Net.Helpers;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq; using System.Linq;
using System.Text.Json;
namespace Needlework.Net.ViewModels.Pages.Endpoints; namespace Needlework.Net.ViewModels.Pages.Endpoints;
public partial class OperationViewModel : ObservableObject public partial class OperationViewModel : ObservableObject
{ {
public string Summary { get; }
public string Description { get; }
public string ReturnType { get; }
public bool IsRequestBody { get; }
public string? RequestBodyType { get; }
public IAvaloniaReadOnlyList<PropertyClassViewModel> RequestClasses { get; }
public IAvaloniaReadOnlyList<PropertyClassViewModel> ResponseClasses { get; }
public IAvaloniaReadOnlyList<ParameterViewModel> PathParameters { get; }
public IAvaloniaReadOnlyList<ParameterViewModel> QueryParameters { get; }
public string? RequestTemplate { get; }
public OperationViewModel(OpenApiOperation operation, Models.Document document) public OperationViewModel(OpenApiOperation operation, Models.Document document)
{ {
Summary = operation.Summary ?? string.Empty; Summary = operation.Summary ?? string.Empty;
Description = operation.Description ?? string.Empty; Description = operation.Description ?? string.Empty;
IsRequestBody = operation.RequestBody != null; IsRequestBody = operation.RequestBody != null;
ReturnType = GetReturnType(operation.Responses); ReturnType = OpenApiHelpers.GetReturnType(operation.Responses);
RequestClasses = GetRequestClasses(operation.RequestBody, document); RequestClasses = OpenApiHelpers.GetRequestClasses(operation.RequestBody, document);
ResponseClasses = GetResponseClasses(operation.Responses, document); ResponseClasses = OpenApiHelpers.GetResponseClasses(operation.Responses, document);
PathParameters = GetParameters(operation.Parameters, ParameterLocation.Path); PathParameters = OpenApiHelpers.GetParameters(operation.Parameters.ToList(), ParameterLocation.Path);
QueryParameters = GetParameters(operation.Parameters, ParameterLocation.Query); QueryParameters = OpenApiHelpers.GetParameters(operation.Parameters.ToList(), ParameterLocation.Query);
RequestBodyType = GetRequestBodyType(operation.RequestBody); RequestBodyType = OpenApiHelpers.GetRequestBodyType(operation.RequestBody);
RequestTemplate = GetRequestTemplate(operation.RequestBody, document); RequestTemplate = OpenApiHelpers.GetRequestTemplate(operation.RequestBody, document);
} }
private string? GetRequestTemplate(OpenApiRequestBody? requestBody, Document document) public string Summary { get; }
{
var requestClasses = GetRequestClasses(requestBody, document);
if (requestClasses.Count == 0)
{
var type = GetRequestBodyType(requestBody);
if (type == null) return null;
return GetRequestDefaultValue(type);
}
var template = CreateTemplate(requestClasses); public string Description { get; }
return JsonSerializer.Serialize(JsonSerializer.Deserialize<object>(string.Join(string.Empty, template)), App.JsonSerializerOptions);
}
private List<string> CreateTemplate(AvaloniaList<PropertyClassViewModel> requestClasses) public string ReturnType { get; }
{
if (requestClasses.Count == 0) return [];
List<string> template = [];
template.Add("{");
var rootClass = requestClasses.First(); public bool IsRequestBody { get; }
if (rootClass.PropertyEnums.Any()) return [rootClass.PropertyEnums.First().Values];
var propertyFields = rootClass.PropertyFields;
for (int i = 0; i < propertyFields.Count; i++)
{
template.Add($"\"{propertyFields[i].Name}\"");
template.Add(":");
template.Add($"#{propertyFields[i].Type}");
if (i == propertyFields.Count - 1) template.Add("}"); public string? RequestBodyType { get; }
else template.Add(",");
}
for (int i = 0; i < template.Count; i++) public List<PropertyClassViewModel> RequestClasses { get; }
{
var type = template[i];
if (!type.Contains("#")) continue;
var foundClass = requestClasses.Where(c => c.Id == type.Replace("#", string.Empty)); public List<PropertyClassViewModel> ResponseClasses { get; }
if (foundClass.Any())
{
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
{
template[i] = GetRequestDefaultValue(type);
}
}
return template; public List<ParameterViewModel> PathParameters { get; }
}
private static string GetRequestDefaultValue(string type) public List<ParameterViewModel> QueryParameters { get; }
{
var defaultValue = string.Empty;
if (type.Contains("[]")) defaultValue = "[]";
else if (type.Contains("string")) defaultValue = "\"\"";
else if (type.Contains("boolean")) defaultValue = "false";
else if (type.Contains("integer")) defaultValue = "0";
else if (type.Contains("double") || type.Contains("float")) defaultValue = "0.0";
else if (type.Contains("object")) defaultValue = "{}";
return defaultValue;
}
private string? GetRequestBodyType(OpenApiRequestBody? requestBody) public string? RequestTemplate { get; }
{
if (requestBody == null) return null;
if (requestBody.Content.TryGetValue("application/json", out var media))
{
var schema = media.Schema;
if (schema == null) return null; // Because "PostLolAccountVerificationV1SendDeactivationPin" exists where the media body is empty...
return GetSchemaType(schema);
}
return null;
}
private AvaloniaList<ParameterViewModel> GetParameters(IList<OpenApiParameter> parameters, ParameterLocation location)
{
var pathParameters = new AvaloniaList<ParameterViewModel>();
foreach (var parameter in parameters)
{
if (parameter.In != location) continue;
pathParameters.Add(new ParameterViewModel(parameter.Name, GetSchemaType(parameter.Schema), parameter.Required));
}
return pathParameters;
}
private bool TryGetResponse(OpenApiResponses responses, [NotNullWhen(true)] out OpenApiResponse? response)
{
response = null;
var flag = false;
if (responses.TryGetValue("2XX", out var x))
{
response = x;
flag = true;
}
else if (responses.TryGetValue("200", out var y))
{
response = y;
flag = true;
}
return flag;
}
private AvaloniaList<PropertyClassViewModel> GetResponseClasses(OpenApiResponses responses, Document document)
{
if (!TryGetResponse(responses, out var response))
return [];
if (response.Content.TryGetValue("application/json", out var media))
{
var rawDocument = document.OpenApiDocument;
var schema = media.Schema;
if (schema == null) return [];
AvaloniaList<PropertyClassViewModel> propertyClasses = [];
WalkSchema(schema, propertyClasses, rawDocument);
return propertyClasses;
}
return [];
}
private void WalkSchema(OpenApiSchema schema, AvaloniaList<PropertyClassViewModel> propertyClasses, OpenApiDocument document)
{
var type = GetSchemaType(schema);
if (IsComponent(type))
{
string componentId = GetComponentId(schema);
var componentSchema = document.Components.Schemas[componentId];
var responseClass = new PropertyClassViewModel(componentId, componentSchema.Properties, componentSchema.Enum);
if (propertyClasses.Where(c => c.Id == componentId).Any()) return; // Avoid adding duplicate schemas in classes
propertyClasses.Add(responseClass);
foreach ((var _, var property) in componentSchema.Properties)
// Check for self-references like "LolLootLootOddsResponse"
// I blame dubble
if (IsComponent(GetSchemaType(property)) && componentId != GetComponentId(property))
WalkSchema(property, propertyClasses, document);
}
}
private static string GetComponentId(OpenApiSchema schema)
{
string componentId;
if (schema.Reference != null) componentId = schema.Reference.Id;
else if (schema.Items != null) componentId = schema.Items.Reference.Id;
else componentId = schema.AdditionalProperties.Reference.Id;
return componentId;
}
private static bool IsComponent(string type)
{
return !(type.Contains("object")
|| type.Contains("array")
|| type.Contains("bool")
|| type.Contains("string")
|| type.Contains("integer")
|| type.Contains("number"));
}
private AvaloniaList<PropertyClassViewModel> GetRequestClasses(OpenApiRequestBody? requestBody, Document document)
{
if (requestBody == null) return [];
if (requestBody.Content.TryGetValue("application/json", out var media))
{
var rawDocument = document.OpenApiDocument;
var schema = media.Schema;
if (schema == null) return [];
var type = GetSchemaType(media.Schema);
if (IsComponent(type))
{
var componentId = GetComponentId(schema);
var componentSchema = rawDocument.Components.Schemas[componentId];
AvaloniaList<PropertyClassViewModel> propertyClasses = [];
WalkSchema(componentSchema, propertyClasses, rawDocument);
return propertyClasses;
}
}
return [];
}
private string GetReturnType(OpenApiResponses responses)
{
if (!TryGetResponse(responses, out var response))
return "none";
if (response.Content.TryGetValue("application/json", out var media))
{
var schema = media.Schema;
return GetSchemaType(schema);
}
return "none";
}
public static string GetSchemaType(OpenApiSchema schema)
{
if (schema.Reference != null) return schema.Reference.Id;
if (schema.Type == "object" && schema.AdditionalProperties?.Reference != null) return schema.AdditionalProperties.Reference.Id;
if (schema.Type == "integer" || schema.Type == "number") return $"{schema.Type}:{schema.Format}";
if (schema.Type == "array" && schema.AdditionalProperties?.Reference != null) return schema.AdditionalProperties.Reference.Id;
if (schema.Type == "array" && schema.Items.Reference != null) return $"{schema.Items.Reference.Id}[]";
if (schema.Type == "array" && (schema.Items.Type == "integer" || schema.Items.Type == "number")) return $"{schema.Items.Type}:{schema.Items.Format}[]";
if (schema.Type == "array") return $"{schema.Items.Type}[]";
return schema.Type;
}
} }

View File

@@ -4,11 +4,6 @@ namespace Needlework.Net.ViewModels.Pages.Endpoints;
public partial class ParameterViewModel : ObservableObject public partial class ParameterViewModel : ObservableObject
{ {
public string Name { get; }
public string Type { get; }
public bool IsRequired { get; }
[ObservableProperty] private string? _value = null;
public ParameterViewModel(string name, string type, bool isRequired, string? value = null) public ParameterViewModel(string name, string type, bool isRequired, string? value = null)
{ {
Name = name; Name = name;
@@ -16,4 +11,14 @@ public partial class ParameterViewModel : ObservableObject
IsRequired = isRequired; IsRequired = isRequired;
Value = value; Value = value;
} }
public string Name { get; }
public string Type { get; }
public bool IsRequired { get; }
[ObservableProperty]
private string? _value = null;
} }

View File

@@ -1,6 +1,5 @@
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input; using CommunityToolkit.Mvvm.Input;
using Microsoft.Extensions.Logging;
using Needlework.Net.Models; using Needlework.Net.Models;
using Needlework.Net.ViewModels.Shared; using Needlework.Net.ViewModels.Shared;
using System; using System;
@@ -11,24 +10,30 @@ namespace Needlework.Net.ViewModels.Pages.Endpoints;
public partial class PathOperationViewModel : ObservableObject public partial class PathOperationViewModel : ObservableObject
{ {
public PathOperationViewModel(Services.NotificationService notificationService, PathOperation pathOperation, Document document, Tab tab)
{
Path = pathOperation.Path;
Operation = new OperationViewModel(pathOperation.Operation, document);
Request = new(() => new RequestViewModel(notificationService, tab)
{
Method = pathOperation.Method.ToUpper(),
RequestDocument = new(Operation.RequestTemplate ?? string.Empty)
});
Url = $"https://swagger.dysolix.dev/lcu/#/{Uri.EscapeDataString(pathOperation.Tag)}/{pathOperation.Operation.OperationId}";
Markdown = $"[{pathOperation.Method.ToUpper()} {Path}]({Url})";
}
public string Path { get; } public string Path { get; }
public OperationViewModel Operation { get; } public OperationViewModel Operation { get; }
public string Url { get; } public string Url { get; }
[ObservableProperty] private bool _isBusy; public string Markdown { get; }
[ObservableProperty] private Lazy<RequestViewModel> _request;
public PathOperationViewModel(PathOperation pathOperation, ILogger<RequestViewModel> requestViewModelLogger, Document document, Tab tab, System.Net.Http.HttpClient httpClient) [ObservableProperty] private bool _isBusy;
{
Path = pathOperation.Path; [ObservableProperty] private Lazy<RequestViewModel> _request;
Operation = new OperationViewModel(pathOperation.Operation, document);
Request = new(() => new RequestViewModel(requestViewModelLogger, tab, httpClient)
{
Method = pathOperation.Method.ToUpper()
});
Url = $"https://swagger.dysolix.dev/lcu/#/{pathOperation.Tag}/{pathOperation.Operation.OperationId}";
}
[RelayCommand] [RelayCommand]
private async Task SendRequest() private async Task SendRequest()
@@ -59,4 +64,10 @@ public partial class PathOperationViewModel : ObservableObject
{ {
App.MainWindow?.Clipboard?.SetTextAsync(Url); App.MainWindow?.Clipboard?.SetTextAsync(Url);
} }
[RelayCommand]
private void CopyMarkdown()
{
App.MainWindow?.Clipboard?.SetTextAsync(Markdown);
}
} }

View File

@@ -0,0 +1,55 @@
using Avalonia;
using AvaloniaEdit.Utils;
using CommunityToolkit.Mvvm.ComponentModel;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
namespace Needlework.Net.ViewModels.Pages.Endpoints;
public partial class PluginViewModel : ObservableObject
{
public PluginViewModel(Services.NotificationService notificationService, string endpoint, Models.Document document, Tab tab)
{
Endpoint = endpoint;
PathOperations = document.Plugins[endpoint].Select(x => new PathOperationViewModel(notificationService, x, document, tab)).ToList();
FilteredPathOperations = new ObservableCollection<PathOperationViewModel>(PathOperations);
}
public string Endpoint { get; }
public string Title => Endpoint;
public List<PathOperationViewModel> PathOperations { get; }
[ObservableProperty]
private ObservableCollection<PathOperationViewModel> _filteredPathOperations;
[ObservableProperty]
private PathOperationViewModel? _selectedPathOperation;
[ObservableProperty]
private string? _search;
[ObservableProperty]
private Vector _offset = new();
[ObservableProperty]
private Vector _paramsOffset = new();
[ObservableProperty]
private Vector _schemasOffset = new();
partial void OnSearchChanged(string? value)
{
FilteredPathOperations.Clear();
if (string.IsNullOrWhiteSpace(value))
{
FilteredPathOperations.AddRange(PathOperations);
return;
}
FilteredPathOperations.AddRange(PathOperations.Where(o => o.Path.Contains(value, StringComparison.InvariantCultureIgnoreCase)));
}
}

View File

@@ -1,7 +1,7 @@
using Avalonia.Collections; using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.ComponentModel;
using Microsoft.OpenApi.Any; using Microsoft.OpenApi.Any;
using Microsoft.OpenApi.Models; using Microsoft.OpenApi.Models;
using Needlework.Net.Helpers;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@@ -9,17 +9,13 @@ namespace Needlework.Net.ViewModels.Pages.Endpoints;
public class PropertyClassViewModel : ObservableObject public class PropertyClassViewModel : ObservableObject
{ {
public string Id { get; }
public IAvaloniaReadOnlyList<PropertyFieldViewModel> PropertyFields { get; } = new AvaloniaList<PropertyFieldViewModel>();
public IAvaloniaReadOnlyList<PropertyEnumViewModel> PropertyEnums { get; } = new AvaloniaList<PropertyEnumViewModel>();
public PropertyClassViewModel(string id, IDictionary<string, OpenApiSchema> properties, IList<IOpenApiAny> enumValue) public PropertyClassViewModel(string id, IDictionary<string, OpenApiSchema> properties, IList<IOpenApiAny> enumValue)
{ {
AvaloniaList<PropertyFieldViewModel> propertyFields = []; List<PropertyFieldViewModel> propertyFields = [];
AvaloniaList<PropertyEnumViewModel> propertyEnums = []; List<PropertyEnumViewModel> propertyEnums = [];
foreach ((var propertyName, var propertySchema) in properties) foreach ((var propertyName, var propertySchema) in properties)
{ {
var type = OperationViewModel.GetSchemaType(propertySchema); var type = OpenApiHelpers.GetSchemaType(propertySchema);
var field = new PropertyFieldViewModel(propertyName, type); var field = new PropertyFieldViewModel(propertyName, type);
propertyFields.Add(field); propertyFields.Add(field);
} }
@@ -32,4 +28,10 @@ public class PropertyClassViewModel : ObservableObject
PropertyEnums = propertyEnums; PropertyEnums = propertyEnums;
Id = id; Id = id;
} }
public string Id { get; }
public List<PropertyFieldViewModel> PropertyFields { get; } = [];
public List<PropertyEnumViewModel> PropertyEnums { get; } = [];
} }

View File

@@ -6,11 +6,11 @@ namespace Needlework.Net.ViewModels.Pages.Endpoints;
public class PropertyEnumViewModel public class PropertyEnumViewModel
{ {
public string Type { get; } = "Enum";
public string Values { get; }
public PropertyEnumViewModel(IList<IOpenApiAny> enumValue) public PropertyEnumViewModel(IList<IOpenApiAny> enumValue)
{ {
Values = $"[{string.Join(", ", enumValue.Select(x => $"\"{((OpenApiString)x).Value}\"").ToList())}]"; Values = $"[{string.Join(", ", enumValue.Select(x => $"\"{((OpenApiString)x).Value}\"").ToList())}]";
} }
public string Type { get; } = "Enum";
public string Values { get; }
} }

View File

@@ -2,12 +2,13 @@
public class PropertyFieldViewModel public class PropertyFieldViewModel
{ {
public string Name { get; }
public string Type { get; }
public PropertyFieldViewModel(string name, string type) public PropertyFieldViewModel(string name, string type)
{ {
Name = name; Name = name;
Type = type; Type = type;
} }
public string Name { get; }
public string Type { get; }
} }

View File

@@ -1,17 +1,10 @@
using BlossomiShymae.GrrrLCU; using BlossomiShymae.Briar.Utils;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
namespace Needlework.Net.ViewModels.Pages.Endpoints; namespace Needlework.Net.ViewModels.Pages.Endpoints;
public partial class ResponseViewModel : ObservableObject public partial class ResponseViewModel : ObservableObject
{ {
[ObservableProperty] private string? _path;
[ObservableProperty] private string? _status;
[ObservableProperty] private string? _authentication;
[ObservableProperty] private string? _username;
[ObservableProperty] private string? _password;
[ObservableProperty] private string? _authorization;
public ResponseViewModel(string path) public ResponseViewModel(string path)
{ {
Path = path; Path = path;
@@ -26,6 +19,24 @@ public partial class ResponseViewModel : ObservableObject
} }
} }
[ObservableProperty]
private string? _path;
[ObservableProperty]
private string? _status;
[ObservableProperty]
private string? _authentication;
[ObservableProperty]
private string? _username;
[ObservableProperty]
private string? _password;
[ObservableProperty]
private string? _authorization;
private static ProcessInfo? GetProcessInfo() private static ProcessInfo? GetProcessInfo()
{ {
if (ProcessFinder.IsActive()) return ProcessFinder.GetProcessInfo(); if (ProcessFinder.IsActive()) return ProcessFinder.GetProcessInfo();

View File

@@ -0,0 +1,15 @@
using CommunityToolkit.Mvvm.ComponentModel;
using Needlework.Net.DataModels;
namespace Needlework.Net.ViewModels.Pages.Home
{
public partial class HextechDocsPostViewModel : ObservableObject
{
public HextechDocsPostViewModel(HextechDocsPost hextechDocsPost)
{
HextechDocsPost = hextechDocsPost;
}
public HextechDocsPost HextechDocsPost { get; }
}
}

View File

@@ -0,0 +1,80 @@
using Avalonia;
using Avalonia.Platform;
using Avalonia.Threading;
using CommunityToolkit.Mvvm.ComponentModel;
using Needlework.Net.Extensions;
using Needlework.Net.Models;
using Needlework.Net.Services;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reactive;
using System.Reactive.Linq;
using System.Text.Json;
using System.Threading.Tasks;
namespace Needlework.Net.ViewModels.Pages.Home;
public partial class HomeViewModel : PageBase, IEnableLogger
{
private readonly HextechDocsService _hextechDocsService;
private readonly IDisposable _carouselNextDisposable;
public HomeViewModel(HextechDocsService hextechDocsService) : base("Home", "fa-solid fa-house")
{
_hextechDocsService = hextechDocsService;
_carouselNextDisposable = Observable.Timer(TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(5))
.Select(time => Unit.Default)
.Subscribe(_ =>
{
if (SelectedHextechDocsPost is HextechDocsPostViewModel vm)
{
var index = HextechDocsPosts.IndexOf(vm);
if (index == HextechDocsPosts.Count - 1)
{
index = 0;
}
else
{
index += 1;
}
SelectedHextechDocsPost = HextechDocsPosts.ElementAt(index);
}
});
}
public List<LibraryViewModel> Libraries { get; } = JsonSerializer.Deserialize<List<Library>>(AssetLoader.Open(new Uri($"avares://NeedleworkDotNet/Assets/libraries.json")))
!.Where(library => library.Tags.Contains("lcu") || library.Tags.Contains("ingame"))
.Select(library => new LibraryViewModel(library))
.ToList();
[ObservableProperty]
private Vector _librariesOffset = new();
[ObservableProperty]
private List<HextechDocsPostViewModel> _hextechDocsPosts = [];
[ObservableProperty]
private HextechDocsPostViewModel? _selectedHextechDocsPost;
public override async Task InitializeAsync()
{
try
{
var posts = await _hextechDocsService.GetPostsAsync();
var hextechDocsPosts = posts.Select(post => new HextechDocsPostViewModel(post)).ToList();
Dispatcher.UIThread.Invoke(() =>
{
HextechDocsPosts = hextechDocsPosts;
SelectedHextechDocsPost = HextechDocsPosts.First();
});
}
catch (Exception ex)
{
this.Log()
.Error(ex, "Failed to get posts from HextechDocs.");
}
}
}

View File

@@ -0,0 +1,15 @@
using CommunityToolkit.Mvvm.ComponentModel;
using Needlework.Net.Models;
namespace Needlework.Net.ViewModels.Pages.Home
{
public partial class LibraryViewModel : ObservableObject
{
public LibraryViewModel(Library library)
{
Library = library;
}
public Library Library { get; }
}
}

View File

@@ -1,34 +0,0 @@
using Avalonia.Platform;
using CommunityToolkit.Mvvm.Input;
using Needlework.Net.Models;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Text.Json;
using System.Threading.Tasks;
namespace Needlework.Net.ViewModels.Pages;
public partial class HomeViewModel : PageBase
{
public List<Library> Libraries { get; } = JsonSerializer.Deserialize<List<Library>>(AssetLoader.Open(new Uri($"avares://NeedleworkDotNet/Assets/libraries.json")))!;
public HomeViewModel() : base("Home", "home", int.MinValue) { }
public override Task InitializeAsync()
{
IsInitialized = true;
return Task.CompletedTask;
}
[RelayCommand]
private void OpenUrl(string url)
{
var process = new Process()
{
StartInfo = new ProcessStartInfo(url) { UseShellExecute = true }
};
process.Start();
}
}

View File

@@ -4,12 +4,11 @@ using System.Threading.Tasks;
namespace Needlework.Net.ViewModels.Pages; namespace Needlework.Net.ViewModels.Pages;
public abstract partial class PageBase(string displayName, string icon, int index = 0) : ObservableValidator public abstract partial class PageBase(string displayName, string icon) : ObservableValidator
{ {
[ObservableProperty] private string _displayName = displayName; public string DisplayName { get; } = displayName;
[ObservableProperty] private string _icon = icon;
[ObservableProperty] private int _index = index; public string Icon { get; } = icon;
[ObservableProperty] private bool _isInitialized;
public abstract Task InitializeAsync(); public abstract Task InitializeAsync();
} }

View File

@@ -0,0 +1,25 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Needlework.Net.ViewModels.Pages
{
public class PageFactory
{
private readonly IEnumerable<PageBase> _pages;
public PageFactory(IEnumerable<PageBase> pages)
{
_pages = pages;
}
public PageBase GetPage<T>() where T : PageBase
{
var page = _pages.Where(page => typeof(T) == page.GetType())
.FirstOrDefault() ?? throw new NotSupportedException(typeof(T).FullName);
Task.Run(page.InitializeAsync);
return page;
}
}
}

View File

@@ -0,0 +1,38 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Needlework.Net.Services;
using Needlework.Net.ViewModels.Pages.Endpoints;
using System;
namespace Needlework.Net.ViewModels.Pages.Schemas
{
public partial class SchemaSearchDetailsViewModel : ObservableObject
{
private readonly SchemaPaneService _schemaPaneService;
public SchemaSearchDetailsViewModel(Tab tab, PropertyClassViewModel vm, SchemaPaneService schemaPaneService)
{
_schemaPaneService = schemaPaneService;
Tab = tab;
Id = vm.Id;
}
public string Id { get; }
public Tab Tab { get; }
public string Document => Tab switch
{
Tab.LCU => "LCU",
Tab.GameClient => "Game Client",
_ => throw new NotImplementedException()
};
[RelayCommand]
private void Display()
{
_schemaPaneService.Add(Id, Tab);
}
}
}

View File

@@ -0,0 +1,77 @@
using Avalonia;
using Avalonia.Threading;
using CommunityToolkit.Mvvm.ComponentModel;
using DebounceThrottle;
using Needlework.Net.Helpers;
using Needlework.Net.Services;
using Needlework.Net.ViewModels.Pages.Endpoints;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Needlework.Net.ViewModels.Pages.Schemas
{
public partial class SchemasViewModel : PageBase
{
private readonly DebounceDispatcher _debounceDispatcher = new(TimeSpan.FromMilliseconds(500));
private readonly DocumentService _documentService;
private readonly SchemaPaneService _schemaPaneService;
private List<SchemaSearchDetailsViewModel> _schemas = [];
public SchemasViewModel(DocumentService documentService, SchemaPaneService schemaPaneService) : base("Schemas", "fa-solid fa-file-lines")
{
_documentService = documentService;
_schemaPaneService = schemaPaneService;
}
[ObservableProperty]
private bool _isBusy = true;
[ObservableProperty]
private string? _search;
[ObservableProperty]
private List<SchemaSearchDetailsViewModel> _schemaItems = [];
[ObservableProperty]
private Vector _offset = new();
partial void OnSearchChanged(string? value)
{
_debounceDispatcher.Debounce(() =>
{
if (string.IsNullOrEmpty(value))
{
Dispatcher.UIThread.Invoke(() =>
{
SchemaItems = _schemas.ToList();
});
return;
}
var items = _schemas.Where(schema => schema.Id.Contains(value, StringComparison.OrdinalIgnoreCase))
.ToList();
Dispatcher.UIThread.Invoke(() => { SchemaItems = items; });
});
}
public override async Task InitializeAsync()
{
var lcuSchemaDocument = await _documentService.GetLcuSchemaDocumentAsync();
var lolClientDocument = await _documentService.GetLolClientDocumentAsync();
Dispatcher.UIThread.Invoke(() =>
{
var schemas = Enumerable.Concat(
lcuSchemaDocument.OpenApiDocument.Components.Schemas.Values.Select(schema => new SchemaSearchDetailsViewModel(Tab.LCU, OpenApiHelpers.WalkSchema(schema, lcuSchemaDocument.OpenApiDocument), _schemaPaneService)),
lolClientDocument.OpenApiDocument.Components.Schemas.Values.Select(schema => new SchemaSearchDetailsViewModel(Tab.GameClient, OpenApiHelpers.WalkSchema(schema, lolClientDocument.OpenApiDocument), _schemaPaneService))
).ToList();
_schemas = schemas;
SchemaItems = schemas.ToList();
IsBusy = false;
});
}
}
}

View File

@@ -0,0 +1,197 @@
using Akavache;
using Avalonia.Threading;
using BlossomiShymae.Briar;
using BlossomiShymae.Briar.Utils;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using FluentAvalonia.UI.Controls;
using Needlework.Net.Constants;
using Needlework.Net.DataModels;
using Needlework.Net.Extensions;
using Needlework.Net.Models;
using Needlework.Net.Services;
using System;
using System.Net.Http.Json;
using System.Reactive;
using System.Reactive.Linq;
using System.Threading.Tasks;
namespace Needlework.Net.ViewModels.Pages.Settings
{
public partial class SettingsViewModel : PageBase, IEnableLogger
{
private readonly IBlobCache _blobCache;
private readonly IDisposable _checkForUpdatesDisposable;
private readonly IDisposable _checkForSchemaVersionDisposable;
private readonly GithubService _githubService;
private readonly DocumentService _documentService;
private readonly NotificationService _notificationService;
private readonly TaskCompletionSource<bool> _initializeTaskCompletionSource = new();
public SettingsViewModel(IBlobCache blobCache, GithubService githubService, DocumentService documentService, NotificationService notificationService) : base("Settings", "fa-solid fa-gear")
{
_blobCache = blobCache;
_githubService = githubService;
_documentService = documentService;
_notificationService = notificationService;
_checkForUpdatesDisposable = Observable.Timer(TimeSpan.Zero, Intervals.CheckForUpdates)
.Select(time => Unit.Default)
.Subscribe(async _ =>
{
try
{
await _initializeTaskCompletionSource.Task;
if (AppSettings!.IsCheckForUpdates)
{
await CheckForUpdatesAsync();
}
}
catch (Exception ex)
{
var message = "Failed to check for updates. Please check your internet connection or try again later.";
this.Log()
.Error(ex, message);
_notificationService.Notify(AppInfo.Name, message, InfoBarSeverity.Error);
_checkForUpdatesDisposable?.Dispose();
}
});
_checkForSchemaVersionDisposable = Observable.Timer(TimeSpan.Zero, TimeSpan.FromMinutes(5))
.Select(time => Unit.Default)
.Subscribe(async _ =>
{
try
{
await _initializeTaskCompletionSource.Task;
if (AppSettings!.IsCheckForSchema)
{
await CheckForSchemaVersionAsync();
}
}
catch (Exception ex)
{
var message = "Failed to check for schema version. Please check your internet connection or try again later.";
this.Log()
.Error(ex, message);
_notificationService.Notify(AppInfo.Name, message, InfoBarSeverity.Error);
_checkForSchemaVersionDisposable?.Dispose();
}
});
}
[ObservableProperty]
private bool _isBusy = true;
[ObservableProperty]
private AppSettings? _appSettings;
[ObservableProperty]
[NotifyPropertyChangedFor(nameof(UpdateCheckTitle), nameof(UpdateCheckIconValue), nameof(UpdateCheckLastChecked))]
private Guid _upToDateGuid = Guid.Empty;
public bool IsUpToDate { get; private set; }
public bool IsSchemaVersionChecked { get; private set; }
public string UpdateCheckTitle => IsUpToDate switch
{
true => "You're up to date",
false => "You're out of date"
};
public string UpdateCheckIconValue => IsUpToDate switch
{
true => "fa-heart-circle-check",
false => "fa-heart-circle-exclamation"
};
public string UpdateCheckLastChecked => $"Last checked: {DateTime.Now:dddd}, {DateTime.Now:T}";
partial void OnAppSettingsChanged(AppSettings? value)
{
if (AppSettings is AppSettings appSettings)
{
_blobCache.InsertObject(BlobCacheKeys.AppSettings, appSettings);
}
}
public override async Task InitializeAsync()
{
await Dispatcher.UIThread.InvokeAsync(async () =>
{
try
{
AppSettings = await _blobCache.GetObject<AppSettings>(BlobCacheKeys.AppSettings);
}
catch (Exception ex)
{
this.Log()
.Warning(ex, "Failed to get application settings.");
AppSettings = new();
}
finally
{
AppSettings!.PropertyChanged += (s, e) => OnAppSettingsChanged((AppSettings?)s);
IsBusy = false;
_initializeTaskCompletionSource.SetResult(true);
}
});
}
[RelayCommand]
private async Task CheckForUpdatesAsync()
{
var release = await _githubService.GetLatestReleaseAsync();
if (release.IsLatest(AppInfo.Version))
{
this.Log()
.Information("New version available: {TagName}", release.TagName);
_notificationService.Notify(AppInfo.Name, $"New version available: {release.TagName}", InfoBarSeverity.Informational, null, "https://github.com/BlossomiShymae/Needlework.Net/releases/latest");
_checkForUpdatesDisposable?.Dispose();
IsUpToDate = false;
}
else
{
IsUpToDate = true;
}
UpToDateGuid = Guid.NewGuid();
}
private async Task CheckForSchemaVersionAsync()
{
if (!ProcessFinder.IsPortOpen()) return;
var lcuSchemaDocument = await _documentService.GetLcuSchemaDocumentAsync();
var client = Connector.GetLcuHttpClientInstance();
var currentSemVer = lcuSchemaDocument.Info.Version.Split('.');
var systemBuild = await client.GetFromJsonAsync<SystemBuild>("/system/v1/builds") ?? throw new NullReferenceException();
var latestSemVer = systemBuild.Version.Split('.');
if (!IsSchemaVersionChecked)
{
this.Log()
.Information("LCU Schema (current): {Version}", lcuSchemaDocument.Info.Version);
this.Log()
.Information("LCU Schema (latest): {Version}", systemBuild.Version);
IsSchemaVersionChecked = true;
}
bool isVersionMatching = currentSemVer[0] == latestSemVer[0] && currentSemVer[1] == latestSemVer[1]; // Compare major and minor versions
if (!isVersionMatching)
{
this.Log()
.Warning("LCU Schema outdated: Current {CurrentVersion}, Latest {LatestVersion}", lcuSchemaDocument.Info.Version, systemBuild.Version);
_notificationService.Notify(AppInfo.Name, $"LCU Schema is outdated compared to latest system build. Consider submitting a pull request on dysolix/hasagi-types.\nCurrent: {string.Join(".", currentSemVer)}\nLatest: {string.Join(".", latestSemVer)}", InfoBarSeverity.Warning, null, "https://github.com/dysolix/hasagi-types#updating-the-types");
_checkForSchemaVersionDisposable?.Dispose();
}
}
}
}

View File

@@ -1,21 +1,23 @@
using BlossomiShymae.GrrrLCU; using BlossomiShymae.Briar.WebSocket.Events;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using System; using System;
namespace Needlework.Net.ViewModels.Pages.Websocket; namespace Needlework.Net.ViewModels.Pages.WebSocket;
public class EventViewModel : ObservableObject public class EventViewModel : ObservableObject
{ {
public string Time { get; }
public string Type { get; }
public string Uri { get; }
public string Key => $"{Time} {Type} {Uri}";
public EventViewModel(EventData eventData) public EventViewModel(EventData eventData)
{ {
Time = $"{DateTime.Now:HH:mm:ss.fff}"; Time = $"{DateTime.Now:HH:mm:ss.fff}";
Type = eventData?.EventType?.ToUpper() ?? string.Empty; Type = eventData?.EventType?.ToUpper() ?? string.Empty;
Uri = eventData?.Uri ?? string.Empty; Uri = eventData?.Uri ?? string.Empty;
} }
public string Time { get; }
public string Type { get; }
public string Uri { get; }
public string Key => $"{Time} {Type} {Uri}";
} }

View File

@@ -1,10 +1,17 @@
using Avalonia.Collections; using Avalonia;
using BlossomiShymae.GrrrLCU; using Avalonia.Collections;
using AvaloniaEdit.Document;
using BlossomiShymae.Briar;
using BlossomiShymae.Briar.WebSocket.Events;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input; using CommunityToolkit.Mvvm.Input;
using CommunityToolkit.Mvvm.Messaging; using CommunityToolkit.Mvvm.Messaging;
using Microsoft.Extensions.Logging; using Flurl.Http;
using Flurl.Http.Configuration;
using Needlework.Net.Constants;
using Needlework.Net.Extensions;
using Needlework.Net.Messages; using Needlework.Net.Messages;
using Needlework.Net.Services;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
@@ -16,67 +23,87 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Websocket.Client; using Websocket.Client;
namespace Needlework.Net.ViewModels.Pages.Websocket; namespace Needlework.Net.ViewModels.Pages.WebSocket;
public partial class WebsocketViewModel : PageBase public partial class WebSocketViewModel : PageBase, IEnableLogger
{ {
public ObservableCollection<EventViewModel> EventLog { get; } = [];
public SemaphoreSlim EventLogLock { get; } = new(1, 1);
[NotifyPropertyChangedFor(nameof(FilteredEventLog))]
[ObservableProperty] private string _search = string.Empty;
[ObservableProperty] private bool _isAttach = true;
[ObservableProperty] private bool _isTail = false;
[ObservableProperty] private EventViewModel? _selectedEventLog = null;
[ObservableProperty] private IAvaloniaList<string> _eventTypes = new AvaloniaList<string>();
[ObservableProperty] private string _eventType = "OnJsonApiEvent";
private Dictionary<string, EventMessage> _events = []; private Dictionary<string, EventMessage> _events = [];
private readonly IFlurlClient _githubUserContentClient;
private readonly NotificationService _notificationService;
private readonly object _tokenLock = new();
public WebSocketViewModel(IFlurlClientCache clients, NotificationService notificationService) : base("Event Viewer", "fa-solid fa-plug")
{
_githubUserContentClient = clients.Get(FlurlClientKeys.GithubUserContentClient);
_notificationService = notificationService;
EventLog.CollectionChanged += (s, e) => OnPropertyChanged(nameof(FilteredEventLog));
}
public ObservableCollection<EventViewModel> EventLog { get; } = [];
public SemaphoreSlim EventLogLock { get; } = new(1, 1);
public WebsocketClient? Client { get; set; } public WebsocketClient? Client { get; set; }
public List<IDisposable> ClientDisposables = []; public List<IDisposable> ClientDisposables = [];
private readonly object _tokenLock = new();
public CancellationTokenSource TokenSource { get; set; } = new(); public CancellationTokenSource TokenSource { get; set; } = new();
public HttpClient HttpClient { get; }
public IReadOnlyList<EventViewModel> FilteredEventLog => string.IsNullOrWhiteSpace(Search) ? EventLog : [.. EventLog.Where(x => x.Key.Contains(Search, StringComparison.InvariantCultureIgnoreCase))]; public IReadOnlyList<EventViewModel> FilteredEventLog => string.IsNullOrWhiteSpace(Search) ? EventLog : [.. EventLog.Where(x => x.Key.Contains(Search, StringComparison.InvariantCultureIgnoreCase))];
private readonly ILogger<WebsocketViewModel> _logger; [ObservableProperty]
private Vector _eventLogOffset = new();
public WebsocketViewModel(HttpClient httpClient, ILogger<WebsocketViewModel> logger) : base("Event Viewer", "plug", -100) [NotifyPropertyChangedFor(nameof(FilteredEventLog))]
{ [ObservableProperty]
_logger = logger; private string _search = string.Empty;
HttpClient = httpClient;
EventLog.CollectionChanged += (s, e) => OnPropertyChanged(nameof(FilteredEventLog));
Task.Run(async () =>
{
await InitializeEventTypes();
InitializeWebsocket();
});
}
public override Task InitializeAsync() [ObservableProperty]
private bool _isAttach = true;
[ObservableProperty]
private bool _isTail = false;
[ObservableProperty]
private EventViewModel? _selectedEventLog = null;
[ObservableProperty]
private IAvaloniaList<string> _eventTypes = new AvaloniaList<string>();
[ObservableProperty]
private string _eventType = "OnJsonApiEvent";
[ObservableProperty]
private TextDocument _document = new();
[ObservableProperty]
private Vector _documentOffset = new();
public override async Task InitializeAsync()
{ {
IsInitialized = true; await InitializeEventTypes();
return Task.CompletedTask; InitializeWebsocket();
} }
private async Task InitializeEventTypes() private async Task InitializeEventTypes()
{ {
try try
{ {
var file = await HttpClient.GetStringAsync("https://raw.githubusercontent.com/dysolix/hasagi-types/refs/heads/main/dist/lcu-events.d.ts"); var file = await _githubUserContentClient.Request("/dysolix/hasagi-types/refs/heads/main/dist/lcu-events.d.ts")
.GetStringAsync();
var matches = EventTypesRegex().Matches(file); var matches = EventTypesRegex().Matches(file);
Avalonia.Threading.Dispatcher.UIThread.Invoke(() => EventTypes.AddRange(matches.Select(m => m.Groups[1].Value))); Avalonia.Threading.Dispatcher.UIThread.Invoke(() => EventTypes.AddRange(matches.Select(m => m.Groups[1].Value)));
} }
catch (HttpRequestException ex) catch (HttpRequestException ex)
{ {
_logger.LogError(ex, "Failed to get event types"); var message = "Failed to get event types from GitHub. Please check your internet connection or try again later.";
WeakReferenceMessenger.Default.Send(new InfoBarUpdateMessage(new("Failed to get event types", true, ex.Message, FluentAvalonia.UI.Controls.InfoBarSeverity.Error, TimeSpan.FromSeconds(10)))); this.Log()
.Error(ex, message);
_notificationService.Notify(AppInfo.Name, message, FluentAvalonia.UI.Controls.InfoBarSeverity.Error);
} }
} }
@@ -86,7 +113,8 @@ public partial class WebsocketViewModel : PageBase
{ {
if (Client != null) if (Client != null)
{ {
_logger.LogDebug("Disposing old connection"); this.Log()
.Debug("Disposing old connection");
foreach (var disposable in ClientDisposables) foreach (var disposable in ClientDisposables)
disposable.Dispose(); disposable.Dispose();
ClientDisposables.Clear(); ClientDisposables.Clear();
@@ -116,7 +144,8 @@ public partial class WebsocketViewModel : PageBase
}) })
{ IsBackground = true }; { IsBackground = true };
thread.Start(); thread.Start();
_logger.LogDebug("Initialized new connection: {EventType}", EventType); this.Log()
.Debug("Initialized new connection: {EventType}", EventType);
TokenSource = tokenSource; TokenSource = tokenSource;
} }
} }
@@ -128,7 +157,7 @@ public partial class WebsocketViewModel : PageBase
{ {
var text = JsonSerializer.Serialize(message, App.JsonSerializerOptions); var text = JsonSerializer.Serialize(message, App.JsonSerializerOptions);
if (text.Length >= App.MaxCharacters) WeakReferenceMessenger.Default.Send(new OopsiesDialogRequestedMessage(text)); if (text.Length >= App.MaxCharacters) WeakReferenceMessenger.Default.Send(new OopsiesDialogRequestedMessage(text));
else WeakReferenceMessenger.Default.Send(new ResponseUpdatedMessage(text), nameof(WebsocketViewModel)); else Document = new(text);
} }
} }
@@ -137,16 +166,19 @@ public partial class WebsocketViewModel : PageBase
{ {
_events.Clear(); _events.Clear();
EventLog.Clear(); EventLog.Clear();
Document = new();
} }
private void OnReconnection(ReconnectionInfo info) private void OnReconnection(ReconnectionInfo info)
{ {
_logger.LogTrace("Reconnected: {Type}", info.Type); this.Log()
.Debug("Reconnected: {Type}", info.Type);
} }
private void OnDisconnection(DisconnectionInfo info) private void OnDisconnection(DisconnectionInfo info)
{ {
_logger.LogTrace("Disconnected: {Type}", info.Type); this.Log()
.Debug("Disconnected: {Type}", info.Type);
InitializeWebsocket(); InitializeWebsocket();
} }

View File

@@ -1,10 +1,13 @@
using Avalonia.Media; using Avalonia;
using BlossomiShymae.GrrrLCU; using Avalonia.Media;
using AvaloniaEdit.Document;
using BlossomiShymae.Briar;
using BlossomiShymae.Briar.Utils;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Messaging; using CommunityToolkit.Mvvm.Messaging;
using Microsoft.Extensions.Logging; using Needlework.Net.Extensions;
using Needlework.Net.Messages; using Needlework.Net.Messages;
using Needlework.Net.ViewModels.MainWindow; using Needlework.Net.Services;
using Needlework.Net.ViewModels.Pages.Endpoints; using Needlework.Net.ViewModels.Pages.Endpoints;
using System; using System;
using System.Net.Http; using System.Net.Http;
@@ -13,37 +16,66 @@ using System.Threading.Tasks;
namespace Needlework.Net.ViewModels.Shared; namespace Needlework.Net.ViewModels.Shared;
public partial class RequestViewModel : ObservableObject public partial class RequestViewModel : ObservableObject, IEnableLogger
{ {
[ObservableProperty] private string? _method = "GET"; private readonly NotificationService _notificationService;
[ObservableProperty] private SolidColorBrush _color = new(GetColor("GET"));
[ObservableProperty] private bool _isRequestBusy = false;
[ObservableProperty] private string? _requestPath = null;
[ObservableProperty] private string? _requestBody = null;
[ObservableProperty] private string? _responsePath = null;
[ObservableProperty] private string? _responseStatus = null;
[ObservableProperty] private string? _responseAuthentication = null;
[ObservableProperty] private string? _responseUsername = null;
[ObservableProperty] private string? _responsePassword = null;
[ObservableProperty] private string? _responseAuthorization = null;
[ObservableProperty] private string? _responseBody = null;
public event EventHandler<RequestViewModel>? RequestText;
public event EventHandler<string>? UpdateText;
private readonly ILogger<RequestViewModel> _logger;
private readonly Tab _tab; private readonly Tab _tab;
private readonly HttpClient _httpClient;
public RequestViewModel(ILogger<RequestViewModel> logger, Pages.Endpoints.Tab tab, HttpClient httpClient) public RequestViewModel(NotificationService notificationService, Tab tab)
{ {
_logger = logger;
_tab = tab; _tab = tab;
_httpClient = httpClient; _notificationService = notificationService;
} }
[ObservableProperty]
private string? _method = "GET";
[ObservableProperty]
private SolidColorBrush _color = new(GetColor("GET"));
[ObservableProperty]
private bool _isRequestBusy;
[ObservableProperty]
private string? _requestPath;
[ObservableProperty]
private TextDocument _requestDocument = new();
[ObservableProperty]
private Vector _requestDocumentOffset = new();
[ObservableProperty]
private TextDocument _responseDocument = new();
[ObservableProperty]
private Vector _responseDocumentOffset = new();
[ObservableProperty]
private double _responseDocumentHorizontalScrollBar;
[ObservableProperty]
private double _responseDocumentVerticalScrollBar;
[ObservableProperty]
private string? _responsePath;
[ObservableProperty]
private string? _responseStatus;
[ObservableProperty]
private string? _responseAuthentication;
[ObservableProperty]
private string? _responseUsername;
[ObservableProperty]
private string? _responsePassword;
[ObservableProperty]
private string? _responseAuthorization;
partial void OnMethodChanged(string? oldValue, string? newValue) partial void OnMethodChanged(string? oldValue, string? newValue)
{ {
if (newValue == null) return; if (newValue == null) return;
@@ -75,34 +107,34 @@ public partial class RequestViewModel : ObservableObject
throw new Exception("Path is empty."); throw new Exception("Path is empty.");
var method = GetMethod(); var method = GetMethod();
_logger.LogDebug("Sending request: {Tuple}", (Method, RequestPath)); this.Log()
RequestText?.Invoke(this, this); .Debug("Sending request: {Tuple}", (Method, RequestPath));
var content = new StringContent(RequestBody ?? string.Empty, new System.Net.Http.Headers.MediaTypeHeaderValue("application/json")); var requestBody = RequestDocument.Text;
var responsePath = $"https://127.0.0.1:2999{RequestPath}"; var content = new StringContent(requestBody, new System.Net.Http.Headers.MediaTypeHeaderValue("application/json"));
var response = await _httpClient.SendAsync(new HttpRequestMessage(method, responsePath) { Content = content }); var client = Connector.GetGameHttpClientInstance();
var response = await client.SendAsync(new HttpRequestMessage(method, RequestPath) { Content = content });
var responseBody = await response.Content.ReadAsByteArrayAsync(); var responseBody = await response.Content.ReadAsByteArrayAsync();
var body = responseBody.Length > 0 ? JsonSerializer.Serialize(JsonSerializer.Deserialize<object>(responseBody), App.JsonSerializerOptions) : string.Empty; var body = responseBody.Length > 0 ? JsonSerializer.Serialize(JsonSerializer.Deserialize<object>(responseBody), App.JsonSerializerOptions) : string.Empty;
if (body.Length > App.MaxCharacters) if (body.Length > App.MaxCharacters)
{ {
WeakReferenceMessenger.Default.Send(new OopsiesDialogRequestedMessage(body)); WeakReferenceMessenger.Default.Send(new OopsiesDialogRequestedMessage(body));
UpdateText?.Invoke(this, string.Empty); ResponseDocument = new();
} }
else else
{ {
ResponseBody = body; ResponseDocument = new(body);
UpdateText?.Invoke(this, body);
} }
ResponseStatus = $"{(int)response.StatusCode} {response.StatusCode.ToString()}"; ResponseStatus = $"{(int)response.StatusCode} {response.StatusCode.ToString()}";
ResponsePath = responsePath; ResponsePath = $"https://127.0.0.1:2999{RequestPath}";
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Request failed: {Tuple}", (Method, RequestPath)); this.Log()
WeakReferenceMessenger.Default.Send(new InfoBarUpdateMessage(new InfoBarViewModel("Request Failed", true, ex.Message, FluentAvalonia.UI.Controls.InfoBarSeverity.Error, TimeSpan.FromSeconds(5)))); .Error(ex, "Request failed: {Tuple}", (Method, RequestPath));
UpdateText?.Invoke(this, string.Empty); _notificationService.Notify("Request failed", ex.Message, FluentAvalonia.UI.Controls.InfoBarSeverity.Error);
ResponseStatus = null; ResponseStatus = null;
ResponsePath = null; ResponsePath = null;
@@ -110,7 +142,7 @@ public partial class RequestViewModel : ObservableObject
ResponseAuthorization = null; ResponseAuthorization = null;
ResponseUsername = null; ResponseUsername = null;
ResponsePassword = null; ResponsePassword = null;
ResponseBody = null; ResponseDocument = new();
} }
finally finally
{ {
@@ -127,11 +159,12 @@ public partial class RequestViewModel : ObservableObject
throw new Exception("Path is empty."); throw new Exception("Path is empty.");
var method = GetMethod(); var method = GetMethod();
_logger.LogDebug("Sending request: {Tuple}", (Method, RequestPath)); this.Log()
.Debug("Sending request: {Tuple}", (Method, RequestPath));
var processInfo = ProcessFinder.GetProcessInfo(); var processInfo = ProcessFinder.GetProcessInfo();
RequestText?.Invoke(this, this); var requestBody = RequestDocument.Text;
var content = new StringContent(RequestBody ?? string.Empty, new System.Net.Http.Headers.MediaTypeHeaderValue("application/json")); var content = new StringContent(requestBody, new System.Net.Http.Headers.MediaTypeHeaderValue("application/json"));
var client = Connector.GetLcuHttpClientInstance(); var client = Connector.GetLcuHttpClientInstance();
var response = await client.SendAsync(new(method, RequestPath) { Content = content }); var response = await client.SendAsync(new(method, RequestPath) { Content = content });
var riotAuthentication = new RiotAuthentication(processInfo.RemotingAuthToken); var riotAuthentication = new RiotAuthentication(processInfo.RemotingAuthToken);
@@ -141,12 +174,11 @@ public partial class RequestViewModel : ObservableObject
if (body.Length >= App.MaxCharacters) if (body.Length >= App.MaxCharacters)
{ {
WeakReferenceMessenger.Default.Send(new OopsiesDialogRequestedMessage(body)); WeakReferenceMessenger.Default.Send(new OopsiesDialogRequestedMessage(body));
UpdateText?.Invoke(this, string.Empty); ResponseDocument = new();
} }
else else
{ {
ResponseBody = body; ResponseDocument = new(body);
UpdateText?.Invoke(this, body);
} }
ResponseStatus = $"{(int)response.StatusCode} {response.StatusCode.ToString()}"; ResponseStatus = $"{(int)response.StatusCode} {response.StatusCode.ToString()}";
@@ -158,9 +190,9 @@ public partial class RequestViewModel : ObservableObject
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Request failed: {Tuple}", (Method, RequestPath)); this.Log()
WeakReferenceMessenger.Default.Send(new InfoBarUpdateMessage(new InfoBarViewModel("Request Failed", true, ex.Message, FluentAvalonia.UI.Controls.InfoBarSeverity.Error, TimeSpan.FromSeconds(5)))); .Error(ex, "Request failed: {Tuple}", (Method, RequestPath));
UpdateText?.Invoke(this, string.Empty); _notificationService.Notify("Request failed", ex.Message, FluentAvalonia.UI.Controls.InfoBarSeverity.Error);
ResponseStatus = null; ResponseStatus = null;
ResponsePath = null; ResponsePath = null;
@@ -168,7 +200,7 @@ public partial class RequestViewModel : ObservableObject
ResponseAuthorization = null; ResponseAuthorization = null;
ResponseUsername = null; ResponseUsername = null;
ResponsePassword = null; ResponsePassword = null;
ResponseBody = null; ResponseDocument = new();
} }
finally finally
{ {

View File

@@ -8,15 +8,17 @@
xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
xmlns:i="https://github.com/projektanker/icons.avalonia" xmlns:i="https://github.com/projektanker/icons.avalonia"
xmlns:vm="using:Needlework.Net.ViewModels.MainWindow" xmlns:vm="using:Needlework.Net.ViewModels.MainWindow"
xmlns:views="using:Needlework.Net.Views.MainWindow"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Needlework.Net.Views.MainWindow.MainWindowView" x:Class="Needlework.Net.Views.MainWindow.MainWindowView"
x:DataType="vm:MainWindowViewModel" x:DataType="vm:MainWindowViewModel"
Title="Needlework.Net" Title="{Binding AppName}"
Icon="/Assets/app.ico" Icon="/Assets/app.ico"
Width="1280" Width="1280"
Height="720"> Height="720">
<Grid RowDefinitions="auto,*"> <Grid RowDefinitions="auto,*">
<Grid ColumnDefinitions="auto,auto,*,auto" <Grid Name="TitleBarHost"
ColumnDefinitions="auto,auto,*,auto"
Background="Transparent" Background="Transparent"
Height="40" Height="40"
Grid.Row="0"> Grid.Row="0">
@@ -28,75 +30,121 @@
DockPanel.Dock="Left" DockPanel.Dock="Left"
Grid.Column="0"/> Grid.Column="0"/>
<TextBlock FontSize="12" <TextBlock FontSize="12"
Text="{Binding Title}"
IsHitTestVisible="False" IsHitTestVisible="False"
VerticalAlignment="Center" VerticalAlignment="Center"
Grid.Column="1"> Grid.Column="1"/>
Needlework.Net <Border Grid.Column="2" Padding="4" IsHitTestVisible="True">
</TextBlock> <StackPanel HorizontalAlignment="Center"
</Grid> Orientation="Horizontal">
<ui:NavigationView AlwaysShowHeader="False" <AutoCompleteBox Name="SchemaAutoCompleteBox"
PaneDisplayMode="Left" Margin="0 0 8 0"
IsSettingsVisible="False" MinWidth="200"
IsPaneOpen="False" MaxWidth="500"
OpenPaneLength="200" MaxDropDownHeight="400"
Grid.Row="1" Watermark="Search schemas"
MenuItemsSource="{Binding MenuItems}" FilterMode="None"
SelectedItem="{Binding SelectedMenuItem}"> ValueMemberBinding="{Binding Key, DataType=vm:SchemaSearchDetailsViewModel}"
<ui:NavigationView.PaneFooter> AsyncPopulator="{Binding PopulateAsync}"
<StackPanel Orientation="Vertical"> SelectedItem="{Binding SelectedSchemaSearchDetails}">
<StackPanel.Styles> <AutoCompleteBox.ItemTemplate>
<Style Selector="materialIcons|MaterialIcon"> <DataTemplate x:DataType="vm:SchemaSearchDetailsViewModel">
<Setter Property="Width" Value="20" /> <ContentControl Content="{Binding}"/>
<Setter Property="Height" Value="20" /> </DataTemplate>
</Style> </AutoCompleteBox.ItemTemplate>
<Style Selector="i|Icon"> </AutoCompleteBox>
<Setter Property="FontSize" Value="20" /> <Button i:Attached.Icon="fa-solid fa-file-lines"
</Style> FontSize="20"
</StackPanel.Styles> Command="{Binding OpenSchemaPaneCommand}"/>
<Button
Theme="{StaticResource TransparentButton}"
VerticalAlignment="Center"
Command="{Binding OpenUrlCommand}"
CommandParameter="https://github.com/BlossomiShymae/Needlework.Net"
ToolTip.Tip="Open on GitHub."
Margin="4">
<materialIcons:MaterialIcon Kind="Github" />
</Button>
<Button
Theme="{StaticResource TransparentButton}"
VerticalAlignment="Center"
Command="{Binding OpenUrlCommand}"
CommandParameter="https://discord.gg/chEvEX5J4E"
ToolTip.Tip="Open Discord server."
Margin="4">
<i:Icon Value="fa-brand fa-discord" />
</Button>
</StackPanel> </StackPanel>
</ui:NavigationView.PaneFooter> </Border>
<Grid> </Grid>
<TransitioningContentControl Content="{Binding CurrentPage}"/> <SplitView Grid.Row="1"
<Button Content="{Binding Version}" PaneBackground="Transparent"
Background="RoyalBlue" IsPaneOpen="{Binding IsPaneOpen}"
HorizontalAlignment="Right" DisplayMode="Inline"
VerticalAlignment="Bottom" OpenPaneLength="350"
Margin="16"/> PanePlacement="Right">
<ItemsRepeater ItemsSource="{Binding InfoBarItems}" <ui:NavigationView AlwaysShowHeader="False"
VerticalAlignment="Bottom"> PaneDisplayMode="Left"
<ItemsRepeater.ItemTemplate> IsSettingsVisible="False"
<DataTemplate> IsPaneOpen="False"
<Border Margin="4"> OpenPaneLength="200"
<ui:InfoBar Grid.Row="1"
Background="{DynamicResource SolidBackgroundFillColorBaseBrush}" Name="NavigationView">
Title="{Binding Title}" <ui:NavigationView.PaneFooter>
IsOpen="{Binding IsOpen}" <StackPanel Orientation="Vertical">
Severity="{Binding Severity}" <StackPanel.Styles>
Message="{Binding Message}" <Style Selector="materialIcons|MaterialIcon">
ActionButton="{Binding ActionButton}"/> <Setter Property="Width" Value="20" />
</Border> <Setter Property="Height" Value="20" />
</DataTemplate> </Style>
</ItemsRepeater.ItemTemplate> <Style Selector="i|Icon">
</ItemsRepeater> <Setter Property="FontSize" Value="20" />
</Grid> </Style>
</ui:NavigationView> </StackPanel.Styles>
<Button
Theme="{StaticResource TransparentButton}"
VerticalAlignment="Center"
Command="{Binding OpenUrlCommand}"
CommandParameter="https://github.com/BlossomiShymae/Needlework.Net"
ToolTip.Tip="Open on GitHub."
Margin="4">
<materialIcons:MaterialIcon Kind="Github" />
</Button>
<Button
Theme="{StaticResource TransparentButton}"
VerticalAlignment="Center"
Command="{Binding OpenUrlCommand}"
CommandParameter="https://discord.gg/chEvEX5J4E"
ToolTip.Tip="Open Discord server."
Margin="4">
<i:Icon Value="fa-brand fa-discord" />
</Button>
</StackPanel>
</ui:NavigationView.PaneFooter>
<Grid>
<TransitioningContentControl Name="CurrentPageContentControl"/>
<ItemsControl ItemsSource="{Binding Notifications}"
VerticalAlignment="Bottom">
<ItemsControl.ItemTemplate>
<DataTemplate x:DataType="vm:NotificationViewModel">
<ContentControl Content="{Binding}"/>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</Grid>
</ui:NavigationView>
<SplitView.Pane>
<Grid RowDefinitions="auto,*">
<ui:CommandBar DefaultLabelPosition="Right"
Grid.Row="0">
<ui:CommandBar.PrimaryCommands>
<ui:CommandBarButton Name="CloseCommandBarButton" Label="Close" Command="{Binding CloseSchemaCommand}"/>
<ui:CommandBarButton Name="CloseAllCommandBarButton" Label="Close all" Command="{Binding CloseSchemaAllCommand}"/>
</ui:CommandBar.PrimaryCommands>
</ui:CommandBar>
<ListBox ItemsSource="{Binding Schemas}" SelectedItem="{Binding SelectedSchema}" Margin="8 0 8 0" Grid.Row="1">
<ListBox.Styles>
<Style Selector="ListBoxItem">
<Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
<Setter Property="Padding" Value="0"></Setter>
<Setter Property="Margin" Value="0 0 0 8"></Setter>
</Style>
</ListBox.Styles>
<ListBox.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel/>
</ItemsPanelTemplate>
</ListBox.ItemsPanel>
<ListBox.ItemTemplate>
<DataTemplate>
<ContentControl Content="{Binding}"/>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
</Grid>
</SplitView.Pane>
</SplitView>
</Grid> </Grid>
</Window> </Window>

View File

@@ -1,7 +1,21 @@
using System; using Avalonia;
using System.Runtime.InteropServices;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Interactivity;
using Avalonia.Media;
using FluentAvalonia.UI.Controls;
using FluentAvalonia.UI.Windowing; using FluentAvalonia.UI.Windowing;
using Needlework.Net.ViewModels.MainWindow;
using Needlework.Net.ViewModels.Pages;
using Needlework.Net.ViewModels.Pages.About;
using Needlework.Net.ViewModels.Pages.Console;
using Needlework.Net.ViewModels.Pages.Endpoints;
using Needlework.Net.ViewModels.Pages.Home;
using Needlework.Net.ViewModels.Pages.Schemas;
using Needlework.Net.ViewModels.Pages.Settings;
using Needlework.Net.ViewModels.Pages.WebSocket;
using System;
using System.Collections.Generic;
using System.Linq;
namespace Needlework.Net.Views.MainWindow; namespace Needlework.Net.Views.MainWindow;
@@ -10,21 +24,77 @@ public partial class MainWindowView : AppWindow
public MainWindowView() public MainWindowView()
{ {
InitializeComponent(); InitializeComponent();
}
public MainWindowView(MainWindowViewModel mainWindowViewModel, PageFactory pageFactory)
{
InitializeComponent();
DataContext = mainWindowViewModel;
TitleBar.ExtendsContentIntoTitleBar = true; TitleBar.ExtendsContentIntoTitleBar = true;
TitleBar.TitleBarHitTestType = TitleBarHitTestType.Complex;
TransparencyLevelHint = [WindowTransparencyLevel.Mica, WindowTransparencyLevel.None]; TransparencyLevelHint = [WindowTransparencyLevel.Mica, WindowTransparencyLevel.None];
Background = IsWindows11 ? null : Background;
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) NavigationView.MenuItems = [.. new List<PageBase>()
{ {
if (IsWindows11OrNewer()) pageFactory.GetPage<HomeViewModel>(),
pageFactory.GetPage<EndpointsViewModel>(),
pageFactory.GetPage<ConsoleViewModel>(),
pageFactory.GetPage<WebSocketViewModel>(),
pageFactory.GetPage<SchemasViewModel>(),
pageFactory.GetPage<SettingsViewModel>(),
pageFactory.GetPage<AboutViewModel>(),
}
.Select(ToNavigationViewItem)];
NavigationView.GetObservable(NavigationView.SelectedItemProperty)
.Subscribe(value =>
{ {
Background = null; if (value is NavigationViewItem item)
{
CurrentPageContentControl.Content = item.Tag;
}
});
NavigationView.SelectedItem = NavigationView.MenuItems.Cast<NavigationViewItem>()
.First();
SchemaAutoCompleteBox.MinimumPopulateDelay = TimeSpan.FromSeconds(1);
SchemaAutoCompleteBox.MinimumPrefixLength = 3;
App.Current!.TryGetResource("TextFillColorPrimaryBrush", ActualThemeVariant, out var brush);
CloseCommandBarButton.IconSource = new ImageIconSource
{
Source = new Projektanker.Icons.Avalonia.IconImage()
{
Value = "fa-solid fa-file-circle-xmark",
Brush = (SolidColorBrush)brush!
} }
};
}
private NavigationViewItem ToNavigationViewItem(PageBase page)
{
App.Current!.TryGetResource("TextFillColorPrimaryBrush", ActualThemeVariant, out var brush);
return new NavigationViewItem()
{
Content = page.DisplayName,
Tag = page,
IconSource = new ImageIconSource
{
Source = new Projektanker.Icons.Avalonia.IconImage()
{
Value = page.Icon,
Brush = (SolidColorBrush)brush!
}
}
};
}
protected override void OnLoaded(RoutedEventArgs e)
{
if (VisualRoot is AppWindow aw)
{
TitleBarHost.ColumnDefinitions[3].Width = new GridLength(aw.TitleBar.RightInset, GridUnitType.Pixel);
} }
} }
private static bool IsWindows11OrNewer()
{
return Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Build >= 22000;
}
} }

View File

@@ -0,0 +1,25 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="using:Needlework.Net.ViewModels.MainWindow"
xmlns:ui="using:FluentAvalonia.UI.Controls"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Needlework.Net.Views.MainWindow.NotificationView"
x:DataType="vm:NotificationViewModel">
<Border Margin="4">
<ui:InfoBar
IsOpen="True"
Background="{DynamicResource SolidBackgroundFillColorBaseBrush}"
Title="{Binding Notification.Title}"
Severity="{Binding Notification.InfoBarSeverity}"
Message="{Binding Notification.Message}">
<ui:InfoBar.ActionButton>
<Button Command="{Binding OpenUrlCommand}"
IsVisible="{Binding IsButtonVisible}">
Open URL
</Button>
</ui:InfoBar.ActionButton>
</ui:InfoBar>
</Border>
</UserControl>

View File

@@ -0,0 +1,11 @@
using Avalonia.Controls;
namespace Needlework.Net.Views.MainWindow;
public partial class NotificationView : UserControl
{
public NotificationView()
{
InitializeComponent();
}
}

View File

@@ -10,8 +10,10 @@ namespace Needlework.Net.Views.MainWindow;
public class OopsiesDialog : IDialog, IDisposable public class OopsiesDialog : IDialog, IDisposable
{ {
private bool _isDisposing; private bool _isDisposing;
private string? _text; private string? _text;
private ContentDialog _dialog;
private readonly ContentDialog _dialog;
public OopsiesDialog() public OopsiesDialog()
{ {

View File

@@ -0,0 +1,16 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="using:Needlework.Net.ViewModels.MainWindow"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Needlework.Net.Views.MainWindow.SchemaSearchDetailsView"
x:DataType="vm:SchemaSearchDetailsViewModel">
<StackPanel HorizontalAlignment="Left"
VerticalAlignment="Center">
<TextBlock Text="{Binding Key}"/>
<TextBlock Text="{Binding Document}"
Theme="{StaticResource CaptionTextBlockStyle}"
Foreground="{DynamicResource AccentTextFillColorPrimaryBrush}"/>
</StackPanel>
</UserControl>

View File

@@ -0,0 +1,11 @@
using Avalonia.Controls;
namespace Needlework.Net.Views.MainWindow;
public partial class SchemaSearchDetailsView : UserControl
{
public SchemaSearchDetailsView()
{
InitializeComponent();
}
}

View File

@@ -0,0 +1,42 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="using:Needlework.Net.ViewModels.MainWindow"
xmlns:controls="using:Needlework.Net.Controls"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Needlework.Net.Views.MainWindow.SchemaView"
x:DataType="vm:SchemaViewModel">
<UserControl.Styles>
<Style Selector="DataGrid">
<Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
</Style>
<Style Selector="DataGridColumnHeader TextBlock">
<Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}"/>
</Style>
<Style Selector="DataGridRow DataGridCell">
<Setter Property="FontSize" Value="12"></Setter>
</Style>
<Style Selector="DataGridRow">
<Setter Property="Margin" Value="0 0 0 4"></Setter>
</Style>
</UserControl.Styles>
<controls:Card>
<StackPanel>
<TextBlock FontSize="12" FontWeight="DemiBold" Text="{Binding Id}" Margin="0 0 0 4"/>
<DataGrid IsVisible="{Binding PropertyFields, Converter={StaticResource EnumerableToVisibilityConverter}}"
ItemsSource="{Binding PropertyFields}"
AutoGenerateColumns="True"
IsReadOnly="True"
GridLinesVisibility="Horizontal">
</DataGrid>
<DataGrid IsVisible="{Binding PropertyEnums, Converter={StaticResource EnumerableToVisibilityConverter}}"
Margin="0 0 0 8"
ItemsSource="{Binding PropertyEnums}"
AutoGenerateColumns="True"
IsReadOnly="True"
GridLinesVisibility="Horizontal">
</DataGrid>
</StackPanel>
</controls:Card>
</UserControl>

View File

@@ -0,0 +1,11 @@
using Avalonia.Controls;
namespace Needlework.Net.Views.MainWindow;
public partial class SchemaView : UserControl
{
public SchemaView()
{
InitializeComponent();
}
}

View File

@@ -2,11 +2,11 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="using:Needlework.Net.ViewModels.Pages" xmlns:vm="using:Needlework.Net.ViewModels.Pages.About"
xmlns:controls="using:Needlework.Net.Controls" xmlns:controls="using:Needlework.Net.Controls"
xmlns:i="https://github.com/projektanker/icons.avalonia" xmlns:i="https://github.com/projektanker/icons.avalonia"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Needlework.Net.Views.Pages.AboutView" x:Class="Needlework.Net.Views.Pages.About.AboutView"
x:DataType="vm:AboutViewModel"> x:DataType="vm:AboutViewModel">
<ScrollViewer Margin="8"> <ScrollViewer Margin="8">
<WrapPanel HorizontalAlignment="Center"> <WrapPanel HorizontalAlignment="Center">

View File

@@ -1,6 +1,6 @@
using Avalonia.Controls; using Avalonia.Controls;
namespace Needlework.Net.Views.Pages; namespace Needlework.Net.Views.Pages.About;
public partial class AboutView : UserControl public partial class AboutView : UserControl
{ {

View File

@@ -5,10 +5,10 @@
xmlns:avaloniaEdit="https://github.com/avaloniaui/avaloniaedit" xmlns:avaloniaEdit="https://github.com/avaloniaui/avaloniaedit"
xmlns:ui="using:FluentAvalonia.UI.Controls" xmlns:ui="using:FluentAvalonia.UI.Controls"
xmlns:uip="using:FluentAvalonia.UI.Controls.Primitives" xmlns:uip="using:FluentAvalonia.UI.Controls.Primitives"
xmlns:vm="using:Needlework.Net.ViewModels.Pages" xmlns:vm="using:Needlework.Net.ViewModels.Pages.Console"
xmlns:controls="using:Needlework.Net.Controls" xmlns:controls="using:Needlework.Net.Controls"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Needlework.Net.Views.Pages.ConsoleView" x:Class="Needlework.Net.Views.Pages.Console.ConsoleView"
x:DataType="vm:ConsoleViewModel"> x:DataType="vm:ConsoleViewModel">
<controls:BusyArea IsBusy="{Binding IsBusy}" <controls:BusyArea IsBusy="{Binding IsBusy}"
BusyText="Loading..."> BusyText="Loading...">
@@ -52,14 +52,20 @@
Text="{Binding Request.ResponsePath}"/> Text="{Binding Request.ResponsePath}"/>
<avaloniaEdit:TextEditor <avaloniaEdit:TextEditor
Name="RequestEditor" Name="RequestEditor"
Text="" Document="{Binding Request.RequestDocument}"
ShowLineNumbers="True" ShowLineNumbers="True"
HorizontalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"
VerticalScrollBarVisibility="Visible" VerticalScrollBarVisibility="Visible"
Margin="0 8 0 0" Margin="0 8 0 0"
FontSize="12" FontSize="12"
Grid.Row="1" Grid.Row="1"
Grid.Column="0"/> Grid.Column="0">
<avaloniaEdit:TextEditor.Styles>
<Style Selector="ScrollViewer#PART_ScrollViewer">
<Setter Property="Offset" Value="{Binding Request.RequestDocumentOffset, Mode=TwoWay}"/>
</Style>
</avaloniaEdit:TextEditor.Styles>
</avaloniaEdit:TextEditor>
</Grid> </Grid>
<Grid RowDefinitions="35,*" <Grid RowDefinitions="35,*"
ColumnDefinitions="*" ColumnDefinitions="*"
@@ -77,12 +83,19 @@
Grid.Row="1" Grid.Row="1"
Grid.Column="0" Grid.Column="0"
Name="ResponseEditor" Name="ResponseEditor"
Document="{Binding Request.ResponseDocument}"
HorizontalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"
VerticalScrollBarVisibility="Visible" VerticalScrollBarVisibility="Visible"
ShowLineNumbers="True" ShowLineNumbers="True"
IsReadOnly="True" IsReadOnly="True"
Text="" Text=""
FontSize="12"/> FontSize="12">
<avaloniaEdit:TextEditor.Styles>
<Style Selector="ScrollViewer#PART_ScrollViewer">
<Setter Property="Offset" Value="{Binding Request.ResponseDocumentOffset, Mode=TwoWay}"/>
</Style>
</avaloniaEdit:TextEditor.Styles>
</avaloniaEdit:TextEditor>
</Grid> </Grid>
</Grid> </Grid>
</controls:BusyArea> </controls:BusyArea>

View File

@@ -0,0 +1,25 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Styling;
using Needlework.Net.Extensions;
using TextMateSharp.Grammars;
namespace Needlework.Net.Views.Pages.Console;
public partial class ConsoleView : UserControl
{
public ConsoleView()
{
InitializeComponent();
ResponseEditor.ApplyJsonEditorSettings();
RequestEditor.ApplyJsonEditorSettings();
OnBaseThemeChanged(Application.Current!.ActualThemeVariant);
}
private void OnBaseThemeChanged(ThemeVariant currentTheme)
{
var registryOptions = new RegistryOptions(
currentTheme == ThemeVariant.Dark ? ThemeName.DarkPlus : ThemeName.LightPlus);
}
}

View File

@@ -1,61 +0,0 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Styling;
using AvaloniaEdit;
using Needlework.Net.Extensions;
using Needlework.Net.ViewModels.Pages;
using TextMateSharp.Grammars;
namespace Needlework.Net.Views.Pages;
public partial class ConsoleView : UserControl
{
private TextEditor? _responseEditor;
private TextEditor? _requestEditor;
public ConsoleView()
{
InitializeComponent();
}
protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
{
base.OnAttachedToVisualTree(e);
_responseEditor = this.FindControl<TextEditor>("ResponseEditor");
_requestEditor = this.FindControl<TextEditor>("RequestEditor");
_responseEditor?.ApplyJsonEditorSettings();
_requestEditor?.ApplyJsonEditorSettings();
var vm = (ConsoleViewModel)DataContext!;
vm.Request.RequestText += LcuRequest_RequestText; ;
vm.Request.UpdateText += LcuRequest_UpdateText;
OnBaseThemeChanged(Application.Current!.ActualThemeVariant);
}
private void LcuRequest_RequestText(object? sender, ViewModels.Shared.RequestViewModel e)
{
e.RequestBody = _requestEditor!.Text;
}
private void LcuRequest_UpdateText(object? sender, string e)
{
_responseEditor!.Text = e;
}
protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
{
base.OnDetachedFromVisualTree(e);
var vm = (ConsoleViewModel)DataContext!;
vm.Request.RequestText -= LcuRequest_RequestText;
vm.Request.UpdateText -= LcuRequest_UpdateText;
}
private void OnBaseThemeChanged(ThemeVariant currentTheme)
{
var registryOptions = new RegistryOptions(
currentTheme == ThemeVariant.Dark ? ThemeName.DarkPlus : ThemeName.LightPlus);
}
}

View File

@@ -0,0 +1,28 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="using:Needlework.Net.ViewModels.Pages.Endpoints"
xmlns:controls="using:Needlework.Net.Controls"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
Name="EndpointsControl"
x:Class="Needlework.Net.Views.Pages.Endpoints.EndpointListView"
x:DataType="vm:EndpointListViewModel">
<Grid RowDefinitions="auto,auto,*" ColumnDefinitions="*">
<TextBox Watermark="Search" Margin="0 0 0 4" Text="{Binding Search}" Grid.Row="1" Grid.Column="0"/>
<ScrollViewer Grid.Row="2" Grid.Column="0" Offset="{Binding Offset, Mode=TwoWay}">
<ItemsControl ItemsSource="{Binding EndpointSearchDetails}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<VirtualizingStackPanel/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<ContentControl Content="{Binding}"/>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</ScrollViewer>
</Grid>
</UserControl>

View File

@@ -0,0 +1,11 @@
using Avalonia.Controls;
namespace Needlework.Net.Views.Pages.Endpoints;
public partial class EndpointListView : UserControl
{
public EndpointListView()
{
InitializeComponent();
}
}

View File

@@ -0,0 +1,15 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="using:Needlework.Net.ViewModels.Pages.Endpoints"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Needlework.Net.Views.Pages.Endpoints.EndpointSearchDetailsView"
x:DataType="vm:EndpointSearchDetailsViewModel">
<Button Content="{Binding Plugin}"
Command="{Binding OpenEndpointCommand}"
VerticalAlignment="Stretch"
HorizontalAlignment="Stretch"
HorizontalContentAlignment="Left"
Theme="{StaticResource TransparentButton}"/>
</UserControl>

View File

@@ -0,0 +1,11 @@
using Avalonia.Controls;
namespace Needlework.Net.Views.Pages.Endpoints;
public partial class EndpointSearchDetailsView : UserControl
{
public EndpointSearchDetailsView()
{
InitializeComponent();
}
}

View File

@@ -0,0 +1,48 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:i="https://github.com/projektanker/icons.avalonia"
xmlns:vm="using:Needlework.Net.ViewModels.Pages.Endpoints"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Needlework.Net.Views.Pages.Endpoints.EndpointTabItemContentView"
x:DataType="vm:EndpointTabItemContentViewModel">
<Grid RowDefinitions="auto,auto,*" ColumnDefinitions="*">
<Menu Grid.Row="0"
Grid.Column="0">
<MenuItem Header="_New tab">
<MenuItem Header="LCU"
Command="{Binding AddEndpointCommand}"
CommandParameter="{x:Static vm:Tab.LCU}"/>
<MenuItem Header="Game Client"
Command="{Binding AddEndpointCommand}"
CommandParameter="{x:Static vm:Tab.GameClient}"/>
</MenuItem>
</Menu>
<Separator Grid.Row="1"
Grid.Column="0"/>
<Grid Grid.Row="2"
Grid.Column="0"
RowDefinitions="auto,*"
ColumnDefinitions="*"
Margin="16">
<StackPanel Orientation="Horizontal"
Grid.Row="0"
Grid.Column="0"
Margin="0 0 0 8">
<Button Command="{Binding GoBackCommand}"
Theme="{StaticResource TransparentButton}"
Margin="0 0 8 0">
<i:Icon Value="fa-arrow-left"
FontSize="20"/>
</Button>
<TextBlock Theme="{StaticResource TitleTextBlockStyle}"
Text="{Binding Title}"/>
</StackPanel>
<TransitioningContentControl
Grid.Row="1"
Grid.Column="0"
Content="{Binding ActiveViewModel}"/>
</Grid>
</Grid>
</UserControl>

View File

@@ -0,0 +1,11 @@
using Avalonia.Controls;
namespace Needlework.Net.Views.Pages.Endpoints;
public partial class EndpointTabItemContentView : UserControl
{
public EndpointTabItemContentView()
{
InitializeComponent();
}
}

View File

@@ -1,94 +0,0 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Styling;
using AvaloniaEdit;
using Needlework.Net.Extensions;
using Needlework.Net.ViewModels.Pages.Endpoints;
using Needlework.Net.ViewModels.Shared;
using TextMateSharp.Grammars;
namespace Needlework.Net.Views.Pages.Endpoints;
public partial class EndpointView : UserControl
{
private TextEditor? _requestEditor;
private TextEditor? _responseEditor;
private RequestViewModel? _lcuRequestVm;
public EndpointView()
{
InitializeComponent();
}
protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
{
base.OnAttachedToVisualTree(e);
_requestEditor = this.FindControl<TextEditor>("EndpointRequestEditor");
_responseEditor = this.FindControl<TextEditor>("EndpointResponseEditor");
_requestEditor?.ApplyJsonEditorSettings();
_responseEditor?.ApplyJsonEditorSettings();
var vm = (EndpointViewModel)DataContext!;
vm.PathOperationSelected += Vm_PathOperationSelected;
if (vm.SelectedPathOperation != null)
{
_lcuRequestVm = vm.SelectedPathOperation.Request.Value;
vm.SelectedPathOperation.Request.Value.RequestText += LcuRequest_RequestText;
vm.SelectedPathOperation.Request.Value.UpdateText += LcuRequest_UpdateText;
}
OnBaseThemeChanged(Application.Current!.ActualThemeVariant);
}
private void Vm_PathOperationSelected(object? sender, string e)
{
var vm = (EndpointViewModel)DataContext!;
if (vm.SelectedPathOperation != null)
{
_requestEditor!.Text = e;
if (_lcuRequestVm != null)
{
_lcuRequestVm.RequestText -= LcuRequest_RequestText;
_lcuRequestVm.UpdateText -= LcuRequest_UpdateText;
}
vm.SelectedPathOperation.Request.Value.RequestText += LcuRequest_RequestText;
vm.SelectedPathOperation.Request.Value.UpdateText += LcuRequest_UpdateText;
_lcuRequestVm = vm.SelectedPathOperation.Request.Value;
_responseEditor!.Text = vm.SelectedPathOperation.Request.Value.ResponseBody ?? string.Empty;
}
}
protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
{
base.OnDetachedFromVisualTree(e);
var vm = (EndpointViewModel)DataContext!;
vm.PathOperationSelected -= Vm_PathOperationSelected;
if (_lcuRequestVm != null)
{
_lcuRequestVm.RequestText -= LcuRequest_RequestText;
_lcuRequestVm.UpdateText -= LcuRequest_UpdateText;
_lcuRequestVm = null;
}
}
private void OnBaseThemeChanged(ThemeVariant currentTheme)
{
var registryOptions = new RegistryOptions(
currentTheme == ThemeVariant.Dark ? ThemeName.DarkPlus : ThemeName.LightPlus);
}
private void LcuRequest_RequestText(object? sender, RequestViewModel e)
{
e.RequestBody = _requestEditor!.Text;
}
private void LcuRequest_UpdateText(object? sender, string e)
{
_responseEditor!.Text = e;
}
}

View File

@@ -1,32 +0,0 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="using:Needlework.Net.ViewModels.Pages.Endpoints"
xmlns:avalonEdit="https://github.com/avaloniaui/avaloniaedit"
xmlns:i="https://github.com/projektanker/icons.avalonia"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Needlework.Net.Views.Pages.Endpoints.EndpointsNavigationView"
x:DataType="vm:EndpointsNavigationViewModel">
<Grid RowDefinitions="auto,*"
ColumnDefinitions="*"
Margin="16">
<StackPanel Orientation="Horizontal"
Grid.Row="0"
Grid.Column="0"
Margin="0 0 0 8">
<Button Command="{Binding GoBackCommand}"
Theme="{StaticResource TransparentButton}"
Margin="0 0 8 0">
<i:Icon Value="fa-arrow-left"
FontSize="20"/>
</Button>
<TextBlock Theme="{StaticResource TitleTextBlockStyle}"
Text="{Binding Title}"/>
</StackPanel>
<TransitioningContentControl
Grid.Row="1"
Grid.Column="0"
Content="{Binding ActiveViewModel}"/>
</Grid>
</UserControl>

View File

@@ -1,75 +0,0 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:i="https://github.com/projektanker/icons.avalonia"
Name="EndpointsTab"
xmlns:vm="using:Needlework.Net.ViewModels.Pages.Endpoints"
xmlns:ui="using:FluentAvalonia.UI.Controls"
xmlns:controls="using:Needlework.Net.Controls"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Needlework.Net.Views.Pages.Endpoints.EndpointsTabView"
x:DataType="vm:EndpointsTabViewModel">
<controls:BusyArea IsBusy="{Binding IsBusy}"
BusyText="Loading...">
<Grid>
<ui:TabView TabItems="{Binding Endpoints}"
AddTabButtonCommand="{Binding AddEndpointCommand}"
AddTabButtonCommandParameter="{x:Static vm:Tab.LCU}"
TabCloseRequested="TabView_TabCloseRequested">
<!--Need to override Tab header for Mica theme...-->
<ui:TabView.Resources>
<ResourceDictionary>
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{DynamicResource ControlFillColorTransparent}"/>
</ResourceDictionary>
</ui:TabView.Resources>
<!--We need to hack this style for Mica theme since there is no way to explicity set style priority in Avalonia...-->
<ui:TabView.Styles>
<Style Selector="Grid > ContentPresenter#TabContentPresenter">
<Style.Animations>
<Animation IterationCount="1" Duration="0:0:1" FillMode="Both">
<KeyFrame Cue="0%">
<Setter Property="Background" Value="{DynamicResource ControlFillColorTransparent}"/>
</KeyFrame>
<KeyFrame Cue="100%">
<Setter Property="Background" Value="{DynamicResource ControlFillColorTransparent}"/>
</KeyFrame>
</Animation>
</Style.Animations>
</Style>
</ui:TabView.Styles>
<ui:TabView.TabItemTemplate>
<DataTemplate DataType="vm:EndpointItem">
<ui:TabViewItem Header="{Binding Header}"
IconSource="{Binding IconSource}"
IsSelected="{Binding Selected}"
Content="{Binding}">
<ui:TabViewItem.ContentTemplate>
<DataTemplate DataType="vm:EndpointItem">
<Grid RowDefinitions="auto,auto,*" ColumnDefinitions="*">
<Menu Grid.Row="0"
Grid.Column="0">
<MenuItem Header="_New tab">
<MenuItem Header="LCU"
Command="{Binding #EndpointsTab.((vm:EndpointsTabViewModel)DataContext).AddEndpointCommand}"
CommandParameter="{x:Static vm:Tab.LCU}"/>
<MenuItem Header="Game Client"
Command="{Binding #EndpointsTab.((vm:EndpointsTabViewModel)DataContext).AddEndpointCommand}"
CommandParameter="{x:Static vm:Tab.GameClient}"/>
</MenuItem>
</Menu>
<Separator Grid.Row="1"
Grid.Column="0"/>
<ContentControl Grid.Row="2"
Grid.Column="0"
Content="{Binding Content}"/>
</Grid>
</DataTemplate>
</ui:TabViewItem.ContentTemplate>
</ui:TabViewItem>
</DataTemplate>
</ui:TabView.TabItemTemplate>
</ui:TabView>
</Grid>
</controls:BusyArea>
</UserControl>

View File

@@ -1,24 +0,0 @@
using Avalonia.Controls;
using Needlework.Net.ViewModels.Pages.Endpoints;
using System.Collections;
namespace Needlework.Net.Views.Pages.Endpoints;
public partial class EndpointsTabView : UserControl
{
public EndpointsTabView()
{
InitializeComponent();
}
private void TabView_TabCloseRequested(FluentAvalonia.UI.Controls.TabView sender, FluentAvalonia.UI.Controls.TabViewTabCloseRequestedEventArgs args)
{
if (args.Tab.Content is EndpointItem item && sender.TabItems is IList tabItems)
{
if (tabItems.Count > 1)
{
tabItems.Remove(item);
}
}
}
}

View File

@@ -1,29 +1,58 @@
<UserControl xmlns="https://github.com/avaloniaui" <UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="using:Needlework.Net.ViewModels.Pages.Endpoints" xmlns:i="https://github.com/projektanker/icons.avalonia"
xmlns:controls="using:Needlework.Net.Controls" Name="EndpointsTab"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" xmlns:vm="using:Needlework.Net.ViewModels.Pages.Endpoints"
Name="EndpointsControl" xmlns:ui="using:FluentAvalonia.UI.Controls"
x:Class="Needlework.Net.Views.Pages.Endpoints.EndpointsView" xmlns:controls="using:Needlework.Net.Controls"
x:DataType="vm:EndpointsViewModel"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
<Grid RowDefinitions="auto,auto,*" ColumnDefinitions="*"> x:Class="Needlework.Net.Views.Pages.Endpoints.EndpointsView"
<TextBox Watermark="Search" Margin="0 4" Text="{Binding Search}" Grid.Row="1" Grid.Column="0"/> x:DataType="vm:EndpointsViewModel">
<ScrollViewer Grid.Row="2" Grid.Column="0"> <controls:BusyArea IsBusy="{Binding IsBusy}"
<ItemsRepeater ItemsSource="{Binding Query}"> BusyText="Loading...">
<ItemsRepeater.ItemTemplate> <Grid>
<DataTemplate> <ui:TabView TabItems="{Binding Endpoints}"
<Button Command="{Binding #EndpointsControl.((vm:EndpointsViewModel)DataContext).OpenEndpointCommand}" AddTabButtonCommand="{Binding AddEndpointCommand}"
VerticalAlignment="Stretch" AddTabButtonCommandParameter="{x:Static vm:Tab.LCU}"
HorizontalAlignment="Stretch" TabCloseRequested="TabView_TabCloseRequested">
HorizontalContentAlignment="Left" <!--Need to override Tab header for Mica theme...-->
CommandParameter="{Binding}" <ui:TabView.Resources>
Content="{Binding}" <ResourceDictionary>
Theme="{StaticResource TransparentButton}"/> <SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{DynamicResource ControlFillColorTransparent}"/>
</ResourceDictionary>
</ui:TabView.Resources>
<!--We need to hack this style for Mica theme since there is no way to explicity set style priority in Avalonia...-->
<ui:TabView.Styles>
<Style Selector="Grid > ContentPresenter#TabContentPresenter">
<Style.Animations>
<Animation IterationCount="1" Duration="0:0:1" FillMode="Both">
<KeyFrame Cue="0%">
<Setter Property="Background" Value="{DynamicResource ControlFillColorTransparentBrush}"/>
</KeyFrame>
<KeyFrame Cue="100%">
<Setter Property="Background" Value="{DynamicResource ControlFillColorTransparentBrush}"/>
</KeyFrame>
</Animation>
</Style.Animations>
</Style>
</ui:TabView.Styles>
<ui:TabView.TabItemTemplate>
<DataTemplate x:DataType="vm:EndpointTabItemViewModel">
<ui:TabViewItem Header="{Binding Header}"
IconSource="{Binding IconSource}"
IsSelected="{Binding Selected}"
Content="{Binding Content}">
<ui:TabViewItem.ContentTemplate>
<DataTemplate x:DataType="vm:EndpointTabItemContentViewModel">
<ContentControl Content="{Binding}"/>
</DataTemplate>
</ui:TabViewItem.ContentTemplate>
</ui:TabViewItem>
</DataTemplate> </DataTemplate>
</ItemsRepeater.ItemTemplate> </ui:TabView.TabItemTemplate>
</ItemsRepeater> </ui:TabView>
</ScrollViewer> </Grid>
</Grid> </controls:BusyArea>
</UserControl> </UserControl>

View File

@@ -1,4 +1,6 @@
using Avalonia.Controls; using Avalonia.Controls;
using Needlework.Net.ViewModels.Pages.Endpoints;
using System.Collections;
namespace Needlework.Net.Views.Pages.Endpoints; namespace Needlework.Net.Views.Pages.Endpoints;
@@ -8,4 +10,15 @@ public partial class EndpointsView : UserControl
{ {
InitializeComponent(); InitializeComponent();
} }
private void TabView_TabCloseRequested(FluentAvalonia.UI.Controls.TabView sender, FluentAvalonia.UI.Controls.TabViewTabCloseRequestedEventArgs args)
{
if (args.Tab.DataContext is EndpointTabItemViewModel item && sender.TabItems is IList tabItems)
{
if (tabItems.Count > 1)
{
tabItems.Remove(item);
}
}
}
} }

Some files were not shown because too many files have changed in this diff Show More