Basic federation, move some response classes to the right namespace

8 files changed, 80 insertions, 5 deletions

diff --git a/LibMatrix/Extensions/CanonicalJsonSerializer.cs b/LibMatrix/Extensions/CanonicalJsonSerializer.cs

index 55a4b1a..ae535aa 100644
--- a/LibMatrix/Extensions/CanonicalJsonSerializer.cs
+++ b/LibMatrix/Extensions/CanonicalJsonSerializer.cs
@@ -1,6 +1,7 @@
 using System.Collections.Frozen;
 using System.Reflection;
 using System.Text.Json;
+using System.Text.Json.Nodes;
 using System.Text.Json.Serialization.Metadata;
 using ArcaneLibs.Extensions;
 
@@ -57,6 +58,14 @@ public static class CanonicalJsonSerializer {
     // public static String Serialize<TValue>(TValue value, JsonTypeInfo<TValue> jsonTypeInfo) => JsonSerializer.Serialize(value, jsonTypeInfo, _options);
     // public static String Serialize(Object value, JsonTypeInfo jsonTypeInfo) 
 
+    public static byte[] SerializeToUtf8Bytes<T>(T value, JsonSerializerOptions? options = null) {
+        var newOptions = MergeOptions(null);
+        return JsonSerializer.SerializeToNode(value, options) // We want to allow passing custom converters for eg. double/float -> string here...
+            .SortProperties()!
+            .CanonicalizeNumbers()!
+            .ToJsonString(newOptions).AsBytes().ToArray();
+    }
+    
 #endregion
 
     // ReSharper disable once UnusedType.Local
diff --git a/LibMatrix/Homeservers/FederationClient.cs b/LibMatrix/Homeservers/FederationClient.cs

index 617b737..a2cb12d 100644
--- a/LibMatrix/Homeservers/FederationClient.cs
+++ b/LibMatrix/Homeservers/FederationClient.cs
@@ -1,6 +1,7 @@
 using System.Text.Json.Serialization;
 using LibMatrix.Extensions;
 using LibMatrix.Services;
+using Microsoft.VisualBasic.CompilerServices;
 
 namespace LibMatrix.Homeservers;
 
@@ -17,6 +18,70 @@ public class FederationClient {
     public HomeserverResolverService.WellKnownUris WellKnownUris { get; set; }
 
     public async Task<ServerVersionResponse> GetServerVersionAsync() => await HttpClient.GetFromJsonAsync<ServerVersionResponse>("/_matrix/federation/v1/version");
+    public async Task<ServerKeysResponse> GetServerKeysAsync() => await HttpClient.GetFromJsonAsync<ServerKeysResponse>("/_matrix/key/v2/server");
+}
+
+public class ServerKeysResponse {
+    [JsonPropertyName("server_name")]
+    public string ServerName { get; set; }
+
+    [JsonPropertyName("valid_until_ts")]
+    public ulong ValidUntilTs { get; set; }
+
+    [JsonIgnore]
+    public DateTime ValidUntil {
+        get => DateTimeOffset.FromUnixTimeMilliseconds((long)ValidUntilTs).DateTime;
+        set => ValidUntilTs = (ulong)new DateTimeOffset(value).ToUnixTimeMilliseconds();
+    }
+
+    [JsonPropertyName("verify_keys")]
+    public Dictionary<string, CurrentVerifyKey> VerifyKeys { get; set; } = new();
+
+    [JsonIgnore]
+    public Dictionary<VersionedKeyId, CurrentVerifyKey> VerifyKeysById {
+        get => VerifyKeys.ToDictionary(key => (VersionedKeyId)key.Key, key => key.Value);
+        set => VerifyKeys = value.ToDictionary(key => (string)key.Key, key => key.Value);
+    }
+
+    [JsonPropertyName("old_verify_keys")]
+    public Dictionary<string, ExpiredVerifyKey> OldVerifyKeys { get; set; } = new();
+
+    [JsonIgnore]
+    public Dictionary<VersionedKeyId, ExpiredVerifyKey> OldVerifyKeysById {
+        get => OldVerifyKeys.ToDictionary(key => (VersionedKeyId)key.Key, key => key.Value);
+        set => OldVerifyKeys = value.ToDictionary(key => (string)key.Key, key => key.Value);
+    }
+
+    public class VersionedKeyId {
+        public required string Algorithm { get; set; }
+        public required string KeyId { get; set; }
+
+        public static implicit operator VersionedKeyId(string key) {
+            var parts = key.Split(':', 2);
+            if (parts.Length != 2) throw new ArgumentException("Invalid key format. Expected 'algorithm:keyId'.", nameof(key));
+            return new VersionedKeyId { Algorithm = parts[0], KeyId = parts[1] };
+        }
+
+        public static implicit operator string(VersionedKeyId key) => $"{key.Algorithm}:{key.KeyId}";
+        public static implicit operator (string, string)(VersionedKeyId key) => (key.Algorithm, key.KeyId);
+        public static implicit operator VersionedKeyId((string algorithm, string keyId) key) => (key.algorithm, key.keyId);
+    }
+
+    public class CurrentVerifyKey {
+        [JsonPropertyName("key")]
+        public string Key { get; set; }
+    }
+
+    public class ExpiredVerifyKey : CurrentVerifyKey {
+        [JsonPropertyName("expired_ts")]
+        public ulong ExpiredTs { get; set; }
+
+        [JsonIgnore]
+        public DateTime Expired {
+            get => DateTimeOffset.FromUnixTimeMilliseconds((long)ExpiredTs).DateTime;
+            set => ExpiredTs = (ulong)new DateTimeOffset(value).ToUnixTimeMilliseconds();
+        }
+    }
 }
 
 public class ServerVersionResponse {
diff --git a/LibMatrix/EventIdResponse.cs b/LibMatrix/Responses/EventIdResponse.cs

index 6a04229..9e23210 100644
--- a/LibMatrix/EventIdResponse.cs
+++ b/LibMatrix/Responses/EventIdResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace LibMatrix;
+namespace LibMatrix.Responses;
 
 public class EventIdResponse {
     [JsonPropertyName("event_id")]
diff --git a/LibMatrix/MessagesResponse.cs b/LibMatrix/Responses/MessagesResponse.cs

index 526da74..4912add 100644
--- a/LibMatrix/MessagesResponse.cs
+++ b/LibMatrix/Responses/MessagesResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace LibMatrix;
+namespace LibMatrix.Responses;
 
 public class MessagesResponse {
     [JsonPropertyName("start")]
diff --git a/LibMatrix/UserIdAndReason.cs b/LibMatrix/Responses/UserIdAndReason.cs

index 99c9eaf..176cf7c 100644
--- a/LibMatrix/UserIdAndReason.cs
+++ b/LibMatrix/Responses/UserIdAndReason.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace LibMatrix;
+namespace LibMatrix.Responses;
 
 internal class UserIdAndReason(string userId = null!, string reason = null!) {
     [JsonPropertyName("user_id")]
diff --git a/LibMatrix/WhoAmIResponse.cs b/LibMatrix/Responses/WhoAmIResponse.cs

index 10fff35..db47152 100644
--- a/LibMatrix/WhoAmIResponse.cs
+++ b/LibMatrix/Responses/WhoAmIResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace LibMatrix;
+namespace LibMatrix.Responses;
 
 public class WhoAmIResponse {
     [JsonPropertyName("user_id")]
diff --git a/LibMatrix/RoomTypes/GenericRoom.cs b/LibMatrix/RoomTypes/GenericRoom.cs

index 2eb1dba..fd4db4d 100644
--- a/LibMatrix/RoomTypes/GenericRoom.cs
+++ b/LibMatrix/RoomTypes/GenericRoom.cs
@@ -1,6 +1,5 @@
 using System.Collections.Frozen;
 using System.Net.Http.Json;
-using System.Security.Cryptography;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
@@ -12,6 +11,7 @@ using LibMatrix.EventTypes.Spec.State.RoomInfo;
 using LibMatrix.Filters;
 using LibMatrix.Helpers;
 using LibMatrix.Homeservers;
+using LibMatrix.Responses;
 
 namespace LibMatrix.RoomTypes;
 
diff --git a/LibMatrix/RoomTypes/SpaceRoom.cs b/LibMatrix/RoomTypes/SpaceRoom.cs

index 0c74be5..96abd77 100644
--- a/LibMatrix/RoomTypes/SpaceRoom.cs
+++ b/LibMatrix/RoomTypes/SpaceRoom.cs
@@ -1,5 +1,6 @@
 using ArcaneLibs.Extensions;
 using LibMatrix.Homeservers;
+using LibMatrix.Responses;
 
 namespace LibMatrix.RoomTypes;