need server and core webapp to work at same time for testing purposes

Auth setup continued
Beginnings of Core Auth
2026-05-03 18:04:40 -04:00 · 2026-05-02 16:06:08 -04:00 · 2026-04-30 19:08:37 -04:00 · 2026-04-29 14:39:28 -04:00 · 2026-04-29 13:52:35 -04:00 · 2026-04-29 09:13:58 -04:00
59 changed files with 1989 additions and 1188 deletions
--- a/Relay.sln
+++ b/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
--- a/RelayClient/MainPage.xaml
+++ b/RelayClient/MainPage.xaml
@@ -62,8 +62,6 @@
            <!-- <WebView Source="test.html"/> -->
            <Grid RowDefinitions="Auto,*"
                  ColumnDefinitions="*">
-                <Button Text="Send message to JavaScript"
-                        Clicked="OnSendMessageButtonClicked" />
                <HybridWebView x:Name="hybridWebView"
                               RawMessageReceived="OnHybridWebViewRawMessageReceived"
                               Grid.Row="1" />
--- a/RelayClient/MainPage.xaml.cs
+++ b/RelayClient/MainPage.xaml.cs
@@ -1,22 +1,23 @@
-using RelayClient.Crypto;
-using RelayClient.Models;
-using WebSocketSharp;
-using System.Text.Json;
+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 WebSocket _wsc;
-    private string? _serverPublicKey;
+    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)
    {
        InitializeComponent();
@@ -31,19 +32,31 @@ public partial class MainPage : ContentPage
            KeyStorage.SavePublicKey(_username, keys.publicKey);
        }

-        _wsc = new WebSocket("ws://localhost:1337/");
-        
-        _wsc.OnMessage += WscOnMessage;
-        _wsc.Connect();
-
-        var publicKey = KeyStorage.LoadPublicKey(_username);
-        _wsc.Send($"REGISTER_KEY|{_username}|{publicKey}");
-        _wsc.Send("GET_SERVER_KEY");
-        _wsc.Send("GET_CHANNELS");
-        
-        hybridWebView.SetInvokeJavaScriptTarget(this);
        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)
@@ -63,24 +76,24 @@ public partial class MainPage : ContentPage
        if (string.IsNullOrWhiteSpace(text))
            return;

-        if (string.IsNullOrWhiteSpace(_serverPublicKey))
+        if (string.IsNullOrWhiteSpace(_socket.ServerPublicKey))
        {
            Console.WriteLine("Server public key not loaded yet.");
            return;
        }
-        
+
        if (string.IsNullOrWhiteSpace(_currentChannelId))
        {
            Console.WriteLine("No channel selected yet.");
            return;
        }

-        var encrypted = E2EeHelper.EncryptForRecipient(text, _serverPublicKey);
+        var encrypted = E2EeHelper.EncryptForRecipient(text, _socket.ServerPublicKey);

        var payload = new SocketEncryptedMessage
        {
            ChannelId = _currentChannelId!,
-            Type = "client_encrypted_chat",
+            Type = SignalType.ClientEncryptedChat,
            SenderUsername = _username,
            CipherText = encrypted.CipherText,
            Nonce = encrypted.Nonce,
@@ -88,8 +101,7 @@ public partial class MainPage : ContentPage
            EncryptedKey = encrypted.EncryptedKey
        };

-        var json = JsonSerializer.Serialize(payload);
-        _wsc.Send(json);
+        _socket.SendJson(payload);

        Console.WriteLine($"[{_username}] sent encrypted message.");

@@ -97,165 +109,83 @@ public partial class MainPage : ContentPage
        MessageEntry.Focus();
    }

