From 49bb14a7f0906b6e88b7613ac1bc508d1709c06d Mon Sep 17 00:00:00 2001 From: Rory& Date: Fri, 28 Feb 2025 02:24:24 +0100 Subject: Well known resolver rewrite work --- .../WellKnownResolvers/ClientWellKnownResolver.cs | 53 +++++++++++++++++++++ .../WellKnownResolvers/SupportWellKnownResolver.cs | 54 ++++++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 LibMatrix/Services/WellKnownResolvers/ClientWellKnownResolver.cs create mode 100644 LibMatrix/Services/WellKnownResolvers/SupportWellKnownResolver.cs (limited to 'LibMatrix/Services/WellKnownResolvers') diff --git a/LibMatrix/Services/WellKnownResolvers/ClientWellKnownResolver.cs b/LibMatrix/Services/WellKnownResolvers/ClientWellKnownResolver.cs new file mode 100644 index 0000000..d4d0166 --- /dev/null +++ b/LibMatrix/Services/WellKnownResolvers/ClientWellKnownResolver.cs @@ -0,0 +1,53 @@ +using System.Text.Json.Serialization; +using ArcaneLibs.Collections; +using LibMatrix.Extensions; +using Microsoft.Extensions.Logging; + +namespace LibMatrix.Services.WellKnownResolvers; + +public class ClientWellKnownResolver(ILogger logger) { + private static readonly SemaphoreCache ClientWellKnownCache = new() { + StoreNulls = false + }; + private static readonly MatrixHttpClient HttpClient = new(); + + public Task TryResolveClientWellKnown(string homeserver) { + return ClientWellKnownCache.TryGetOrAdd(homeserver, async () => { + logger.LogTrace($"Resolving client well-known: {homeserver}"); + if ((await TryGetClientWellKnownFromHttps(homeserver)) is { } clientWellKnown) + return new() { + Source = WellKnownResolverService.WellKnownSource.Https, + WellKnown = clientWellKnown + }; + + return default!; + }); + } + + private async Task TryGetClientWellKnownFromHttps(string homeserver) { + try { + return await HttpClient.TryGetFromJsonAsync($"https://{homeserver}/.well-known/matrix/client"); + } + catch { + return null; + } + } + + + + public class ClientWellKnown { + [JsonPropertyName("m.homeserver")] + public required WellKnownHomeserver Homeserver { get; set; } + + public class WellKnownHomeserver { + [JsonPropertyName("base_url")] + public required string BaseUrl { get; set; } + } + } + + public struct WellKnownResolutionResult { + public WellKnownResolverService.WellKnownSource Source { get; set; } + public ClientWellKnown WellKnown { get; set; } + public List Warnings { get; set; } + } +} \ No newline at end of file diff --git a/LibMatrix/Services/WellKnownResolvers/SupportWellKnownResolver.cs b/LibMatrix/Services/WellKnownResolvers/SupportWellKnownResolver.cs new file mode 100644 index 0000000..1d7567a --- /dev/null +++ b/LibMatrix/Services/WellKnownResolvers/SupportWellKnownResolver.cs @@ -0,0 +1,54 @@ +using System.Text.Json.Serialization; +using ArcaneLibs.Collections; +using LibMatrix.Extensions; +using Microsoft.Extensions.Logging; + +namespace LibMatrix.Services.WellKnownResolvers; + +public class SupportWellKnownResolver(ILogger logger) { + private static readonly SemaphoreCache> ClientWellKnownCache = new() { + StoreNulls = false + }; + + private static readonly MatrixHttpClient HttpClient = new(); + + public Task> TryResolveClientWellKnown(string homeserver) { + return ClientWellKnownCache.TryGetOrAdd(homeserver, async () => { + logger.LogTrace($"Resolving client well-known: {homeserver}"); + if ((await TryGetClientWellKnownFromHttps(homeserver)) is { } clientWellKnown) + return new() { + Source = WellKnownResolverService.WellKnownSource.Https, + WellKnown = clientWellKnown + }; + return default!; + }); + } + + private async Task TryGetClientWellKnownFromHttps(string homeserver) { + try { + return await HttpClient.TryGetFromJsonAsync($"https://{homeserver}/.well-known/matrix/support"); + } + catch { + return null; + } + } + + public struct SupportWellKnown { + [JsonPropertyName("contacts")] + public List? Contacts { get; set; } + + [JsonPropertyName("support_page")] + public Uri? SupportPage { get; set; } + + public class WellKnownContact { + [JsonPropertyName("email_address")] + public string? EmailAddress { get; set; } + + [JsonPropertyName("matrix_id")] + public string? MatrixId { get; set; } + + [JsonPropertyName("role")] + public required string Role { get; set; } + } + } +} \ No newline at end of file -- cgit 1.5.1