Shared System completed. Test for bugs.
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
using System.Text.Json;
|
||||
using RelayServer.Models.Rtc;
|
||||
using RelayShared.Rtc;
|
||||
using RelayServer.Services.Rtc;
|
||||
|
||||
namespace RelayServer.Endpoints;
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
namespace RelayServer.Models;
|
||||
|
||||
public class SocketChannelList
|
||||
{
|
||||
public required string Type { get; set; }
|
||||
public required List<SocketChannelInfo> Channels { get; set; }
|
||||
}
|
||||
@@ -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; }
|
||||
}
|
||||
@@ -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; }
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
namespace RelayServer.Models;
|
||||
|
||||
public class ServerPublicKeyMessage
|
||||
{
|
||||
public required string Type { get; set; }
|
||||
public required string PublicKey { get; set; }
|
||||
}
|
||||
@@ -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; }
|
||||
}
|
||||
@@ -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; }
|
||||
}
|
||||
@@ -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; }
|
||||
}
|
||||
@@ -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; }
|
||||
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
namespace RelayServer.Models.Rtc;
|
||||
|
||||
public class RtcJoinRequest
|
||||
{
|
||||
public required string ChannelId { get; set; }
|
||||
public required string Username { get; set; }
|
||||
}
|
||||
@@ -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; }
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
namespace RelayServer.Models.Rtc;
|
||||
|
||||
public class RtcLeaveRequest
|
||||
{
|
||||
public required string ChannelId { get; set; }
|
||||
public required string Username { get; set; }
|
||||
}
|
||||
@@ -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; }
|
||||
}
|
||||
@@ -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; }
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
namespace RelayServer.Models.Rtc;
|
||||
|
||||
public sealed class RtcSessionDescription
|
||||
{
|
||||
public required string Type { get; set; }
|
||||
public required string Sdp { get; set; }
|
||||
}
|
||||
@@ -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();
|
||||
|
||||
@@ -17,4 +17,8 @@
|
||||
<ProjectReference Include="..\RelayShared\RelayShared.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="Models\Rtc\" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using RelayServer.Models.Rtc;
|
||||
using RelayShared.Rtc;
|
||||
using SurrealDb.Net;
|
||||
|
||||
namespace RelayServer.Services.Rtc;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
using System.Text.Json;
|
||||
using RelayServer.Models.Rtc;
|
||||
using RelayShared.Rtc;
|
||||
using WebSocketSharp.Server;
|
||||
|
||||
namespace RelayServer.Services.Rtc;
|
||||
|
||||
Reference in New Issue
Block a user