DifferentDirection/Relay
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Shared System completed. Test for bugs.

Browse Source
This commit is contained in:
RuKira
2026-04-10 14:14:35 -04:00
parent e855948ca9
commit c3b8dc5061
31 changed files with 109 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RelayClient/MainPage.xaml.cs
View File

@@ -1,5 +1,4 @@
using RelayClient.Crypto;
using RelayClient.Models;
using WebSocketSharp;
using System.Text.Json;
using System.Text.Json.Serialization;

8
RelayClient/Models/ChannelItem.cs
View File

@@ -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; }
}

9
RelayClient/Models/RtcNotificationMessage.cs
View File

@@ -1,9 +0,0 @@
namespace RelayClient.Models;
public sealed class RtcNotificationMessage
{
public string? Type { get; set; }
public string? ChannelId { get; set; }
public string? Username { get; set; }
public string? Direction { get; set; }
}

13
RelayClient/Models/RtcSignalMessage.cs
View File

@@ -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; }
}

7
RelayClient/Models/ServerPublicKeyMessage.cs
View File

@@ -1,7 +0,0 @@
namespace RelayClient.Models;
public class ServerPublicKeyMessage
{
public required string Type { get; set; }
public required string PublicKey { get; set; }
}

7
RelayClient/Models/SocketChannelList.cs
View File

@@ -1,7 +0,0 @@
namespace RelayClient.Models;
public class SocketChannelList
{
public required string Type { get; set; }
public required List<ChannelItem> Channels { get; set; }
}

13
RelayClient/Models/SocketEncryptedMessage.cs
View File

@@ -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; }
}

13
RelayClient/Models/SocketRtcSignalMessage.cs
View File

@@ -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; }
}

4
RelayClient/RelayClient.csproj
View File

@@ -54,4 +54,8 @@
<ProjectReference Include="..\RelayShared\RelayShared.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Models\" />
</ItemGroup>
</Project>

1
RelayClient/Resources/Raw/wwwroot/index.js
View File

@@ -25,6 +25,7 @@ window.setChannelId = function(channelId) {
currentChannelId = channelId;
LogMessage("Channel set to: " + currentChannelId);
};
function LogMessage(msg) {
const messageLog = document.getElementById("messageLog");
messageLog.value += '\r\n' + msg;

2
RelayServer/Endpoints/RtcEndpoints.cs
View File

@@ -1,5 +1,5 @@
using System.Text.Json;
using RelayServer.Models.Rtc;
using RelayShared.Rtc;
using RelayServer.Services.Rtc;
namespace RelayServer.Endpoints;

7
RelayServer/Models/Chat/SocketChannelList.cs
View File

@@ -1,7 +0,0 @@
namespace RelayServer.Models;
public class SocketChannelList
{
public required string Type { get; set; }
public required List<SocketChannelInfo> Channels { get; set; }
}

13
RelayServer/Models/Chat/SocketEncryptedMessage.cs
View File

@@ -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; }
}

13
RelayServer/Models/Crypto/RtcSignalMessage.cs
View File

@@ -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; }
}

7
RelayServer/Models/Crypto/ServerPublicKeyMessage.cs
View File

@@ -1,7 +0,0 @@
namespace RelayServer.Models;
public class ServerPublicKeyMessage
{
public required string Type { get; set; }
public required string PublicKey { get; set; }
}

13
RelayServer/Models/Crypto/SocketRtcSignalMessage.cs
View File

@@ -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; }
}

14
RelayServer/Models/Rtc/RtcActiveCall.cs
View File

@@ -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; }
}

12
RelayServer/Models/Rtc/RtcAnswer.cs
View File

@@ -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; }
}

30
RelayServer/Models/Rtc/RtcIceCandidate.cs
View File

@@ -1,30 +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; }
}
public class DBIceCandidate
{
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; }
}

7
RelayServer/Models/Rtc/RtcJoinRequest.cs
View File

@@ -1,7 +0,0 @@
namespace RelayServer.Models.Rtc;
public class RtcJoinRequest
{
public required string ChannelId { get; set; }
public required string Username { get; set; }
}

10
RelayServer/Models/Rtc/RtcJoinResponse.cs
View File

@@ -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; }
}

7
RelayServer/Models/Rtc/RtcLeaveRequest.cs
View File

@@ -1,7 +0,0 @@
namespace RelayServer.Models.Rtc;
public class RtcLeaveRequest
{
public required string ChannelId { get; set; }
public required string Username { get; set; }
}

17
RelayServer/Models/Rtc/RtcNotificationMessage.cs
View File

@@ -1,17 +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; }
}
public sealed class RtcIceNotificationMessage
{
public required string Type { get; set; }
public required string ChannelId { get; set; }
public string? Username { get; set; }
public required IceCandidate Candidate { get; set; }
}

14
RelayServer/Models/Rtc/RtcOffer.cs
View File

@@ -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; }
}

7
RelayServer/Models/Rtc/RtcSessionDescription.cs
View File

@@ -1,7 +0,0 @@
namespace RelayServer.Models.Rtc;
public sealed class RtcSessionDescription
{
public required string Type { get; set; }
public required string Sdp { get; set; }
}