-    private void WscOnMessage(object? sender, MessageEventArgs e)
+    private void HandleChannelList(SocketChannelList channelList)
    {
-        if (e.Data.StartsWith("SERVER:REGISTERED_KEY:"))
-        {
-            Console.WriteLine(e.Data);
-            return;
-        }
+        _channels.Clear();
+        _channels.AddRange(channelList.Channels.OrderBy(c => c.CreatedAt));

-        hybridWebView.SendRawMessage($"[{_username}] RAW WS DATA {e.Data}");
-        
-        Console.WriteLine($"[{_username}] RAW WS DATA: {e.Data}");
+        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 () =>
+        {
+            ChannelLabel.Text = $"#{_currentChannelName}";
+            RenderChannelList();
+            await _rtc.PushRtcContextToJsAsync();
+        });
+
+        _socket.SendRaw($"GET_HISTORY|{_username}|{_currentChannelId}");
+    }
+
+    private void HandleEncryptedChat(SocketEncryptedMessage payload) {
+        if (payload.RecipientUsername != _username)
+            return;
+
+        string decryptedText;

        try
        {
-            using var doc = JsonDocument.Parse(e.Data);
-            var root = doc.RootElement;
+            var privateKey = KeyStorage.LoadPrivateKey(_username);

-            if (!root.TryGetProperty("Type", out var typeElement))
-                return;
-
-            var type = typeElement.GetString();
-
-            if (type == "channel_list")
-            {
-                var channelList = JsonSerializer.Deserialize<SocketChannelList>(e.Data);
-                if (channelList is null)
-                    return;
-
-                _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 not null)
-                {
-                    _currentChannelId = defaultChannel.ChannelId;
-                    _currentChannelName = defaultChannel.Name;
-
-                    MainThread.BeginInvokeOnMainThread(async () =>
-                    {
-                        ChannelLabel.Text = $"#{_currentChannelName}";
-                        RenderChannelList();
-                        await PushRtcContextToJsAsync();
-                    });
-
-                    _wsc.Send($"GET_HISTORY|{_username}|{_currentChannelId}");
-                }
-
-                return;
-            }
-
-            if (type == "server_public_key")
-            {
-                var serverKeyMessage = JsonSerializer.Deserialize<ServerPublicKeyMessage>(e.Data);
-                if (serverKeyMessage is not null)
-                {
-                    _serverPublicKey = serverKeyMessage.PublicKey;
-                    Console.WriteLine($"[{_username}] loaded server public key.");
-                }
-
-                return;
-            }
-            
-            if (type == "encrypted_rtc_signal")
-            {
-                var payload = JsonSerializer.Deserialize<SocketRtcSignalMessage>(e.Data);
-                if (payload is null)
-                    return;
-
-                if (payload.ChannelId != _currentChannelId)
-                    return;
-
-                if (payload.SenderUsername == _username)
-                    return;
-
-                var privateKey = KeyStorage.LoadPrivateKey(_username);
-
-                var decryptedJson = E2EeHelper.DecryptForRecipient(
-                    new EncryptedPayload
-                    {
-                        CipherText = payload.CipherText,
-                        Nonce = payload.Nonce,
-                        Tag = payload.Tag,
-                        EncryptedKey = payload.EncryptedKey
-                    },
-                    privateKey
-                );
-
-                MainThread.BeginInvokeOnMainThread(async () =>
-                {
-                    await SendRtcSignalToJsAsync(decryptedJson);
-                });
-
-                return;
-            }
-            
-            if (type != "encrypted_chat")
-                return;
-
-            var pyload = JsonSerializer.Deserialize<SocketEncryptedMessage>(e.Data);
-            if (pyload is null)
-                return;
-
-            if (pyload.RecipientUsername != _username)
-                return;
-
-            Console.WriteLine($"[{_username}] received encrypted payload for {pyload.RecipientUsername}");
-
-            var privKey = KeyStorage.LoadPrivateKey(_username);
-
-            var decryptedText = E2EeHelper.DecryptForRecipient(
+            decryptedText = E2EeHelper.DecryptForRecipient(
                new EncryptedPayload
                {
-                    CipherText = pyload.CipherText,
-                    Nonce = pyload.Nonce,
-                    Tag = pyload.Tag,
-                    EncryptedKey = pyload.EncryptedKey
+                    CipherText = payload.CipherText,
+                    Nonce = payload.Nonce,
+                    Tag = payload.Tag,
+                    EncryptedKey = payload.EncryptedKey
                },
-                privKey
-            );
-
-            Console.WriteLine($"[{_username}] decrypted message from {pyload.SenderUsername}: {decryptedText}");
-
-            var message = new ChatMessage
-            {
-                SenderUsername = pyload.SenderUsername,
-                Text = decryptedText,
-                Timestamp = DateTime.Now
-            };
-
-            if (!_messagesByChannel.ContainsKey(pyload.ChannelId))
-            {
-                _messagesByChannel[pyload.ChannelId] = [];
-            }
-
-            _messagesByChannel[pyload.ChannelId].Add(message);
-
-            if (pyload.ChannelId == _currentChannelId)
-            {
-                MainThread.BeginInvokeOnMainThread(() =>
-                {
-                    RenderSingleMessage(message);
-                });
-            }
+                privateKey
+            ); 
        }
        catch (Exception ex)
        {
-            Console.WriteLine($"[{_username}] failed to process websocket message: {ex.Message}");
+            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()
    {
-        _wsc.OnMessage -= WscOnMessage;
-        _wsc.Close();
+        _socket.Disconnect();
        base.OnDisappearing();
    }

@@ -265,28 +195,36 @@ public partial class MainPage : ContentPage

        foreach (var channel in _channels.OrderBy(c => c.CreatedAt))
        {
-            var button = new Button
+            var button = new ChannelButton
            {
-                Text = $"#{channel.Name}"
+                Text = $"#{channel.Name}",
+                Type = channel.Type,
+                Group = channel.Group
            };

            button.Clicked += (_, _) =>
            {
                _currentChannelId = channel.ChannelId;
                _currentChannelName = channel.Name;
-                
+
                MainThread.BeginInvokeOnMainThread(async () =>
                {
-                    await PushRtcContextToJsAsync();
+                    await _rtc.PushRtcContextToJsAsync();
+
+                    if (channel.Type == ChannelType.Voice)
+                    {
+                        if (!RtcView.IsVisible)
+                            SwapView();
+
+                        _ = _rtc.JoinRtcChannel();
+                    }
                });

                ChannelLabel.Text = $"#{_currentChannelName}";
                RenderCurrentChannelMessages();

                if (!_messagesByChannel.ContainsKey(channel.ChannelId))
-                {
-                    _wsc.Send($"GET_HISTORY|{_username}|{channel.ChannelId}");
-                }
+                    _socket.SendRaw($"GET_HISTORY|{_username}|{channel.ChannelId}");
            };

            SidebarList.Children.Add(button);
@@ -311,7 +249,7 @@ public partial class MainPage : ContentPage

    private async void RenderSingleMessage(ChatMessage message)
    {
-        bool isOwnMessage = message.SenderUsername == _username;
+        var isOwnMessage = message.SenderUsername == _username;

        var bubble = new Border
        {
@@ -339,14 +277,13 @@ public partial class MainPage : ContentPage
        await MessagesScrollView.ScrollToAsync(MessagesLayout, ScrollToPosition.End, true);
    }

-    private void SwapView_OnClicked(object? sender, EventArgs e)
+    private void SwapView()
    {
        if (RtcView.IsVisible)
        {
            MessagesScrollView.IsVisible = true;
            RtcView.IsVisible = false;
            ViewSwapped.Text = "Swap to Web View";
-
        }
        else
        {
@@ -356,127 +293,50 @@ public partial class MainPage : ContentPage
        }
    }

-    public async Task<bool> JoinRtcChannel()
+    private void SwapView_OnClicked(object? sender, EventArgs e)
    {
-        //TODO: get bool value for if channel ID has an active call
-        //TODO: Join RTC using current channel ID
-        hybridWebView.SendRawMessage($"Attempting to join RTC Channel {_currentChannelName}");
-        bool active = await ServerAPI.GetIsChannelActiveAsync(_currentChannelId);
-        hybridWebView.SendRawMessage($"Rtc Channel {_currentChannelName} is active: {active}");
-        return active;
-        //await hybridWebView.EvaluateJavaScriptAsync($"window.channelCallJoin({active})");
-
-    }
-    public async void WriteRtcOffer(string json)
-    {
-        try
-        {
-            RtcDescription? description = JsonSerializer.Deserialize<RtcDescription>(json);
-            DBOffer offer = new DBOffer
-            {
-                ChannelId = _currentChannelId,
-                Username = _username,
-                SessionDescription = description
-            };
-            await ServerAPI.PostOfferAsync(offer);
-        }
-        catch (Exception ex)
-        {
-            hybridWebView.SendRawMessage(ex.Message);
-        }
-
-    }
-    public async Task<string> GetRtcOffer()
-    {
-        RtcDescription? offer = await ServerAPI.GetOffersForChannelAsync(_currentChannelId);
-        return JsonSerializer.Serialize(offer);
-    }
-    public async void WriteRtcAnswer(string json)
-    {
-        RtcDescription? description = JsonSerializer.Deserialize<RtcDescription>(json);
-        DBOffer answer = new DBOffer
-        {
-            ChannelId = _currentChannelId,
-            Username = _username,
-            SessionDescription = description
-        };
-        await ServerAPI.PostAnswerAsync(answer);
-    }
-
-    public async void AnswerCallback(RtcDescription answer)
-    {
-        await hybridWebView.EvaluateJavaScriptAsync($"window.AnswerCallback({answer})");
-    }
-    
-    private void OnSendMessageButtonClicked(object sender, EventArgs e)
-    {
-        hybridWebView.SendRawMessage($"Hello from C#!");
+        SwapView();
    }

    private async void OnHybridWebViewRawMessageReceived(object sender, HybridWebViewRawMessageReceivedEventArgs e)
    {
        if (e.Message == "rtc_page_ready")
        {
-            await PushRtcContextToJsAsync();
+            await _rtc.PushRtcContextToJsAsync();
            return;
        }

-        await DisplayAlertAsync("Raw Message Received", e.Message, "OK");
+        SafeSendRawToWebView($"JS RAW -> C#: {e.Message}");
    }
-    
-    public void SendRtcSignal(string json)
+
+    private void SafeSendRawToWebView(string message)
    {
-        if (string.IsNullOrWhiteSpace(_serverPublicKey))
+        MainThread.BeginInvokeOnMainThread(() =>
        {
-            Console.WriteLine("Server public key not loaded yet.");
-            return;
-        }
-
-        RtcSignalMessage? rtcSignal;
-        try
-        {
-            rtcSignal = JsonSerializer.Deserialize<RtcSignalMessage>(json);
-        }
-        catch (Exception ex)
-        {
-            Console.WriteLine($"Failed to parse RTC signal from JS: {ex.Message}");
-            return;
-        }
-
-        if (rtcSignal is null)
-            return;
-
-        var encrypted = E2EeHelper.EncryptForRecipient(json, _serverPublicKey);
-
-        var payload = new SocketRtcSignalMessage
-        {
-            Type = "encrypted_rtc_signal",
-            SenderUsername = _username,
-            ChannelId = rtcSignal.ChannelId,
-            CipherText = encrypted.CipherText,
-            Nonce = encrypted.Nonce,
-            Tag = encrypted.Tag,
-            EncryptedKey = encrypted.EncryptedKey
-        };
-
-        _wsc.Send(JsonSerializer.Serialize(payload));
-        Console.WriteLine($"[{_username}] sent RTC signal: {rtcSignal.Type} -> {rtcSignal.ChannelId}");
+            try
+            {
+                hybridWebView.SendRawMessage(message);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"[{_username}] failed to send raw message to HybridWebView: {ex.Message}");
+            }
+        });
    }
-    
-    private async Task SendRtcSignalToJsAsync(string rawJson)
+
+    public class ChannelButton : Button
    {
-        var jsArg = JsonSerializer.Serialize(rawJson);
-        await hybridWebView.EvaluateJavaScriptAsync($"window.handleRtcSignal({jsArg})");
+        public ChannelType Type { get; set; }
+        public string Group { get; set; } = string.Empty;
    }
-    
-    private async Task PushRtcContextToJsAsync()
+
+    [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
    {
-        var usernameJson = JsonSerializer.Serialize(_username);
-        var channelIdJson = JsonSerializer.Serialize(_currentChannelId);
-
-        await hybridWebView.EvaluateJavaScriptAsync($"window.setUsername({usernameJson})");
-        await hybridWebView.EvaluateJavaScriptAsync($"window.setChannelId({channelIdJson})");
-
-        Console.WriteLine($"[{_username}] pushed RTC context into HybridWebView.");
    }
 }
--- a/RelayClient/MauiProgram.cs
+++ b/RelayClient/MauiProgram.cs
@@ -5,11 +5,8 @@ namespace RelayClient;

 public static class MauiProgram
 {
-    // public static event Action<ChatMessage>? MessageSent;
    public static MauiApp CreateMauiApp()
    {
-        //wsc.OnMessage += (sender, e) => OnWebSocketRecieved(sender, e);
-        //wsc.Connect();
        var builder = MauiApp.CreateBuilder();
        builder.UseMauiApp<App>().ConfigureFonts(fonts =>
            {
@@ -18,8 +15,6 @@ public static class MauiProgram
                fonts.AddFont("AnonymousPro-Italic.ttf", "AnonymousProItalic");
                fonts.AddFont("AnonymousPro-Regular.ttf", "AnonymousProRegular");
            });
-        
-        

 #if DEBUG
        builder.Services.AddHybridWebViewDeveloperTools();
@@ -28,19 +23,4 @@ public static class MauiProgram

        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);
-    //}
 }
--- a/RelayClient/Models/ChannelItem.cs
+++ b/RelayClient/Models/ChannelItem.cs
@@ -1,8 +0,0 @@
-namespace RelayClient.Models;
-
-public class ChannelItem
-{
-    public required string ChannelId { get; set; }
-    public required string Name { get; set; }
-    public required DateTime CreatedAt { get; set; }
-}
--- a/RelayClient/Models/RtcSignalMessage.cs
+++ b/RelayClient/Models/RtcSignalMessage.cs
@@ -1,13 +0,0 @@
-namespace RelayClient.Models;
-
-public class RtcSignalMessage
-{
-    public required string Type { get; set; } // rtc_join / rtc_offer / rtc_answer / rtc_ice_candidate / rtc_leave
-    public required string From { get; set; }
-    public required string ChannelId { get; set; }
-
-    public string? Sdp { get; set; }
-    public string? Candidate { get; set; }
-    public string? SdpMid { get; set; }
-    public int? SdpMLineIndex { get; set; }
-}
--- a/RelayClient/Models/ServerPublicKeyMessage.cs
+++ b/RelayClient/Models/ServerPublicKeyMessage.cs
@@ -1,7 +0,0 @@
-namespace RelayClient.Models;
-
-public class ServerPublicKeyMessage
-{
-    public required string Type { get; set; }
-    public required string PublicKey { get; set; }
-}
--- a/RelayClient/Models/SocketChannelList.cs
+++ b/RelayClient/Models/SocketChannelList.cs
@@ -1,7 +0,0 @@
-namespace RelayClient.Models;
-
-public class SocketChannelList
-{
-    public required string Type { get; set; }
-    public required List<ChannelItem> Channels { get; set; }
-}
--- a/RelayClient/Models/SocketEncryptedMessage.cs
+++ b/RelayClient/Models/SocketEncryptedMessage.cs
@@ -1,13 +0,0 @@
-namespace RelayClient.Models;
-
-public class SocketEncryptedMessage
-{
-    public required string Type { get; set; }
-    public required string SenderUsername { get; set; }
-    public string? RecipientUsername { get; set; }
-    public required string ChannelId { get; set; }
-    public required string CipherText { get; set; }
-    public required string Nonce { get; set; }
-    public required string Tag { get; set; }
-    public required string EncryptedKey { get; set; }
-}
--- a/RelayClient/Models/SocketRtcSignalMessage.cs
+++ b/RelayClient/Models/SocketRtcSignalMessage.cs
@@ -1,13 +0,0 @@
-namespace RelayClient.Models;
-
-public class SocketRtcSignalMessage
-{
-    public required string Type { get; set; } // encrypted_rtc_signal
-    public required string SenderUsername { get; set; }
-    public required string ChannelId { get; set; }
-
-    public required string CipherText { get; set; }
-    public required string Nonce { get; set; }
-    public required string Tag { get; set; }
-    public required string EncryptedKey { get; set; }
-}
--- a/RelayClient/RelayClient.csproj
+++ b/RelayClient/RelayClient.csproj
@@ -50,4 +50,12 @@
        <PackageReference Include="WebSocketSharp" Version="1.0.3-rc11" />
    </ItemGroup>

+    <ItemGroup>
+      <ProjectReference Include="..\RelayShared\RelayShared.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Folder Include="Models\" />
+    </ItemGroup>
+
 </Project>
--- a/RelayClient/Resources/Raw/wwwroot/index.css
+++ b/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;
+}
--- a/RelayClient/Resources/Raw/wwwroot/index.html
+++ b/RelayClient/Resources/Raw/wwwroot/index.html
@@ -8,6 +8,9 @@
    <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>
@@ -16,8 +19,8 @@
        </div>

        <div>
-            <button onclick="loadDevices()">Refresh Devices</button>
-            <button onclick="joinChannelCall()">Join Call</button>
+            <button onclick="Media.refreshDevicesAndPreview()">Refresh Devices</button>
+            <button onclick="RelayRtc.joinChannelCall()">Join Call</button>
        </div>

        <div style="margin-top: 8px;">
@@ -35,11 +38,7 @@
                <div id="localMediaStatus">Waiting for local media...</div>
            </div>

-            <div style="display: inline-block; vertical-align: top;">
-                <video id="remoteVideo" autoplay playsinline style="width: 320px; height: 240px; background: #111;"></video>
-                <div id="remoteVideoStatus">Remote video: waiting...</div>
-                <div id="remoteMediaStatus">Remote media: waiting...</div>
-            </div>
+            <div id="remoteMediaContainer" class="remote-media-container"></div>
        </div>
        
        <div style="margin-top: 10px;">
