refactor: adjust to new project structure

Tanji.CLI/Program.cs

@@ -1,10 +1,9 @@
 using System.Runtime.InteropServices;
 
-using Tanji.Core;
 using Tanji.Core.Network;
-using Tanji.Core.Services;
 using Tanji.Core.Habbo.Canvas;
-using Tanji.Core.Configuration;
+using Tanji.Infrastructure.Services;
+using Tanji.Infrastructure.Configuration;
 
 using Eavesdrop;
 

Tanji.Core/Tanji.Core.csproj

@@ -21,13 +21,7 @@
 	<ItemGroup>
 		<PackageReference Include="Eavesdrop" Version="1.3.0" />
 		<PackageReference Include="Hypo.Flazzy" Version="0.4.0" />
-		<PackageReference Include="System.IO.Pipelines" Version="8.0.0" />
-		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-		<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
 		<PackageReference Include="CommunityToolkit.HighPerformance" Version="8.2.2" />
-		<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
-		<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
 	</ItemGroup>
 
 </Project>

Tanji.Core/Configuration/PostConfigureTanjiOptions.cs → Tanji.Infrastructure/Configuration/PostConfigureTanjiOptions.cs

@@ -8,7 +8,7 @@
 
 using CommunityToolkit.HighPerformance.Buffers;
 
