diff --git a/MatrixRoomUtils.Core/Services/HomeserverProviderService.cs b/MatrixRoomUtils.Core/Services/HomeserverProviderService.cs
deleted file mode 100644
index 4bc785a..0000000
--- a/MatrixRoomUtils.Core/Services/HomeserverProviderService.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System.Net.Http.Headers;
-using System.Net.Http.Json;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using MatrixRoomUtils.Core.Extensions;
-using MatrixRoomUtils.Core.Responses;
-using Microsoft.Extensions.Logging;
-
-namespace MatrixRoomUtils.Core.Services;
-
-public class HomeserverProviderService {
- private readonly TieredStorageService _tieredStorageService;
- private readonly ILogger<HomeserverProviderService> _logger;
- private readonly HomeserverResolverService _homeserverResolverService;
-
- public HomeserverProviderService(TieredStorageService tieredStorageService,
- ILogger<HomeserverProviderService> logger, HomeserverResolverService homeserverResolverService) {
- Console.WriteLine("Homeserver provider service instantiated!");
- _tieredStorageService = tieredStorageService;
- _logger = logger;
- _homeserverResolverService = homeserverResolverService;
- logger.LogDebug(
- $"New HomeserverProviderService created with TieredStorageService<{string.Join(", ", tieredStorageService.GetType().GetProperties().Select(x => x.Name))}>!");
- }
-
- private static Dictionary<string, SemaphoreSlim> _authenticatedHomeserverSemaphore = new();
- private static Dictionary<string, AuthenticatedHomeServer> _authenticatedHomeServerCache = new();
-
- public async Task<AuthenticatedHomeServer> GetAuthenticatedWithToken(string homeserver, string accessToken,
- string? overrideFullDomain = null) {
- SemaphoreSlim sem = _authenticatedHomeserverSemaphore.GetOrCreate(homeserver+accessToken, _ => new SemaphoreSlim(1, 1));
- await sem.WaitAsync();
- if (_authenticatedHomeServerCache.ContainsKey(homeserver+accessToken)) {
- sem.Release();
- return _authenticatedHomeServerCache[homeserver+accessToken];
- }
-
- var hs = new AuthenticatedHomeServer(_tieredStorageService, homeserver, accessToken);
- hs.FullHomeServerDomain = overrideFullDomain ??
- await _homeserverResolverService.ResolveHomeserverFromWellKnown(homeserver);
- hs._httpClient.Dispose();
- hs._httpClient = new MatrixHttpClient { BaseAddress = new Uri(hs.FullHomeServerDomain) };
- hs._httpClient.Timeout = TimeSpan.FromSeconds(120);
- hs._httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken);
-
- hs.WhoAmI = (await hs._httpClient.GetFromJsonAsync<WhoAmIResponse>("/_matrix/client/v3/account/whoami"))!;
-
- _authenticatedHomeServerCache[homeserver+accessToken] = hs;
- sem.Release();
-
- return hs;
- }
-
- public async Task<RemoteHomeServer> GetRemoteHomeserver(string homeserver, string? overrideFullDomain = null) {
- var hs = new RemoteHomeServer(homeserver);
- hs.FullHomeServerDomain = overrideFullDomain ??
- await _homeserverResolverService.ResolveHomeserverFromWellKnown(homeserver);
- hs._httpClient.Dispose();
- hs._httpClient = new MatrixHttpClient { BaseAddress = new Uri(hs.FullHomeServerDomain) };
- hs._httpClient.Timeout = TimeSpan.FromSeconds(120);
- return hs;
- }
-
- public async Task<LoginResponse> Login(string homeserver, string user, string password,
- string? overrideFullDomain = null) {
- var hs = await GetRemoteHomeserver(homeserver, overrideFullDomain);
- var payload = new LoginRequest {
- Identifier = new() { User = user },
- Password = password
- };
- var resp = await hs._httpClient.PostAsJsonAsync("/_matrix/client/v3/login", payload);
- var data = await resp.Content.ReadFromJsonAsync<LoginResponse>();
- return data!;
- }
-
- private class LoginRequest {
- [JsonPropertyName("type")]
- public string Type { get; set; } = "m.login.password";
-
- [JsonPropertyName("identifier")]
- public LoginIdentifier Identifier { get; set; } = new();
-
- [JsonPropertyName("password")]
- public string Password { get; set; } = "";
-
- [JsonPropertyName("initial_device_display_name")]
- public string InitialDeviceDisplayName { get; set; } = "Rory&::LibMatrix";
-
- public class LoginIdentifier {
- [JsonPropertyName("type")]
- public string Type { get; set; } = "m.id.user";
-
- [JsonPropertyName("user")]
- public string User { get; set; } = "";
- }
- }
-}
diff --git a/MatrixRoomUtils.Core/Services/HomeserverResolverService.cs b/MatrixRoomUtils.Core/Services/HomeserverResolverService.cs
deleted file mode 100644
index 5856000..0000000
--- a/MatrixRoomUtils.Core/Services/HomeserverResolverService.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System.Net.Http.Json;
-using System.Text.Json;
-using MatrixRoomUtils.Core.Extensions;
-using Microsoft.Extensions.Logging;
-
-namespace MatrixRoomUtils.Core.Services;
-
-public class HomeserverResolverService {
- private readonly MatrixHttpClient _httpClient = new();
- private readonly ILogger<HomeserverResolverService> _logger;
-
- private static readonly Dictionary<string, string> _wellKnownCache = new();
- private static readonly Dictionary<string, SemaphoreSlim> _wellKnownSemaphores = new();
-
- public HomeserverResolverService(ILogger<HomeserverResolverService> logger) {
- _logger = logger;
- }
-
- public async Task<string> ResolveHomeserverFromWellKnown(string homeserver) {
- var res = await _resolveHomeserverFromWellKnown(homeserver);
- if (!res.StartsWith("http")) res = "https://" + res;
- if (res.EndsWith(":443")) res = res.Substring(0, res.Length - 4);
- return res;
- }
-
- private async Task<string> _resolveHomeserverFromWellKnown(string homeserver) {
- if (homeserver is null) throw new ArgumentNullException(nameof(homeserver));
- SemaphoreSlim sem = _wellKnownSemaphores.GetOrCreate(homeserver, _ => new SemaphoreSlim(1, 1));
- await sem.WaitAsync();
- if (_wellKnownCache.ContainsKey(homeserver)) {
- sem.Release();
- return _wellKnownCache[homeserver];
- }
-
- string? result = null;
- _logger.LogInformation($"Attempting to resolve homeserver: {homeserver}");
- result ??= await _tryResolveFromClientWellknown(homeserver);
- result ??= await _tryResolveFromServerWellknown(homeserver);
- result ??= await _tryCheckIfDomainHasHomeserver(homeserver);
-
- if (result is not null) {
- _logger.LogInformation($"Resolved homeserver: {homeserver} -> {result}");
- _wellKnownCache[homeserver] = result;
- sem.Release();
- return result;
- }
-
- throw new InvalidDataException($"Failed to resolve homeserver for {homeserver}! Is it online and configured correctly?");
- }
-
- private async Task<string?> _tryResolveFromClientWellknown(string homeserver) {
- if (!homeserver.StartsWith("http")) homeserver = "https://" + homeserver;
- if (await _httpClient.CheckSuccessStatus($"{homeserver}/.well-known/matrix/client")) {
- var resp = await _httpClient.GetFromJsonAsync<JsonElement>($"{homeserver}/.well-known/matrix/client");
- var hs = resp.GetProperty("m.homeserver").GetProperty("base_url").GetString();
- return hs;
- }
-
- _logger.LogInformation("No client well-known...");
- return null;
- }
-
- private async Task<string?> _tryResolveFromServerWellknown(string homeserver) {
- if (!homeserver.StartsWith("http")) homeserver = "https://" + homeserver;
- if (await _httpClient.CheckSuccessStatus($"{homeserver}/.well-known/matrix/server")) {
- var resp = await _httpClient.GetFromJsonAsync<JsonElement>($"{homeserver}/.well-known/matrix/server");
- var hs = resp.GetProperty("m.server").GetString();
- return hs;
- }
-
- _logger.LogInformation("No server well-known...");
- return null;
- }
-
- private async Task<string?> _tryCheckIfDomainHasHomeserver(string homeserver) {
- _logger.LogInformation($"Checking if {homeserver} hosts a homeserver...");
- if (await _httpClient.CheckSuccessStatus($"{homeserver}/_matrix/client/versions"))
- return homeserver;
- _logger.LogInformation("No homeserver on shortname...");
- return null;
- }
-
- private async Task<string?> _tryCheckIfSubDomainHasHomeserver(string homeserver, string subdomain) {
- homeserver = homeserver.Replace("https://", $"https://{subdomain}.");
- return await _tryCheckIfDomainHasHomeserver(homeserver);
- }
-}
diff --git a/MatrixRoomUtils.Core/Services/ServiceInstaller.cs b/MatrixRoomUtils.Core/Services/ServiceInstaller.cs
deleted file mode 100644
index bd5b1bd..0000000
--- a/MatrixRoomUtils.Core/Services/ServiceInstaller.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using MatrixRoomUtils.Core.Extensions;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace MatrixRoomUtils.Core.Services;
-
-public static class ServiceInstaller {
-
- public static IServiceCollection AddRoryLibMatrixServices(this IServiceCollection services, RoryLibMatrixConfiguration? config = null) {
- //Check required services
- if (!services.Any(x => x.ServiceType == typeof(TieredStorageService)))
- throw new Exception("[MRUCore/DI] No TieredStorageService has been registered!");
- //Add config
- if(config is not null)
- services.AddSingleton(config);
- else {
- services.AddSingleton(new RoryLibMatrixConfiguration());
- }
- //Add services
- services.AddSingleton<HomeserverProviderService>();
- services.AddSingleton<HomeserverResolverService>();
- // services.AddScoped<MatrixHttpClient>();
- return services;
- }
-
-
-}
-
-public class RoryLibMatrixConfiguration {
- public string AppName { get; set; } = "Rory&::LibMatrix";
-}
diff --git a/MatrixRoomUtils.Core/Services/TieredStorageService.cs b/MatrixRoomUtils.Core/Services/TieredStorageService.cs
deleted file mode 100644
index 2f27443..0000000
--- a/MatrixRoomUtils.Core/Services/TieredStorageService.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using MatrixRoomUtils.Core.Interfaces.Services;
-
-namespace MatrixRoomUtils.Core.Services;
-
-public class TieredStorageService {
- public IStorageProvider CacheStorageProvider { get; }
- public IStorageProvider DataStorageProvider { get; }
-
- public TieredStorageService(IStorageProvider cacheStorageProvider, IStorageProvider dataStorageProvider) {
- CacheStorageProvider = cacheStorageProvider;
- DataStorageProvider = dataStorageProvider;
- }
-}
\ No newline at end of file
|