1
RelayServer/Program.cs
View File

@@ -3,6 +3,7 @@ using RelayServer.Services.Chat;
using RelayServer.Services.Core;
using RelayServer.Services.Data;
using RelayServer.Services.Rtc;
using RelayShared.Rtc;
using WebSocketSharp.Server;
var surrealService = new SurrealService();

4
RelayServer/RelayServer.csproj
View File

@@ -17,4 +17,8 @@
<ProjectReference Include="..\RelayShared\RelayShared.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Models\Rtc\" />
</ItemGroup>
</Project>

3
RelayServer/Services/Chat/ChatSocketBehavior.cs
View File

@@ -6,6 +6,7 @@ using RelayServer.Services.Rtc;
using WebSocketSharp;
using WebSocketSharp.Server;
using ErrorEventArgs = WebSocketSharp.ErrorEventArgs;
using RelayShared.Rtc;
namespace RelayServer.Services.Chat;
@@ -145,7 +146,7 @@ public class ChatSocketBehavior : WebSocketBehavior
var channels = GetChannelsSync()
.OrderBy(c => c.CreatedAt)
.Select(c => new SocketChannelInfo
.Select(c => new ChannelItem()
{
ChannelId = GetRecordId(c.Id),
Name = c.Name,

2
RelayServer/Services/Rtc/RtcCallService.cs
View File

@@ -1,4 +1,4 @@
using RelayServer.Models.Rtc;
using RelayShared.Rtc;
using SurrealDb.Net;
namespace RelayServer.Services.Rtc;

2
RelayServer/Services/Rtc/RtcNotificationService.cs
View File

@@ -1,5 +1,5 @@
using System.Text.Json;
using RelayServer.Models.Rtc;
using RelayShared.Rtc;
using WebSocketSharp.Server;
namespace RelayServer.Services.Rtc;

130
RelayShared/Rtc/RtcModels.cs
View File

@@ -2,51 +2,118 @@
namespace RelayShared.Rtc;
public class RtcSignalTypes
public static class RtcSignalTypes
{
public const string Offer = "rtc_offer";
public const string Answer = "rtc_answer";
public const string Candidate = "rtc_candidate";
public const string OfferUpdated = "rtc_offer_updated";
public const string AnswerUpdated = "rtc_answer_updated";
public const string CandidateAdded = "rtc_candidate_added";
public const string CallLeft = "rtc_call_left";
}
public class RtcJoinRequest
public sealed class RtcSignalMessage
{
public required string ChannelId { get; set; }
public required string Username { get; set; }
public string Type { get; set; } = string.Empty;
public string From { get; set; } = string.Empty;
public string ChannelId { get; set; } = string.Empty;
public string? Sdp { get; set; }
public string? Candidate { get; set; }
public string? SdpMid { get; set; }
public int? SdpMLineIndex { get; set; }
public bool IsInitiator { get; set; }
}
public sealed class RtcNotificationMessage
{
public string? Type { get; set; }
public string? ChannelId { get; set; }
public string? Username { get; set; }
public string? Direction { get; set; }
}
public sealed class ServerPublicKeyMessage
{
public string Type { get; set; } = string.Empty;
public string PublicKey { get; set; } = string.Empty;
}
public sealed class SocketRtcSignalMessage
{
public string Type { get; set; } = string.Empty;
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 string Type { get; set; } = string.Empty;
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 ChannelItem
{
public string ChannelId { get; set; } = string.Empty;
public string Name { get; set; } = string.Empty;
public DateTime CreatedAt { get; set; }
}
public sealed class SocketChannelList
{
public string Type { get; set; } = string.Empty;
public List<ChannelItem> Channels { 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 bool HasActiveCall { get; set; }
public bool IsOfferer { get; set; }
public string? OfferUser { get; set; }
public RtcSessionDescription? OfferSdp { get; set; }
}
public sealed class RtcLeaveRequest
{
public string ChannelId { get; set; } = string.Empty;
public string Username { get; set; } = string.Empty;
}
public sealed class RtcSessionDescription
{
public required string Type { get; set; }
public required string Sdp { get; set; }
public string Type { get; set; } = string.Empty;
public string Sdp { get; set; } = string.Empty;
}
public class RtcOffer : Record
public sealed class RtcOffer
{
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; }
public string ChannelId { get; set; } = string.Empty;
public string Username { get; set; } = string.Empty;
public RtcSessionDescription SessionDescription { get; set; } = new();
}
public class RtcLeaveRequest
public sealed class RtcAnswer
{
public required string ChannelId { get; set; }
public required string Username { get; set; }
}
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; }
public string ChannelId { get; set; } = string.Empty;
public string Username { get; set; } = string.Empty;
public RtcSessionDescription SessionDescription { get; set; } = new();
}
public class RtcIceCandidate : Record
@@ -76,18 +143,9 @@ public class IceCandidate
}
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; }
}
public sealed class RtcActiveCall : Record
{
public required string ChannelId { get; set; }
public string ChannelId { get; set; } = string.Empty;
public string? OfferUser { get; set; }
public RtcSessionDescription? Offer { get; set; }
public RtcSessionDescription? Answer { get; set; }