Merge remote-tracking branch 'origin/RTC-Rewrite' into RTC-Rewrite

# Conflicts:
#	RelayClient/MainPage.xaml.cs

Relay.sln

@@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RelayClient", "RelayClient\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RelayServer", "RelayServer\RelayServer.csproj", "{38995780-E9AA-44D6-B62D-07CCA45E4E4C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RelayShared", "RelayShared\RelayShared.csproj", "{60B17B0B-9910-426A-9B48-AD9377AC89F7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -55,6 +57,18 @@ Global
 		{38995780-E9AA-44D6-B62D-07CCA45E4E4C}.Release|x64.Build.0 = Release|Any CPU
 		{38995780-E9AA-44D6-B62D-07CCA45E4E4C}.Release|x86.ActiveCfg = Release|Any CPU
 		{38995780-E9AA-44D6-B62D-07CCA45E4E4C}.Release|x86.Build.0 = Release|Any CPU
+		{60B17B0B-9910-426A-9B48-AD9377AC89F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60B17B0B-9910-426A-9B48-AD9377AC89F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60B17B0B-9910-426A-9B48-AD9377AC89F7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{60B17B0B-9910-426A-9B48-AD9377AC89F7}.Debug|x64.Build.0 = Debug|Any CPU
+		{60B17B0B-9910-426A-9B48-AD9377AC89F7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{60B17B0B-9910-426A-9B48-AD9377AC89F7}.Debug|x86.Build.0 = Debug|Any CPU
+		{60B17B0B-9910-426A-9B48-AD9377AC89F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{60B17B0B-9910-426A-9B48-AD9377AC89F7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{60B17B0B-9910-426A-9B48-AD9377AC89F7}.Release|x64.ActiveCfg = Release|Any CPU
+		{60B17B0B-9910-426A-9B48-AD9377AC89F7}.Release|x64.Build.0 = Release|Any CPU
+		{60B17B0B-9910-426A-9B48-AD9377AC89F7}.Release|x86.ActiveCfg = Release|Any CPU
+		{60B17B0B-9910-426A-9B48-AD9377AC89F7}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

RelayClient/App.xaml.cs

@@ -2,37 +2,30 @@
 
 public partial class App : Application
 {
-    private bool _openedSecondWindow;
-
     public App()
     {
         InitializeComponent();
+
+        var username = Environment.GetCommandLineArgs()
+            .Skip(1)
+            .Chunk(2)
+            .Where(x => x.Length == 2 && x[0] == "--user")
+            .Select(x => x[1])
+            .FirstOrDefault();
+
+        if (string.IsNullOrWhiteSpace(username))
+        {
+            throw new Exception("Missing required --user argument. Example: --user Keeper317");
+        }
+
+        ClientSession.Username = username;
     }
 
     protected override Window CreateWindow(IActivationState? activationState)
     {
-        var keeperWindow = new Window(new MainPage("Keeper317"))
+        return new Window(new MainPage(ClientSession.Username))
         {
-            Title = "Relay Client - Keeper317"
+            Title = $"Relay Client - {ClientSession.Username}"
         };
-
-        keeperWindow.Created += KeeperWindow_Created;
-
-        return keeperWindow;
-    }
-
-    private void KeeperWindow_Created(object? sender, EventArgs e)
-    {
-        if (_openedSecondWindow)
-            return;
-
-        _openedSecondWindow = false;
-
-        var kiraWindow = new Window(new MainPage("Ru_Kira"))
-        {
-            Title = "Relay Client - Ru_Kira"
-        };
-
-        Current?.OpenWindow(kiraWindow);
     }
 }

RelayClient/ChatSimulator.cs

@@ -1,22 +1,5 @@
 namespace RelayClient;
 
-public static class ChatSimulator
-{
-    public static event Action<ChatMessage>? MessageSent;
-
-    public static void Send(string senderUsername, string text)
-    {
-        var message = new ChatMessage
-        {
-            SenderUsername = senderUsername,
-            Text = text,
-            Timestamp = DateTime.Now
-        };
-
-        MessageSent?.Invoke(message);
-    }
-}
-
 public sealed class ChatMessage
 {
     public required string SenderUsername { get; set; }

RelayClient/ClientSession.cs

@@ -0,0 +1,6 @@
+namespace RelayClient;
+
+public static class ClientSession
+{
+    public static string Username { get; set; } = "Unknown";
+}

RelayClient/Crypto/E2EeHelper.cs

@@ -9,35 +9,33 @@ public static class E2EeHelper
     {
         using var rsa = RSA.Create(2048);
 
-        var publicKey = Convert.ToBase64String(rsa.ExportSubjectPublicKeyInfo());
+        return (
-        var privateKey = Convert.ToBase64String(rsa.ExportPkcs8PrivateKey());
+            Convert.ToBase64String(rsa.ExportSubjectPublicKeyInfo()),
-
+            Convert.ToBase64String(rsa.ExportPkcs8PrivateKey())
-        return (publicKey, privateKey);
+        );
     }
 
-    public static EncryptedMessagePayload EncryptForRecipient(string plainText, string recipientPublicKeyBase64)
+    public static EncryptedPayload EncryptForRecipient(string plainText, string recipientPublicKeyBase64)
     {
-        var aesKey = RandomNumberGenerator.GetBytes(32);
+        byte[] aesKey = RandomNumberGenerator.GetBytes(32);
-        var nonce = RandomNumberGenerator.GetBytes(12);
+        byte[] nonce = RandomNumberGenerator.GetBytes(12);
-        var plainBytes = Encoding.UTF8.GetBytes(plainText);
+        byte[] plainBytes = Encoding.UTF8.GetBytes(plainText);
-        var cipherBytes = new byte[plainBytes.Length];
+        byte[] cipherBytes = new byte[plainBytes.Length];
-        var tag = new byte[16];
+        byte[] tag = new byte[16];
 
         using (var aes = new AesGcm(aesKey, 16))
         {
             aes.Encrypt(nonce, plainBytes, cipherBytes, tag);
         }
 
-        var recipientPublicKey = Convert.FromBase64String(recipientPublicKeyBase64);
         byte[] encryptedKey;
-
         using (var rsa = RSA.Create())
         {
-            rsa.ImportSubjectPublicKeyInfo(recipientPublicKey, out _);
+            rsa.ImportSubjectPublicKeyInfo(Convert.FromBase64String(recipientPublicKeyBase64), out _);
             encryptedKey = rsa.Encrypt(aesKey, RSAEncryptionPadding.OaepSHA256);
         }
 
-        return new EncryptedMessagePayload
+        return new EncryptedPayload
         {
             CipherText = Convert.ToBase64String(cipherBytes),
             Nonce = Convert.ToBase64String(nonce),
@@ -46,34 +44,32 @@ public static class E2EeHelper
         };
     }
 
-    public static string DecryptForRecipient(EncryptedMessagePayload payload, string recipientPrivateKeyBase64)
+    public static string DecryptForRecipient(EncryptedPayload payload, string recipientPrivateKeyBase64)
     {
-        var encryptedKey = Convert.FromBase64String(payload.EncryptedKey);
-        var privateKey = Convert.FromBase64String(recipientPrivateKeyBase64);
-
         byte[] aesKey;
-
         using (var rsa = RSA.Create())
         {
-            rsa.ImportPkcs8PrivateKey(privateKey, out _);
+            rsa.ImportPkcs8PrivateKey(Convert.FromBase64String(recipientPrivateKeyBase64), out _);
-            aesKey = rsa.Decrypt(encryptedKey, RSAEncryptionPadding.OaepSHA256);
+            aesKey = rsa.Decrypt(Convert.FromBase64String(payload.EncryptedKey), RSAEncryptionPadding.OaepSHA256);
         }
 
-        var nonce = Convert.FromBase64String(payload.Nonce);
+        byte[] plainBytes = new byte[Convert.FromBase64String(payload.CipherText).Length];
-        var tag = Convert.FromBase64String(payload.Tag);
-        var cipherBytes = Convert.FromBase64String(payload.CipherText);
-        var plainBytes = new byte[cipherBytes.Length];
 
         using (var aes = new AesGcm(aesKey, 16))
         {
-            aes.Decrypt(nonce, cipherBytes, tag, plainBytes);
+            aes.Decrypt(
+                Convert.FromBase64String(payload.Nonce),
+                Convert.FromBase64String(payload.CipherText),
+                Convert.FromBase64String(payload.Tag),
+                plainBytes
+            );
         }
 
         return Encoding.UTF8.GetString(plainBytes);
     }
 }
 
-public class EncryptedMessagePayload
+public class EncryptedPayload
 {
     public required string CipherText { get; set; }
     public required string Nonce { get; set; }

RelayClient/Crypto/KeyStorage.cs

@@ -2,19 +2,36 @@ namespace RelayClient.Crypto;
 
 public static class KeyStorage
 {
+    private static string GetKeyFolder()
+    {
+        var folder = Path.Combine(FileSystem.AppDataDirectory, "keys");
+        Directory.CreateDirectory(folder);
+        return folder;
+    }
+
     public static void SavePrivateKey(string username, string privateKey)
     {
-        Directory.CreateDirectory("keys");
+        File.WriteAllText(Path.Combine(GetKeyFolder(), $"{username}.private.key"), privateKey);
-        File.WriteAllText(Path.Combine("keys", $"{username}.private.key"), privateKey);
+    }
+
+    public static void SavePublicKey(string username, string publicKey)
+    {
+        File.WriteAllText(Path.Combine(GetKeyFolder(), $"{username}.public.key"), publicKey);
     }
 
     public static string LoadPrivateKey(string username)
     {
-        return File.ReadAllText(Path.Combine("keys", $"{username}.private.key"));
+        return File.ReadAllText(Path.Combine(GetKeyFolder(), $"{username}.private.key"));
     }
 
-    public static bool PrivateKeyExists(string username)
+    public static string LoadPublicKey(string username)
     {
-        return File.Exists(Path.Combine("keys", $"{username}.private.key"));
+        return File.ReadAllText(Path.Combine(GetKeyFolder(), $"{username}.public.key"));
+    }
+
+    public static bool HasKeys(string username)
+    {
+        return File.Exists(Path.Combine(GetKeyFolder(), $"{username}.private.key")) &&
+               File.Exists(Path.Combine(GetKeyFolder(), $"{username}.public.key"));
     }
 }

RelayClient/MainPage.xaml

@@ -5,26 +5,74 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     Title="Relay Client">
 
-    <Grid RowDefinitions="Auto,*,Auto" Padding="12" RowSpacing="10">
+    <Grid RowDefinitions="Auto,*,Auto"
+          ColumnDefinitions="220,*"
+          Padding="12"
+          RowSpacing="10"
+          ColumnSpacing="10">
 
-        <Border Grid.Row="0" StrokeThickness="1" Padding="10">
+        <!-- Header -->
+        <Border Grid.Row="0"
+                Grid.ColumnSpan="2"
+                StrokeThickness="1"
+                Padding="10">
             <VerticalStackLayout Spacing="4">
                 <Label x:Name="UserLabel"
                        Text="Logged in as: Unknown"
                        FontAttributes="Bold"
                        FontSize="18" />
-                <Label Text="#general"
+                <Label x:Name="ChannelLabel"
+                       Text="No channel selected"
                        FontSize="14" />
             </VerticalStackLayout>
         </Border>
 
-        <Border Grid.Row="1" StrokeThickness="1" Padding="10">
+        <!-- Sidebar -->
-            <ScrollView x:Name="MessagesScrollView">
+        <Border Grid.Row="1"
-                <VerticalStackLayout x:Name="MessagesLayout" Spacing="8" />
+                Grid.Column="0"
+                StrokeThickness="1"
+                Padding="10">
+            <ScrollView>
+                <VerticalStackLayout Spacing="8">
+                    <Label Text="Channels"
+                           FontAttributes="Bold"
+                           FontSize="16" />
+                    <VerticalStackLayout x:Name="SidebarList"
+                                         Spacing="6" />
+                </VerticalStackLayout>
             </ScrollView>
         </Border>
 
-        <Grid Grid.Row="2" ColumnDefinitions="*,Auto" ColumnSpacing="10">
+        <!-- Messages -->
+        <Border Grid.Row="1"
+                Grid.Column="1"
+                StrokeThickness="1"
+                Padding="10">
+            <ScrollView x:Name="MessagesScrollView">
+                <VerticalStackLayout x:Name="MessagesLayout"
+                                     Spacing="8" />
+            </ScrollView>
+        </Border>
+        <Border x:Name="RtcView"
+                Grid.Row="1"
+                Grid.Column="1"
+                StrokeThickness="1"
+                Padding="10"
+                IsVisible="False">
+            <!-- <WebView Source="test.html"/> -->
+            <Grid RowDefinitions="Auto,*"
+                  ColumnDefinitions="*">
+                <HybridWebView x:Name="hybridWebView"
+                               RawMessageReceived="OnHybridWebViewRawMessageReceived"
+                               Grid.Row="1" />
+            </Grid>
+        </Border>
+
+        <!-- Input -->
+        <Grid Grid.Row="2"
+              Grid.Column="1"
+              ColumnDefinitions="*,Auto"
+              ColumnSpacing="10">
             <Entry x:Name="MessageEntry"
                    Grid.Column="0"
                    Placeholder="Type a message..."
@@ -35,6 +83,11 @@
                     Text="Send"
                     Clicked="SendButton_OnClicked" />
         </Grid>
+        
+        <!-- Swap View -->
+        <Button x:Name="ViewSwapped" Grid.Row="2" Grid.Column="0"
+                Text="Swap to WebView"
+                Clicked="SwapView_OnClicked" />
 
     </Grid>
 </ContentPage>

RelayClient/MainPage.xaml.cs

@@ -1,8 +1,22 @@
-namespace RelayClient;
+using System.Text.Json.Serialization;
+using RelayClient.Crypto;
+using RelayClient.Services;
+using RelayShared.Rtc;
+using RelayShared.Services;
+
+namespace RelayClient;
 
 public partial class MainPage : ContentPage
 {
     private readonly string _username;
+    private readonly RelaySocketClient _socket;
+    private readonly RtcBridgeService _rtc;
+
+    private string? _currentChannelId;
+    private string? _currentChannelName;
+
+    private readonly Dictionary<string, List<ChatMessage>> _messagesByChannel = new();
+    private readonly List<ChannelItem> _channels = [];
 
     public MainPage(string username)
     {
@@ -11,86 +25,318 @@ public partial class MainPage : ContentPage
         _username = username;
         UserLabel.Text = $"Logged in as: {_username}";
 
-        ChatSimulator.MessageSent += OnMessageSent;
+        if (!KeyStorage.HasKeys(_username))
+        {
+            var keys = E2EeHelper.GenerateRsaKeyPair();
+            KeyStorage.SavePrivateKey(_username, keys.privateKey);
+            KeyStorage.SavePublicKey(_username, keys.publicKey);
+        }
+
+        ServerAPI.setupClient();
+
+        _socket = new RelaySocketClient(_username);
+        _rtc = new RtcBridgeService(
+            _username,
+            _socket,
+            hybridWebView,
+            () => _currentChannelId,
+            SafeSendRawToWebView
+        );
+        
+        hybridWebView.SetInvokeJavaScriptTarget(_rtc);
+
+        _socket.Log += Console.WriteLine;
+        _socket.ChannelListReceived += HandleChannelList;
+        _socket.EncryptedChatReceived += HandleEncryptedChat;
+        _socket.EncryptedRtcSignalReceived += payload =>
+        {
+            MainThread.BeginInvokeOnMainThread(async () =>
+            {
+                await _rtc.HandleIncomingRtcSignalAsync(payload);
+            });
+        };
+
+        _socket.Connect();
     }
 
     private void SendButton_OnClicked(object? sender, EventArgs e)
     {
-        SendMessage(sender, e);
+        SendMessage();
     }
 
     private void MessageEntry_OnCompleted(object? sender, EventArgs e)
     {
-        SendMessage(sender, e);
+        SendMessage();
     }
 
-    private void SendMessage(object? sender, EventArgs e)
+    private void SendMessage()
     {
         var text = MessageEntry.Text?.Trim();
 
         if (string.IsNullOrWhiteSpace(text))
             return;
-        
-        MauiProgram.wsc.Send($"{_username}:{text}");
 
-        // ChatSimulator.Send(_username, text);
+        if (string.IsNullOrWhiteSpace(_socket.ServerPublicKey))
+        {
+            Console.WriteLine("Server public key not loaded yet.");
+            return;
+        }
 
-        Console.WriteLine($"[{_username}] sent message: {text}");
+        if (string.IsNullOrWhiteSpace(_currentChannelId))
-        
+        {
+            Console.WriteLine("No channel selected yet.");
+            return;
+        }
+
+        var encrypted = E2EeHelper.EncryptForRecipient(text, _socket.ServerPublicKey);
+
+        var payload = new SocketEncryptedMessage
+        {
+            ChannelId = _currentChannelId!,
+            Type = SignalType.ClientEncryptedChat,
+            SenderUsername = _username,
+            CipherText = encrypted.CipherText,
+            Nonce = encrypted.Nonce,
+            Tag = encrypted.Tag,
+            EncryptedKey = encrypted.EncryptedKey
+        };
+
+        _socket.SendJson(payload);
+
+        Console.WriteLine($"[{_username}] sent encrypted message.");
 
         MessageEntry.Text = string.Empty;
         MessageEntry.Focus();
     }
 
-    private void OnMessageSent(ChatMessage message)
+    private void HandleChannelList(SocketChannelList channelList)
     {
+        _channels.Clear();
+        _channels.AddRange(channelList.Channels.OrderBy(c => c.CreatedAt));
+
+        var defaultChannel = _channels
+                                 .Where(c => c.Name.Equals("welcome", StringComparison.OrdinalIgnoreCase))
+                                 .OrderBy(c => c.CreatedAt)
+                                 .FirstOrDefault()
+                             ?? _channels.OrderBy(c => c.CreatedAt).FirstOrDefault();
+
+        if (defaultChannel is null) return;
+
+        _currentChannelId = defaultChannel.ChannelId;
+        _currentChannelName = defaultChannel.Name;
+
         MainThread.BeginInvokeOnMainThread(async () =>
         {
-            bool isOwnMessage = message.SenderUsername == _username;
+            ChannelLabel.Text = $"#{_currentChannelName}";
-
+            RenderChannelList();
-            var bubble = new Border
+            await _rtc.PushRtcContextToJsAsync();
-            {
-                StrokeThickness = 1,
-                Padding = 10,
-                Margin = isOwnMessage
-                    ? new Thickness(40, 0, 0, 0)
-                    : new Thickness(0, 0, 40, 0),
-                HorizontalOptions = isOwnMessage
-                    ? LayoutOptions.End
-                    : LayoutOptions.Start,
-                Content = new VerticalStackLayout
-                {
-                    Spacing = 2,
-                    Children =
-                    {
-                        new Label
-                        {
-                            Text = message.SenderUsername,
-                            FontAttributes = FontAttributes.Bold,
-                            FontSize = 12
-                        },
-                        new Label
-                        {
-                            Text = message.Text,
-                            FontSize = 14
-                        },
-                        new Label
-                        {
-                            Text = message.Timestamp.ToString("h:mm tt"),
-                            FontSize = 10
-                        }
-                    }
-                }
-            };
-
-            MessagesLayout.Children.Add(bubble);
-            await MessagesScrollView.ScrollToAsync(MessagesLayout, ScrollToPosition.End, true);
         });
+
+        _socket.SendRaw($"GET_HISTORY|{_username}|{_currentChannelId}");
+    }
+
+    private void HandleEncryptedChat(SocketEncryptedMessage payload) {
+        if (payload.RecipientUsername != _username)
+            return;
+
+        string decryptedText;
+
+        try
+        {
+            var privateKey = KeyStorage.LoadPrivateKey(_username);
+
+            decryptedText = E2EeHelper.DecryptForRecipient(
+                new EncryptedPayload
+                {
+                    CipherText = payload.CipherText,
+                    Nonce = payload.Nonce,
+                    Tag = payload.Tag,
+                    EncryptedKey = payload.EncryptedKey
+                },
+                privateKey
+            ); 
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine($"[{_username}] failed to decrypt chat: {ex.Message}");
+            return;
+        }
+
+        var message = new ChatMessage
+        {
+            SenderUsername = payload.SenderUsername,
+            Text = decryptedText,
+            Timestamp = DateTime.Now
+        };
+
+        if (!_messagesByChannel.ContainsKey(payload.ChannelId))
+            _messagesByChannel[payload.ChannelId] = [];
+
+        _messagesByChannel[payload.ChannelId].Add(message);
+
+        if (payload.ChannelId == _currentChannelId)
+        {
+            MainThread.BeginInvokeOnMainThread(() =>
+            {
+                RenderSingleMessage(message);
+            });
+        }
     }
 
     protected override void OnDisappearing()
     {
-        ChatSimulator.MessageSent -= OnMessageSent;
+        _socket.Disconnect();
         base.OnDisappearing();
     }
+
+    private void RenderChannelList()
+    {
+        SidebarList.Children.Clear();
+
+        foreach (var channel in _channels.OrderBy(c => c.CreatedAt))
+        {
+            var button = new ChannelButton
+            {
+                Text = $"#{channel.Name}",
+                Type = channel.Type,
+                Group = channel.Group
+            };
+
+            button.Clicked += (_, _) =>
+            {
+                _currentChannelId = channel.ChannelId;
+                _currentChannelName = channel.Name;
+
+                MainThread.BeginInvokeOnMainThread(async () =>
+                {
+                    await _rtc.PushRtcContextToJsAsync();
+
+                    if (channel.Type == ChannelType.Voice)
+                    {
+                        if (!RtcView.IsVisible)
+                            SwapView();
+
+                        _ = _rtc.JoinRtcChannel();
+                    }
+                });
+
+                ChannelLabel.Text = $"#{_currentChannelName}";
+                RenderCurrentChannelMessages();
+
+                if (!_messagesByChannel.ContainsKey(channel.ChannelId))
+                    _socket.SendRaw($"GET_HISTORY|{_username}|{channel.ChannelId}");
+            };
+
+            SidebarList.Children.Add(button);
+        }
+    }
+
+    private void RenderCurrentChannelMessages()
+    {
+        MessagesLayout.Children.Clear();
+
+        if (_currentChannelId is null)
+            return;
+
+        if (!_messagesByChannel.TryGetValue(_currentChannelId, out var messages))
+            return;
+
+        foreach (var message in messages.OrderBy(m => m.Timestamp))
+        {
+            RenderSingleMessage(message);
+        }
+    }
+
+    private async void RenderSingleMessage(ChatMessage message)
+    {
+        var isOwnMessage = message.SenderUsername == _username;
+
+        var bubble = new Border
+        {
+            StrokeThickness = 1,
+            Padding = 10,
+            Margin = isOwnMessage
+                ? new Thickness(40, 0, 0, 0)
+                : new Thickness(0, 0, 40, 0),
+            HorizontalOptions = isOwnMessage
+                ? LayoutOptions.End
+                : LayoutOptions.Start,
+            Content = new VerticalStackLayout
+            {
+                Spacing = 2,
+                Children =
+                {
+                    new Label { Text = message.SenderUsername, FontAttributes = FontAttributes.Bold, FontSize = 12 },
+                    new Label { Text = message.Text, FontSize = 14 },
+                    new Label { Text = message.Timestamp.ToString("h:mm tt"), FontSize = 10 }
+                }
+            }
+        };
+
+        MessagesLayout.Children.Add(bubble);
+        await MessagesScrollView.ScrollToAsync(MessagesLayout, ScrollToPosition.End, true);
+    }
+
+    private void SwapView()
+    {
+        if (RtcView.IsVisible)
+        {
+            MessagesScrollView.IsVisible = true;
+            RtcView.IsVisible = false;
+            ViewSwapped.Text = "Swap to Web View";
+        }
+        else
+        {
+            MessagesScrollView.IsVisible = false;
+            RtcView.IsVisible = true;
+            ViewSwapped.Text = "Swap to Message View";
+        }
+    }
+
+    private void SwapView_OnClicked(object? sender, EventArgs e)
+    {
+        SwapView();
+    }
+
+    private async void OnHybridWebViewRawMessageReceived(object sender, HybridWebViewRawMessageReceivedEventArgs e)
+    {
+        if (e.Message == "rtc_page_ready")
+        {
+            await _rtc.PushRtcContextToJsAsync();
+            return;
+        }
+
+        SafeSendRawToWebView($"JS RAW -> C#: {e.Message}");
+    }
+
+    private void SafeSendRawToWebView(string message)
+    {
+        MainThread.BeginInvokeOnMainThread(() =>
+        {
+            try
+            {
+                hybridWebView.SendRawMessage(message);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"[{_username}] failed to send raw message to HybridWebView: {ex.Message}");
+            }
+        });
+    }
+
+    public class ChannelButton : Button
+    {
+        public ChannelType Type { get; set; }
+        public string Group { get; set; } = string.Empty;
+    }
+
+    [JsonSourceGenerationOptions(WriteIndented = false)]
+    [JsonSerializable(typeof(RtcDescription))]
+    [JsonSerializable(typeof(List<RtcSignalMessage>))]
+    [JsonSerializable(typeof(IceCandidate))]
+    [JsonSerializable(typeof(List<IceCandidate>))]
+    [JsonSerializable(typeof(string))]
+    internal partial class HybridJSType : JsonSerializerContext
+    {
+    }
 }

RelayClient/MauiProgram.cs

@@ -5,12 +5,8 @@ namespace RelayClient;
 
 public static class MauiProgram
 {
-    // public static event Action<ChatMessage>? MessageSent;
-    public static WebSocket wsc = new WebSocket("ws://localhost:1337");
     public static MauiApp CreateMauiApp()
     {
-        wsc.OnMessage += (sender, e) => OnWebSocketRecieved(sender, e);
-        wsc.Connect();
         var builder = MauiApp.CreateBuilder();
         builder.UseMauiApp<App>().ConfigureFonts(fonts =>
             {
@@ -19,29 +15,12 @@ public static class MauiProgram
                 fonts.AddFont("AnonymousPro-Italic.ttf", "AnonymousProItalic");
                 fonts.AddFont("AnonymousPro-Regular.ttf", "AnonymousProRegular");
             });
-        
-        
 
 #if DEBUG
-        builder.Logging.AddDebug();
+        builder.Services.AddHybridWebViewDeveloperTools();
+        builder.Logging.AddDebug(); 
 #endif
 
         return builder.Build();
     }
-
-    public static void OnWebSocketRecieved(object? sender, MessageEventArgs e)
-    {
-        Console.WriteLine(sender.ToString());
-        
-        ChatSimulator.Send(e.Data.Split(":")[0], e.Data.Split(":")[1]);
-
-        // var message = new ChatMessage
-        // {
-        //     SenderUsername = e.Data.Split(":")[0],
-        //     Text = e.Data.Split(":")[1],
-        //     Timestamp = DateTime.Now
-        // };
-        //
-        // MessageSent?.Invoke(message);
-    }
 }

RelayClient/RelayClient.csproj

@@ -36,13 +36,26 @@
         <MauiImage Update="Resources\Images\dotnet_bot.png" Resize="True" BaseSize="300,185" />
         <MauiFont Include="Resources\Fonts\*" />
         <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
+        <None Remove="Resources\Raw\test.html" />
+        <MauiAsset Include="Resources\Raw\test.html">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </MauiAsset>
     </ItemGroup>
 
     <ItemGroup>
+        <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="11.0.0-preview.2.26159.112" />
         <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
         <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
         <PackageReference Include="SurrealDb.Net" Version="0.9.0" />
         <PackageReference Include="WebSocketSharp" Version="1.0.3-rc11" />
     </ItemGroup>
 
+    <ItemGroup>
+      <ProjectReference Include="..\RelayShared\RelayShared.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Folder Include="Models\" />
+    </ItemGroup>
+
 </Project>

RelayClient/Resources/AppIcon/appicon.svg

@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="New_Version" data-name="New Version" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 759.23 759.23"><defs><style>.cls-1{fill:#2e3338;}</style></defs><path id="Background" class="cls-1" d="M177.77,0H581.46A177.77,177.77,0,0,1,759.23,177.77V581.46A177.77,177.77,0,0,1,581.46,759.23H177.77A177.77,177.77,0,0,1,0,581.46V177.77A177.77,177.77,0,0,1,177.77,0Z"/></svg>
-<svg width="456" height="456" viewBox="0 0 456 456" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <rect x="0" y="0" width="456" height="456" fill="#512BD4" />
-</svg>

RelayClient/Resources/AppIcon/old_appicon.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="456" height="456" viewBox="0 0 456 456" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <rect x="0" y="0" width="456" height="456" fill="#512BD4" />
+</svg>

RelayClient/Resources/AppIcon/old_appiconfg.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="456" height="456" viewBox="0 0 456 456" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <path d="m 105.50037,281.60863 c -2.70293,0 -5.00091,-0.90042 -6.893127,-2.70209 -1.892214,-1.84778 -2.837901,-4.04181 -2.837901,-6.58209 0,-2.58722 0.945687,-4.80389 2.837901,-6.65167 1.892217,-1.84778 4.190197,-2.77167 6.893127,-2.77167 2.74819,0 5.06798,0.92389 6.96019,2.77167 1.93749,1.84778 2.90581,4.06445 2.90581,6.65167 0,2.54028 -0.96832,4.73431 -2.90581,6.58209 -1.89221,1.80167 -4.212,2.70209 -6.96019,2.70209 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
+    <path d="M 213.56111,280.08446 H 195.99044 L 149.69953,207.0544 c -1.17121,-1.84778 -2.14037,-3.76515 -2.90581,-5.75126 h -0.40578 c 0.36051,2.12528 0.54076,6.67515 0.54076,13.6496 v 65.13172 h -15.54349 v -99.36009 h 18.71925 l 44.7374,71.29798 c 1.89222,2.95695 3.1087,4.98917 3.64945,6.09751 h 0.26996 c -0.45021,-2.6325 -0.67573,-7.09015 -0.67573,-13.37293 v -64.02256 h 15.47557 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
+    <path d="m 289.25134,280.08446 h -54.40052 v -99.36009 h 52.23835 v 13.99669 h -36.15411 v 28.13085 h 33.31621 v 13.9271 h -33.31621 v 29.37835 h 38.31628 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
+    <path d="M 366.56466,194.72106 H 338.7222 v 85.3634 h -16.08423 v -85.3634 h -27.77455 v -13.99669 h 71.70124 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
+</svg>

RelayClient/Resources/Raw/test.css

@@ -0,0 +1,24 @@
+@import url('https://fonts.googleapis.com/css2?family=Anonymous+Pro');
+
+body {
+  font-family: 'Anonymous Pro', monospace;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  text-align: center;
+  color: #2c3e50;
+  margin: 80px 10px;
+  background-color: #666666;
+}
+
+video {
+  width: 40vw;
+  height: 30vw;
+  margin: 2rem;
+  background: #2c3e50;
+}
+
+.videos {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}

RelayClient/Resources/Raw/test.html

@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="favicon.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>WebRTC Demo</title>
+  </head>
+  <body>
+    <h2>1. Start your Webcam</h2>
+    <div class="videos">
+      <span>
+        <h3>Local Stream</h3>
+        <video id="webcamVideo" autoplay playsinline></video>
+      </span>
+      <span>
+        <h3>Remote Stream</h3>
+        <video id="remoteVideo" autoplay playsinline></video>
+      </span>
+
+
+    </div>
+
+    <button id="webcamButton">Start webcam</button>
+    <h2>2. Create a new Call</h2>
+    <button id="callButton" disabled>Create Call (offer)</button>
+
+    <h2>3. Join a Call</h2>
+    <p>Answer the call from a different browser window or device</p>
+    
+    <input id="callInput" />
+    <button id="answerButton" disabled>Answer</button>
+
+    <h2>4. Hangup</h2>
+
+    <button id="hangupButton" disabled>Hangup</button>
+
+    <script type="module" src="test.js"></script>
+
+  </body>
+</html>

RelayClient/Resources/Raw/test.js

@@ -0,0 +1,146 @@
+import './test.css';
+
+import firebase from 'firebase/app';
+import 'firebase/firestore';
+
+const firebaseConfig = {
+  // your config
+};
+
+if (!firebase.apps.length) {
+  firebase.initializeApp(firebaseConfig);
+}
+const firestore = firebase.firestore();
+
+const servers = {
+  iceServers: [
+    {
+      urls: ['stun:stun1.l.google.com:19302', 'stun:stun2.l.google.com:19302'],
+    },
+  ],
+  iceCandidatePoolSize: 10,
+};
+
+// Global State
+const pc = new RTCPeerConnection(servers);
+let localStream = null;
+let remoteStream = null;
+
+// HTML elements
+const webcamButton = document.getElementById('webcamButton');
+const webcamVideo = document.getElementById('webcamVideo');
+const callButton = document.getElementById('callButton');
+const callInput = document.getElementById('callInput');
+const answerButton = document.getElementById('answerButton');
+const remoteVideo = document.getElementById('remoteVideo');
+const hangupButton = document.getElementById('hangupButton');
+
+// 1. Setup media sources
+
+webcamButton.onclick = async () => {
+  localStream = await navigator.mediaDevices.getUserMedia({ video: true, audio: true });
+  remoteStream = new MediaStream();
+
+  // Push tracks from local stream to peer connection
+  localStream.getTracks().forEach((track) => {
+    pc.addTrack(track, localStream);
+  });
+
+  // Pull tracks from remote stream, add to video stream
+  pc.ontrack = (event) => {
+    event.streams[0].getTracks().forEach((track) => {
+      remoteStream.addTrack(track);
+    });
+  };
+
+  webcamVideo.srcObject = localStream;
+  remoteVideo.srcObject = remoteStream;
+
+  callButton.disabled = false;
+  answerButton.disabled = false;
+  webcamButton.disabled = true;
+};
+
+// 2. Create an offer
+callButton.onclick = async () => {
+  // Reference Firestore collections for signaling
+  const callDoc = firestore.collection('calls').doc();
+  const offerCandidates = callDoc.collection('offerCandidates');
+  const answerCandidates = callDoc.collection('answerCandidates');
+
+  callInput.value = callDoc.id;
+
+  // Get candidates for caller, save to db
+  pc.onicecandidate = (event) => {
+    event.candidate && offerCandidates.add(event.candidate.toJSON());
+  };
+
+  // Create offer
+  const offerDescription = await pc.createOffer();
+  await pc.setLocalDescription(offerDescription);
+
+  const offer = {
+    sdp: offerDescription.sdp,
+    type: offerDescription.type,
+  };
+
+  await callDoc.set({ offer });
+
+  // Listen for remote answer
+  callDoc.onSnapshot((snapshot) => {
+    const data = snapshot.data();
+    if (!pc.currentRemoteDescription && data?.answer) {
+      const answerDescription = new RTCSessionDescription(data.answer);
+      pc.setRemoteDescription(answerDescription);
+    }
+  });
+
+  // When answered, add candidate to peer connection
+  answerCandidates.onSnapshot((snapshot) => {
+    snapshot.docChanges().forEach((change) => {
+      if (change.type === 'added') {
+        const candidate = new RTCIceCandidate(change.doc.data());
+        pc.addIceCandidate(candidate);
+      }
+    });
+  });
+
+  hangupButton.disabled = false;
+};
+
+// 3. Answer the call with the unique ID
+answerButton.onclick = async () => {
+  const callId = callInput.value;
+  const callDoc = firestore.collection('calls').doc(callId);
+  const answerCandidates = callDoc.collection('answerCandidates');
+  const offerCandidates = callDoc.collection('offerCandidates');
+
+  pc.onicecandidate = (event) => {
+    event.candidate && answerCandidates.add(event.candidate.toJSON());
+  };
+
+  const callData = (await callDoc.get()).data();
+
+  const offerDescription = callData.offer;
+  await pc.setRemoteDescription(new RTCSessionDescription(offerDescription));
+
+  const answerDescription = await pc.createAnswer();
+  await pc.setLocalDescription(answerDescription);
+
+  const answer = {
+    type: answerDescription.type,
+    sdp: answerDescription.sdp,
+  };
+
+  await callDoc.update({ answer });
+
+  offerCandidates.onSnapshot((snapshot) => {
+    snapshot.docChanges().forEach((change) => {
+      console.log(change);
+      if (change.type === 'added') {
+        let data = change.doc.data();
+        pc.addIceCandidate(new RTCIceCandidate(data));
+      }
+    });
+  });
+};

RelayClient/Resources/Raw/wwwroot/index.css

@@ -0,0 +1,114 @@
+body {
+    margin: 0;
+    padding: 16px;
+    background-color: #121212;
+    color: #FFFFFF;
+    font-family: "Segoe UI", Arial, sans-serif;
+}
+
+h3 {
+    margin: 0 0 10px 0;
+    color: #FFA9D1F4;
+}
+
+button {
+    background-color: #332940;
+    color: #FFFFFF;
+    border: none;
+    padding: 8px 12px;
+    margin-right: 6px;
+    border-radius: 6px;
+    cursor: pointer;
+    transition: background 0.2s ease, transform 0.05s ease;
+}
+
+button:hover {
+    background-color: #40324f;
+}
+
+button:active {
+    transform: scale(0.97);
+}
+
+select {
+    background-color: #332940;
+    color: #FFFFFF;
+    border: none;
+    padding: 6px;
+    border-radius: 6px;
+    margin-left: 4px;
+}
+
+label {
+    font-size: 14px;
+}
+
+video {
+    border-radius: 8px;
+    border: 1px solid #332940;
+    background-color: #1F1A24;
+}
+
+#localVideoStatus,
+#remoteVideoStatus,
+#localMediaStatus,
+#remoteMediaStatus {
+    font-size: 12px;
+    margin-top: 4px;
+    color: #FFA9D1F4;
+}
+
+textarea {
+    background-color: #1F1A24;
+    color: #FFFFFF;
+    border: 1px solid #332940;
+    border-radius: 8px;
+    padding: 8px;
+    font-family: monospace;
+    resize: none;
+}
+
+div {
+    margin-bottom: 6px;
+}
+
+textarea::-webkit-scrollbar {
+    width: 8px;
+}
+
+textarea::-webkit-scrollbar-thumb {
+    background: #332940;
+    border-radius: 4px;
+}
+
+.panel {
+    background: #1F1A24;
+    border: 1px solid #332940;
+    border-radius: 10px;
+    padding: 12px;
+}
+
+.remote-media-container {
+    display: flex;
+    flex-direction: row;
+    gap: 16px;
+    align-items: flex-start;
+    flex-wrap: nowrap;
+    overflow-x: auto;
+    padding: 8px 0;
+}
+
+.remote-media-tile,
+.remote-tile {
+    flex: 0 0 auto;
+    width: 320px;
+}
+
+.remote-media-tile video,
+.remote-tile video {
+    width: 320px;
+    height: 240px;
+    background: #111;
+    border-radius: 8px;
+    object-fit: cover;
+}

RelayClient/Resources/Raw/wwwroot/index.html

@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+    <link rel="icon" href="data:,">
+    <link rel="stylesheet" href="styles/app.css">
+    <link rel="stylesheet" href="index.css">
+    <script src="_framework/hybridwebview.js"></script>
+    <script src="media.js"></script>
+    <script src="relaySocket.js"></script>
+    <script src="rtc.js"></script>
+    <script src="index.js"></script>
+</head>
+    <body>
+        <div>
+            <h3>Relay RTC Test</h3>
+        </div>
+
+        <div>
+            <button onclick="Media.refreshDevicesAndPreview()">Refresh Devices</button>
+            <button onclick="RelayRtc.joinChannelCall()">Join Call</button>
+        </div>
+
+        <div style="margin-top: 8px;">
+            <label for="cameraSelect">Camera:</label>
+            <select id="cameraSelect"></select>
+
+            <label for="micSelect" style="margin-left: 12px;">Microphone:</label>
+            <select id="micSelect"></select>
+        </div>
+
+        <div style="margin-top: 10px;">
+            <div style="display: inline-block; margin-right: 20px; vertical-align: top;">
+                <video id="localVideo" autoplay playsinline muted style="width: 320px; height: 240px; background: #111;"></video>
+                <div id="localVideoStatus">Local video: waiting...</div>
+                <div id="localMediaStatus">Waiting for local media...</div>
+            </div>
+
+            <div id="remoteMediaContainer" class="remote-media-container"></div>
+        </div>
+        
+        <div style="margin-top: 10px;">
+            <textarea readonly id="messageLog" style="width: 90%; height: 12em;"></textarea>
+        </div>
+    </body>
+</html>

RelayClient/Resources/Raw/wwwroot/index.js

@@ -0,0 +1,52 @@
+let currentUsername = null;
+let currentChannelId = null;
+
+const configuration = {
+    iceServers: [
+        {
+            urls: [
+                "stun:stun1.l.google.com:19302",
+                "stun:stun2.l.google.com:19302"
+            ]
+        }
+    ],
+    iceCandidatePoolSize: 10
+};
+
+window.setUsername = function (name) {
+    currentUsername = name;
+    LogMessage("Username set to: " + currentUsername);
+};
+
+window.setChannelId = function (channelId) {
+    currentChannelId = channelId;
+    LogMessage("Channel set to: " + currentChannelId);
+};
+
+function LogMessage(msg) {
+    const messageLog = document.getElementById("messageLog");
+
+    if (!messageLog) {
+        console.log(msg);
+        return;
+    }
+
+    messageLog.value += "\r\n" + msg;
+    messageLog.scrollTop = messageLog.scrollHeight;
+}
+
+window.LogMessage = LogMessage;
+
+window.addEventListener("HybridWebViewMessageReceived", function (e) {
+    LogMessage("Raw message: " + e.detail.message);
+});
+
+window.addEventListener("load", async () => {
+    LogMessage("RTC page loaded");
+
+    window.HybridWebView.SendRawMessage("rtc_page_ready");
+
+    Media.wireDeviceSelectors();
+    await Media.loadDevices();
+    await Media.ensureLocalMedia();
+});

RelayClient/Resources/Raw/wwwroot/media.js

@@ -0,0 +1,261 @@
+let localStream = null;
+const remoteStreams = {};
+
+const Media = {
+    async loadDevices() {
+        const devices = await navigator.mediaDevices.enumerateDevices();
+
+        const cameras = devices.filter(d => d.kind === "videoinput");
+        const mics = devices.filter(d => d.kind === "audioinput");
+
+        const cameraSelect = document.getElementById("cameraSelect");
+        const micSelect = document.getElementById("micSelect");
+
+        if (!cameraSelect || !micSelect) return;
+
+        const selectedCamera = cameraSelect.value;
+        const selectedMic = micSelect.value;
+
+        cameraSelect.innerHTML = "";
+        micSelect.innerHTML = "";
+
+        const noCamera = document.createElement("option");
+        noCamera.value = "";
+        noCamera.textContent = "No camera / audio only";
+        cameraSelect.appendChild(noCamera);
+
+        const defaultMic = document.createElement("option");
+        defaultMic.value = "";
+        defaultMic.textContent = "Default microphone";
+        micSelect.appendChild(defaultMic);
+
+        for (const camera of cameras) {
+            const option = document.createElement("option");
+            option.value = camera.deviceId;
+            option.textContent = camera.label || `Camera ${cameraSelect.length}`;
+            cameraSelect.appendChild(option);
+        }
+
+        for (const mic of mics) {
+            const option = document.createElement("option");
+            option.value = mic.deviceId;
+            option.textContent = mic.label || `Microphone ${micSelect.length}`;
+            micSelect.appendChild(option);
+        }
+
+        cameraSelect.value = [...cameraSelect.options].some(o => o.value === selectedCamera)
+            ? selectedCamera
+            : "";
+
+        micSelect.value = [...micSelect.options].some(o => o.value === selectedMic)
+            ? selectedMic
+            : "";
+
+        LogMessage(`Loaded devices: ${cameras.length} cameras, ${mics.length} mics`);
+    },
+
+    async ensureLocalMedia() {
+        const cameraSelect = document.getElementById("cameraSelect");
+        const micSelect = document.getElementById("micSelect");
+
+        if (localStream) {
+            return localStream;
+        }
+
+        const audioDeviceId = micSelect?.value || "";
+        const videoDeviceId = cameraSelect?.value || "";
+
+        const constraints = {
+            audio: audioDeviceId
+                ? { deviceId: { exact: audioDeviceId } }
+                : true,
+            video: videoDeviceId
+                ? { deviceId: { exact: videoDeviceId } }
+                : false
+        };
+
+        try {
+            localStream = await navigator.mediaDevices.getUserMedia(constraints);
+        } catch (err) {
+            LogMessage("Selected media failed: " + err);
+
+            localStream = await navigator.mediaDevices.getUserMedia({
+                audio: audioDeviceId
+                    ? { deviceId: { exact: audioDeviceId } }
+                    : true,
+                video: false
+            });
+
+            LogMessage("No camera available, continuing without video");
+        }
+
+        this.attachLocalStream(localStream);
+        LogMessage("Local media initialized");
+
+        return localStream;
+    },
+
+    attachLocalStream(stream) {
+        const localVideo = document.getElementById("localVideo");
+        const localMediaStatus = document.getElementById("localMediaStatus");
+        const localVideoStatus = document.getElementById("localVideoStatus");
+
+        const audioTracks = stream.getAudioTracks();
+        const videoTracks = stream.getVideoTracks();
+
+        if (localVideo) {
+            localVideo.srcObject = videoTracks.length > 0 ? stream : null;
+        }
+
+        if (localMediaStatus) {
+            localMediaStatus.textContent =
+                audioTracks.length > 0
+                    ? "Microphone active"
+                    : "No microphone";
+        }
+
+        if (localVideoStatus) {
+            localVideoStatus.textContent =
+                videoTracks.length > 0
+                    ? "Local video active"
+                    : "Local video unavailable";
+        }
+    },
+
+    async restartLocalMedia() {
+        if (localStream) {
+            localStream.getTracks().forEach(track => track.stop());
+            localStream = null;
+        }
+
+        await this.ensureLocalMedia();
+
+        if (window.RelayRtc?.applyLocalStreamToAllPeerConnections) {
+            await window.RelayRtc.applyLocalStreamToAllPeerConnections();
+        }
+    },
+
+    async refreshDevicesAndPreview() {
+        if (localStream) {
+            localStream.getTracks().forEach(track => track.stop());
+            localStream = null;
+        }
+
+        await this.loadDevices();
+        await this.ensureLocalMedia();
+
+        if (window.RelayRtc?.applyLocalStreamToAllPeerConnections) {
+            await window.RelayRtc.applyLocalStreamToAllPeerConnections();
+        }
+    },
+
+    async applyLocalStreamToPeerConnection(pc, username) {
+        const stream = await this.ensureLocalMedia();
+        const existingSenders = pc.getSenders();
+
+        for (const track of stream.getTracks()) {
+            const existingSender = existingSenders.find(sender =>
+                sender.track && sender.track.kind === track.kind
+            );
+
+            if (existingSender) {
+                await existingSender.replaceTrack(track);
+                LogMessage(`Replaced local ${track.kind} track for ${username}`);
+            } else {
+                pc.addTrack(track, stream);
+                LogMessage(`Added local ${track.kind} track for ${username}`);
+            }
+        }
+    },
+
+    async applyLocalStreamToAllPeerConnections() {
+        if (!window.RelayRtc?.peerConnections) return;
+
+        for (const [username, pc] of Object.entries(window.RelayRtc.peerConnections)) {
+            await this.applyLocalStreamToPeerConnection(pc, username);
+        }
+    },
+
+    attachRemoteStream(username, stream) {
+        remoteStreams[username] = stream;
+
+        const tile = this.ensureRemoteTile(username);
+        const video = tile.querySelector("video");
+        const status = tile.querySelector(".remote-media-status");
+
+        if (video) {
+            video.srcObject = stream;
+        }
+
+        const audioTracks = stream.getAudioTracks();
+        const videoTracks = stream.getVideoTracks();
+
+        if (status) {
+            status.textContent =
+                `${audioTracks.length > 0 ? "Audio" : "No audio"} / ` +
+                `${videoTracks.length > 0 ? "Video" : "No video"}`;
+        }
+    },
+
+    ensureRemoteTile(username) {
+        const container = document.getElementById("remoteMediaContainer");
+        if (!container) return null;
+
+        let tile = document.getElementById(`remote-tile-${username}`);
+        if (tile) return tile;
+
+        tile = document.createElement("div");
+        tile.id = `remote-tile-${username}`;
+        tile.className = "remote-media-tile";
+
+        const title = document.createElement("div");
+        title.className = "remote-media-title";
+        title.textContent = username;
+
+        const video = document.createElement("video");
+        video.autoplay = true;
+        video.playsInline = true;
+
+        const status = document.createElement("div");
+        status.className = "remote-media-status";
+        status.textContent = "Remote media: waiting...";
+
+        tile.appendChild(title);
+        tile.appendChild(video);
+        tile.appendChild(status);
+
+        container.appendChild(tile);
+
+        return tile;
+    },
+
+    removeRemoteStream(username) {
+        delete remoteStreams[username];
+
+        const tile = document.getElementById(`remote-tile-${username}`);
+        if (tile) {
+            tile.remove();
+        }
+    },
+
+    wireDeviceSelectors() {
+        const cameraSelect = document.getElementById("cameraSelect");
+        const micSelect = document.getElementById("micSelect");
+
+        if (cameraSelect) {
+            cameraSelect.addEventListener("change", async () => {
+                LogMessage("Camera changed");
+                await this.restartLocalMedia();
+            });
+        }
+
+        if (micSelect) {
+            micSelect.addEventListener("change", async () => {
+                LogMessage("Microphone changed");
+                await this.restartLocalMedia();
+            });
+        }
+    }
+};
+
+window.Media = Media;

RelayClient/Resources/Raw/wwwroot/relaySocket.js

@@ -0,0 +1,46 @@
+const RelaySocket = {
+    async joinRtcChannel() {
+        await window.HybridWebView.InvokeDotNet("JoinRtcChannel");
+    },
+
+    async leaveRtcChannel() {
+        await window.HybridWebView.InvokeDotNet("LeaveRtcChannel");
+    },
+
+    async getRtcParticipants() {
+        const raw = await window.HybridWebView.InvokeDotNet("GetRtcParticipants");
+
+        if (!raw) return [];
+
+        return typeof raw === "string"
+            ? JSON.parse(raw)
+            : raw;
+    },
+
+    async sendRtcSignal(signal) {
+        if (!signal.channelId) signal.channelId = currentChannelId;
+        if (!signal.from) signal.from = currentUsername;
+
+        await window.HybridWebView.InvokeDotNet("SendRtcSignal", [
+            JSON.stringify(signal)
+        ]);
+    },
+
+    receiveRtcSignal(rawJson) {
+        LogMessage("RelaySocket.receiveRtcSignal hit");
+
+        if (window.RelayRtc?.handleRtcSignal) {
+            LogMessage("Forwarding RTC signal to RelayRtc.handleRtcSignal");
+            return window.RelayRtc.handleRtcSignal(rawJson);
+        }
+
+        if (typeof window.handleRtcSignal === "function") {
+            LogMessage("Forwarding RTC signal to window.handleRtcSignal");
+            return window.handleRtcSignal(rawJson);
+        }
+
+        LogMessage("No RTC signal handler registered.");
+    }
+};
+
+window.RelaySocket = RelaySocket;

RelayClient/Resources/Raw/wwwroot/rtc.js

@@ -0,0 +1,225 @@
+const peerConnections = {};
+
+async function joinChannelCall() {
+    LogMessage("Current username: " + currentUsername);
+    LogMessage("Current channel: " + currentChannelId);
+
+    if (!currentUsername || !currentChannelId) {
+        LogMessage("Cannot join RTC: missing username or channel.");
+        return;
+    }
+
+    await RelaySocket.joinRtcChannel();
+    await Media.ensureLocalMedia();
+
+    const participants = await RelaySocket.getRtcParticipants();
+
+    LogMessage("Participants: " + JSON.stringify(participants));
+
+    const existingUsers = participants.filter(x => x !== currentUsername);
+
+    if (existingUsers.length === 0) {
+        LogMessage("Joined call as first participant. Waiting for others...");
+        return;
+    }
+
+    for (const username of existingUsers) {
+        await sendOffer(username);
+    }
+}
+
+async function sendOffer(username) {
+    const pc = await ensurePeerConnectionForUser(username);
+
+    await Media.applyLocalStreamToPeerConnection(pc, username);
+
+    const offer = await pc.createOffer();
+    await pc.setLocalDescription(offer);
+
+    await RelaySocket.sendRtcSignal({
+        type: "rtc_offer",
+        channelId: currentChannelId,
+        from: currentUsername,
+        to: username,
+        sdp: offer.sdp
+    });
+
+    LogMessage(`Sent offer to ${username}`);
+}
+
+async function handleRtcSignal(rawJson) {
+    try {
+        const msg = typeof rawJson === "string" ? JSON.parse(rawJson) : rawJson;
+
+        if (!msg || !msg.type) return;
+        if (msg.from === currentUsername) return;
+
+        if (msg.to && msg.to !== currentUsername) {
+            LogMessage(`Ignoring RTC signal meant for ${msg.to}`);
+            return;
+        }
+
+        LogMessage(`Received signal: ${msg.type} from ${msg.from}`);
+
+        if (msg.type === "rtc_offer") {
+            await handleOffer(msg);
+            return;
+        }
+
+        if (msg.type === "rtc_answer") {
+            await handleAnswer(msg);
+            return;
+        }
+
+        if (msg.type === "rtc_ice") {
+            await handleIce(msg);
+            return;
+        }
+
+        if (msg.type === "rtc_leave") {
+            closePeerConnection(msg.from);
+            return;
+        }
+
+        LogMessage("Unhandled RTC signal type: " + msg.type);
+    } catch (err) {
+        LogMessage("handleRtcSignal failed: " + err);
+    }
+}
+
+async function handleOffer(msg) {
+    const pc = await ensurePeerConnectionForUser(msg.from);
+
+    await Media.ensureLocalMedia();
+    await Media.applyLocalStreamToPeerConnection(pc, msg.from);
+
+    await pc.setRemoteDescription({
+        type: "offer",
+        sdp: msg.sdp
+    });
+
+    const answer = await pc.createAnswer();
+    await pc.setLocalDescription(answer);
+
+    await RelaySocket.sendRtcSignal({
+        type: "rtc_answer",
+        channelId: currentChannelId,
+        from: currentUsername,
+        to: msg.from,
+        sdp: answer.sdp
+    });
+
+    LogMessage(`Sent answer to ${msg.from}`);
+}
+
+async function handleAnswer(msg) {
+    const pc = peerConnections[msg.from];
+
+    if (!pc) {
+        LogMessage(`No peer connection found for answer from ${msg.from}`);
+        return;
+    }
+
+    await pc.setRemoteDescription({
+        type: "answer",
+        sdp: msg.sdp
+    });
+
+    LogMessage(`Applied answer from ${msg.from}`);
+}
+
+async function handleIce(msg) {
+    const pc = peerConnections[msg.from];
+
+    if (!pc) {
+        LogMessage(`No peer connection found for ICE from ${msg.from}`);
+        return;
+    }
+
+    if (!msg.candidate) return;
+
+    await pc.addIceCandidate(msg.candidate);
+
+    LogMessage(`Applied ICE from ${msg.from}`);
+}
+
+async function ensurePeerConnectionForUser(username) {
+    if (peerConnections[username]) {
+        return peerConnections[username];
+    }
+
+    const pc = new RTCPeerConnection(configuration);
+    peerConnections[username] = pc;
+
+    pc.onicecandidate = async event => {
+        if (!event.candidate) return;
+
+        await RelaySocket.sendRtcSignal({
+            type: "rtc_ice",
+            channelId: currentChannelId,
+            from: currentUsername,
+            to: username,
+            candidate: JSON.stringify(event.candidate)
+        });
+    };
+
+    pc.ontrack = event => {
+        LogMessage(`Remote track received from ${username}`);
+
+        const stream = event.streams[0];
+        if (!stream) return;
+
+        Media.attachRemoteStream(username, stream);
+    };
+
+    pc.onconnectionstatechange = () => {
+        LogMessage(`Connection ${username}: ${pc.connectionState}`);
+
+        if (
+            pc.connectionState === "failed" ||
+            pc.connectionState === "closed" ||
+            pc.connectionState === "disconnected"
+        ) {
+            closePeerConnection(username);
+        }
+    };
+
+    return pc;
+}
+
+async function leaveChannelCall() {
+    await RelaySocket.sendRtcSignal({
+        type: "rtc_leave",
+        channelId: currentChannelId,
+        from: currentUsername
+    });
+
+    for (const username of Object.keys(peerConnections)) {
+        closePeerConnection(username);
+    }
+
+    await RelaySocket.leaveRtcChannel();
+
+    LogMessage("Left RTC channel");
+}
+
+function closePeerConnection(username) {
+    const pc = peerConnections[username];
+    if (!pc) return;
+
+    pc.close();
+    delete peerConnections[username];
+
+    Media.removeRemoteStream(username);
+
+    LogMessage(`Closed RTC connection with ${username}`);
+}
+
+window.RelayRtc = {
+    joinChannelCall,
+    leaveChannelCall,
+    handleRtcSignal,
+    peerConnections
+};
+
+window.handleRtcSignal = handleRtcSignal;

RelayClient/ServerAPI.cs

@@ -0,0 +1,161 @@
+using System.Net.Http.Headers;
+using System.Net.Http.Json;
+using System.Text.Json;
+
+namespace RelayClient;
+
+public class ServerAPI
+{
+    static HttpClient client = new HttpClient { BaseAddress = new Uri("http://localhost:5000/") };
+    
+    public static void setupClient()
+    {
+        client.DefaultRequestHeaders.Accept.Clear();
+        client.DefaultRequestHeaders.Accept.Add(
+            new MediaTypeWithQualityHeaderValue("application/json"));
+    }
+    
+    public static async Task<Uri> PostOfferAsync(DBOffer offer)
+    {
+        HttpResponseMessage response = await client.PostAsJsonAsync(
+            "api/rtc/offer", offer);
+        response.EnsureSuccessStatusCode();
+        return response.Headers.Location;
+    }
+
+    public static async Task<Uri> GetAllOffersAsync()
+    {
+        HttpResponseMessage response = await client.GetAsync("api/rtc/offers");
+        response.EnsureSuccessStatusCode();
+        return response.Headers.Location;
+    }
+
+    public static async Task<bool> GetIsChannelActiveAsync(string channelId)
+    {
+        HttpResponseMessage response = await client.GetAsync($"api/rtc/active/{channelId}");
+        response.EnsureSuccessStatusCode();
+        return  bool.Parse(response.Content.ReadAsStringAsync().Result);
+    }
+
+    public static async Task<RtcDescription> GetOffersForChannelAsync(string channelId)
+    {
+        HttpResponseMessage response = await client.GetAsync($"api/rtc/offers/{channelId}");
+        response.EnsureSuccessStatusCode();
+        RtcDescription? offer = JsonSerializer.Deserialize<RtcDescription>(await response.Content.ReadAsStringAsync());
+        return offer;
+    }
+
+    public static async Task<Uri?> PostAnswerAsync(DBOffer answer)
+    {
+        HttpResponseMessage response = await client.PostAsJsonAsync("api/rtc/answer", answer);
+        var body = await response.Content.ReadAsStringAsync();
+
+        Console.WriteLine("PostAnswerAsync status: " + response.StatusCode);
+        Console.WriteLine("PostAnswerAsync body: " + body);
+
+        response.EnsureSuccessStatusCode();
+        return response.Headers.Location;
+    }
+
+    public static async Task<Uri> GetAnswersForChannelAsync(string channelId)
+    {
+        HttpResponseMessage response = await client.GetAsync($"api/rtc/answers/{channelId}");
+        response.EnsureSuccessStatusCode();
+        return response.Headers.Location;
+    }
+
+    public static async Task<Uri> GetLatestAnswerForChannelAsync(string channelId)
+    {
+        HttpResponseMessage response = await client.GetAsync($"api/rtc/latest/{channelId}");
+        response.EnsureSuccessStatusCode();
+        return response.Headers.Location;
+    }
+
+    public static async Task<Uri> PostIceCandidateAsync(DBIceCandidate candidate)
+    {
+        HttpResponseMessage response = await client.PostAsJsonAsync("api/rtc/candidate", candidate);
+        response.EnsureSuccessStatusCode();
+        return response.Headers.Location;
+    }
+
+    public static async Task<Uri> GetIceCandidatesForChannelAsync(string channelId)
+    {
+        HttpResponseMessage response = await client.GetAsync($"api/rtc/candidates/{channelId}");
+        response.EnsureSuccessStatusCode();
+        return response.Headers.Location;
+    }
+
+    public static async Task<Uri> GetIceCandidatesForChannelByUserAsync(string channelId, string userId, string directions)
+    {
+        HttpResponseMessage response = await client.GetAsync($"api/rtc/candidates/{channelId}/{userId}/{directions}");
+        response.EnsureSuccessStatusCode();
+        return response.Headers.Location;
+    }
+
+    public static async Task<Uri> PostLeave(RtcLeave leave)
+    {
+        HttpResponseMessage response = await client.PostAsJsonAsync("api/rtc/leave", leave);
+        response.EnsureSuccessStatusCode();
+        return response.Headers.Location;
+    }
+    
+    public static async Task<RtcDescription?> GetAnswerForChannelAsync(string? channelId)
+    {
+        if (string.IsNullOrWhiteSpace(channelId))
+            return null;
+
+        HttpResponseMessage response = await client.GetAsync($"api/rtc/answer/{channelId}");
+        if (!response.IsSuccessStatusCode)
+            return null;
+
+        var json = await response.Content.ReadAsStringAsync();
+        return JsonSerializer.Deserialize<RtcDescription>(json);
+    }
+    
+    public static async Task<List<string>> GetRtcParticipantsAsync(string? channelId)
+    {
+        if (string.IsNullOrWhiteSpace(channelId))
+            return new List<string>();
+
+        HttpResponseMessage response = await client.GetAsync($"api/rtc/participants/{channelId}");
+        response.EnsureSuccessStatusCode();
+
+        var json = await response.Content.ReadAsStringAsync();
+
+        return JsonSerializer.Deserialize<List<string>>(json) ?? new List<string>();
+    }
+}
+
+public class RtcDescription
+{
+    public string type { get; set; }
+    public string sdp { get; set; }
+}
+
+public class DBOffer
+{
+    public required string ChannelId { get; set; }
+    public required string Username { get; set; }
+    public required RtcDescription SessionDescription { get; set; }
+}
+public class IceCandidate
+{
+    public required string candidate { get; set; }
+    public required string sdpMid { get; set; }
+    public required int sdpMLineIndex { get; set; }
+    public required string usernameFragment { get; set; }
+    
+}
+
+public class DBIceCandidate
+{
+    public required string ChannelId { get; set; }
+    public required string Username { get; set; }
+    public required IceCandidate Candidate { get; set; }
+}
+
+public class RtcLeave
+{
+    public string ChannelId { get; set; }
+    public string Username { get; set; }
+}

RelayClient/Services/RelaySocketClient.cs

@@ -0,0 +1,127 @@
+using System.Text.Json;
+using RelayClient.Crypto;
+using RelayShared.Services;
+using WebSocketSharp;
+
+namespace RelayClient.Services;
+
+public sealed class RelaySocketClient
+{
+    private readonly string _username;
+    private readonly WebSocket _socket;
+
+    public string? ServerPublicKey { get; private set; }
+
+    public event Action<string>? RawMessageReceived;
+    public event Action<SocketChannelList>? ChannelListReceived;
+    public event Action<SocketEncryptedMessage>? EncryptedChatReceived;
+    public event Action<SocketRtcSignalMessage>? EncryptedRtcSignalReceived;
+    public event Action<string>? ServerPublicKeyReceived;
+    public event Action<string>? Log;
+
+    public RelaySocketClient(string username, string url = "ws://localhost:1337/")
+    {
+        _username = username;
+        _socket = new WebSocket(url);
+        _socket.OnMessage += OnMessage;
+    }
+
+    public void Connect()
+    {
+        _socket.Connect();
+
+        var publicKey = KeyStorage.LoadPublicKey(_username);
+
+        SendRaw($"REGISTER_KEY|{_username}|{publicKey}");
+        SendRaw("GET_SERVER_KEY");
+        SendRaw("GET_CHANNELS");
+    }
+
+    public void SendRaw(string message)
+    {
+        if (_socket.ReadyState == WebSocketState.Open)
+            _socket.Send(message);
+    }
+
+    public void SendJson<T>(T payload)
+    {
+        SendRaw(JsonSerializer.Serialize(payload));
+    }
+
+    public void Disconnect()
+    {
+        _socket.OnMessage -= OnMessage;
+
+        if (_socket.ReadyState == WebSocketState.Open)
+            _socket.Close();
+    }
+
+    private void OnMessage(object? sender, MessageEventArgs e)
+    {
+        if (e.Data.StartsWith("SERVER:REGISTERED_KEY:"))
+        {
+            Log?.Invoke(e.Data);
+            return;
+        }
+
+        RawMessageReceived?.Invoke(e.Data);
+        Log?.Invoke($"[{_username}] RAW WS DATA: {e.Data}");
+
+        try
+        {
+            using var doc = JsonDocument.Parse(e.Data);
+            var root = doc.RootElement;
+
+            if (!root.TryGetProperty("Type", out var typeElement))
+                return;
+
+            var type = (SignalType)typeElement.GetInt32();
+
+            switch (type)
+            {
+                case SignalType.ChannelList:
+                {
+                    var channelList = JsonSerializer.Deserialize<SocketChannelList>(e.Data);
+                    if (channelList is not null)
+                        ChannelListReceived?.Invoke(channelList);
+
+                    return;
+                }
+
+                case SignalType.ServerPublicKey:
+                {
+                    var serverKeyMessage = JsonSerializer.Deserialize<ServerPublicKeyMessage>(e.Data);
+                    if (serverKeyMessage is not null)
+                    {
+                        ServerPublicKey = serverKeyMessage.PublicKey;
+                        ServerPublicKeyReceived?.Invoke(serverKeyMessage.PublicKey);
+                    }
+
+                    return;
+                }
+
+                case SignalType.EncryptedSignal:
+                {
+                    var payload = JsonSerializer.Deserialize<SocketRtcSignalMessage>(e.Data);
+                    if (payload is not null)
+                        EncryptedRtcSignalReceived?.Invoke(payload);
+
+                    return;
+                }
+
+                case SignalType.EncryptedChat:
+                {
+                    var payload = JsonSerializer.Deserialize<SocketEncryptedMessage>(e.Data);
+                    if (payload is not null)
+                        EncryptedChatReceived?.Invoke(payload);
+
+                    return;
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            Log?.Invoke($"[{_username}] failed to process websocket message: {ex.Message}");
+        }
+    }
+}

RelayClient/Services/RtcBridgeService.cs

@@ -0,0 +1,224 @@
+using System.Text.Json;
+using RelayClient.Crypto;
+using RelayShared.Rtc;
+using RelayShared.Services;
+
+namespace RelayClient.Services;
+
+public sealed class RtcBridgeService
+{
+    private readonly string _username;
+    private readonly RelaySocketClient _socket;
+    private readonly HybridWebView _hybridWebView;
+    private readonly Func<string?> _getCurrentChannelId;
+    private readonly Action<string> _sendRawToWebView;
+
+    public RtcBridgeService(string username, RelaySocketClient socket, HybridWebView hybridWebView,
+                            Func<string?> getCurrentChannelId, Action<string> sendRawToWebView)
+    {
+        _username = username;
+        _socket = socket;
+        _hybridWebView = hybridWebView;
+        _getCurrentChannelId = getCurrentChannelId;
+        _sendRawToWebView = sendRawToWebView;
+    }
+
+    public Task JoinRtcChannel()
+    {
+        var channelId = _getCurrentChannelId();
+
+        if (string.IsNullOrWhiteSpace(channelId))
+            return Task.CompletedTask;
+
+        _socket.SendRaw($"RTC_JOIN_CHANNEL|{_username}|{channelId}");
+        return Task.CompletedTask;
+    }
+
+    public void LeaveRtcChannel()
+    {
+        var channelId = _getCurrentChannelId();
+
+        if (string.IsNullOrWhiteSpace(channelId))
+            return;
+
+        _socket.SendRaw($"RTC_LEAVE_CHANNEL|{_username}|{channelId}");
+    }
+
+    public void SendRtcSignal(string json)
+    {
+        if (string.IsNullOrWhiteSpace(_socket.ServerPublicKey))
+        {
+            _sendRawToWebView("SendRtcSignal failed: server public key not loaded.");
+            return;
+        }
+
+        RtcSignalMessage? rtcSignal;
+
+        try
+        {
+            rtcSignal = JsonSerializer.Deserialize<RtcSignalMessage>(json);
+        }
+        catch (Exception ex)
+        {
+            _sendRawToWebView("SendRtcSignal failed to parse RTC signal: " + ex.Message);
+            return;
+        }
+
+        if (rtcSignal is null)
+            return;
+
+        rtcSignal.ChannelId ??= _getCurrentChannelId();
+        rtcSignal.From ??= _username;
+
+        if (string.IsNullOrWhiteSpace(rtcSignal.ChannelId))
+        {
+            _sendRawToWebView("SendRtcSignal failed: missing channel id.");
+            return;
+        }
+
+        var outgoingJson = JsonSerializer.Serialize(rtcSignal);
+
+        try
+        {
+            var encrypted = E2EeHelper.EncryptForRecipient(outgoingJson, _socket.ServerPublicKey);
+
+            var payload = new SocketRtcSignalMessage
+            {
+                Type = SignalType.EncryptedSignal,
+                SenderUsername = _username,
+                ChannelId = rtcSignal.ChannelId,
+                CipherText = encrypted.CipherText,
+                Nonce = encrypted.Nonce,
+                Tag = encrypted.Tag,
+                EncryptedKey = encrypted.EncryptedKey
+            };
+
+            _socket.SendJson(payload);
+
+            _sendRawToWebView($"SendRtcSignal sent: {rtcSignal.Type} -> {rtcSignal.To}");
+        }
+        catch (Exception ex)
+        {
+            _sendRawToWebView("SendRtcSignal failed: " + ex.Message);
+        }
+    }
+
+    public async Task<string> GetRtcParticipants()
+    {
+        var channelId = _getCurrentChannelId();
+
+        if (string.IsNullOrWhiteSpace(channelId))
+            return "[]";
+
+        var participants = await ServerAPI.GetRtcParticipantsAsync(channelId);
+        return JsonSerializer.Serialize(participants ?? []);
+    }
+
+    public async Task HandleIncomingRtcSignalAsync(SocketRtcSignalMessage payload)
+    {
+        var currentChannelId = _getCurrentChannelId();
+
+        if (payload.ChannelId != currentChannelId)
+            return;
+
+        if (payload.SenderUsername == _username)
+            return;
+
+        string decryptedJson;
+
+        try
+        {
+            var privateKey = KeyStorage.LoadPrivateKey(_username);
+
+            decryptedJson = E2EeHelper.DecryptForRecipient(
+                new EncryptedPayload
+                {
+                    CipherText = payload.CipherText,
+                    Nonce = payload.Nonce,
+                    Tag = payload.Tag,
+                    EncryptedKey = payload.EncryptedKey
+                },
+                privateKey
+            );
+        }
+        catch (Exception ex)
+        {
+            _sendRawToWebView("RTC decrypt failed: " + ex.Message);
+            return;
+        }
+
+        RtcSignalMessage? rtcSignal;
+
+        try
+        {
+            rtcSignal = JsonSerializer.Deserialize<RtcSignalMessage>(decryptedJson);
+        }
+        catch (Exception ex)
+        {
+            _sendRawToWebView("RTC signal parse failed: " + ex.Message);
+            return;
+        }
+
+        if (rtcSignal is null)
+            return;
+
+        if (!string.IsNullOrWhiteSpace(rtcSignal.To) &&
+            !string.Equals(rtcSignal.To, _username, StringComparison.OrdinalIgnoreCase))
+        {
+            _sendRawToWebView($"Ignoring RTC signal meant for {rtcSignal.To}");
+            return;
+        }
+
+        _sendRawToWebView("Received encrypted RTC signal: " + decryptedJson);
+
+        await SendRtcSignalToJsAsync(decryptedJson);
+    }
+
+    public Task PushRtcContextToJsAsync()
+    {
+        MainThread.BeginInvokeOnMainThread(async () =>
+        {
+            var usernameJson = JsonSerializer.Serialize(_username);
+            var channelIdJson = JsonSerializer.Serialize(_getCurrentChannelId());
+
+            await _hybridWebView.EvaluateJavaScriptAsync($"window.setUsername({usernameJson})");
+            await _hybridWebView.EvaluateJavaScriptAsync($"window.setChannelId({channelIdJson})");
+        });
+
+        return Task.CompletedTask;
+    }
+
+    private Task SendRtcSignalToJsAsync(string rawJson)
+    {
+        MainThread.BeginInvokeOnMainThread(async () =>
+        {
+            try
+            {
+                var jsArg = JsonSerializer.Serialize(rawJson);
+
+                await _hybridWebView.EvaluateJavaScriptAsync($@"
+                    try {{
+                        window.HybridWebView.SendRawMessage('C# eval entered');
+
+                        if (!window.RelaySocket) {{
+                            window.HybridWebView.SendRawMessage('window.RelaySocket missing');
+                        }} else if (typeof window.RelaySocket.receiveRtcSignal !== 'function') {{
+                            window.HybridWebView.SendRawMessage('RelaySocket.receiveRtcSignal missing');
+                        }} else {{
+                            window.HybridWebView.SendRawMessage('Calling RelaySocket.receiveRtcSignal');
+                            window.RelaySocket.receiveRtcSignal({jsArg});
+                        }}
+                    }} catch (err) {{
+                        window.HybridWebView.SendRawMessage('RTC JS dispatch failed: ' + err);
+                    }}
+                ");
+            }
+            catch (Exception ex)
+            {
+                _sendRawToWebView("SendRtcSignalToJsAsync failed: " + ex.Message);
+            }
+        });
+
+        return Task.CompletedTask;
+    }
+}

RelayCore/Program.cs

@@ -1,21 +1,31 @@
 using SurrealDb.Net;
-using SurrealDb.Net.Models;
 using SurrealDb.Net.Models.Auth;
 using System.Text.Json;
-using RelayCore;
+using System;
+using System.Net;
+using System.Threading.Tasks;
+using System.Text;
+using System.Text.Json;
+
 using RelayCore.Enums;
 using RelayCore.Models;
 
-await using var db = new SurrealDbClient("ws://127.0.0.1:8000/rpc");
 
+await using var db = new SurrealDbClient("ws://127.0.0.1:8000/rpc");
 await db.SignIn(new RootAuth { Username = "root", Password = "secret" });
 await db.Use("test", "test");
 
 var keeper = await CreateUserAsync(db, "Keeper317", "Keeper317@gmail.com", "password");
 var kira = await CreateUserAsync(db, "Ru_Kira", "jduesling13@gmail.com", "password");
+var test = await CreateUserAsync(db, "Test", "test@gmail.com", "password");
+
+var server = new Program();
 
 Console.WriteLine($"Keeper created: {ToJsonString(keeper)}");
 Console.WriteLine($"Kira created: {ToJsonString(kira)}");
+Console.WriteLine($"Test created: {ToJsonString(test)}");
+
+await server.Main(db);
 Console.ReadKey(true);
 return;
 
@@ -53,4 +63,52 @@ static async Task<Users> CreateUserAsync(SurrealDbClient db, string username, st
     });
 
     return updated;
+}
+
+
+partial class Program
+{
+    public async Task Main(SurrealDbClient db)
+    {
+        // Set up listener
+        using var listener = new HttpListener();
+        listener.Prefixes.Add("http://localhost:8080/");
+        listener.Start();
+        Console.WriteLine("API Started: http://localhost:8080/");
+
+        while (true)
+        {
+            // Process requests
+            var context = await listener.GetContextAsync();
+            var req = context.Request;
+            var res = context.Response;
+
+            if (req.Url.AbsolutePath == "/api/hello" && req.HttpMethod == "GET")
+            {
+                var data = new { Message = "Hello, world!", Time = DateTime.Now };
+                byte[] buf = Encoding.UTF8.GetBytes(JsonSerializer.Serialize(data));
+                res.ContentType = "application/json";
+                await res.OutputStream.WriteAsync(buf, 0, buf.Length);
+            }
+
+            if (req.Url.AbsolutePath == "/api/users" && req.HttpMethod == "GET")
+            {
+                var data = new { Message = GetDBUsers(db).Result, Time = DateTime.Now };
+                byte[] buf = Encoding.UTF8.GetBytes(JsonSerializer.Serialize(data));
+                res.ContentType = "application/json";
+                await res.OutputStream.WriteAsync(buf, 0, buf.Length);
+            }
+            res.Close();
+        }
+    }
+    static async Task<Users[]> GetDBUsers(SurrealDbClient db)
+     {
+         var users = await db.Select<Users>("users");
+         Console.WriteLine(ToJsonString(users));
+         return users.ToArray();
+     }
+    static string ToJsonString(object? o)
+    {
+        return JsonSerializer.Serialize(o, new JsonSerializerOptions { WriteIndented = true, });
+    }
 }

RelayServer/.gitignore

@@ -79,6 +79,7 @@ keys/*
 ############################################
 
 data/
+!Services/Data/
 *.db
 *.sqlite
 *.sqlite3

RelayServer/Endpoints/RtcEndpoints.cs

@@ -0,0 +1,141 @@
+using System.Text.Json;
+using RelayShared.Rtc;
+using RelayServer.Services.Rtc;
+using RelayShared.Services;
+
+namespace RelayServer.Endpoints;
+
+public static class RtcEndpoints
+{
+    /// <summary>
+    /// Maps all RTC-related HTTP endpoints used for storing offers and answers,
+    /// writing ICE candidates, checking active calls, and leaving active calls.
+    /// </summary>
+    /// <param name="app">The web application to map endpoints onto.</param>
+    public static void MapRtcEndpoints(this WebApplication app)
+    {
+        // Store or update the current SDP offer for a channel call.
+        app.MapPost("/api/rtc/offer", async (RtcOffer request, RtcCallService rtcCallService) =>
+        {
+            await rtcCallService.WriteOfferAsync(request.ChannelId, request.Username, request.SessionDescription);
+
+            RtcNotificationService.BroadcastToChannel(new RtcNotificationMessage
+            {
+                Type = SignalType.OfferUpdated,
+                ChannelId = request.ChannelId,
+                Username = request.Username
+            });
+
+            return Results.Ok();
+        });
+
+        // List all offers.
+        app.MapGet("/api/rtc/offers", async (RtcCallService rtcCallService) =>
+        {
+            return Results.Ok(await rtcCallService.GetOffersAsync());
+        });
+
+        // Return whether the specified channel currently has an active call.
+        app.MapGet("/api/rtc/active/{channelId}", async (string channelId, RtcCallService rtcCallService) =>
+        {
+            return Results.Ok(await rtcCallService.HasActiveCallAsync(channelId));
+        });
+
+        // Return the latest stored SDP offer for the specified channel.
+        app.MapGet("/api/rtc/offers/{channelId}", async (string channelId, RtcCallService rtcCallService) =>
+        {
+            var offer = await rtcCallService.GetOfferAsync(channelId);
+            return offer is null ? Results.NotFound() : Results.Ok(offer);
+        });
+
+        // Store a new SDP answer for the specified channel call.
+        app.MapPost("/api/rtc/answer", async (RtcOffer request, RtcCallService rtcCallService) =>
+        {
+            Console.WriteLine($"RTC answer received for channel {request.ChannelId} from {request.Username}");
+
+            await rtcCallService.WriteAnswerAsync(request.ChannelId, request.SessionDescription);
+
+            Console.WriteLine($"Broadcasting rtc_answer_updated for {request.ChannelId}");
+
+            RtcNotificationService.BroadcastToChannel(new RtcNotificationMessage
+            {
+                Type = SignalType.AnswerUpdated,
+                ChannelId = request.ChannelId
+            });
+
+            return Results.Ok();
+        });
+
+        // Return all answers stored for the specified channel.
+        app.MapGet("/api/rtc/answers/{channelId}", async (string channelId, RtcCallService rtcCallService) =>
+        {
+            return Results.Ok(await rtcCallService.GetAnswersAsync(channelId));
+        });
+        
+        app.MapGet("/api/rtc/participants/{channelId}", (string channelId) =>
+        {
+            return Results.Ok(RtcChannelPresenceService.GetUsersInChannel(channelId));
+        });
+
+        // Return the latest answer stored for the specified channel.
+        app.MapGet("/api/rtc/answer/{channelId}", async (string channelId, RtcCallService rtcCallService) =>
+        {
+            var answer = await rtcCallService.GetLatestAnswerAsync(channelId);
+            return answer is null ? Results.NotFound() : Results.Ok(answer);
+        });
+
+        // Store a new ICE candidate for the specified channel call.
+        app.MapPost("/api/rtc/candidate", async (RtcIceCandidate request, RtcCallService rtcCallService) =>
+        {
+            await rtcCallService.WriteIceCandidateAsync(
+                request.ChannelId,
+                request.Username,
+                request.Candidate.candidate,
+                request.Candidate.sdpMid,
+                request.Candidate.sdpMLineIndex
+            );
+
+            RtcNotificationService.BroadcastToChannel(new RtcNotificationMessage
+            {
+                Type = SignalType.CandidateAdded,
+                ChannelId = request.ChannelId,
+                Username = request.Username,
+                Direction = JsonSerializer.Serialize(request.Candidate)
+            });
+
+            return Results.Ok();
+        });
+
+        // Return all ICE candidates stored for the specified channel.
+        app.MapGet("/api/rtc/candidates/{channelId}", async (string channelId, RtcCallService rtcCallService) =>
+        {
+            return Results.Ok(await rtcCallService.GetIceCandidatesAsync(channelId));
+        });
+
+        // Return ICE candidates for the specified channel that belong to other users
+        // and match the requested direction.
+        app.MapGet("/api/rtc/candidates/{channelId}/{username}/{direction}", async (
+            string channelId,
+            string username,
+            string direction,
+            RtcCallService rtcCallService) =>
+        {
+            return Results.Ok(await rtcCallService.GetIceCandidatesForOthersAsync(channelId, username, direction));
+        });
+
+        // Leave the active call for the specified channel.
+        app.MapPost("/api/rtc/leave", async (RtcLeaveRequest request, RtcCallService rtcCallService) =>
+        {
+            await rtcCallService.LeaveCallAsync(request.ChannelId, request.Username);
+
+            RtcNotificationService.BroadcastToChannel(new RtcNotificationMessage
+            {
+                Type = SignalType.CallLeft,
+                ChannelId = request.ChannelId,
+                Username = request.Username
+            });
+
+            return Results.Ok();
+        });
+    }
+}

RelayServer/Models/Chat/SocketChannelInfo.cs

@@ -0,0 +1,8 @@
+namespace RelayServer.Models;
+
+public class SocketChannelInfo
+{
+    public required string ChannelId { get; set; }
+    public required string Name { get; set; }
+    public required DateTime CreatedAt { get; set; }
+}

RelayServer/Models/Crypto/ClientPublicKeys.cs

@@ -0,0 +1,11 @@
+using SurrealDb.Net.Models;
+
+namespace RelayServer.Models;
+
+public class ClientPublicKeys : Record
+{
+    public required string Username { get; set; }
+    public required string PublicKey { get; set; }
+    public required DateTime CreatedAt { get; set; }
+    public required DateTime UpdatedAt { get; set; }
+}

RelayServer/Models/Crypto/ServerEncryptionKeys.cs

@@ -5,6 +5,8 @@ namespace RelayServer.Models;
 public class ServerEncryptionKeys : Record
 {
     public required string KeyBase64 { get; set; }
+    public required string PublicKey { get; set; }
+    public required string PrivateKey { get; set; }
     public required DateTime CreatedAt { get; set; }
     public required DateTime UpdatedAt { get; set; }
 }

RelayServer/Program.cs

@@ -1,10 +1,11 @@
-using System.Text.Json;
+using RelayServer.Endpoints;
-using System;
+using RelayServer.Services.Chat;
+using RelayServer.Services.Core;
+using RelayServer.Services.Data;
+using RelayServer.Services.Rtc;
+using RelayShared.Rtc;
+using RelayShared.Services;
 using WebSocketSharp.Server;
-using WebSocketSharp;
-
-using RelayServer.Models;
-using RelayServer.Services;
 
 var surrealService = new SurrealService();
 var coreClient = new CoreClientService();
@@ -12,161 +13,36 @@ var cryptoService = new ChannelCryptoService();
 
 await using var db = await surrealService.ConnectAsync();
 
+ChatSocketBehavior.ClientKeyService = new ClientKeyService(db);
+ChatSocketBehavior.Db = db;
+ChatSocketBehavior.ChannelCryptoService = cryptoService;
+
+var bootstrapService = new ServerBootstrapService(db, coreClient, cryptoService);
+await bootstrapService.InitializeAsync();
+
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddSingleton(db);
+builder.Services.AddScoped<RtcCallService>();
+
+var app = builder.Build();
+
+app.MapGet("/", () => "Server Running!");
+app.MapRtcEndpoints();
+
 var wssv = new WebSocketServer("ws://localhost:1337");
-wssv.AddWebSocketService<ChatTest>("/");
+wssv.AddWebSocketService<ChatSocketBehavior>("/");
+RtcNotificationService.Server = wssv;
+
 wssv.Start();
 Console.WriteLine("WebSocket server started");
-Console.ReadKey(true);
+
+await app.StartAsync();
+Console.WriteLine("HTTP API started");
+
+ConsoleCommandService.Start();
+await Task.Delay(Timeout.Infinite, ConsoleCommandService.ShutdownTokenSource.Token);
+
 wssv.Stop();
-
+await app.StopAsync();
-var keeper = await coreClient.GetUserByUsernameAsync("Keeper317");
+return;
-var kira = await coreClient.GetUserByUsernameAsync("Ru_Kira");
-
-if (keeper is null || kira is null)
-{
-    Console.WriteLine("One or more required users do not exist in RelayCore.");
-    return;
-}
-
-if (!keeper.Licensed || !kira.Licensed)
-{
-    Console.WriteLine("One or more required users are not licensed.");
-    return;
-}
-
-Console.WriteLine($"Core verified user: {keeper.Username}");
-Console.WriteLine($"Core verified user: {kira.Username}");
-
-var server = await db.Create("servers", new Servers
-{
-    Name = "Test Server",
-    OwnerUserId = kira.Id,
-    CreatedAt = DateTime.UtcNow
-});
-
-Console.WriteLine($"Server created: {ToJsonString(server)}");
-
-var keeperMember = await db.Create("server_members", new ServerMembers
-{
-    UserId = keeper.Id,
-    JoinedAt = DateTime.UtcNow,
-    IsOwner = true
-});
-
-var kiraMember = await db.Create("server_members", new ServerMembers
-{
-    UserId = kira.Id,
-    JoinedAt = DateTime.UtcNow,
-    IsOwner = false
-});
-
-Console.WriteLine("Server members created.");
-
-var channel = await db.Create("channels", new Channels
-{
-    Name = "general",
-    CreatedAt = DateTime.UtcNow
-});
-
-Console.WriteLine($"Channel created: {ToJsonString(channel)}");
-
-var channelId = GetRecordId(channel.Id);
-Console.WriteLine($"Resolved channelId: {channelId}");
-
-var keyBase64 = cryptoService.GenerateKey();
-
-var serverKey = await db.Create("server_encryption_keys", new ServerEncryptionKeys
-{
-    KeyBase64 = keyBase64,
-    CreatedAt = DateTime.UtcNow,
-    UpdatedAt = DateTime.UtcNow
-});
-
-Console.WriteLine("Server encryption key created.");
-
-var encrypted = cryptoService.Encrypt("hello from Keeper317 in #general", keyBase64);
-
-var savedMessage = await db.Create("channel_messages", new ChannelMessages
-{
-    ChannelId = channelId,
-    SenderUserId = keeper.Id,
-    CipherText = encrypted.cipherText,
-    Nonce = encrypted.nonce,
-    Tag = encrypted.tag,
-    CreatedAt = DateTime.UtcNow
-});
-
-Console.WriteLine($"Encrypted message saved: {ToJsonString(savedMessage)}");
-
-var decrypted = cryptoService.Decrypt(
-    savedMessage.CipherText,
-    savedMessage.Nonce,
-    savedMessage.Tag,
-    keyBase64
-);
-
-var storedMessages = await db.Select<ChannelMessages>("channel_messages");
-
-Console.WriteLine("Stored DB messages:");
-Console.WriteLine(ToJsonString(storedMessages));
-
-Console.WriteLine();
-Console.WriteLine($"Decrypted message: {decrypted}");
-
-Console.WriteLine();
-Console.WriteLine("Simulating Kira reading #general...");
-
-var kiraVisibleMessages = storedMessages
-    .Where(m => m.ChannelId == channelId)
-    .OrderBy(m => m.CreatedAt)
-    .ToList();
-
-foreach (var msg in kiraVisibleMessages)
-{
-    var plainText = cryptoService.Decrypt(
-        msg.CipherText,
-        msg.Nonce,
-        msg.Tag,
-        keyBase64
-    );
-
-    Console.WriteLine($"Kira reads message from {msg.SenderUserId}: {plainText}");
-}
-return;
-
-static string ToJsonString(object? obj)
-{
-    return JsonSerializer.Serialize(obj, new JsonSerializerOptions
-    {
-        WriteIndented = true,
-        Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping
-    });
-}
-
-static string GetRecordId(object? id)
-{
-    if (id is null)
-        return string.Empty;
-
-    var json = JsonSerializer.Serialize(id);
-
-    using var doc = JsonDocument.Parse(json);
-
-    var root = doc.RootElement;
-
-    var recordId = root.GetProperty("Id").GetString() ?? string.Empty;
-    var table = root.GetProperty("Table").GetString() ?? string.Empty;
-
-    return $"{table}:{recordId}";
-}
-
-public class ChatTest : WebSocketBehavior
-{
-    protected override void OnMessage(MessageEventArgs e)
-    {
-        // var msg = e.Data.Split(":")[1] == "PING" ? "SERVER:PONG" : "SERVER:RESPONSE";
-        var msg = e.Data;
-        Console.WriteLine(msg);
-        Send(msg);
-    }
-}

RelayServer/RelayServer.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
@@ -8,8 +8,13 @@
     </PropertyGroup>
 
     <ItemGroup>
+      <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.2.9" />
       <PackageReference Include="SurrealDb.Net" Version="0.9.0" />
       <PackageReference Include="WebSocketSharp" Version="1.0.3-rc11" />
     </ItemGroup>
 
+    <ItemGroup>
+      <ProjectReference Include="..\RelayShared\RelayShared.csproj" />
+    </ItemGroup>
+
 </Project>

RelayServer/Services/ChannelMessageService.cs

@@ -1,6 +0,0 @@
-namespace RelayServer.Services;
-
-public class ChannelMessageService
-{
-    
-}

RelayServer/Services/Chat/ChannelCryptoService.cs

@@ -1,7 +1,7 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace RelayServer.Services;
+namespace RelayServer.Services.Chat;
 
 public sealed class ChannelCryptoService
 {

RelayServer/Services/Chat/ChatSocketBehavior.cs

@@ -0,0 +1,640 @@
+using System.Text.Json;
+using RelayServer.Models;
+using RelayServer.Services.Crypto;
+using RelayServer.Services.Data;
+using RelayServer.Services.Rtc;
+using WebSocketSharp;
+using WebSocketSharp.Server;
+using ErrorEventArgs = WebSocketSharp.ErrorEventArgs;
+using RelayShared.Services;
+
+namespace RelayServer.Services.Chat;
+
+/// <summary>
+/// Handles websocket-based chat operations including client key registration,
+/// server key retrieval, channel listing, channel history loading, and encrypted
+/// channel message relay.
+/// </summary>
+public class ChatSocketBehavior : WebSocketBehavior
+{
+    public static ClientKeyService? ClientKeyService { get; set; }
+    public static string? ServerPublicKey { get; set; }
+    public static string? ServerPrivateKey { get; set; }
+    public static string? ChannelDbKey { get; set; }
+    public static ChannelCryptoService? ChannelCryptoService { get; set; }
+    public static SurrealDb.Net.SurrealDbClient? Db { get; set; }
+
+    /// <summary>
+    /// Routes incoming websocket messages to the appropriate chat handler.
+    /// </summary>
+    /// <param name="e">The websocket message event arguments.</param>
+    protected override void OnMessage(MessageEventArgs e)
+    {
+        var msg = e.Data;
+        Console.WriteLine(msg);
+
+        if (msg.StartsWith("REGISTER_KEY|"))
+        {
+            HandleRegisterKey(msg);
+            return;
+        }
+
+        if (msg == "GET_SERVER_KEY")
+        {
+            HandleGetServerKey();
+            return;
+        }
+
+        if (msg == "GET_CHANNELS")
+        {
+            HandleGetChannels();
+            return;
+        }
+
+        if (msg.StartsWith("GET_HISTORY|"))
+        {
+            HandleGetHistory(msg);
+            return;
+        }
+        
+        if (msg.StartsWith("RTC_JOIN_CHANNEL|"))
+        {
+            HandleRtcJoinChannel(msg);
+            return;
+        }
+
+        if (msg.StartsWith("RTC_LEAVE_CHANNEL|"))
+        {
+            HandleRtcLeaveChannel(msg);
+            return;
+        }
+
+        if (IsEncryptedRtcSignal(msg))
+        {
+            HandleEncryptedRtcSignal(msg);
+            return;
+        }
+
+        HandleEncryptedChatMessage(msg);
+    }
+    
+    private static bool IsEncryptedRtcSignal(string msg)
+    {
+        try
+        {
+            using var doc = JsonDocument.Parse(msg);
+            var root = doc.RootElement;
+
+            if (!root.TryGetProperty("Type", out var typeProp))
+                return false;
+
+            var type = (SignalType)typeProp.GetInt32();
+
+            return type == SignalType.EncryptedSignal;
+        }
+        catch
+        {
+            return false;
+        }
+    }
+    
+    private void HandleEncryptedRtcSignal(string msg)
+    {
+        Console.WriteLine("RTC SIGNAL HIT");
+        SocketRtcSignalMessage? clientPayload;
+
+        try
+        {
+            clientPayload = JsonSerializer.Deserialize<SocketRtcSignalMessage>(msg);
+        }
+        catch
+        {
+            Console.WriteLine("Failed to parse encrypted RTC signal payload.");
+            return;
+        }
+
+        if (clientPayload is null || clientPayload.Type != SignalType.EncryptedSignal)
+            return;
+
+        if (string.IsNullOrWhiteSpace(clientPayload.ChannelId))
+        {
+            Console.WriteLine("Encrypted RTC signal missing channel id.");
+            return;
+        }
+
+        string plainText;
+
+        try
+        {
+            plainText = E2EeHelper.DecryptForRecipient(
+                new EncryptedPayload
+                {
+                    CipherText = clientPayload.CipherText,
+                    Nonce = clientPayload.Nonce,
+                    Tag = clientPayload.Tag,
+                    EncryptedKey = clientPayload.EncryptedKey
+                },
+                ServerPrivateKey
+            );
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine($"Failed to decrypt RTC signal: {ex.Message}");
+            return;
+        }
+
+        var sessionIds = RtcChannelPresenceService.GetSessionsInChannel(clientPayload.ChannelId);
+
+        foreach (var sessionId in sessionIds)
+        {
+            if (sessionId == ID)
+                continue;
+
+            var username = RtcChannelPresenceService.GetUsernameForSession(sessionId);
+            if (string.IsNullOrWhiteSpace(username))
+                continue;
+
+            var clientKey = GetClientPublicKeyByUsernameSync(username);
+            if (clientKey is null)
+                continue;
+
+            var encrypted = E2EeHelper.EncryptForRecipient(plainText, clientKey.PublicKey);
+
+            var outbound = new SocketRtcSignalMessage
+            {
+                Type = SignalType.EncryptedSignal,
+                SenderUsername = clientPayload.SenderUsername,
+                ChannelId = clientPayload.ChannelId,
+                CipherText = encrypted.CipherText,
+                Nonce = encrypted.Nonce,
+                Tag = encrypted.Tag,
+                EncryptedKey = encrypted.EncryptedKey
+            };
+
+            Sessions.SendTo(JsonSerializer.Serialize(outbound), sessionId);
+        }
+
+        Console.WriteLine($"Forwarded encrypted RTC signal from {clientPayload.SenderUsername} to channel {clientPayload.ChannelId}");
+    }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="e"></param>
+    protected override void OnClose(CloseEventArgs e)
+    {
+        RtcChannelPresenceService.RemoveSession(ID);
+        Console.WriteLine($"WebSocket closed: session={ID}, code={e.Code}, reason={e.Reason}");
+        base.OnClose(e);
+    }
+    
+    protected override void OnError(ErrorEventArgs e)
+    {
+        Console.WriteLine($"WebSocket error: session={ID}, message={e.Message}");
+        base.OnError(e);
+    }
+
+    /// <summary>
+    /// Extracts a display username from a stored user record id value.
+    /// </summary>
+    /// <param name="senderUserId">The stored sender user id.</param>
+    /// <returns>
+    /// The extracted username when possible; otherwise, a fallback value.
+    /// </returns>
+    private static string ExtractUsernameFromUserId(string senderUserId)
+    {
+        if (string.IsNullOrWhiteSpace(senderUserId))
+            return "Unknown";
+
+        var parts = senderUserId.Split(':', 2);
+        return parts.Length == 2 ? parts[1] : senderUserId;
+    }
+
+    /// <summary>
+    /// Registers or updates a client's public key from a websocket registration payload.
+    /// </summary>
+    /// <param name="msg">The raw websocket registration message.</param>
+    private void HandleRegisterKey(string msg)
+    {
+        var parts = msg.Split('|', 3);
+
+        if (parts.Length < 3)
+        {
+            Console.WriteLine("Invalid REGISTER_KEY payload.");
+            return;
+        }
+
+        var username = parts[1];
+        var publicKey = parts[2];
+
+        if (ClientKeyService is null)
+        {
+            Console.WriteLine("ClientKeyService is not initialized.");
+            return;
+        }
+
+        RegisterOrUpdateClientKeySync(username, publicKey);
+
+        Send($"SERVER:REGISTERED_KEY:{username}");
+    }
+
+    /// <summary>
+    /// Sends the current list of channels to the connected websocket client.
+    /// </summary>
+    private void HandleGetChannels()
+    {
+        if (Db is null)
+        {
+            Console.WriteLine("Db is not initialized.");
+            return;
+        }
+        //TODO: Update to include ChannelType and Group String on channels
+        var channels = GetChannelsSync()
+            .OrderBy(c => c.CreatedAt)
+            .Select(c => new ChannelItem()
+            {
+                ChannelId = GetRecordId(c.Id),
+                Name = c.Name,
+                CreatedAt = c.CreatedAt
+            })
+            .ToList();
+
+        var payload = new SocketChannelList
+        {
+            Type = SignalType.ChannelList,
+            Channels = channels
+        };
+
+        Send(JsonSerializer.Serialize(payload));
+    }
+
+    /// <summary>
+    /// Sends the server's public key to the connected websocket client.
+    /// </summary>
+    private void HandleGetServerKey()
+    {
+        if (string.IsNullOrWhiteSpace(ServerPublicKey))
+        {
+            Console.WriteLine("Server public key is not initialized.");
+            return;
+        }
+
+        var payload = new ServerPublicKeyMessage
+        {
+            Type = SignalType.ServerPublicKey,
+            PublicKey = ServerPublicKey
+        };
+
+        Send(JsonSerializer.Serialize(payload));
+    }
+
+    /// <summary>
+    /// Decrypts an incoming encrypted chat payload, stores it in the database,
+    /// and rebroadcasts it to connected clients encrypted with each client's public key.
+    /// </summary>
+    /// <param name="msg">The raw encrypted chat websocket message.</param>
+    private void HandleEncryptedChatMessage(string msg)
+    {
+        SocketEncryptedMessage? clientPayload;
+
+        try
+        {
+            clientPayload = JsonSerializer.Deserialize<SocketEncryptedMessage>(msg);
+        }
+        catch
+        {
+            Console.WriteLine("Failed to parse encrypted client payload.");
+            return;
+        }
+
+        if (clientPayload is null || clientPayload.Type != SignalType.ClientEncryptedChat)
+            return;
+
+        if (!EnsureCoreReady() || !EnsureCryptoReady())
+            return;
+
+        string plainText;
+
+        try
+        {
+            plainText = E2EeHelper.DecryptForRecipient(
+                new EncryptedPayload
+                {
+                    CipherText = clientPayload.CipherText,
+                    Nonce = clientPayload.Nonce,
+                    Tag = clientPayload.Tag,
+                    EncryptedKey = clientPayload.EncryptedKey
+                },
+                ServerPrivateKey
+            );
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine($"Failed to decrypt client payload: {ex.Message}");
+            return;
+        }
+
+        Console.WriteLine($"Server decrypted message from {clientPayload.SenderUsername}: {plainText}");
+        try
+        {
+            var dbEncrypted = ChannelCryptoService.Encrypt(plainText, ChannelDbKey);
+
+            var savedMessage = CreateChannelMessageSync(new ChannelMessages
+            {
+                ChannelId = clientPayload.ChannelId,
+                SenderUserId = $"users:{clientPayload.SenderUsername.ToLower()}",
+                CipherText = dbEncrypted.cipherText,
+                Nonce = dbEncrypted.nonce,
+                Tag = dbEncrypted.tag,
+                CreatedAt = DateTime.UtcNow
+            });
+
+            Console.WriteLine($"Live message saved to DB: {JsonSerializer.Serialize(savedMessage)}");
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine($"Failed to save live message to DB: {ex.Message}");
+            return;
+        }
+
+        var allKeys = GetAllClientPublicKeysSync();
+
+        foreach (var client in allKeys)
+        {
+            var encrypted = E2EeHelper.EncryptForRecipient(plainText, client.PublicKey);
+
+            Console.WriteLine($"Encrypting outbound message from {clientPayload.SenderUsername} for {client.Username}");
+
+            var outbound = new SocketEncryptedMessage
+            {
+                Type = SignalType.EncryptedChat,
+                SenderUsername = clientPayload.SenderUsername,
+                RecipientUsername = client.Username,
+                ChannelId = clientPayload.ChannelId,
+                CipherText = encrypted.CipherText,
+                Nonce = encrypted.Nonce,
+                Tag = encrypted.Tag,
+                EncryptedKey = encrypted.EncryptedKey
+            };
+
+            Sessions.Broadcast(JsonSerializer.Serialize(outbound));
+        }
+    }
+
+    /// <summary>
+    /// Loads stored channel history for a specific user and channel, decrypts it from
+    /// database storage format, and sends it back encrypted for the requesting client.
+    /// </summary>
+    /// <param name="msg">The raw history request websocket message.</param>
+    private void HandleGetHistory(string msg)
+    {
+        var parts = msg.Split('|', 3);
+
+        if (parts.Length < 3)
+        {
+            Console.WriteLine("Invalid GET_HISTORY payload.");
+            return;
+        }
+
+        var username = parts[1];
+        var channelId = parts[2];
+
+        if (!EnsureCoreReady() || ChannelCryptoService is null || string.IsNullOrWhiteSpace(ChannelDbKey))
+        {
+            Console.WriteLine("History dependencies are not initialized.");
+            return;
+        }
+
+        var targetClient = GetClientPublicKeyByUsernameSync(username);
+
+        if (targetClient is null)
+        {
+            Console.WriteLine($"No public key found for history request user {username}");
+            return;
+        }
+
+        var allMessages = GetChannelMessagesSync();
+
+        var channelMessages = allMessages
+            .Where(m => m.ChannelId == channelId)
+            .OrderBy(m => m.CreatedAt)
+            .ToList();
+
+        Console.WriteLine($"Sending {channelMessages.Count} history messages to {username}");
+
+        foreach (var dbMessage in channelMessages)
+        {
+            string plainText;
+
+            try
+            {
+                plainText = ChannelCryptoService.Decrypt(
+                    dbMessage.CipherText,
+                    dbMessage.Nonce,
+                    dbMessage.Tag,
+                    ChannelDbKey
+                );
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"Failed to decrypt DB history row {dbMessage.Id}: {ex.Message}");
+                continue;
+            }
+
+            var encrypted = E2EeHelper.EncryptForRecipient(plainText, targetClient.PublicKey);
+
+            var outbound = new SocketEncryptedMessage
+            {
+                Type = SignalType.EncryptedChat,
+                SenderUsername = ExtractUsernameFromUserId(dbMessage.SenderUserId),
+                RecipientUsername = username,
+                ChannelId = channelId,
+                CipherText = encrypted.CipherText,
+                Nonce = encrypted.Nonce,
+                Tag = encrypted.Tag,
+                EncryptedKey = encrypted.EncryptedKey
+            };
+
+            Send(JsonSerializer.Serialize(outbound));
+        }
+    }
+
+    /// <summary>
+    /// Converts a SurrealDB record id object into a table:id string representation.
+    /// </summary>
+    /// <param name="id">The raw record id object.</param>
+    /// <returns>
+    /// A formatted record id string, or an empty string if the input is null.
+    /// </returns>
+    private static string GetRecordId(object? id)
+    {
+        if (id is null)
+            return string.Empty;
+
+        var json = JsonSerializer.Serialize(id);
+
+        using var doc = JsonDocument.Parse(json);
+
+        var root = doc.RootElement;
+
+        var recordId = root.GetProperty("Id").GetString() ?? string.Empty;
+        var table = root.GetProperty("Table").GetString() ?? string.Empty;
+
+        return $"{table}:{recordId}";
+    }
+    
+    /// <summary>
+    /// Synchronously registers or updates a stored client public key using the async key service.
+    /// </summary>
+    /// <param name="username">The client username.</param>
+    /// <param name="publicKey">The client's public key.</param>
+    private void RegisterOrUpdateClientKeySync(string username, string publicKey)
+    {
+        Task.Run(async () => await ClientKeyService!.RegisterOrUpdateKeyAsync(username, publicKey))
+            .GetAwaiter()
+            .GetResult();
+    }
+
+    /// <summary>
+    /// Synchronously loads all channels from the database.
+    /// </summary>
+    /// <returns>A list of channel records.</returns>
+    private List<Channels> GetChannelsSync()
+    {
+        return Task.Run(async () => await Db!.Select<Channels>("channels"))
+            .GetAwaiter()
+            .GetResult()
+            .ToList();
+    }
+
+    /// <summary>
+    /// Synchronously gets the stored public key record for the specified user.
+    /// </summary>
+    /// <param name="username">The username to look up.</param>
+    /// <returns>
+    /// The matching client public key record, or null if none exists.
+    /// </returns>
+    private ClientPublicKeys? GetClientPublicKeyByUsernameSync(string username)
+    {
+        return Task.Run(async () => await ClientKeyService!.GetByUsernameAsync(username))
+            .GetAwaiter()
+            .GetResult();
+    }
+
+    /// <summary>
+    /// Synchronously loads all stored client public key records.
+    /// </summary>
+    /// <returns>A list of all client public key records.</returns>
+    private List<ClientPublicKeys> GetAllClientPublicKeysSync()
+    {
+        return Task.Run(async () => await ClientKeyService!.GetAllAsync())
+            .GetAwaiter()
+            .GetResult();
+    }
+
+    /// <summary>
+    /// Synchronously loads all stored channel messages from the database.
+    /// </summary>
+    /// <returns>A list of channel message records.</returns>
+    private List<ChannelMessages> GetChannelMessagesSync()
+    {
+        return Task.Run(async () => await Db!.Select<ChannelMessages>("channel_messages"))
+            .GetAwaiter()
+            .GetResult()
+            .ToList();
+    }
+
+    /// <summary>
+    /// Synchronously creates a new channel message record in the database.
+    /// </summary>
+    /// <param name="message">The message record to create.</param>
+    /// <returns>The created channel message record.</returns>
+    private ChannelMessages CreateChannelMessageSync(ChannelMessages message)
+    {
+        return Task.Run(async () => await Db!.Create("channel_messages", message))
+            .GetAwaiter()
+            .GetResult();
+    }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <returns></returns>
+    private bool EnsureCoreReady()
+    {
+        if (ClientKeyService is null || Db is null)
+        {
+            Console.WriteLine("Core services not initialized.");
+            return false;
+        }
+
+        return true;
+    }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <returns></returns>
+    private bool EnsureCryptoReady()
+    {
+        if (string.IsNullOrWhiteSpace(ServerPrivateKey) || string.IsNullOrWhiteSpace(ChannelDbKey))
+        {
+            Console.WriteLine("Crypto keys not initialized.");
+            return false;
+        }
+
+        if (ChannelCryptoService is null)
+        {
+            Console.WriteLine("ChannelCryptoService is not initialized.");
+            return false;
+        }
+
+        return true;
+    }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="msg"></param>
+    private void HandleRtcJoinChannel(string msg)
+    {
+        var parts = msg.Split('|', 3);
+        if (parts.Length < 3)
+        {
+            Console.WriteLine("Invalid RTC_JOIN_CHANNEL payload.");
+            return;
+        }
+
+        var username = parts[1];
+        var channelId = parts[2];
+
+        RtcChannelPresenceService.SetUser(ID, username);
+        RtcChannelPresenceService.JoinChannel(ID, channelId);
+
+        Console.WriteLine($"RTC presence joined: session={ID}, user={username}, channel={channelId}");
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="msg"></param>
+    private void HandleRtcLeaveChannel(string msg)
+    {
+        var parts = msg.Split('|', 3);
+        if (parts.Length < 3)
+        {
+            Console.WriteLine("Invalid RTC_LEAVE_CHANNEL payload.");
+            return;
+        }
+
+        var username = parts[1];
+        var channelId = parts[2];
+
+        if (RtcChannelPresenceService.IsInChannel(ID, channelId))
+        {
+            RtcChannelPresenceService.LeaveChannel(ID);
+        }
+
+        Console.WriteLine($"RTC presence left: session={ID}, user={username}, channel={channelId}");
+    }
+}

RelayServer/Services/Core/CoreClientService.cs

@@ -1,4 +1,4 @@
-namespace RelayServer.Services;
+namespace RelayServer.Services.Core;
 
 public sealed class CoreClientService
 {
@@ -8,6 +8,7 @@ public sealed class CoreClientService
         {
             "Keeper317" => new CoreUser("users:keeper317", "Keeper317", true),
             "Ru_Kira" => new CoreUser("users:ru_kira", "Ru_Kira", true),
+            "Test" => new CoreUser("users:test", "Test", true),
             _ => null
         });
     }

RelayServer/Services/Core/ServerBootstrapService.cs

@@ -0,0 +1,195 @@
+using System.Text.Json;
+using RelayServer.Models;
+using RelayServer.Services.Chat;
+using RelayServer.Services.Crypto;
+using SurrealDb.Net;
+
+namespace RelayServer.Services.Core;
+
+public sealed class ServerBootstrapService
+{
+    // TODO: Make channels dynamically addable
+    // TODO: Add logic for channel types (ENUM)
+    // TODO: Add logic for channel groups for future UI use
+    
+    private readonly SurrealDbClient _db;
+    private readonly CoreClientService _coreClient;
+    private readonly ChannelCryptoService _cryptoService;
+
+    public ServerBootstrapService(
+        SurrealDbClient db,
+        CoreClientService coreClient,
+        ChannelCryptoService cryptoService)
+    {
+        _db = db;
+        _coreClient = coreClient;
+        _cryptoService = cryptoService;
+    }
+
+    public async Task InitializeAsync()
+    {
+        var keeper = await _coreClient.GetUserByUsernameAsync("Keeper317");
+        var kira = await _coreClient.GetUserByUsernameAsync("Ru_Kira");
+        var test = await _coreClient.GetUserByUsernameAsync("Test");
+
+        if (keeper is null || kira is null || test is null)
+            throw new InvalidOperationException("One or more required users do not exist in RelayCore.");
+
+        if (!keeper.Licensed || !kira.Licensed || !test.Licensed)
+            throw new InvalidOperationException("One or more required users are not licensed.");
+
+        Console.WriteLine($"Core verified user: {keeper.Username}");
+        Console.WriteLine($"Core verified user: {kira.Username}");
+        Console.WriteLine($"Core verified user: {test.Username}");
+
+        var server = await GetServerByNameAsync("Test Server");
+
+        if (server is null)
+        {
+            server = await _db.Create("servers", new Servers
+            {
+                Name = "Test Server",
+                OwnerUserId = keeper.Id,
+                CreatedAt = DateTime.UtcNow
+            });
+
+            Console.WriteLine($"Server created: {ToJsonString(server)}");
+        }
+        else
+        {
+            Console.WriteLine($"Server already exists: {ToJsonString(server)}");
+        }
+
+        await EnsureServerMemberAsync(keeper.Id, true);
+        await EnsureServerMemberAsync(kira.Id, false);
+        await EnsureServerMemberAsync(test.Id, false);
+
+        Console.WriteLine("Server members ensured.");
+
+        var channel = await EnsureChannelAsync("general", DateTime.UtcNow);
+        var channel2 = await EnsureChannelAsync("files", DateTime.UtcNow.Subtract(new TimeSpan(0, 4, 0, 0)));
+        var channel3 = await EnsureChannelAsync("welcome", DateTime.UtcNow.Subtract(new TimeSpan(1, 4, 4, 4)));
+        var channel4 = await EnsureChannelAsync("voice-general", DateTime.UtcNow.Subtract(new TimeSpan(0, 2, 0, 0)));
+
+        Console.WriteLine($"Resolved channelId: {GetRecordId(channel.Id)}");
+        Console.WriteLine($"Resolved channelId: {GetRecordId(channel2.Id)}");
+        Console.WriteLine($"Resolved channelId: {GetRecordId(channel3.Id)}");
+        Console.WriteLine($"Resolved channelId: {GetRecordId(channel4.Id)}");
+
+        var existingKey = await GetLatestServerEncryptionKeyAsync();
+
+        if (existingKey is null)
+        {
+            var keyBase64 = _cryptoService.GenerateKey();
+            var serverKeys = E2EeHelper.GenerateRsaKeyPair();
+
+            existingKey = await _db.Create("server_encryption_keys", new ServerEncryptionKeys
+            {
+                KeyBase64 = keyBase64,
+                PublicKey = serverKeys.publicKey,
+                PrivateKey = serverKeys.privateKey,
+                CreatedAt = DateTime.UtcNow,
+                UpdatedAt = DateTime.UtcNow
+            });
+
+            Console.WriteLine("Server encryption key created.");
+        }
+        else
+        {
+            Console.WriteLine("Server encryption key already exists.");
+        }
+
+        ChatSocketBehavior.ServerPublicKey = existingKey.PublicKey;
+        ChatSocketBehavior.ServerPrivateKey = existingKey.PrivateKey;
+        ChatSocketBehavior.ChannelDbKey = existingKey.KeyBase64;
+    }
+
+    private static string ToJsonString(object? obj)
+    {
+        return JsonSerializer.Serialize(obj, new JsonSerializerOptions
+        {
+            WriteIndented = true,
+            Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+        });
+    }
+
+    private static string GetRecordId(object? id)
+    {
+        if (id is null)
+            return string.Empty;
+
+        var json = JsonSerializer.Serialize(id);
+
+        using var doc = JsonDocument.Parse(json);
+        var root = doc.RootElement;
+
+        var recordId = root.GetProperty("Id").GetString() ?? string.Empty;
+        var table = root.GetProperty("Table").GetString() ?? string.Empty;
+
+        return $"{table}:{recordId}";
+    }
+    
+    private async Task<Servers?> GetServerByNameAsync(string name)
+    {
+        var servers = await _db.Select<Servers>("servers");
+        return servers.FirstOrDefault(x => x.Name == name);
+    }
+
+    private async Task<ServerMembers?> GetServerMemberByUserIdAsync(string userId)
+    {
+        var members = await _db.Select<ServerMembers>("server_members");
+        return members.FirstOrDefault(x => x.UserId == userId);
+    }
+
+    private async Task<Channels?> GetChannelByNameAsync(string name)
+    {
+        var channels = await _db.Select<Channels>("channels");
+        return channels.FirstOrDefault(x => x.Name == name);
+    }
+
+    private async Task<ServerEncryptionKeys?> GetLatestServerEncryptionKeyAsync()
+    {
+        var keys = await _db.Select<ServerEncryptionKeys>("server_encryption_keys");
+        return keys
+            .OrderByDescending(x => x.CreatedAt)
+            .FirstOrDefault();
+    }
+    
+    private async Task EnsureServerMemberAsync(string userId, bool isOwner)
+    {
+        var existing = await GetServerMemberByUserIdAsync(userId);
+        if (existing is not null)
+        {
+            Console.WriteLine($"Server member already exists for {userId}");
+            return;
+        }
+
+        await _db.Create("server_members", new ServerMembers
+        {
+            UserId = userId,
+            JoinedAt = DateTime.UtcNow,
+            IsOwner = isOwner
+        });
+
+        Console.WriteLine($"Server member created for {userId}");
+    }
+    
+    private async Task<Channels> EnsureChannelAsync(string name, DateTime createdAt)
+    {
+        var existing = await GetChannelByNameAsync(name);
+        if (existing is not null)
+        {
+            Console.WriteLine($"Channel already exists: {name}");
+            return existing;
+        }
+
+        var channel = await _db.Create("channels", new Channels
+        {
+            Name = name,
+            CreatedAt = createdAt
+        });
+
+        Console.WriteLine($"Channel created: {ToJsonString(channel)}");
+        return channel;
+    }
+}

RelayServer/Services/Crypto/E2EeHelper.cs

@@ -0,0 +1,78 @@
+using System.Security.Cryptography;
+using System.Text;
+
+namespace RelayServer.Services.Crypto;
+
+public static class E2EeHelper
+{
+    public static (string publicKey, string privateKey) GenerateRsaKeyPair()
+    {
+        using var rsa = RSA.Create(2048);
+
+        return (
+            Convert.ToBase64String(rsa.ExportSubjectPublicKeyInfo()),
+            Convert.ToBase64String(rsa.ExportPkcs8PrivateKey())
+        );
+    }
+
+    public static EncryptedPayload EncryptForRecipient(string plainText, string recipientPublicKeyBase64)
+    {
+        byte[] aesKey = RandomNumberGenerator.GetBytes(32);
+        byte[] nonce = RandomNumberGenerator.GetBytes(12);
+        byte[] plainBytes = Encoding.UTF8.GetBytes(plainText);
+        byte[] cipherBytes = new byte[plainBytes.Length];
+        byte[] tag = new byte[16];
+
+        using (var aes = new AesGcm(aesKey, 16))
+        {
+            aes.Encrypt(nonce, plainBytes, cipherBytes, tag);
+        }
+
+        byte[] encryptedKey;
+        using (var rsa = RSA.Create())
+        {
+            rsa.ImportSubjectPublicKeyInfo(Convert.FromBase64String(recipientPublicKeyBase64), out _);
+            encryptedKey = rsa.Encrypt(aesKey, RSAEncryptionPadding.OaepSHA256);
+        }
+
+        return new EncryptedPayload
+        {
+            CipherText = Convert.ToBase64String(cipherBytes),
+            Nonce = Convert.ToBase64String(nonce),
+            Tag = Convert.ToBase64String(tag),
+            EncryptedKey = Convert.ToBase64String(encryptedKey)
+        };
+    }
+
+    public static string DecryptForRecipient(EncryptedPayload payload, string recipientPrivateKeyBase64)
+    {
+        byte[] aesKey;
+        using (var rsa = RSA.Create())
+        {
+            rsa.ImportPkcs8PrivateKey(Convert.FromBase64String(recipientPrivateKeyBase64), out _);
+            aesKey = rsa.Decrypt(Convert.FromBase64String(payload.EncryptedKey), RSAEncryptionPadding.OaepSHA256);
+        }
+
+        byte[] plainBytes = new byte[Convert.FromBase64String(payload.CipherText).Length];
+
+        using (var aes = new AesGcm(aesKey, 16))
+        {
+            aes.Decrypt(
+                Convert.FromBase64String(payload.Nonce),
+                Convert.FromBase64String(payload.CipherText),
+                Convert.FromBase64String(payload.Tag),
+                plainBytes
+            );
+        }
+
+        return Encoding.UTF8.GetString(plainBytes);
+    }
+}
+
+public class EncryptedPayload
+{
+    public required string CipherText { get; set; }
+    public required string Nonce { get; set; }
+    public required string Tag { get; set; }
+    public required string EncryptedKey { get; set; }
+}

RelayServer/Services/Data/ClientKeyService.cs

@@ -0,0 +1,61 @@
+using RelayServer.Models;
+using SurrealDb.Net;
+
+namespace RelayServer.Services.Data;
+
+public sealed class ClientKeyService
+{
+    private readonly SurrealDbClient _db;
+
+    public ClientKeyService(SurrealDbClient db)
+    {
+        _db = db;
+    }
+
+    public async Task RegisterOrUpdateKeyAsync(string username, string publicKey)
+    {
+        var allKeys = await _db.Select<ClientPublicKeys>("client_public_keys");
+
+        var existing = allKeys.FirstOrDefault(x => x.Username == username);
+
+        if (existing is null)
+        {
+            await _db.Create("client_public_keys", new ClientPublicKeys
+            {
+                Username = username,
+                PublicKey = publicKey,
+                CreatedAt = DateTime.UtcNow,
+                UpdatedAt = DateTime.UtcNow
+            });
+
+            Console.WriteLine($"Stored public key for {username}");
+            return;
+        }
+
+        existing.PublicKey = publicKey;
+        existing.UpdatedAt = DateTime.UtcNow;
+
+        await _db.Merge<ClientPublicKeys, ClientPublicKeys>(new ClientPublicKeys
+        {
+            Id = existing.Id,
+            Username = existing.Username,
+            PublicKey = existing.PublicKey,
+            CreatedAt = existing.CreatedAt,
+            UpdatedAt = existing.UpdatedAt
+        });
+
+        Console.WriteLine($"Updated public key for {username}");
+    }
+
+    public async Task<ClientPublicKeys?> GetByUsernameAsync(string username)
+    {
+        var allKeys = await _db.Select<ClientPublicKeys>("client_public_keys");
+        return allKeys.FirstOrDefault(x => x.Username == username);
+    }
+    
+    public async Task<List<ClientPublicKeys>> GetAllAsync()
+    {
+        var allKeys = await _db.Select<ClientPublicKeys>("client_public_keys");
+        return allKeys.ToList();
+    }
+}

RelayServer/Services/Data/SurrealService.cs

@@ -1,7 +1,7 @@
 using SurrealDb.Net;
 using SurrealDb.Net.Models.Auth;
 
-namespace RelayServer.Services;
+namespace RelayServer.Services.Data;
 
 public sealed class SurrealService
 {

RelayServer/Services/Rtc/RtcCallService.cs

@@ -0,0 +1,253 @@
+using RelayShared.Rtc;
+using SurrealDb.Net;
+using RelayShared.Rtc;
+
+namespace RelayServer.Services.Rtc;
+
+public sealed class RtcCallService
+{
+    private readonly SurrealDbClient _db;
+
+    public RtcCallService(SurrealDbClient db)
+    {
+        _db = db;
+    }
+
+    /// <summary>
+    /// Checks whether the specified channel currently has an active RTC call.
+    /// </summary>
+    /// <param name="channelId">The channel to inspect.</param>
+    /// <returns>
+    /// True if the channel has an active call; otherwise, false.
+    /// </returns>
+    public async Task<bool> HasActiveCallAsync(string channelId)
+    {
+        var activeCalls = await _db.Select<DBActiveCall>("rtc_active_calls");
+        return activeCalls.Any(x => x.ChannelId == channelId && x.IsActive);
+    }
+    
+    public async Task<DBActiveCall?> GetActiveCallAsync(string channelId)
+    {
+        var activeCalls = await _db.Select<DBActiveCall>("rtc_active_calls");
+        return activeCalls
+            .Where(x => x.ChannelId == channelId && x.IsActive)
+            .OrderByDescending(x => x.UpdatedAt)
+            .FirstOrDefault();
+    }
+
+    /// <summary>
+    /// Creates or updates the current SDP offer for a user in the specified channel.
+    /// If no active call exists for the channel, a new active call is created.
+    /// Otherwise, the existing active call timestamp is refreshed.
+    /// </summary>
+    /// <param name="channelId">The channel the offer belongs to.</param>
+    /// <param name="username">The user creating the offer.</param>
+    /// <param name="type">The RtcSession Type. </param>
+    /// <param name="sdp">The SDP offer payload.</param>
+    public async Task WriteOfferAsync(string channelId, string username, RtcSessionDescription sessionDescription)
+    {
+        var activeCalls = await _db.Select<DBActiveCall>("rtc_active_calls");
+        var activeCall = activeCalls.FirstOrDefault(x => x.ChannelId == channelId && x.IsActive);
+
+        if (activeCall is null)
+        {
+            await _db.Create("rtc_active_calls", new DBActiveCall
+            {
+                ChannelId = channelId,
+                OfferUser = username,
+                Offer = new RtcSessionDescription
+                {
+                    Type = sessionDescription.Type,
+                    Sdp = sessionDescription.Sdp
+                },
+                Answer = null,
+                CreatedAt = DateTime.UtcNow,
+                UpdatedAt = DateTime.UtcNow,
+                IsActive = true
+            });
+
+            return;
+        }
+
+        activeCall.OfferUser = username;
+        activeCall.Offer = new RtcSessionDescription
+        {
+            Type = sessionDescription.Type,
+            Sdp = sessionDescription.Sdp
+        };
+        activeCall.UpdatedAt = DateTime.UtcNow;
+
+        await _db.Merge<DBActiveCall, DBActiveCall>(activeCall);
+    }
+
+    /// <summary>
+    /// Gets the current offer stored on the active call for the specified channel.
+    /// </summary>
+    /// <param name="channelId">The channel whose offer should be retrieved.</param>
+    /// <returns>
+    /// The current offer for the active call, or null if no active call or offer exists.
+    /// </returns>
+    public async Task<RtcSessionDescription?> GetOfferAsync(string channelId)
+    {
+        var activeCall = await GetActiveCallAsync(channelId);
+        return activeCall?.Offer;
+    }
+
+    /// <summary>
+    /// Writes a new SDP answer for the specified channel and refreshes the active call timestamp
+    /// when a matching active call exists.
+    /// </summary>
+    /// <param name="channelId">The channel the answer belongs to.</param>
+    /// <param name="offerUser">The original offer owner.</param>
+    /// <param name="sessionDescription">The SDP and type answer payload.</param>
+    public async Task WriteAnswerAsync(string channelId, RtcSessionDescription sessionDescription)
+    {
+        var activeCalls = await _db.Select<DBActiveCall>("rtc_active_calls");
+        var activeCall = activeCalls.FirstOrDefault(x => x.ChannelId == channelId && x.IsActive);
+
+        if (activeCall is null)
+            return;
+
+        activeCall.Answer = new RtcSessionDescription
+        {
+            Type = sessionDescription.Type,
+            Sdp = sessionDescription.Sdp
+        };
+        activeCall.UpdatedAt = DateTime.UtcNow;
+
+        await _db.Merge<DBActiveCall, DBActiveCall>(activeCall);
+    }
+
+    /// <summary>
+    /// Gets all answers stored for the specified channel in creation order.
+    /// </summary>
+    /// <param name="channelId">The channel whose answers should be retrieved.</param>
+    /// <returns>
+    /// A list of answers for the channel ordered from oldest to newest.
+    /// </returns>
+    public async Task<List<RtcSessionDescription>> GetAnswersAsync(string channelId)
+    {
+        var activeCall = await GetActiveCallAsync(channelId);
+
+        if (activeCall?.Answer is null)
+            return [];
+
+        return [activeCall.Answer];
+    }
+
+    /// <summary>
+    /// Gets the most recent answer stored for the specified channel.
+    /// </summary>
+    /// <param name="channelId">The channel whose latest answer should be retrieved.</param>
+    /// <returns>
+    /// The newest answer for the channel, or null if no answer exists.
+    /// </returns>
+    public async Task<RtcSessionDescription?> GetLatestAnswerAsync(string channelId)
+    {
+        var activeCall = await GetActiveCallAsync(channelId);
+        return activeCall?.Answer;
+    }
+
+    /// <summary>
+    /// Writes a new ICE candidate entry for the specified channel and user.
+    /// </summary>
+    /// <param name="channelId">The channel the ICE candidate belongs to.</param>
+    /// <param name="username">The user who produced the ICE candidate.</param>
+    /// <param name="candidate">The ICE candidate string.</param>
+    /// <param name="sdpMid">The SDP media identifier for the candidate, if any.</param>
+    /// <param name="sdpMLineIndex">The SDP media line index for the candidate, if any.</param>
+    /// <param name="direction">
+    /// The signaling direction the candidate belongs to, such as offer or answer.
+    /// </param>
+    public async Task WriteIceCandidateAsync(
+        string channelId,
+        string username,
+        string candidate,
+        string? sdpMid,
+        int? sdpMLineIndex/*,
+        string direction*/)
+    {
+        await _db.Create("rtc_ice_candidates", new DBIceCandidate
+        {
+            ChannelId = channelId,
+            Username = username,
+            Candidate = candidate,
+            SdpMid = sdpMid,
+            SdpMLineIndex = sdpMLineIndex,
+            // Direction = direction,
+            CreatedAt = DateTime.UtcNow
+        });
+    }
+
+    /// <summary>
+    /// Gets all ICE candidates stored for the specified channel in creation order.
+    /// </summary>
+    /// <param name="channelId">The channel whose ICE candidates should be retrieved.</param>
+    /// <returns>
+    /// A list of ICE candidates for the channel ordered from oldest to newest.
+    /// </returns>
+    public async Task<List<DBIceCandidate>> GetIceCandidatesAsync(string channelId)
+    {
+        var candidates = await _db.Select<DBIceCandidate>("rtc_ice_candidates");
+        return candidates
+            .Where(x => x.ChannelId == channelId)
+            .OrderBy(x => x.CreatedAt)
+            .ToList();
+    }
+
+    /// <summary>
+    /// Gets ICE candidates for the specified channel that were created by other users
+    /// and match the requested signaling direction.
+    /// </summary>
+    /// <param name="channelId">The channel whose ICE candidates should be retrieved.</param>
+    /// <param name="username">The user to exclude from the results.</param>
+    /// <param name="direction">The signaling direction to match.</param>
+    /// <returns>
+    /// A list of matching ICE candidates ordered from oldest to newest.
+    /// </returns>
+    public async Task<List<DBIceCandidate>> GetIceCandidatesForOthersAsync(string channelId, string username, string direction)
+    {
+        var candidates = await _db.Select<DBIceCandidate>("rtc_ice_candidates");
+        return candidates
+            .Where(x => x.ChannelId == channelId && x.Username != username /*&& x.Direction == direction*/)
+            .OrderBy(x => x.CreatedAt)
+            .ToList();
+    }
+
+    /// <summary>
+    /// Leaves the active call for the specified channel. In the current implementation,
+    /// the call is only marked inactive when the offer user leaves.
+    /// </summary>
+    /// <param name="channelId">The channel whose call should be left.</param>
+    /// <param name="username">The user leaving the call.</param>
+    public async Task LeaveCallAsync(string channelId, string username)
+    {
+        var activeCalls = await _db.Select<DBActiveCall>("rtc_active_calls");
+        var activeCall = activeCalls.FirstOrDefault(x => x.ChannelId == channelId && x.IsActive);
+
+        if (activeCall is null)
+            return;
+
+        if (activeCall.OfferUser == username)
+        {
+            activeCall.IsActive = false;
+            activeCall.UpdatedAt = DateTime.UtcNow;
+            await _db.Merge<DBActiveCall, DBActiveCall>(activeCall);
+        }
+    }
+
+    /// <summary>
+    /// Gets all active call records that currently contain an offer.
+    /// </summary>
+    /// <returns>
+    /// A list of active calls with offers, ordered from newest to oldest.
+    /// </returns>
+    public async Task<List<DBActiveCall>> GetOffersAsync()
+    {
+        var activeCalls = await _db.Select<DBActiveCall>("rtc_active_calls");
+        return activeCalls
+            .Where(x => x.Offer is not null)
+            .OrderByDescending(x => x.UpdatedAt)
+            .ToList();
+    }
+}

RelayServer/Services/Rtc/RtcChannelPresenceService.cs

@@ -0,0 +1,67 @@
+using System.Collections.Concurrent;
+
+namespace RelayServer.Services.Rtc;
+
+public static class RtcChannelPresenceService
+{
+    private static readonly ConcurrentDictionary<string, string> SessionToChannel = new();
+    private static readonly ConcurrentDictionary<string, string> SessionToUsername = new();
+
+    public static void SetUser(string sessionId, string username)
+    {
+        SessionToUsername[sessionId] = username;
+    }
+
+    public static void JoinChannel(string sessionId, string channelId)
+    {
+        SessionToChannel[sessionId] = channelId;
+    }
+
+    public static void LeaveChannel(string sessionId)
+    {
+        SessionToChannel.TryRemove(sessionId, out _);
+    }
+
+    public static void RemoveSession(string sessionId)
+    {
+        SessionToChannel.TryRemove(sessionId, out _);
+        SessionToUsername.TryRemove(sessionId, out _);
+    }
+
+    public static IReadOnlyList<string> GetSessionsInChannel(string channelId)
+    {
+        return SessionToChannel
+            .Where(x => x.Value == channelId)
+            .Select(x => x.Key)
+            .ToList();
+    }
+    
+    public static List<string> GetUsernamesInChannel(string channelId)
+    {
+        return GetUsersInChannel(channelId).ToList();
+    }
+
+    public static IReadOnlyList<string> GetUsersInChannel(string channelId)
+    {
+        var sessionIds = GetSessionsInChannel(channelId);
+
+        return sessionIds
+            .Where(id => SessionToUsername.ContainsKey(id))
+            .Select(id => SessionToUsername[id])
+            .Distinct(StringComparer.OrdinalIgnoreCase)
+            .ToList();
+    }
+
+    public static bool IsInChannel(string sessionId, string channelId)
+    {
+        return SessionToChannel.TryGetValue(sessionId, out var currentChannel) &&
+               string.Equals(currentChannel, channelId, StringComparison.Ordinal);
+    }
+    
+    public static string? GetUsernameForSession(string sessionId)
+    {
+        return SessionToUsername.TryGetValue(sessionId, out var username)
+            ? username
+            : null;
+    }
+}

RelayServer/Services/Rtc/RtcNotificationService.cs

@@ -0,0 +1,28 @@
+using System.Text.Json;
+using RelayShared.Rtc;
+using WebSocketSharp.Server;
+
+namespace RelayServer.Services.Rtc;
+
+public static class RtcNotificationService
+{
+    public static WebSocketServer? Server { get; set; }
+
+    public static void BroadcastToChannel(RtcNotificationMessage message)
+    {
+        if (Server is null)
+            return;
+
+        var host = Server.WebSocketServices["/"];
+        if (host is null)
+            return;
+
+        var json = JsonSerializer.Serialize(message);
+        var sessionIds = RtcChannelPresenceService.GetSessionsInChannel(message.ChannelId);
+
+        foreach (var sessionId in sessionIds)
+        {
+            host.Sessions.SendTo(json, sessionId);
+        }
+    }
+}

RelayServer/Services/ServerBootstrapService.cs

@@ -1,6 +0,0 @@
-namespace RelayServer.Services;
-
-public class ServerBootstrapService
-{
-    
-}

RelayShared/.gitignore

@@ -0,0 +1,93 @@
+############################################
+# .NET Build
+############################################
+
+bin/
+obj/
+out/
+publish/
+
+############################################
+# Visual Studio
+############################################
+
+.vs/
+*.user
+*.suo
+*.userprefs
+*.csproj.user
+*.dbmdl
+*.cache
+*.pdb
+*.opendb
+
+############################################
+# Rider / JetBrains
+############################################
+
+.idea/
+*.sln.iml
+
+############################################
+# VSCode
+############################################
+
+.vscode/
+
+############################################
+# NuGet
+############################################
+
+*.nupkg
+*.snupkg
+packages/
+.nuget/
+.nuget/packages/
+
+############################################
+# Logs
+############################################
+
+*.log
+logs/
+
+############################################
+# OS files
+############################################
+
+.DS_Store
+Thumbs.db
+
+############################################
+# Local secrets / environment
+############################################
+
+.env
+.env.*
+secrets.json
+appsettings.Development.json
+
+############################################
+# E2EE private keys
+############################################
+
+keys/*
+!keys/.gitkeep
+
+############################################
+# Local test databases / data folders
+############################################
+
+data/
+*.db
+*.sqlite
+*.sqlite3
+
+############################################
+# Temporary files
+############################################
+
+*.tmp
+*.temp
+*.bak
+*.swp

RelayShared/Class1.cs

@@ -0,0 +1,9 @@
+namespace RelayShared;
+
+public class Class1
+{
+    public Class1()
+    {
+        return;
+    }
+}

RelayShared/RelayShared.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net9.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="SurrealDb.Net" Version="0.9.0" />
+    </ItemGroup>
+
+</Project>

RelayShared/Rtc/RTCDatabase.cs

@@ -0,0 +1,40 @@
+using SurrealDb.Net.Models;
+
+namespace RelayShared.Rtc;
+
+public sealed class DBActiveCall : Record
+{
+    public string ChannelId { get; set; } = string.Empty;
+    public string? OfferUser { get; set; }
+    public RtcSessionDescription? Offer { get; set; }
+    public RtcSessionDescription? Answer { get; set; }
+    public DateTime CreatedAt { get; set; }
+    public DateTime UpdatedAt { get; set; }
+    public bool IsActive { get; set; }
+    public string[] IceCandidates { get; set; } = []; //TODO: Should be array of DBIceCandidates IDs
+}
+
+public sealed class DBOffer : Record
+{
+    public string ChannelId { get; set; } = string.Empty;
+    public string Username { get; set; } = string.Empty;
+    public string Type { get; set; } = string.Empty;
+    public string Sdp { get; set; } = string.Empty;
+}
+public sealed class DBAnswer : Record
+{
+    public string ChannelId { get; set; } = string.Empty;
+    public string Username { get; set; } = string.Empty;
+    public string Type { get; set; } = string.Empty;
+    public string Sdp { get; set; } = string.Empty;
+}
+
+public class DBIceCandidate : Record
+{
+    public required string ChannelId { get; set; }
+    public required string Username { get; set; }
+    public required string Candidate { get; set; }
+    public string? SdpMid { get; set; }
+    public int? SdpMLineIndex { get; set; }
+    public DateTime CreatedAt { get; set; }
+}

RelayShared/Rtc/RTCTransmissions.cs

@@ -0,0 +1,93 @@
+using System.Text.Json.Serialization;
+using RelayShared.Services;
+
+namespace RelayShared.Rtc;
+
+public sealed class RtcSessionDescription
+{
+    public string Type { get; set; } = string.Empty;
+    public string Sdp { get; set; } = string.Empty;
+}
+
+public sealed class RtcOffer
+{
+    public string ChannelId { get; set; } = string.Empty;
+    public string Username { get; set; } = string.Empty;
+    public RtcSessionDescription SessionDescription { get; set; } = new();
+}
+
+public sealed class RtcAnswer
+{
+    public string ChannelId { get; set; } = string.Empty;
+    public string Username { get; set; } = string.Empty;
+    public RtcSessionDescription SessionDescription { get; set; } = new();
+}
+public class RtcIceCandidate
+{
+    public required string ChannelId { get; set; }
+    public required string Username { get; set; }
+    public required IceCandidate Candidate { get; set; }
+}
+
+public class IceCandidate
+{
+    public required string candidate { get; set; }
+    public required string sdpMid { get; set; }
+    public required int sdpMLineIndex { get; set; }
+    public required string usernameFragment { get; set; }
+    
+}
+
+public sealed class RtcJoinRequest
+{
+    public string ChannelId { get; set; } = string.Empty;
+    public string Username { get; set; } = string.Empty;
+}
+
+public sealed class RtcJoinResponse
+{
+    public string ChannelId { get; set; } = string.Empty;
+    public string[] Participants { get; set; } = [];
+}
+
+public sealed class RtcLeaveRequest
+{
+    public string ChannelId { get; set; } = string.Empty;
+    public string Username { get; set; } = string.Empty;
+}
+public sealed class RtcNotificationMessage //TODO: Review for removal
+{
+    public SignalType? Type { get; set; }
+    public string? ChannelId { get; set; }
+    public string? Username { get; set; }
+    public string? Direction { get; set; }
+}
+public sealed class RtcSignalMessage //TODO: Review for removal.
+{
+    [JsonPropertyName("type")]
+    public string Type { get; set; } = string.Empty;
+
+    [JsonPropertyName("from")]
+    public string From { get; set; } = string.Empty;
+
+    [JsonPropertyName("to")]
+    public string To { get; set; } = string.Empty;
+
+    [JsonPropertyName("channelId")]
+    public string ChannelId { get; set; } = string.Empty;
+
+    [JsonPropertyName("sdp")]
+    public string? Sdp { get; set; }
+
+    [JsonPropertyName("candidate")]
+    public string? Candidate { get; set; }
+
+    [JsonPropertyName("sdpMid")]
+    public string? SdpMid { get; set; }
+
+    [JsonPropertyName("sdpMLineIndex")]
+    public int? SdpMLineIndex { get; set; }
+
+    [JsonPropertyName("isInitiator")]
+    public bool IsInitiator { get; set; }
+}

RelayShared/Rtc/RtcServices.cs

@@ -0,0 +1,6 @@
+namespace RelayShared.Rtc;
+
+public class RtcServices
+{
+    
+}

RelayShared/Services/ChannelEnums.cs

@@ -0,0 +1,10 @@
+namespace RelayShared.Services;
+
+public enum ChannelType
+{
+    Text, //Default channel type, handles text, links, files*, all in a linear live chat format
+    Voice, //Used for general voice and video calls, utilizes WebRTC in its intended use
+    File, //File browser for connected text channels, used for browsing files rather than scrolling through text channel
+    Forum, //Specific forum posts, meant to keep conversations grouped and on topic while keeping all in an easy to find place
+    Stage //Used for announcements and presentations, voice/video call utilizing a modified WebRTC protocol through server
+}

RelayShared/Services/ChannelTransmissions.cs

@@ -0,0 +1,18 @@
+namespace RelayShared.Services;
+
+public sealed class ChannelItem
+{
+    public string ChannelId { get; set; } = string.Empty;
+    public string Name { get; set; } = string.Empty;
+    
+    public ChannelType Type { get; set; }
+    
+    public string Group { get; set; } = string.Empty;
+    public DateTime CreatedAt { get; set; }
+}
+
+public sealed class SocketChannelList
+{
+    public SignalType Type { get; set; } = SignalType.ChannelList;
+    public List<ChannelItem> Channels { get; set; } = [];
+}

RelayShared/Services/ConsoleCommandService.cs

@@ -0,0 +1,38 @@
+namespace RelayShared.Services;
+
+public static class ConsoleCommandService
+{
+    public static CancellationTokenSource ShutdownTokenSource { get; } = new();
+
+    public static void Start()
+    {
+        Task.Run(() =>
+        {
+            while (!ShutdownTokenSource.IsCancellationRequested)
+            {
+                var input = Console.ReadLine();
+
+                if (string.IsNullOrWhiteSpace(input))
+                    continue;
+
+                HandleCommand(input.Trim().ToLower());
+            }
+        });
+    }
+
+    private static void HandleCommand(string command)
+    {
+        switch (command)
+        {
+            case "exit":
+            case "stop":
+                Console.WriteLine("Shutting down...");
+                ShutdownTokenSource.Cancel();
+                break;
+
+            default:
+                Console.WriteLine($"Unknown command: {command}");
+                break;
+        }
+    }
+}

RelayShared/Services/SocketTransmissions.cs

@@ -0,0 +1,48 @@
+namespace RelayShared.Services;
+
+//TODO: review name of file, potentially rename for Encryption services rather than sockets
+
+public sealed class SocketRtcSignalMessage
+{
+    public SignalType Type { get; set; }
+    public string SenderUsername { get; set; } = string.Empty;
+    public string ChannelId { get; set; } = string.Empty;
+    public string CipherText { get; set; } = string.Empty;
+    public string Nonce { get; set; } = string.Empty;
+    public string Tag { get; set; } = string.Empty;
+    public string EncryptedKey { get; set; } = string.Empty;
+}
+
+public sealed class SocketEncryptedMessage
+{
+    public SignalType Type { get; set; } = SignalType.EncryptedChat;
+    public string SenderUsername { get; set; } = string.Empty;
+    public string RecipientUsername { get; set; } = string.Empty;
+    public string ChannelId { get; set; } = string.Empty;
+    public string CipherText { get; set; } = string.Empty;
+    public string Nonce { get; set; } = string.Empty;
+    public string Tag { get; set; } = string.Empty;
+    public string EncryptedKey { get; set; } = string.Empty;
+}
+
+public sealed class ServerPublicKeyMessage
+{
+    public SignalType Type { get; set; } = SignalType.ServerPublicKey;
+    public string PublicKey { get; set; } = string.Empty;
+}
+
+public enum SignalType
+{
+    Offer,
+    Answer,
+    Candidate,
+    OfferUpdated,
+    AnswerUpdated,
+    CandidateAdded,
+    CallLeft,
+    ChannelList,
+    ServerPublicKey,
+    EncryptedSignal,
+    EncryptedChat,
+    ClientEncryptedChat
+}

UI Design Doc outline.md

@@ -0,0 +1,47 @@
+Server Profile:
+    - Server Name
+    - Server Image
+    - Selection Arrow
+    - Server specific settings (notifications, DMs, Admin settings link)
+
+Member Server Settings: [shown only when selecting a member from member list]
+    - Settings for selected Member
+    - Mute and Deafen for voice channels
+    - Nickname editing
+    - Global Username
+    - View profile
+    - Member statuses (full length)
+    - Permissions editing (for admins)
+
+User Profile and Channel Controls:
+    - User settings button
+    - Profile
+    - Mute and deafen for voice channels
+    - Connection details for voice call
+    - Disconnect for voice calls
+    - Share screens in voice channels
+    - Camera controls in voice channels
+
+Members List:
+    - Member tile with Username/Nickname
+    - Status
+    - Profile
+    - Colored based on Assigned roles
+
+Channels List:
+    - Channel Name
+    - Icon for channel type [Forum, Stage, Text, Voice/Video, File]
+    - Colored based on assigned roles
+    - Hidden based on assigned roles
+
+Channel Specific Info:
+    - Channel Type
+    - Notification settings (specific to channel)
+    - Permission editing (for admins)
+    - Invite Link
+    - Channel Settings
+
+General UI Needs:
+    - Icons for individual controls
+    - Design docs
+    - General design for all lists [text, file, forum, members, channels]

dev-run.ps1

@@ -0,0 +1,123 @@
+$root = Split-Path -Parent $MyInvocation.MyCommand.Path
+Set-Location $root
+
+$startedProcesses = @()
+
+function Start-TrackedProcess {
+    param(
+        [string]$FilePath,
+        [string[]]$ArgumentList = @(),
+        [string]$WorkingDirectory = $root
+    )
+
+    $proc = Start-Process -FilePath $FilePath `
+        -ArgumentList $ArgumentList `
+        -WorkingDirectory $WorkingDirectory `
+        -PassThru
+
+    $script:startedProcesses += $proc
+    return $proc
+}
+
+function Stop-AllTrackedProcesses {
+    Write-Host ""
+    Write-Host "Stopping launched processes..."
+
+    foreach ($proc in $script:startedProcesses) {
+        try {
+            if ($proc -and -not $proc.HasExited) {
+                Stop-Process -Id $proc.Id -Force -ErrorAction SilentlyContinue
+                Write-Host "Stopped PID $($proc.Id)"
+            }
+        }
+        catch {
+        }
+    }
+
+    try {
+        $containerIds = docker ps --filter "ancestor=surrealdb/surrealdb:v2.2.1" --format "{{.ID}}"
+        foreach ($id in $containerIds) {
+            docker stop $id | Out-Null
+            Write-Host "Stopped Docker container $id"
+        }
+    }
+    catch {
+    }
+}
+
+Register-EngineEvent PowerShell.Exiting -Action {
+    Stop-AllTrackedProcesses
+} | Out-Null
+
+Write-Host "Building RelayCore..."
+dotnet build .\RelayCore\RelayCore.csproj
+if ($LASTEXITCODE -ne 0) { throw "RelayCore build failed." }
+
+Write-Host "Building RelayServer..."
+dotnet build .\RelayServer\RelayServer.csproj
+if ($LASTEXITCODE -ne 0) { throw "RelayServer build failed." }
+
+Write-Host "Building RelayClient (Windows only)..."
+dotnet build .\RelayClient\RelayClient.csproj -f net10.0-windows10.0.19041.0
+if ($LASTEXITCODE -ne 0) { throw "RelayClient build failed." }
+
+$coreDll = Join-Path $root "RelayCore\bin\Debug\net9.0\RelayCore.dll"
+$serverDll = Join-Path $root "RelayServer\bin\Debug\net10.0\RelayServer.dll"
+$clientExe = Join-Path $root "RelayClient\bin\Debug\net10.0-windows10.0.19041.0\win-x64\RelayClient.exe"
+
+Write-Host "Starting SurrealDB..."
+Start-TrackedProcess `
+    -FilePath "docker" `
+    -ArgumentList @(
+    "run",
+    "--rm",
+    "-p", "8000:8000",
+    "-v", "/mydata:/mydata",
+    "surrealdb/surrealdb:v2.2.1",
+    "start",
+    "--user", "root",
+    "--pass", "secret"
+)
+
+Start-Sleep -Seconds 5
+
+Write-Host "Starting RelayCore..."
+Start-TrackedProcess `
+    -FilePath "dotnet" `
+    -ArgumentList @($coreDll)
+
+Start-Sleep -Seconds 3
+
+Write-Host "Starting RelayServer..."
+Start-TrackedProcess `
+    -FilePath "dotnet" `
+    -ArgumentList @($serverDll)
+
+Start-Sleep -Seconds 3
+
+Write-Host "Starting RelayClient (Keeper317)..."
+Start-TrackedProcess `
+    -FilePath $clientExe `
+    -ArgumentList @("--user", "Keeper317")
+
+Start-Sleep -Seconds 1
+
+Write-Host "Starting RelayClient (Ru_Kira)..."
+Start-TrackedProcess `
+    -FilePath $clientExe `
+    -ArgumentList @("--user", "Ru_Kira")
+
+Start-Sleep -Seconds 20
+
+Write-Host "Starting RelayClient (Test)..."
+Start-TrackedProcess `
+    -FilePath $clientExe `
+    -ArgumentList @("--user", "Test")
+
+Write-Host "" 
+Write-Host "Everything started." 
+Write-Host "Press Ctrl+C in this PowerShell to stop everything."
+
+while ($true) {
+    Start-Sleep -Seconds 1
+}

start-all.ps1

@@ -0,0 +1,85 @@
+$root = Split-Path -Parent $MyInvocation.MyCommand.Path
+Set-Location $root
+
+$dockerExe = (Get-Command docker.exe).Source
+$dotnetExe = (Get-Command dotnet.exe).Source
+$ps = (Get-Command powershell.exe).Source
+
+Write-Host "Building RelayCore..."
+& $dotnetExe build .\RelayCore\RelayCore.csproj
+if ($LASTEXITCODE -ne 0) { throw "RelayCore build failed." }
+
+Write-Host "Building RelayServer..."
+& $dotnetExe build .\RelayServer\RelayServer.csproj
+if ($LASTEXITCODE -ne 0) { throw "RelayServer build failed." }
+
+Write-Host "Building RelayClient (Windows only)..."
+& $dotnetExe build .\RelayClient\RelayClient.csproj -f net10.0-windows10.0.19041.0
+if ($LASTEXITCODE -ne 0) { throw "RelayClient build failed." }
+
+$coreDll   = Join-Path $root "RelayCore\bin\Debug\net9.0\RelayCore.dll"
+$serverDll = Join-Path $root "RelayServer\bin\Debug\net10.0\RelayServer.dll"
+$clientExe = Join-Path $root "RelayClient\bin\Debug\net10.0-windows10.0.19041.0\win-x64\RelayClient.exe"
+
+$tempDir = Join-Path $env:TEMP "RelayTabs"
+New-Item -ItemType Directory -Force -Path $tempDir | Out-Null
+
+function New-TabScript {
+    param(
+        [string]$Name,
+        [string]$Content
+    )
+
+    $path = Join-Path $tempDir "$Name.ps1"
+    Set-Content -Path $path -Value $Content -Encoding UTF8
+    return $path
+}
+
+$dockerScript = New-TabScript -Name "SurrealDB" -Content @"
+Set-Location '$root'
+& '$dockerExe' run --rm -p 8000:8000 -v /mydata:/mydata surrealdb/surrealdb:v2.2.1 start --user root --pass secret
+"@
+
+$coreScript = New-TabScript -Name "RelayCore" -Content @"
+Set-Location '$root'
+Start-Sleep -Seconds 1
+& '$dotnetExe' '$coreDll'
+"@
+
+$serverScript = New-TabScript -Name "RelayServer" -Content @"
+Set-Location '$root'
+Start-Sleep -Seconds 1
+& '$dotnetExe' '$serverDll'
+"@
+
+$keeperScript = New-TabScript -Name "Keeper317" -Content @"
+Set-Location '$root'
+Start-Sleep -Seconds 5
+& '$clientExe' --user Keeper317
+"@
+
+$kiraScript = New-TabScript -Name "Ru_Kira" -Content @"
+Set-Location '$root'
+Start-Sleep -Seconds 5
+& '$clientExe' --user Ru_Kira
+"@
+
+$testScript = New-TabScript -Name "Test" -Content @"
+Set-Location '$root'
+Start-Sleep -Seconds 25
+& '$clientExe' --user Test
+"@
+
+$wtArgs = @(
+    "new-tab --title `"SurrealDB`" `"$ps`" -NoExit -ExecutionPolicy Bypass -File `"$dockerScript`"",
+    "new-tab --title `"RelayCore`" `"$ps`" -NoExit -ExecutionPolicy Bypass -File `"$coreScript`"",
+    "new-tab --title `"RelayServer`" `"$ps`" -NoExit -ExecutionPolicy Bypass -File `"$serverScript`"",
+    "new-tab --title `"Keeper317`" `"$ps`" -NoExit -ExecutionPolicy Bypass -File `"$keeperScript`"",
+    "new-tab --title `"Test`" `"$ps`" -NoExit -ExecutionPolicy Bypass -File `"$testScript`"",
+    "new-tab --title `"Ru_Kira`" `"$ps`" -NoExit -ExecutionPolicy Bypass -File `"$kiraScript`""
+) -join " ; "
+
+Write-Host ""
+Write-Host "Everything started."
+Write-Host "Close out terminal to end all applications."
+Start-Process wt.exe -ArgumentList $wtArgs