--- a/RelayClient/Resources/Raw/wwwroot/index.js
+++ b/RelayClient/Resources/Raw/wwwroot/index.js
@@ -1,432 +1,41 @@
-let peerConnection = null;
-let localStream = null;
-let currentUsername = null;
+let currentUsername = null;
 let currentChannelId = null;
-let availableCameras = [];
-let availableMics = [];
-const configuration = {
-    iceServers:[
-        {
-            urls:[
-                'stun:stun1.l.google.com:19302',
-                'stun:stun2.l.google.com:19302',
-            ],
-        },
-    ],
-    iceCandidatePoolSize: 10,
-}

-window.setUsername = function(name) {
+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) {
+window.setChannelId = function (channelId) {
    currentChannelId = channelId;
    LogMessage("Channel set to: " + currentChannelId);
 };

 function LogMessage(msg) {
    const messageLog = document.getElementById("messageLog");
-    messageLog.value += '\r\n' + msg;
+
+    if (!messageLog) {
+        console.log(msg);
+        return;
+    }
+
+    messageLog.value += "\r\n" + msg;
    messageLog.scrollTop = messageLog.scrollHeight;
 }

-function hasVideoTrack() {
-    return !!localStream && localStream.getVideoTracks().length > 0;
-}
-
-function hasAudioTrack() {
-    return !!localStream && localStream.getAudioTracks().length > 0;
-}
-
-async function ensurePeerConnection() {
-    if (peerConnection) return;
-
-    peerConnection = new RTCPeerConnection({
-        iceServers: [{ urls: "stun:stun.l.google.com:19302" }]
-    });
-
-    peerConnection.onicecandidate = (event) => {
-        if (event.candidate) {
-            LogMessage("ICE candidate gathered");
-        }
-    };
-
-    peerConnection.ontrack = (event) => {
-        LogMessage("Remote track received");
-
-        const remoteVideo = document.getElementById("remoteVideo");
-        const remoteVideoStatus = document.getElementById("remoteVideoStatus");
-        const remoteMediaStatus = document.getElementById("remoteMediaStatus");
-
-        const stream = event.streams[0];
-        const hasVideo = stream.getVideoTracks().length > 0;
-        const hasAudio = stream.getAudioTracks().length > 0;
-
-        if (hasVideo) {
-            remoteVideo.srcObject = stream;
-        } else {
-            remoteVideo.srcObject = null;
-        }
-
-        if (remoteVideoStatus) {
-            remoteVideoStatus.textContent = hasVideo
-                ? "Remote video: active"
-                : "Remote video: unavailable";
-        }
-
-        if (remoteMediaStatus) {
-            remoteMediaStatus.textContent = `Remote media: audio=${hasAudio} video=${hasVideo}`;
-        }
-    };
-
-    peerConnection.onconnectionstatechange = () => {
-        LogMessage("Connection state: " + peerConnection.connectionState);
-        const remoteMediaStatus = document.getElementById("remoteMediaStatus");
-        if (remoteMediaStatus && peerConnection.connectionState === "connected") {
-            remoteMediaStatus.textContent += " | connected";
-        }
-    };
-
-    peerConnection.oniceconnectionstatechange = () => {
-        LogMessage("ICE connection state: " + peerConnection.iceConnectionState);
-    };
-
-    peerConnection.onicegatheringstatechange = () => {
-        LogMessage("ICE gathering state: " + peerConnection.iceGatheringState);
-    };
-}
-async function ensureLocalMedia() {
-    if (localStream) return;
-
-    const localMediaStatus = document.getElementById("localMediaStatus");
-    const localVideoStatus = document.getElementById("localVideoStatus");
-    const cameraSelect = document.getElementById("cameraSelect");
-    const micSelect = document.getElementById("micSelect");
-
-    let selectedCameraId = cameraSelect ? cameraSelect.value : "";
-    let selectedMicId = micSelect ? micSelect.value : "";
-
-    let mediaError = null;
-
-    const videoConstraint = selectedCameraId
-        ? { deviceId: { exact: selectedCameraId } }
-        : false;
-
-    const audioConstraint = selectedMicId
-        ? { deviceId: { exact: selectedMicId } }
-        : true;
-
-    try {
-        localStream = await navigator.mediaDevices.getUserMedia({
-            video: videoConstraint,
-            audio: audioConstraint
-        });
-
-        LogMessage("Local media initialized");
-    } catch (err) {
-        mediaError = err;
-        LogMessage("selected media failed: " + err);
-
-        try {
-            localStream = await navigator.mediaDevices.getUserMedia({
-                video: false,
-                audio: audioConstraint
-            });
-
-            LogMessage("Local media initialized with audio only fallback");
-        } catch (audioErr) {
-            LogMessage("audio-only failed: " + audioErr);
-            if (localMediaStatus) localMediaStatus.textContent = "Local media failed";
-            if (localVideoStatus) localVideoStatus.textContent = "Local video: unavailable";
-            throw mediaError;
-        }
-    }
-
-    const localVideo = document.getElementById("localVideo");
-
-    if (localStream.getVideoTracks().length > 0) {
-        localVideo.srcObject = localStream;
-        if (localVideoStatus) localVideoStatus.textContent = "Local video: active";
-        if (localMediaStatus) localMediaStatus.textContent = "Local media: audio + video";
-    } else {
-        localVideo.srcObject = null;
-        if (localVideoStatus) localVideoStatus.textContent = "Local video: unavailable";
-        if (localMediaStatus) localMediaStatus.textContent = "Local media: audio only";
-        LogMessage("No camera available, continuing without video");
-    }
-
-    for (const track of localStream.getTracks()) {
-        peerConnection.addTrack(track, localStream);
-        LogMessage(`Added local track: ${track.kind}`);
-    }
-}
-
-async function joinChannelCall() {
-    LogMessage("Current username: " + currentUsername);
-    LogMessage("Current channel: " + currentChannelId);
-    LogMessage("Joining RTCChannel");
-    let active = await window.HybridWebView.InvokeDotNet("JoinRtcChannel");
-    await channelCallJoin(active);
-    LogMessage("Joined RTCChannel");
-    // return;
-    // try {
-    //     if (!currentChannelId) {
-    //         LogMessage("No current channel set.");
-    //         return;
-    //     }
-    //
-    //     await ensurePeerConnection();
-    //     await ensureLocalMedia();
-    //
-    //     LogMessage(`Joining call with media: audio=${hasAudioTrack()} video=${hasVideoTrack()}`);
-    //
-    //     const payload = {
-    //         type: "rtc_join",
-    //         from: currentUsername,
-    //         channelId: currentChannelId
-    //     };
-    //
-    //     LogMessage("Requesting join for channel " + currentChannelId);
-    //     await window.HybridWebView.InvokeDotNet("SendRtcSignal", [JSON.stringify(payload)]);
-    // } catch (err) {
-    //     LogMessage("joinChannelCall failed: " + err);
-    // }
-}
-
-async function ensurePeerConnection2()
-{
-    if (peerConnection) return;
-    peerConnection = new RTCPeerConnection(configuration);
-
-    peerConnection.addEventListener('icegatheringstatechange', () => {
-        console.log(
-            `ICE gathering state changed: ${peerConnection.iceGatheringState}`);
-    });
-
-    peerConnection.addEventListener('connectionstatechange', () => {
-        console.log(`Connection state change: ${peerConnection.connectionState}`);
-    });
-
-    peerConnection.addEventListener('signalingstatechange', () => {
-        console.log(`Signaling state change: ${peerConnection.signalingState}`);
-    });
-
-    peerConnection.addEventListener('iceconnectionstatechange ', () => {
-        console.log(
-            `ICE connection state change: ${peerConnection.iceConnectionState}`);
-    });
-}
-async function channelCallJoin(activeCall)
-{
-    LogMessage("Active call: " + activeCall);
-    await ensurePeerConnection2();
-    
-    if (activeCall)
-    {
-        const rawJson = await window.HybridWebView.InvokeDotNet("GetRtcOffer");
-        const offer = typeof rawJson === "string" ? JSON.parse(rawJson) : rawJson;
-        await peerConnection.setRemoteDescription(offer);
-        const answer = await peerConnection.createAnswer();
-        await peerConnection.setLocalDescription(answer);
-
-        LogMessage(`Joining call with media answer: ${JSON.stringify(answer)}`);
-        await window.HybridWebView.InvokeDotNet("WriteRtcAnswer", [JSON.stringify(roomAnswer)]);
-        //TODO: Update offer in SurrealDB to include answer
-    }
-    else
-    {
-        const offer = await peerConnection.createOffer();
-        await peerConnection.setLocalDescription(offer);
-        
-        await window.HybridWebView.InvokeDotNet("WriteRtcOffer", [JSON.stringify(offer)]);
-        LogMessage(`Joining call with media offer: ${JSON.stringify(offer)}`);
-        
-        localStream.getTracks().forEach(track => {
-            peerConnection.addTrack(track, localStream);
-        });
-        
-        peerConnection.addEventListener('track', event => {
-           LogMessage("Received track: " + event.streams[0]);
-            event.streams[0].getTracks().forEach(track => {
-                LogMessage(`Add a track to the remoteStream: ${track}`);
-                remoteStream.addTrack(track);
-            });
-        });
-    }
-}
-async function AnswerCallback(answer)
-{
-    LogMessage("Answer: " + JSON.stringify(answer));
-    
-    if (!peerConnection.currentRemoteDescription && answer.answer)
-    {
-        LogMessage("Current answer: " + answer);
-        const desc = new RTCSessionDescription(answer);
-        await peerConnection.setRemoteDescription(desc);
-    }
-}
-
-async function CollectIceCandidates()
-{
-    //TODO: collect ICE candidates
-}
-async function handleRtcSignal(rawJson) {
-    try {
-        const msg = typeof rawJson === "string" ? JSON.parse(rawJson) : rawJson;
-
-        LogMessage("Received signal: " + msg.type + " from " + msg.from + " in " + msg.channelId);
-
-        await ensurePeerConnection();
-
-        if (msg.type === "rtc_join_state") {
-            if (msg.isInitiator) {
-                LogMessage("No active call found. Becoming initiator.");
-
-                const offer = await peerConnection.createOffer();
-                await peerConnection.setLocalDescription(offer);
-                await waitForIceGatheringComplete(peerConnection);
-
-                const payload = {
-                    type: "rtc_offer",
-                    from: currentUsername,
-                    channelId: currentChannelId,
-                    sdp: peerConnection.localDescription.sdp
-                };
-
-                LogMessage("Sending offer to channel " + currentChannelId);
-                await window.HybridWebView.InvokeDotNet("SendRtcSignal", [JSON.stringify(payload)]);
-            } else {
-                LogMessage("Active call exists. Waiting for stored offer.");
-            }
-
-            return;
-        }
-
-        if (msg.type === "rtc_offer") {
-            LogMessage("Incoming channel call offer from " + msg.from);
-            await ensureLocalMedia();
-
-            LogMessage(`Answering call with media: audio=${hasAudioTrack()} video=${hasVideoTrack()}`);
-            LogMessage("Applying remote offer");
-
-            await peerConnection.setRemoteDescription({
-                type: "offer",
-                sdp: msg.sdp
-            });
-
-            const answer = await peerConnection.createAnswer();
-            await peerConnection.setLocalDescription(answer);
-            await waitForIceGatheringComplete(peerConnection);
-
-            const payload = {
-                type: "rtc_answer",
-                from: currentUsername,
-                channelId: msg.channelId,
-                sdp: peerConnection.localDescription.sdp
-            };
-
-            LogMessage("Sending answer to channel " + msg.channelId);
-            await window.HybridWebView.InvokeDotNet("SendRtcSignal", [JSON.stringify(payload)]);
-            return;
-        }
-
-        if (msg.type === "rtc_answer") {
-            LogMessage("Applying remote answer");
-
-            await peerConnection.setRemoteDescription({
-                type: "answer",
-                sdp: msg.sdp
-            });
-
-            LogMessage("Remote answer applied");
-            return;
-        }
-
-        if (msg.type === "rtc_ice_candidate") {
-            LogMessage("Applying remote ICE candidate");
-
-            await peerConnection.addIceCandidate({
-                candidate: msg.candidate,
-                sdpMid: msg.sdpMid,
-                sdpMLineIndex: msg.sdpMLineIndex
-            });
-
-            LogMessage("Remote ICE candidate applied");
-            return;
-        }
-
-        LogMessage("Unhandled signal type: " + msg.type);
-    } catch (err) {
-        LogMessage("handleRtcSignal failed: " + err);
-    }
-}
-
-async function loadDevices() {
-    try {
-        const devices = await navigator.mediaDevices.enumerateDevices();
-
-        availableCameras = devices.filter(d => d.kind === "videoinput");
-        availableMics = devices.filter(d => d.kind === "audioinput");
-
-        const cameraSelect = document.getElementById("cameraSelect");
-        const micSelect = document.getElementById("micSelect");
-
-        if (!cameraSelect || !micSelect) {
-            LogMessage("Device dropdowns not found.");
-            return;
-        }
-
-        cameraSelect.innerHTML = "";
-        micSelect.innerHTML = "";
-
-        const noCameraOption = document.createElement("option");
-        noCameraOption.value = "";
-        noCameraOption.text = "No camera / audio-only";
-        cameraSelect.appendChild(noCameraOption);
-
-        const noMicOption = document.createElement("option");
-        noMicOption.value = "";
-        noMicOption.text = "Default microphone";
-        micSelect.appendChild(noMicOption);
-
-        for (const cam of availableCameras) {
-            const option = document.createElement("option");
-            option.value = cam.deviceId;
-            option.text = cam.label || `Camera ${cameraSelect.options.length}`;
-            cameraSelect.appendChild(option);
-        }
-
-        for (const mic of availableMics) {
-            const option = document.createElement("option");
-            option.value = mic.deviceId;
-            option.text = mic.label || `Microphone ${micSelect.options.length + 1}`;
-            micSelect.appendChild(option);
-        }
-
-        LogMessage(`Loaded devices: ${availableCameras.length} cameras, ${availableMics.length} mics`);
-    } catch (err) {
-        LogMessage("loadDevices failed: " + err);
-    }
-}
-
-async function waitForIceGatheringComplete(pc) {
-    if (pc.iceGatheringState === "complete") return;
-
-    await new Promise(resolve => {
-        function checkState() {
-            if (pc.iceGatheringState === "complete") {
-                pc.removeEventListener("icegatheringstatechange", checkState);
-                resolve();
-            }
-        }
-
-        pc.addEventListener("icegatheringstatechange", checkState);
-    });
-}
-
-window.handleRtcSignal = handleRtcSignal;
+window.LogMessage = LogMessage;

 window.addEventListener("HybridWebViewMessageReceived", function (e) {
    LogMessage("Raw message: " + e.detail.message);
@@ -434,6 +43,29 @@ window.addEventListener("HybridWebViewMessageReceived", function (e) {

 window.addEventListener("load", async () => {
    LogMessage("RTC page loaded");
+
    window.HybridWebView.SendRawMessage("rtc_page_ready");
-    await loadDevices();
-});
+
+    Media.wireDeviceSelectors();
+    await Media.loadDevices();
+    await Media.ensureLocalMedia();
+});
+
+function testIndex(rawJson)
+{
+    const data = typeof rawJson === "string" ? JSON.parse(rawJson) : rawJson;
+    data.sdp = data.sdp.replaceAll("(rn)", "\r\n");
+    handleRtcSignal(JSON.stringify(data));
+    // if (data.type === "rtc_offer") {
+    //     handleOffer(data)
+    // }
+    // if (data.type === "rtc_answer") {
+    //     data.sdp = data.sdp.replaceAll("(rn)", "\r\n");
+    //     handleAnswer(data)
+    // }
+}
+
+function noDataTest()
+{
+    LogMessage("No Data Called!!");
+}
--- a/RelayClient/Resources/Raw/wwwroot/media.js
+++ b/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;
--- a/RelayClient/Resources/Raw/wwwroot/relaySocket.js
+++ b/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;
--- a/RelayClient/Resources/Raw/wwwroot/rtc.js
+++ b/RelayClient/Resources/Raw/wwwroot/rtc.js
@@ -0,0 +1,227 @@
+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); //Creates an offer to each person in call for MESH RTC
+    }
+}
+
+async function sendOffer(username) {
+    const pc = await ensurePeerConnectionForUser(username);
+
+    await Media.applyLocalStreamToPeerConnection(pc, username);
+
+    const offer = await pc.createOffer();
+    // LogMessage(`Offer created: ${JSON.stringify(offer)}`);
+    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) {
+    LogMessage(`Offer handler: ${msg}`);
+    const pc = await ensurePeerConnectionForUser(msg.from);
+
+    await Media.ensureLocalMedia();
+    await Media.applyLocalStreamToPeerConnection(pc, msg.from);
+    // const offer = JSON.parse(msg.offer);
+    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;
--- a/RelayClient/ServerAPI.cs
+++ b/RelayClient/ServerAPI.cs
@@ -45,9 +45,14 @@ public class ServerAPI
        return offer;
    }