-namespace Tanji.Core.Configuration;
+namespace Tanji.Infrastructure.Configuration;
 
 internal sealed class PostConfigureTanjiOptions : IPostConfigureOptions<TanjiOptions>
 {

Tanji.Core/Configuration/TanjiOptions.cs → Tanji.Infrastructure/Configuration/TanjiOptions.cs

@@ -4,7 +4,7 @@
 using Tanji.Core.Json;
 using Tanji.Core.Habbo.Canvas;
 
-namespace Tanji.Core.Configuration;
+namespace Tanji.Infrastructure.Configuration;
 
 public readonly record struct PlatformPaths
 {

Tanji.Core/Services/IClientHandlerService.cs → Tanji.Infrastructure/Services/IClientHandlerService.cs

@@ -3,7 +3,7 @@
 using Tanji.Core.Habbo;
 using Tanji.Core.Habbo.Canvas;
 
-namespace Tanji.Core.Services;
+namespace Tanji.Infrastructure.Services;
 
 public interface IClientHandlerService
 {

Tanji.Core/Services/IConnectionHandlerService.cs → Tanji.Infrastructure/Services/IConnectionHandlerService.cs

@@ -1,6 +1,7 @@
 using System.Collections.ObjectModel;
 
 using Tanji.Core.Network;
+using Tanji.Infrastructure.Services;
 
 namespace Tanji.Core.Services;
 

Tanji.Core/Services/IPacketMiddlemanService.cs → Tanji.Infrastructure/Services/IPacketMiddlemanService.cs

@@ -1,6 +1,6 @@
 using Tanji.Core.Habbo.Network;
 
-namespace Tanji.Core.Services;
+namespace Tanji.Infrastructure.Services;
 
 public interface IPacketMiddlemanService
 {

Tanji.Core/Services/IWebInterceptionService.cs → Tanji.Infrastructure/Services/IWebInterceptionService.cs

@@ -1,4 +1,4 @@
-namespace Tanji.Core.Services;
+namespace Tanji.Infrastructure.Services;
 
 public interface IWebInterceptionService
 {

Tanji.Core/Services/Implementations/ClientHandlerService.cs → Tanji.Infrastructure/Services/Implementations/ClientHandlerService.cs

@@ -7,19 +7,20 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
+using Tanji.Core;
 using Tanji.Core.Json;
 using Tanji.Core.Habbo;
 using Tanji.Core.Habbo.Canvas;
-using Tanji.Core.Configuration;
 using Tanji.Core.Json.Converters;
 using Tanji.Core.Habbo.Canvas.Flash;
+using Tanji.Infrastructure.Configuration;
 
 using Flazzy.Tools;
 
 using CommunityToolkit.HighPerformance;
 using CommunityToolkit.HighPerformance.Buffers;
 
-namespace Tanji.Core.Services;
+namespace Tanji.Infrastructure.Services.Implementations;
 
 public sealed class ClientHandlerService : IClientHandlerService
 {

Tanji.Core/Services/Implementations/ConnectionHandlerService.cs → Tanji.Infrastructure/Services/Implementations/ConnectionHandlerService.cs

@@ -1,6 +1,7 @@
 using System.Net;
 using System.Collections.ObjectModel;
 
+using Tanji.Core;
 using Tanji.Core.Network;
 using Tanji.Core.Habbo.Canvas;
 using Tanji.Core.Habbo.Network.Buffers;
@@ -10,15 +11,15 @@
 
 using CommunityToolkit.HighPerformance.Buffers;
 
-namespace Tanji.Core.Services;
+namespace Tanji.Infrastructure.Services.Implementations;
 
-public sealed class ConnectionHandlerService : IConnectionHandlerService<PacketMiddlemanService>
+public sealed class ConnectionHandlerService : IConnectionHandlerService
 {
     private readonly PacketMiddlemanService _packetMiddleman;
     private readonly ILogger<ConnectionHandlerService> _logger;
     private readonly IClientHandlerService _clientHandler;
 
-    public ObservableCollection<HConnection<PacketMiddlemanService>> Connections { get; } = [];
+    public ObservableCollection<HConnection> Connections { get; } = [];
 
     public ConnectionHandlerService(ILogger<ConnectionHandlerService> logger,
         IClientHandlerService clientHandler,
@@ -29,15 +30,15 @@ public sealed class ConnectionHandlerService : IConnectionHandlerService<PacketM
         _packetMiddleman = packetMiddleman;
     }
 
-    public async Task<HConnection<PacketMiddlemanService>> LaunchAndInterceptConnectionAsync(string ticket, HConnectionContext context, CancellationToken cancellationToken = default)
+    public async Task<HConnection> LaunchAndInterceptConnectionAsync(string ticket, HConnectionContext context, CancellationToken cancellationToken = default)
     {
         if (string.IsNullOrWhiteSpace(ticket))
         {
             _logger.LogError("Ticket should be provided when attempting to launch the client.");
             ThrowHelper.ThrowArgumentNullException(nameof(ticket));
         }
 
-        var connection = new HConnection<PacketMiddlemanService>(_packetMiddleman);
+        var connection = new HConnection();
         ValueTask interceptLocalConnectionTask = connection.InterceptLocalConnectionAsync(context, cancellationToken);
 
         _ = _clientHandler.LaunchClient(context.Platform, ticket, context.ClientPath);

Tanji.Core/Services/Implementations/PacketMiddlemanService.cs → Tanji.Infrastructure/Services/Implementations/PacketMiddlemanService.cs

@@ -2,7 +2,7 @@
 
 using Microsoft.Extensions.Logging;
 
-namespace Tanji.Core.Services;
+namespace Tanji.Infrastructure.Services.Implementations;
 
 public class PacketMiddlemanService : IPacketMiddlemanService
 {

Tanji.Core/Services/Implementations/WebInterceptionService.cs → Tanji.Infrastructure/Services/Implementations/WebInterceptionService.cs

@@ -1,7 +1,7 @@
 using System.Threading.Channels;
 
 using Tanji.Core.Habbo;
-using Tanji.Core.Configuration;
+using Tanji.Infrastructure.Configuration;
 
 using Eavesdrop;
 
@@ -10,7 +10,7 @@
 
 using CommunityToolkit.HighPerformance;
 
-namespace Tanji.Core.Services;
+namespace Tanji.Infrastructure.Services.Implementations;
 
 public sealed class WebInterceptionService : IWebInterceptionService
 {

Tanji.Core/ServiceCollectionExtensions.cs → Tanji.Infrastructure/Services/ServiceCollectionExtensions.cs

@@ -1,11 +1,12 @@
-using Tanji.Core.Services;
-using Tanji.Core.ViewModels;
-using Tanji.Core.Configuration;
+using Tanji.Infrastructure.Services.Implementations;
+
+using Tanji.Infrastructure.ViewModels;
+using Tanji.Infrastructure.Configuration;
 
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Tanji.Core;
+namespace Tanji.Infrastructure.Services;
 
 public static class ServiceCollectionExtensions
 {
@@ -20,7 +21,7 @@ public static IServiceCollection AddTanjiCore(this IServiceCollection services)
         services.AddSingleton<IClientHandlerService, ClientHandlerService>();
 
         services.AddSingleton<PacketMiddlemanService>();
-        services.AddSingleton<IConnectionHandlerService<PacketMiddlemanService>, ConnectionHandlerService>();
+        services.AddSingleton<IConnectionHandlerService, ConnectionHandlerService>();
 
         // Add view-models
         services.AddSingleton<ConnectionViewModel>();

Tanji.Core/ViewModels/ConnectionViewModel.cs → Tanji.Infrastructure/ViewModels/ConnectionViewModel.cs

@@ -1,9 +1,9 @@
-using Tanji.Core.Services;
-using Tanji.Core.Habbo.Network;
+using Tanji.Core.Habbo.Network;
+using Tanji.Infrastructure.Services;
 
 using CommunityToolkit.Mvvm.ComponentModel;
 
-namespace Tanji.Core.ViewModels;
+namespace Tanji.Infrastructure.ViewModels;
 
 public partial class ConnectionViewModel : ObservableObject
 {

Tanji.Core/ViewModels/ExtensionsViewModel.cs → Tanji.Infrastructure/ViewModels/ExtensionsViewModel.cs

@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 
-namespace Tanji.Core.ViewModels;
+namespace Tanji.Infrastructure.ViewModels;
 
 public partial class ExtensionsViewModel : ObservableObject
 {

Tanji.Core/ViewModels/InjectionViewModel.cs → Tanji.Infrastructure/ViewModels/InjectionViewModel.cs

@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 
-namespace Tanji.Core.ViewModels;
+namespace Tanji.Infrastructure.ViewModels;
 
 public partial class InjectionViewModel : ObservableObject
 {

Tanji.Core/ViewModels/SettingsViewModel.cs → Tanji.Infrastructure/ViewModels/SettingsViewModel.cs

@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 
-namespace Tanji.Core.ViewModels;
+namespace Tanji.Infrastructure.ViewModels;
 
 public partial class SettingsViewModel : ObservableObject
 {

Tanji.Core/ViewModels/ToolboxViewModel.cs → Tanji.Infrastructure/ViewModels/ToolboxViewModel.cs

@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 
-namespace Tanji.Core.ViewModels;
+namespace Tanji.Infrastructure.ViewModels;
 
 public partial class ToolboxViewModel : ObservableObject
 {

Tanji/Controls/PageControl.cs

@@ -3,7 +3,7 @@
 using System.Windows.Forms;
 using System.ComponentModel;
 
-using Tanji.Core.ViewModels;
+using Tanji.Infrastructure.ViewModels;
 
 using Microsoft.Extensions.DependencyInjection;
 

Tanji/Program.cs

@@ -5,9 +5,8 @@
 
 using Tanji.Views;
 using Tanji.Utilities;
-
-using Tanji.Core;
-using Tanji.Core.Configuration;
+using Tanji.Infrastructure.Services;
+using Tanji.Infrastructure.Configuration;
 
 var builder = Host.CreateApplicationBuilder(args);