-    public static async Task<Uri> PostAnswerAsync(DBOffer answer)
+    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;
    }
@@ -66,7 +71,7 @@ public class ServerAPI
        return response.Headers.Location;
    }

-    public static async Task<Uri> PostIceCandidateAsync(IceCandidate candidate)
+    public static async Task<Uri> PostIceCandidateAsync(DBIceCandidate candidate)
    {
        HttpResponseMessage response = await client.PostAsJsonAsync("api/rtc/candidate", candidate);
        response.EnsureSuccessStatusCode();
@@ -94,6 +99,31 @@ public class ServerAPI
        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
@@ -110,8 +140,18 @@ public class DBOffer
 }
 public class IceCandidate
 {
-    public string type { get; set; }
-    public string sdp { get; set; }
+    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
--- a/RelayClient/Services/RelaySocketClient.cs
+++ b/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}");
+        }
+    }
+}
--- a/RelayClient/Services/RtcBridgeService.cs
+++ b/RelayClient/Services/RtcBridgeService.cs
@@ -0,0 +1,255 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+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;
+
+        // _sendRawToWebView($"RTC_SIGNAL file: {JsonSerializer.Serialize(rtcSignal)}");
+        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)
+    {
+        // _sendRawToWebView("HandleIncomingRtcSignal called");
+        var currentChannelId = _getCurrentChannelId();
+
+        if (payload.ChannelId != currentChannelId)
+        {
+            _sendRawToWebView("Channel id does not match");
+            return;
+        }
+
+        if (payload.SenderUsername == _username)
+        {
+            _sendRawToWebView("Received own message");
+            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);
+            // _sendRawToWebView($"Received Encrypted Signal: [{rtcSignal.From}]: {rtcSignal.Offer}");
+        }
+        catch (Exception ex)
+        {
+            _sendRawToWebView("RTC signal parse failed: " + ex.Message);
+            return;
+        }
+
+        if (rtcSignal is null)
+        {
+            _sendRawToWebView("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(rtcSignal);
+    }
+
+    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(RtcSignalMessage data)
+    {
+        if (data.Type == "rtc_offer" || data.Type == "rtc_answer")
+        {
+            data.Sdp = data.Sdp.Replace("\r\n", "(rn)");
+        }
+        MainThread.BeginInvokeOnMainThread(async () =>
+        {
+            try
+            {
+                // await _hybridWebView.InvokeJavaScriptAsync("testIndex", [JsonSerializer.Serialize(data)], [RtcJsType.Default.String]);
+                await _hybridWebView.InvokeJavaScriptAsync("testIndex", [data], [RtcJsType.Default.RtcSignalMessage]);
+                #region OldDebugger
+//                  var jsArg = JsonSerializer.Serialize(data);
+//
+//                 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);
+//                     }}
+//                 ");
+                #endregion  
+            }
+            catch (Exception ex)
+            {
+                _sendRawToWebView("SendRtcSignalToJsAsync failed: " + ex.Message);
+            }
+        });
+        return Task.CompletedTask;
+    }
+}
+
+[JsonSourceGenerationOptions(WriteIndented = false)]
+[JsonSerializable(typeof(RtcDescription))]
+[JsonSerializable(typeof(List<RtcSignalMessage>))]
+[JsonSerializable(typeof(RtcSignalMessage))]
+[JsonSerializable(typeof(IceCandidate))]
+[JsonSerializable(typeof(List<IceCandidate>))]
+[JsonSerializable(typeof(string))]
+internal partial class RtcJsType : JsonSerializerContext
+{
+}
--- a/RelayClient/WebRTC.cs
+++ b/RelayClient/WebRTC.cs
@@ -1,170 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
-using Microsoft.Maui.Dispatching;
-using Microsoft.AspNetCore.SignalR.Client;
-
-namespace RelayClient;
-
-public static class NativeWebRtc
-{
-    [DllImport("webrtc_wrapper.dll")]
-    public static extern IntPtr CreatePeerConnection();
-
-    [DllImport("webrtc_wrapper.dll")]
-    public static extern string CreateOffer(IntPtr pc);
-
-    [DllImport("webrtc_wrapper.dll")]
-    public static extern string CreateAnswer(IntPtr pc);
-
-    [DllImport("webrtc_wrapper.dll")]
-    public static extern void SetLocalDescription(IntPtr pc, string type, string sdp);
-
-    [DllImport("webrtc_wrapper.dll")]
-    public static extern void SetRemoteDescription(IntPtr pc, string type, string sdp);
-
-    [DllImport("webrtc_wrapper.dll")]
-    public static extern void AddIceCandidate(IntPtr pc, string candidate);
-}
-
-public enum RTCSdpType { Offer, Answer }
-
-public class RTCSessionDescription
-{
-    public RTCSdpType Type { get; set; }
-    public string Sdp { get; set; }
-}
-
-public class RTCIceCandidate
-{
-    public string Candidate { get; set; }
-}
-
-public class PeerConnection
-{
-    private readonly IntPtr _nativeHandle;
-    public string RemoteId { get; set; }
-
-    public PeerConnection()
-    {
-        _nativeHandle = NativeWebRtc.CreatePeerConnection();
-    }
-
-    public Task CreateOffer(Action<RTCSessionDescription> onOfferCreated)
-    {
-        var sdp = NativeWebRtc.CreateOffer(_nativeHandle);
-        onOfferCreated?.Invoke(new RTCSessionDescription { Type = RTCSdpType.Offer, Sdp = sdp });
-        return Task.CompletedTask;
-    }
-
-    public Task CreateAnswer(Action<RTCSessionDescription> onAnswerCreated)
-    {
-        var sdp = NativeWebRtc.CreateAnswer(_nativeHandle);
-        onAnswerCreated?.Invoke(new RTCSessionDescription { Type = RTCSdpType.Answer, Sdp = sdp });
-        return Task.CompletedTask;
-    }
-
-    public Task SetLocalDescription(RTCSessionDescription desc)
-    {
-        NativeWebRtc.SetLocalDescription(_nativeHandle, desc.Type.ToString(), desc.Sdp);
-        return Task.CompletedTask;
-    }
-
-    public Task SetRemoteDescription(RTCSessionDescription desc)
-    {
-        NativeWebRtc.SetRemoteDescription(_nativeHandle, desc.Type.ToString(), desc.Sdp);
-        return Task.CompletedTask;
-    }
-
-    public Task AddIceCandidate(RTCIceCandidate candidate)
-    {
-        NativeWebRtc.AddIceCandidate(_nativeHandle, candidate.Candidate);
-        return Task.CompletedTask;
-    }
-}
-public class WebRtcClient
-{
-    private readonly PeerConnection _peerConnection = new();
-    private readonly HubConnection _signal;
-    private string _myId;
-
-    public WebRtcClient(string serverUrl)
-    {
-        _signal = new HubConnectionBuilder()
-            .WithUrl($"{serverUrl}/webrtc")
-            .WithAutomaticReconnect()
-            .Build();
-
-        _signal.On<string, string>("ReceiveOffer", (fromId, sdp) =>
-        {
-            MainThread.BeginInvokeOnMainThread(async () =>
-            {
-                await HandleOffer(fromId, sdp);
-            });
-        });
-
-        _signal.On<string, string>("ReceiveAnswer", (fromId, sdp) =>
-        {
-            MainThread.BeginInvokeOnMainThread(async () =>
-            {
-                await HandleAnswer(sdp);
-            });
-        });
-
-        _signal.On<string, string>("ReceiveIceCandidate", (fromId, candidate) =>
-        {
-            MainThread.BeginInvokeOnMainThread(async () =>
-            {
-                await HandleIceCandidate(candidate);
-            });
-        });
-    }
-
-    public async Task ConnectAsync()
-    {
-        await _signal.StartAsync();
-        _myId = _signal.ConnectionId;
-    }
-
-    public async Task CallAsync(string targetId)
-    {
-        _peerConnection.RemoteId = targetId;
-        await _peerConnection.CreateOffer(async offer =>
-        {
-            await _peerConnection.SetLocalDescription(offer);
-            await _signal.InvokeAsync("SendOffer", targetId, offer.Sdp);
-        });
-    }
-
-    public async Task HandleOffer(string fromId, string sdp)
-    {
-        _peerConnection.RemoteId = fromId;
-        var remoteDesc = new RTCSessionDescription { Type = RTCSdpType.Offer, Sdp = sdp };
-        await _peerConnection.SetRemoteDescription(remoteDesc);
-
-        await _peerConnection.CreateAnswer(async answer =>
-        {
-            await _peerConnection.SetLocalDescription(answer);
-            await _signal.InvokeAsync("SendAnswer", fromId, answer.Sdp);
-        });
-    }
-
-    public async Task HandleAnswer(string sdp)
-    {
-        var remoteDesc = new RTCSessionDescription { Type = RTCSdpType.Answer, Sdp = sdp };
-        await _peerConnection.SetRemoteDescription(remoteDesc);
-    }
-
-    public async Task HandleIceCandidate(string candidate)
-    {
-        await _peerConnection.AddIceCandidate(new RTCIceCandidate { Candidate = candidate });
-    }
-
-    public async Task SendIceCandidate(string candidate)
-    {
-        if (!string.IsNullOrEmpty(_peerConnection.RemoteId))
-        {
-            await _signal.InvokeAsync("SendIceCandidate", _peerConnection.RemoteId, candidate);
-        }
-    }
-}
--- a/RelayCore/Endpoints/AuthEndpoints.cs
+++ b/RelayCore/Endpoints/AuthEndpoints.cs
@@ -0,0 +1,59 @@
+using RelayCore.Services;
+
+namespace RelayCore.Endpoints;
+
+public static class AuthEndpoints
+{
+    public static void MapAuthEndpoints(this WebApplication app)
+    {
+        app.MapPost("/user/signin", async (AuthSignin request, APIAuthService service, HttpContext context) =>
+        {
+            var ip =  context.Connection.RemoteIpAddress?.MapToIPv4().ToString();
+            context.Request.Headers.TryGetValue("User-Agent", out var userAgent);
+            
+            Console.WriteLine($"IP:{ip}\nUserAgent:{userAgent}");
+            // var token = await service.UserSigninAsync(request, ip, userAgent);
+            
+            // return token != null ? Results.Ok(token) : Results.Unauthorized();
+            return Results.Ok();
+        });
+        app.MapPost("/user/register", async (AuthRegister request, APIAuthService service) =>
+        {
+            var token = await service.UserRegisterAsync(request);
+            return token != null  ? Results.Ok(token) : Results.Unauthorized();
+        });
+        app.MapPost("/server/verify/user", async (AuthUserVerify request, APIAuthService service) =>
+        {
+            bool valid = await service.ServerVerifyUser(request);
+            return Results.Ok(valid);
+        });
+        app.MapPost("/server/verify/license", async (AuthServerLicense request, APIAuthService service) =>
+        {
+            throw new NotImplementedException();
+        });
+    }
+}
+
+public class AuthSignin
+{
+    public string UserName { get; set; }
+    public string Password { get; set; }
+}
+
+public class AuthRegister
+{
+    public string Username { get; set; }
+    public string Password { get; set; }
+    public string Email { get; set; }
+}
+
+public class AuthUserVerify
+{
+    public string Username { get; set; }
+    public string Token { get; set; }
+}
+
+public class AuthServerLicense
+{
+    public string License { get; set; }
+}
--- a/RelayCore/Models/PasswordHasher.cs
+++ b/RelayCore/Models/PasswordHasher.cs
@@ -22,7 +22,7 @@ namespace RelayCore.Models
        /// <summary>
        /// Number of threads to use for parallel computation
        /// </summary>
-        private const int DegreeOfParallelism = 1;
+        private const int DegreeOfParallelism = 2;

        /// <summary>
        /// Number of iterations for the Argon2id algorithm
--- a/RelayCore/Models/Sessions.cs
+++ b/RelayCore/Models/Sessions.cs
@@ -4,7 +4,7 @@ namespace RelayCore.Models;

 public class Sessions : Record
 {
-    public required string UserId { get; set; }
+    public required RecordId UserId { get; set; }
    public required string TokenHash { get; set; }
    public required DateTime IssuedAt { get; set; }
    public required DateTime ExpiresAt { get; set; }
--- a/RelayCore/Program.cs
+++ b/RelayCore/Program.cs
@@ -1,14 +1,13 @@
 using SurrealDb.Net;
 using SurrealDb.Net.Models.Auth;
 using System.Text.Json;
-using System;
 using System.Net;
-using System.Threading.Tasks;
 using System.Text;
-using System.Text.Json;

 using RelayCore.Enums;
 using RelayCore.Models;
+using RelayCore.Endpoints;
+using RelayCore.Services;


 await using var db = new SurrealDbClient("ws://127.0.0.1:8000/rpc");
@@ -20,13 +19,30 @@ var kira = await CreateUserAsync(db, "Ru_Kira", "jduesling13@gmail.com", "passwo
 var test = await CreateUserAsync(db, "Test", "test@gmail.com", "password");

 var server = new Program();
-server.Main(db);

 Console.WriteLine($"Keeper created: {ToJsonString(keeper)}");
 Console.WriteLine($"Kira created: {ToJsonString(kira)}");
 Console.WriteLine($"Test created: {ToJsonString(test)}");

+var builder = WebApplication.CreateBuilder(args);
+builder.WebHost.UseUrls("http://127.0.0.1:1337/");
+builder.Services.AddSingleton(db);
+builder.Services.AddScoped<APIAuthService>();
+
+var app = builder.Build();
+app.MapGet("/",  () => "Auth Server Running!");
+app.MapAuthEndpoints();
+
+// await server.Main(db);
+
+await app.StartAsync();
+Console.WriteLine("API Started");
+Console.WriteLine("\n\n\n");
+
+Console.Write("Press any key to stop.");
 Console.ReadKey(true);
+
+await app.StopAsync();
 return;

 static string ToJsonString(object? o)
@@ -51,7 +67,7 @@ static async Task<Users> CreateUserAsync(SurrealDbClient db, string username, st
        OnlineStatus = (int)OnlineStatuses.Online,
    };

-    var created = await db.Create("users", user);
+    var created = await db.Create("auth_users", user);

    var hasher = new PasswordHasher();
    var passwordHash = hasher.HashPassword(created.Id.ToString() + rawPassword);
@@ -65,7 +81,6 @@ static async Task<Users> CreateUserAsync(SurrealDbClient db, string username, st
    return updated;
 }

-
 partial class Program
 {
    public async Task Main(SurrealDbClient db)
--- a/RelayCore/RelayCore.csproj
+++ b/RelayCore/RelayCore.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">

    <PropertyGroup>
        <OutputType>Exe</OutputType>
@@ -10,11 +10,12 @@

    <ItemGroup>
      <PackageReference Include="Konscious.Security.Cryptography.Argon2" Version="1.3.1" />
+      <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.2.9" />
      <PackageReference Include="SurrealDb.Net" Version="0.9.0" />
    </ItemGroup>

    <ItemGroup>
-      <Folder Include="Services\" />
+      <ProjectReference Include="..\RelayShared\RelayShared.csproj" />
    </ItemGroup>

 </Project>
--- a/RelayCore/Services/APIAuthService.cs
+++ b/RelayCore/Services/APIAuthService.cs
@@ -0,0 +1,49 @@
+using RelayCore.Endpoints;
+using RelayCore.Models;
+using SurrealDb.Net;
+using SurrealDb.Net.Models;
+
+namespace RelayCore.Services;
+
+public class APIAuthService(SurrealDbClient _db)
+{
+    
+    public async Task<string> UserSigninAsync(AuthSignin request)
+    {
+        var hasher = new PasswordHasher();
+        var users = await _db.Select<Users>("auth_users");
+        var user = users.FirstOrDefault(x => (x.Username == request.UserName || x.Email == request.UserName) 
+                                             && hasher.VerifyPassword(request.Password, x.Password));
+        var tokens = await _db.Select<Sessions>("auth_sessions");
+        var token = tokens.Where(x => x.UserId == user.Id && !x.Revoked).OrderByDescending(x => x.ExpiresAt).FirstOrDefault();
+        if (token.ExpiresAt > DateTime.UtcNow)
+            return token.TokenHash;
+        
+        //TODO: Generate TOKEN
+        var newToken = hasher.HashPassword($"{user.Email}{user.Username}{user.Password}");
+        //TODO: Store TOKEN and Username for verification
+        var sessionId = await _db.Create<Sessions>(new Sessions
+        {
+            UserId = user.Id,
+            TokenHash = newToken,
+            IssuedAt = DateTime.UtcNow,
+            ExpiresAt = DateTime.UtcNow.AddDays(30),
+            DeviceName = "",
+            Revoked = false,
+            IpAddress = "",
+            UserAgent = ""
+        });
+        //TODO: Add invalidation to TOKENs
+        return newToken;
+    }
+
+    public async Task<string> UserRegisterAsync(AuthRegister request)
+    {
+        throw new NotImplementedException();
+    }
+
+    public async Task<bool> ServerVerifyUser(AuthUserVerify request)
+    {
+        throw new NotImplementedException();
+    }
+}
--- a/RelayServer/Endpoints/RtcEndpoints.cs
+++ b/RelayServer/Endpoints/RtcEndpoints.cs
@@ -1,5 +1,7 @@
-using RelayServer.Models.Rtc;
+using System.Text.Json;
+using RelayShared.Rtc;
 using RelayServer.Services.Rtc;
+using RelayShared.Services;

 namespace RelayServer.Endpoints;

@@ -19,7 +21,7 @@ public static class RtcEndpoints

            RtcNotificationService.BroadcastToChannel(new RtcNotificationMessage
            {
-                Type = "rtc_offer_updated",
+                Type = SignalType.OfferUpdated,
                ChannelId = request.ChannelId,
                Username = request.Username
            });
@@ -49,19 +51,15 @@ public static class RtcEndpoints
        // 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);
-            //DON'T FUCKING HARDCODE STRINGS INTO API REQUESTS
-            // await rtcCallService.WriteAnswerAsync(
-            //     request.ChannelId,
-            //     new RtcSessionDescription
-            //     {
-            //         Type = "answer",
-            //         Sdp = request.Sdp
-            //     });
+
+            Console.WriteLine($"Broadcasting rtc_answer_updated for {request.ChannelId}");

            RtcNotificationService.BroadcastToChannel(new RtcNotificationMessage
            {
-                Type = "rtc_answer_updated",
+                Type = SignalType.AnswerUpdated,
                ChannelId = request.ChannelId
            });

@@ -73,6 +71,11 @@ public static class RtcEndpoints
        {
            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) =>
@@ -87,18 +90,17 @@ public static class RtcEndpoints
            await rtcCallService.WriteIceCandidateAsync(
                request.ChannelId,
                request.Username,
-                request.Candidate,
-                request.SdpMid,
-                request.SdpMLineIndex,
-                request.Direction
+                request.Candidate.candidate,
+                request.Candidate.sdpMid,
+                request.Candidate.sdpMLineIndex
            );

            RtcNotificationService.BroadcastToChannel(new RtcNotificationMessage
            {
-                Type = "rtc_candidate_added",
+                Type = SignalType.CandidateAdded,
                ChannelId = request.ChannelId,
                Username = request.Username,
-                Direction = request.Direction
+                Direction = JsonSerializer.Serialize(request.Candidate)
            });

            return Results.Ok();
@@ -128,7 +130,7 @@ public static class RtcEndpoints

            RtcNotificationService.BroadcastToChannel(new RtcNotificationMessage
            {
-                Type = "rtc_call_left",
+                Type = SignalType.CallLeft,
                ChannelId = request.ChannelId,
                Username = request.Username
            });
--- a/RelayServer/Models/Chat/SocketChannelList.cs
+++ b/RelayServer/Models/Chat/SocketChannelList.cs
@@ -1,7 +0,0 @@
-namespace RelayServer.Models;
-
-public class SocketChannelList
-{
-    public required string Type { get; set; }
-    public required List<SocketChannelInfo> Channels { get; set; }
-}
--- a/RelayServer/Models/Chat/SocketEncryptedMessage.cs
+++ b/RelayServer/Models/Chat/SocketEncryptedMessage.cs
@@ -1,13 +0,0 @@
-namespace RelayServer.Models;
-
-public class SocketEncryptedMessage
-{
-    public required string Type { get; set; }
-    public required string SenderUsername { get; set; }
-    public string? RecipientUsername { get; set; }
-    public required string ChannelId { get; set; }
-    public required string CipherText { get; set; }
-    public required string Nonce { get; set; }
-    public required string Tag { get; set; }
-    public required string EncryptedKey { get; set; }
-}
--- a/RelayServer/Models/Crypto/RtcSignalMessage.cs
+++ b/RelayServer/Models/Crypto/RtcSignalMessage.cs
@@ -1,13 +0,0 @@
-namespace RelayServer.Models;
-
-public class RtcSignalMessage
-{
-    public required string Type { get; set; } // rtc_join / rtc_offer / rtc_answer / rtc_ice_candidate / rtc_leave
-    public required string From { get; set; }
-    public required string ChannelId { get; set; }
-
-    public string? Sdp { get; set; }
-    public string? Candidate { get; set; }
-    public string? SdpMid { get; set; }
-    public int? SdpMLineIndex { get; set; }
-}
--- a/RelayServer/Models/Crypto/ServerPublicKeyMessage.cs
+++ b/RelayServer/Models/Crypto/ServerPublicKeyMessage.cs
@@ -1,7 +0,0 @@
-namespace RelayServer.Models;
-
-public class ServerPublicKeyMessage
-{
-    public required string Type { get; set; }
-    public required string PublicKey { get; set; }
-}
--- a/RelayServer/Models/Crypto/SocketRtcSignalMessage.cs
+++ b/RelayServer/Models/Crypto/SocketRtcSignalMessage.cs
@@ -1,13 +0,0 @@
-namespace RelayServer.Models;
-
-public class SocketRtcSignalMessage
-{
-    public required string Type { get; set; } // encrypted_rtc_signal
-    public required string SenderUsername { get; set; }
-    public required string ChannelId { get; set; }
-
-    public required string CipherText { get; set; }
-    public required string Nonce { get; set; }
-    public required string Tag { get; set; }
-    public required string EncryptedKey { get; set; }
-}
--- a/RelayServer/Models/Rtc/RtcActiveCall.cs
+++ b/RelayServer/Models/Rtc/RtcActiveCall.cs
@@ -1,14 +0,0 @@
-using SurrealDb.Net.Models;
-
-namespace RelayServer.Models.Rtc;
-
-public sealed class RtcActiveCall : Record
-{
-    public required string ChannelId { get; set; }
-    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; }
-}
--- a/RelayServer/Models/Rtc/RtcAnswer.cs
+++ b/RelayServer/Models/Rtc/RtcAnswer.cs
@@ -1,12 +0,0 @@
-using SurrealDb.Net.Models;
-
-namespace RelayServer.Models.Rtc;
-
-public class RtcAnswer : Record
-{
-    public required string ChannelId { get; set; }
-    public required string OfferUser { get; set; }
-    public required string AnswerUser { get; set; }
-    public required string Sdp { get; set; }
-    public DateTime CreatedAt { get; set; }
-}
--- a/RelayServer/Models/Rtc/RtcIceCandidate.cs
+++ b/RelayServer/Models/Rtc/RtcIceCandidate.cs
@@ -1,14 +0,0 @@
-using SurrealDb.Net.Models;
-
-namespace RelayServer.Models.Rtc;
-
-public class RtcIceCandidate : 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 required string Direction { get; set; } // "offer" or "answer"
-    public DateTime CreatedAt { get; set; }
-}
--- a/RelayServer/Models/Rtc/RtcJoinRequest.cs
+++ b/RelayServer/Models/Rtc/RtcJoinRequest.cs
@@ -1,7 +0,0 @@
-namespace RelayServer.Models.Rtc;
-
-public class RtcJoinRequest
-{
-    public required string ChannelId { get; set; }
-    public required string Username { get; set; }
-}
--- a/RelayServer/Models/Rtc/RtcJoinResponse.cs
+++ b/RelayServer/Models/Rtc/RtcJoinResponse.cs
@@ -1,10 +0,0 @@
-namespace RelayServer.Models.Rtc;
-
-public class RtcJoinResponse
-{
-    public required string ChannelId { get; set; }
-    public bool HasActiveCall { get; set; }
-    public bool IsOfferer { get; set; }
-    public string? OfferUser { get; set; }
-    public string? OfferSdp { get; set; }
-}
--- a/RelayServer/Models/Rtc/RtcLeaveRequest.cs
+++ b/RelayServer/Models/Rtc/RtcLeaveRequest.cs
@@ -1,7 +0,0 @@
-namespace RelayServer.Models.Rtc;
-
-public class RtcLeaveRequest
-{
-    public required string ChannelId { get; set; }
-    public required string Username { get; set; }
-}
--- a/RelayServer/Models/Rtc/RtcNotificationMessage.cs
+++ b/RelayServer/Models/Rtc/RtcNotificationMessage.cs
@@ -1,9 +0,0 @@
-namespace RelayServer.Models.Rtc;
-
-public sealed class RtcNotificationMessage
-{
-    public required string Type { get; set; } // rtc_offer_updated / rtc_answer_updated / rtc_candidate_added
-    public required string ChannelId { get; set; }
-    public string? Username { get; set; }
-    public string? Direction { get; set; }
-}
--- a/RelayServer/Models/Rtc/RtcOffer.cs
+++ b/RelayServer/Models/Rtc/RtcOffer.cs
@@ -1,14 +0,0 @@
-using SurrealDb.Net.Models;
-
-namespace RelayServer.Models.Rtc;
-
-public class RtcOffer : Record
-{
-    public required string ChannelId { get; set; }
-    public required string Username { get; set; }
-    public required RtcSessionDescription SessionDescription { get; set; }
-    // public required string Type { get; set; }
-    // public required string Sdp { get; set; }
-    public DateTime CreatedAt { get; set; }
-    public DateTime UpdatedAt { get; set; }
-}
--- a/RelayServer/Models/Rtc/RtcSessionDescription.cs
+++ b/RelayServer/Models/Rtc/RtcSessionDescription.cs
@@ -1,7 +0,0 @@
-namespace RelayServer.Models.Rtc;
-
-public sealed class RtcSessionDescription
-{
-    public required string Type { get; set; }
-    public required string Sdp { get; set; }
-}
--- a/RelayServer/Program.cs
+++ b/RelayServer/Program.cs
@@ -3,6 +3,8 @@ 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;

 var surrealService = new SurrealService();
@@ -19,6 +21,7 @@ var bootstrapService = new ServerBootstrapService(db, coreClient, cryptoService)
 await bootstrapService.InitializeAsync();

 var builder = WebApplication.CreateBuilder(args);
+builder.WebHost.UseUrls("http://127.0.0.1:5000/");

 builder.Services.AddSingleton(db);
 builder.Services.AddScoped<RtcCallService>();
@@ -32,15 +35,14 @@ var wssv = new WebSocketServer("ws://localhost:1337");
 wssv.AddWebSocketService<ChatSocketBehavior>("/");
 RtcNotificationService.Server = wssv;

-//TODO: Use AnswerCallback as a test on client and use the /rtc/answer endpoint call as a test on server
-
 wssv.Start();
 Console.WriteLine("WebSocket server started");

 await app.StartAsync();
 Console.WriteLine("HTTP API started");

-Console.ReadKey(true); // TODO: Make program stop be a console command
+ConsoleCommandService.Start();
+await Task.Delay(Timeout.Infinite, ConsoleCommandService.ShutdownTokenSource.Token);

 wssv.Stop();
 await app.StopAsync();
--- a/RelayServer/RelayServer.csproj
+++ b/RelayServer/RelayServer.csproj
@@ -13,4 +13,8 @@
      <PackageReference Include="WebSocketSharp" Version="1.0.3-rc11" />
    </ItemGroup>

+    <ItemGroup>
+      <ProjectReference Include="..\RelayShared\RelayShared.csproj" />
+    </ItemGroup>
+
 </Project>
--- a/RelayServer/Services/Chat/ChatSocketBehavior.cs
+++ b/RelayServer/Services/Chat/ChatSocketBehavior.cs
@@ -6,6 +6,7 @@ using RelayServer.Services.Rtc;
 using WebSocketSharp;
 using WebSocketSharp.Server;
 using ErrorEventArgs = WebSocketSharp.ErrorEventArgs;
+using RelayShared.Services;

 namespace RelayServer.Services.Chat;

@@ -68,9 +69,114 @@ public class ChatSocketBehavior : WebSocketBehavior
            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>
@@ -81,6 +187,7 @@ public class ChatSocketBehavior : WebSocketBehavior
        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}");
@@ -141,10 +248,10 @@ public class ChatSocketBehavior : WebSocketBehavior
            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 SocketChannelInfo
+            .Select(c => new ChannelItem()
            {
                ChannelId = GetRecordId(c.Id),
                Name = c.Name,
@@ -154,7 +261,7 @@ public class ChatSocketBehavior : WebSocketBehavior

        var payload = new SocketChannelList
        {
-            Type = "channel_list",
+            Type = SignalType.ChannelList,
            Channels = channels
        };

@@ -174,7 +281,7 @@ public class ChatSocketBehavior : WebSocketBehavior

        var payload = new ServerPublicKeyMessage
        {
-            Type = "server_public_key",
+            Type = SignalType.ServerPublicKey,
            PublicKey = ServerPublicKey
        };

@@ -200,7 +307,7 @@ public class ChatSocketBehavior : WebSocketBehavior
            return;
        }

-        if (clientPayload is null || clientPayload.Type != "client_encrypted_chat")
+        if (clientPayload is null || clientPayload.Type != SignalType.ClientEncryptedChat)
            return;

        if (!EnsureCoreReady() || !EnsureCryptoReady())
@@ -260,7 +367,7 @@ public class ChatSocketBehavior : WebSocketBehavior

            var outbound = new SocketEncryptedMessage
            {
-                Type = "encrypted_chat",
+                Type = SignalType.EncryptedChat,
                SenderUsername = clientPayload.SenderUsername,
                RecipientUsername = client.Username,
                ChannelId = clientPayload.ChannelId,
@@ -338,7 +445,7 @@ public class ChatSocketBehavior : WebSocketBehavior

            var outbound = new SocketEncryptedMessage
            {
-                Type = "encrypted_chat",
+                Type = SignalType.EncryptedChat,
                SenderUsername = ExtractUsernameFromUserId(dbMessage.SenderUserId),
                RecipientUsername = username,
                ChannelId = channelId,
--- a/RelayServer/Services/Rtc/RtcCallService.cs
+++ b/RelayServer/Services/Rtc/RtcCallService.cs
@@ -1,5 +1,6 @@
-using RelayServer.Models.Rtc;
+using RelayShared.Rtc;
 using SurrealDb.Net;
+using RelayShared.Rtc;

 namespace RelayServer.Services.Rtc;

@@ -21,13 +22,13 @@ public sealed class RtcCallService
    /// </returns>
    public async Task<bool> HasActiveCallAsync(string channelId)
    {
-        var activeCalls = await _db.Select<RtcActiveCall>("rtc_active_calls");
+        var activeCalls = await _db.Select<DBActiveCall>("rtc_active_calls");
        return activeCalls.Any(x => x.ChannelId == channelId && x.IsActive);
    }
    
-    public async Task<RtcActiveCall?> GetActiveCallAsync(string channelId)
+    public async Task<DBActiveCall?> GetActiveCallAsync(string channelId)
    {
-        var activeCalls = await _db.Select<RtcActiveCall>("rtc_active_calls");
+        var activeCalls = await _db.Select<DBActiveCall>("rtc_active_calls");
        return activeCalls
            .Where(x => x.ChannelId == channelId && x.IsActive)
            .OrderByDescending(x => x.UpdatedAt)
@@ -45,12 +46,12 @@ public sealed class RtcCallService
    /// <param name="sdp">The SDP offer payload.</param>
    public async Task WriteOfferAsync(string channelId, string username, RtcSessionDescription sessionDescription)
    {
-        var activeCalls = await _db.Select<RtcActiveCall>("rtc_active_calls");
+        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 RtcActiveCall
+            await _db.Create("rtc_active_calls", new DBActiveCall
            {
                ChannelId = channelId,
                OfferUser = username,
@@ -76,7 +77,7 @@ public sealed class RtcCallService
        };
        activeCall.UpdatedAt = DateTime.UtcNow;

-        await _db.Merge<RtcActiveCall, RtcActiveCall>(activeCall);
+        await _db.Merge<DBActiveCall, DBActiveCall>(activeCall);
    }

    /// <summary>
@@ -101,7 +102,7 @@ public sealed class RtcCallService
    /// <param name="sessionDescription">The SDP and type answer payload.</param>
    public async Task WriteAnswerAsync(string channelId, RtcSessionDescription sessionDescription)
    {
-        var activeCalls = await _db.Select<RtcActiveCall>("rtc_active_calls");
+        var activeCalls = await _db.Select<DBActiveCall>("rtc_active_calls");
        var activeCall = activeCalls.FirstOrDefault(x => x.ChannelId == channelId && x.IsActive);

        if (activeCall is null)
@@ -114,7 +115,7 @@ public sealed class RtcCallService
        };
        activeCall.UpdatedAt = DateTime.UtcNow;

-        await _db.Merge<RtcActiveCall, RtcActiveCall>(activeCall);
+        await _db.Merge<DBActiveCall, DBActiveCall>(activeCall);
    }

    /// <summary>
@@ -124,13 +125,14 @@ public sealed class RtcCallService
    /// <returns>
    /// A list of answers for the channel ordered from oldest to newest.
    /// </returns>
-    public async Task<List<RtcAnswer>> GetAnswersAsync(string channelId)
+    public async Task<List<RtcSessionDescription>> GetAnswersAsync(string channelId)
    {
-        var answers = await _db.Select<RtcAnswer>("rtc_answers");
-        return answers
-            .Where(x => x.ChannelId == channelId)
-            .OrderBy(x => x.CreatedAt)
-            .ToList();
+        var activeCall = await GetActiveCallAsync(channelId);
+
+        if (activeCall?.Answer is null)
+            return [];
+
+        return [activeCall.Answer];
    }

    /// <summary>
@@ -140,13 +142,10 @@ public sealed class RtcCallService
    /// <returns>
    /// The newest answer for the channel, or null if no answer exists.
    /// </returns>
-    public async Task<RtcAnswer?> GetLatestAnswerAsync(string channelId)
+    public async Task<RtcSessionDescription?> GetLatestAnswerAsync(string channelId)
    {
-        var answers = await _db.Select<RtcAnswer>("rtc_answers");
-        return answers
-            .Where(x => x.ChannelId == channelId)
-            .OrderByDescending(x => x.CreatedAt)
-            .FirstOrDefault();
+        var activeCall = await GetActiveCallAsync(channelId);
+        return activeCall?.Answer;
    }

    /// <summary>
@@ -165,17 +164,17 @@ public sealed class RtcCallService
        string username,
        string candidate,
        string? sdpMid,
-        int? sdpMLineIndex,
-        string direction)
+        int? sdpMLineIndex/*,
+        string direction*/)
    {
-        await _db.Create("rtc_ice_candidates", new RtcIceCandidate
+        await _db.Create("rtc_ice_candidates", new DBIceCandidate
        {
            ChannelId = channelId,
            Username = username,
            Candidate = candidate,
            SdpMid = sdpMid,
            SdpMLineIndex = sdpMLineIndex,
-            Direction = direction,
+            // Direction = direction,
            CreatedAt = DateTime.UtcNow
        });
    }
@@ -187,9 +186,9 @@ public sealed class RtcCallService
    /// <returns>
    /// A list of ICE candidates for the channel ordered from oldest to newest.
    /// </returns>
-    public async Task<List<RtcIceCandidate>> GetIceCandidatesAsync(string channelId)
+    public async Task<List<DBIceCandidate>> GetIceCandidatesAsync(string channelId)
    {
-        var candidates = await _db.Select<RtcIceCandidate>("rtc_ice_candidates");
+        var candidates = await _db.Select<DBIceCandidate>("rtc_ice_candidates");
        return candidates
            .Where(x => x.ChannelId == channelId)
            .OrderBy(x => x.CreatedAt)
@@ -206,11 +205,11 @@ public sealed class RtcCallService
    /// <returns>
    /// A list of matching ICE candidates ordered from oldest to newest.
    /// </returns>
-    public async Task<List<RtcIceCandidate>> GetIceCandidatesForOthersAsync(string channelId, string username, string direction)
+    public async Task<List<DBIceCandidate>> GetIceCandidatesForOthersAsync(string channelId, string username, string direction)
    {
-        var candidates = await _db.Select<RtcIceCandidate>("rtc_ice_candidates");
+        var candidates = await _db.Select<DBIceCandidate>("rtc_ice_candidates");
        return candidates
-            .Where(x => x.ChannelId == channelId && x.Username != username && x.Direction == direction)
+            .Where(x => x.ChannelId == channelId && x.Username != username /*&& x.Direction == direction*/)
            .OrderBy(x => x.CreatedAt)
            .ToList();
    }
@@ -223,7 +222,7 @@ public sealed class RtcCallService
    /// <param name="username">The user leaving the call.</param>
    public async Task LeaveCallAsync(string channelId, string username)
    {
-        var activeCalls = await _db.Select<RtcActiveCall>("rtc_active_calls");
+        var activeCalls = await _db.Select<DBActiveCall>("rtc_active_calls");
        var activeCall = activeCalls.FirstOrDefault(x => x.ChannelId == channelId && x.IsActive);

        if (activeCall is null)
@@ -233,7 +232,7 @@ public sealed class RtcCallService
        {
            activeCall.IsActive = false;
            activeCall.UpdatedAt = DateTime.UtcNow;
-            await _db.Merge<RtcActiveCall, RtcActiveCall>(activeCall);
+            await _db.Merge<DBActiveCall, DBActiveCall>(activeCall);
        }
    }

@@ -243,9 +242,9 @@ public sealed class RtcCallService
    /// <returns>
    /// A list of active calls with offers, ordered from newest to oldest.
    /// </returns>
-    public async Task<List<RtcActiveCall>> GetOffersAsync()
+    public async Task<List<DBActiveCall>> GetOffersAsync()
    {
-        var activeCalls = await _db.Select<RtcActiveCall>("rtc_active_calls");
+        var activeCalls = await _db.Select<DBActiveCall>("rtc_active_calls");
        return activeCalls
            .Where(x => x.Offer is not null)
            .OrderByDescending(x => x.UpdatedAt)
--- a/RelayServer/Services/Rtc/RtcChannelPresenceService.cs
+++ b/RelayServer/Services/Rtc/RtcChannelPresenceService.cs
@@ -35,6 +35,11 @@ public static class RtcChannelPresenceService
            .Select(x => x.Key)
            .ToList();
    }
+    
+    public static List<string> GetUsernamesInChannel(string channelId)
+    {
+        return GetUsersInChannel(channelId).ToList();
+    }

    public static IReadOnlyList<string> GetUsersInChannel(string channelId)
    {
@@ -52,4 +57,11 @@ public static class RtcChannelPresenceService
        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;
+    }
 }
--- a/RelayServer/Services/Rtc/RtcNotificationService.cs
+++ b/RelayServer/Services/Rtc/RtcNotificationService.cs
@@ -1,5 +1,5 @@
 using System.Text.Json;
-using RelayServer.Models.Rtc;
+using RelayShared.Rtc;
 using WebSocketSharp.Server;

 namespace RelayServer.Services.Rtc;
--- a/RelayShared/.gitignore
+++ b/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
--- a/RelayShared/Class1.cs
+++ b/RelayShared/Class1.cs
@@ -0,0 +1,9 @@
+namespace RelayShared;
+
+public class Class1
+{
+    public Class1()
+    {
+        return;
+    }
+}
--- a/RelayShared/RelayShared.csproj
+++ b/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>
--- a/RelayShared/Rtc/RTCDatabase.cs
+++ b/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; }
+}
--- a/RelayShared/Rtc/RTCTransmissions.cs
+++ b/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; }
+}
--- a/RelayShared/Rtc/RtcServices.cs
+++ b/RelayShared/Rtc/RtcServices.cs
@@ -0,0 +1,6 @@
+namespace RelayShared.Rtc;
+
+public class RtcServices
+{
+    
+}
--- a/RelayShared/Services/ChannelEnums.cs
+++ b/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
+}
--- a/RelayShared/Services/ChannelTransmissions.cs
+++ b/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; } = [];
+}
--- a/RelayShared/Services/ConsoleCommandService.cs
+++ b/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;
+        }
+    }
+}
--- a/RelayShared/Services/SocketTransmissions.cs
+++ b/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
+}
--- a/start-all.ps1
+++ b/start-all.ps1
@@ -64,19 +64,19 @@ Start-Sleep -Seconds 5
 & '$clientExe' --user Ru_Kira
 "@

-#$testScript = New-TabScript -Name "Test" -Content @"
-#Set-Location '$root'
-#Start-Sleep -Seconds 25
-#& '$clientExe' --user Test
-#"@
+$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`""
-    #"new-tab --title `"Test`" `"$ps`" -NoExit -ExecutionPolicy Bypass -File `"$testScript`""
 ) -join " ; "

 Write-Host ""
Author	SHA1	Message	Date
Cody Larkin	3460ce6b04	need server and core webapp to work at same time for testing purposes	2026-05-03 18:04:40 -04:00
Cody Larkin	ec6a8c446a	Auth setup continued	2026-05-02 16:06:08 -04:00
Cody Larkin	33eee17c43	Beginnings of Core Auth	2026-04-30 19:08:37 -04:00
Cody Larkin	dd1aa45f6e	Fixed connections	2026-04-29 14:39:28 -04:00
Cody Larkin	38662f6655	Fix attempts for RTC calls	2026-04-29 13:52:35 -04:00
Cody Larkin	777328caed	Merge branch 'RTC-Rewrite'	2026-04-29 09:13:58 -04:00
RuKira	87ade75f1d	Merge remote-tracking branch 'origin/RTC-Rewrite' into RTC-Rewrite # Conflicts: # RelayClient/MainPage.xaml.cs	2026-04-29 09:11:58 -04:00
RuKira	798652cb4d	Set the target of RTC to `_rtc` and removed all Pass Through Methods.	2026-04-29 09:10:49 -04:00
Cody Larkin	6a650a282b	fixed spacing and added todo	2026-04-27 14:32:40 -04:00
RuKira	5b10afcec2	Rewrote all of MainPage.xaml.cs	2026-04-27 10:01:59 -04:00
RuKira	1220654656	Setup new services required for change	2026-04-27 10:01:02 -04:00
RuKira	be797c55c2	Merge remote-tracking branch 'origin/RTC-Rewrite' into RTC-Rewrite	2026-04-27 06:54:21 -04:00
RuKira	20e99fefec	Fixed missing merge stuff.	2026-04-27 06:54:12 -04:00
RuKira	f77a5eb823	Merge remote-tracking branch 'origin/RTC-Rewrite' into RTC-Rewrite	2026-04-27 06:49:55 -04:00
RuKira	d6ecb63b5f	MainPage cleanup	2026-04-27 06:49:44 -04:00
Cody Larkin	687387b105	Reviewed and Updated models for Shared project	2026-04-26 02:33:40 -04:00
RuKira	5486795f4d	Added Peer stuff to RelayRTC I've confirmed any and all issues past this point is C# related, and client is done being rewritten.	2026-04-26 00:18:52 -04:00
RuKira	b90144d335	More logging on the RTC Signal	2026-04-26 00:18:14 -04:00
RuKira	9a3e435dd4	Fixed cases of no Media Content, and swapping Media failing.	2026-04-26 00:14:47 -04:00
RuKira	c4dfb07627	Fixed Ice OBJECT not returning/sending correctly.	2026-04-26 00:09:39 -04:00
RuKira	92c432cd49	Client Code Done - Needs Bug Fixing	2026-04-26 00:06:49 -04:00
RuKira	a52ae2f4a4	Encryption Sent, Encrpytion Decoded, Offer Sent, Offer Recieved, JS -> C# / C# -> JS Broke (some disconnect here) SendRtcSignalToJsAsync	2026-04-24 05:18:50 -04:00
Cody Larkin	0c9ff3b5d9	Setting stage for channel types and groups	2026-04-22 21:35:21 -04:00
Cody Larkin	3b75c2b785	Merge branch 'LeaveCall'	2026-04-21 01:15:13 -04:00
Cody Larkin	4f6bbcf6e2	A step in the right direction	2026-04-21 01:14:44 -04:00
RuKira	a2608ffab9	This isn't FULLY functional, but it's what I've made thus far... I'm still working on a Ice Disconnect somewhere at least for me - welcome to test.	2026-04-18 18:05:22 -04:00
RuKira	b70189c619	Verify RTS Push to JS (fixes to application)	2026-04-17 16:47:30 -04:00
RuKira	88c5d597d3	Removed useless button	2026-04-14 21:59:31 -04:00
RuKira	4a8170c448	Removed File	2026-04-14 21:59:18 -04:00
RuKira	a56e246095	Fixed Messaging Bug (inversed a if statement)	2026-04-13 22:57:39 -04:00
RuKira	fba86881ec	Renames complete.	2026-04-13 17:06:10 -04:00
Cody Larkin	28be2ae6c3	Added TODOs and fixed some typings	2026-04-13 17:02:31 -04:00
RuKira	627d67be39	Shutdown ("Exit", "Stop") now exist	2026-04-13 16:27:12 -04:00
Cody Larkin	085507519a	updated to shared lib	2026-04-11 18:42:29 -04:00
RuKira	a67f94b08e	Merge pull request 'Shared-Files' (#2 ) from Shared-Files into main Reviewed-on: #2	2026-04-10 18:15:17 +00:00
RuKira	c3b8dc5061	Shared System completed. Test for bugs.	2026-04-10 14:14:35 -04:00
RuKira	e855948ca9	Merge branch 'refs/heads/main' into Shared-Files	2026-04-10 14:13:01 -04:00
Cody Larkin	63a12b8d17	review for cleanup	2026-04-10 00:55:15 -04:00
Cody Larkin	dc37933fb8	cleanup prep and leave call prep	2026-04-09 16:53:29 -04:00
RuKira	9ad1d898ff	Starting work on Shared Files	2026-04-09 10:51:04 -04:00
Cody Larkin	dad5de3d7f	CALL WORKS, NEEDS TO HAVE LEAVE CALL SETUP AND HOTSWAP FIXED	2026-04-08 22:29:29 -04:00
Cody Larkin	c03e5102fb	Merge remote-tracking branch 'origin/main'	2026-04-08 18:56:36 -04:00
Cody Larkin	9e587ad7b5	fixed missing audio/video devices	2026-04-08 18:56:30 -04:00
RuKira	8fb9126072	Merge remote-tracking branch 'origin/main'	2026-04-08 18:53:18 -04:00
RuKira	e18e61710e	Added Hotswapping to Settings.	2026-04-08 18:53:07 -04:00
Cody Larkin	cec2d7593f	making ice candidates write to DB properly	2026-04-08 18:48:15 -04:00
Cody Larkin	dff05dd596	ice candidates gathering working, needs to get public ips	2026-04-07 17:30:34 -04:00
Cody Larkin	31646a315a	cleaned up extra debug messages	2026-04-06 20:59:19 -04:00
Cody Larkin	7af9cd0df8	Auto stash before merge of "main" and "origin/main"	2026-04-06 20:48:57 -04:00
RuKira	68a905a292	Update	2026-04-06 20:46:55 -04:00
RuKira	df438e265b	Revert "It's still broken, but I made a bit of progress." This reverts commit `9b666ee109`.	2026-04-06 20:43:03 -04:00
RuKira	98a837cc8b	Dark Mode	2026-04-06 19:40:09 -04:00
RuKira	9b666ee109	It's still broken, but I made a bit of progress.	2026-04-06 18:57:46 -04:00
Cody Larkin	3c1a4c7a2d	brokededed again	2026-04-06 17:42:14 -04:00
RuKira	7d8755ca71	Fixed all underlying issues with the "Answer" call.	2026-04-06 16:08:37 -04:00
RuKira	aa7f6597c4	Merge broketh my code	2026-04-06 15:31:39 -04:00
RuKira	9f4d4eaa15	Merge remote-tracking branch 'origin/main' # Conflicts: # RelayServer/Services/Chat/ChatSocketBehavior.cs	2026-04-06 15:27:23 -04:00
RuKira	e5a1166bec	Changed thread / added helper for UI based messages on MAIN thread.	2026-04-06 15:26:23 -04:00