Use separate hub method params for signaling.

immense · Mar 19, 2021 · 37e187e · 37e187e
1 parent e039bd7
commit 37e187e
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 27 deletions.
diff --git a/Desktop.Core/Services/CasterSocket.cs b/Desktop.Core/Services/CasterSocket.cs
@@ -28,7 +28,7 @@ public interface ICasterSocket
         Task SendCtrlAltDelToAgent();
         Task SendDeviceInfo(string serviceID, string machineName, string deviceID);
         Task SendDtoToViewer<T>(T baseDto, string viewerId);
-        Task SendIceCandidateToBrowser(string candidateJson, string viewerConnectionID);
+        Task SendIceCandidateToBrowser(string candidate, string sdpMid, ushort sdpMLineIndex, string usernameFragment, string viewerConnectionID);
         Task SendMessageToViewer(string viewerID, string message);
         Task SendRtcOfferToBrowser(string sdp, string viewerID, IceServerModel[] iceServers);
         Task SendViewerConnected(string viewerConnectionId);
@@ -164,9 +164,9 @@ public Task SendDtoToViewer<T>(T baseDto, string viewerId)
             var serializedDto = MessagePack.MessagePackSerializer.Serialize(baseDto);
             return Connection.SendAsync("SendDtoToBrowser", serializedDto, viewerId);
         }
-        public async Task SendIceCandidateToBrowser(string candidateJson, string viewerConnectionID)
+        public async Task SendIceCandidateToBrowser(string candidate, string sdpMid, ushort sdpMLineIndex, string usernameFragment, string viewerConnectionID)
         {
-            await Connection.SendAsync("SendIceCandidateToBrowser", candidateJson, viewerConnectionID);
+            await Connection.SendAsync("SendIceCandidateToBrowser", candidate, sdpMid, sdpMLineIndex, usernameFragment, viewerConnectionID);
         }
 
         public async Task SendRtcOfferToBrowser(string sdp, string viewerID, IceServerModel[] iceServers)
@@ -235,13 +235,13 @@ private void ApplyConnectionHandlers()
             });
 
 
-            Connection.On("ReceiveIceCandidate", (string candidateJson, string viewerID) =>
+            Connection.On("ReceiveIceCandidate", (string candidate, string sdpMid, ushort sdpMLineIndex, string usernameFragment, string viewerID) =>
             {
                 try
                 {
                     if (conductor.Viewers.TryGetValue(viewerID, out var viewer))
                     {
-                        viewer.RtcSession.AddIceCandidate(candidateJson);
+                        viewer.RtcSession.AddIceCandidate(candidate, sdpMid, sdpMLineIndex, usernameFragment);
                     }
                 }
                 catch (Exception ex)

diff --git a/Desktop.Core/Services/Viewer.cs b/Desktop.Core/Services/Viewer.cs
@@ -101,8 +101,11 @@ public async Task InitializeWebRtc()
                 };
                 RtcSession.IceCandidateReady += async (sender, candidate) =>
                 {
-                    var candidateJson = JsonSerializer.Serialize(candidate);
-                    await CasterSocket.SendIceCandidateToBrowser(candidateJson, ViewerConnectionID);
+                    await CasterSocket.SendIceCandidateToBrowser(candidate.candidate, 
+                        candidate.sdpMid, 
+                        candidate.sdpMLineIndex,
+                        candidate.usernameFragment,
+                        ViewerConnectionID);
                 };
 
                 await RtcSession.Init(iceServers);

diff --git a/Desktop.Core/Services/WebRtcSession.cs b/Desktop.Core/Services/WebRtcSession.cs
@@ -40,10 +40,17 @@ public WebRtcSession(Viewer viewer, IDtoMessageHandler rtcMessageHandler)
         private IDtoMessageHandler RtcMessageHandler { get; }
         private Timer DataChannelBufferMonitor { get; }
         private Viewer Viewer { get; }
-        public void AddIceCandidate(string candidateJson)
+        public void AddIceCandidate(string candidate, string sdpMid, ushort sdpMLineIndex, string usernameFragment)
         {
-            var candidate = JsonSerializer.Deserialize<RTCIceCandidateInit>(candidateJson);
-            PeerSession.addIceCandidate(candidate);
+            var rtcCandidate = new RTCIceCandidateInit()
+            {
+                candidate = candidate,
+                sdpMid = sdpMid,
+                sdpMLineIndex = sdpMLineIndex,
+                usernameFragment = usernameFragment
+            };
+
+            PeerSession.addIceCandidate(rtcCandidate);
         }
 
         public void Dispose()

diff --git a/Server/Hubs/CasterHub.cs b/Server/Hubs/CasterHub.cs
@@ -165,11 +165,11 @@ public Task SendDtoToBrowser(byte[] dto, string viewerId)
             return ViewerHubContext.Clients.Client(viewerId).SendAsync("SendDtoToBrowser", dto);
         }
 
-        public Task SendIceCandidateToBrowser(string candidateJson, string viewerID)
+        public Task SendIceCandidateToBrowser(string candidate, string sdpMid, ushort sdpMLineIndex, string usernameFragment, string viewerID)
         {
             if (AppConfig.UseWebRtc)
             {
-                return ViewerHubContext.Clients.Client(viewerID).SendAsync("ReceiveIceCandidate", candidateJson);
+                return ViewerHubContext.Clients.Client(viewerID).SendAsync("ReceiveIceCandidate", candidate, sdpMid, sdpMLineIndex, usernameFragment);
             }
 
             return Task.CompletedTask;

diff --git a/Server/Hubs/ViewerHub.cs b/Server/Hubs/ViewerHub.cs
@@ -122,9 +122,9 @@ public override Task OnDisconnectedAsync(Exception exception)
             return base.OnDisconnectedAsync(exception);
         }
 
-        public Task SendIceCandidateToAgent(string candidateJson)
+        public Task SendIceCandidateToAgent(string candidate, string sdpMid, ushort sdpMLineIndex, string usernameFragment)
         {
-            return CasterHubContext.Clients.Client(ScreenCasterID).SendAsync("ReceiveIceCandidate", candidateJson, Context.ConnectionId);
+            return CasterHubContext.Clients.Client(ScreenCasterID).SendAsync("ReceiveIceCandidate", candidate, sdpMid, sdpMLineIndex, usernameFragment, Context.ConnectionId);
         }
 
         public Task SendRtcAnswerToAgent(string sdp)

diff --git a/Server/wwwroot/src/RemoteControl/RtcSession.ts b/Server/wwwroot/src/RemoteControl/RtcSession.ts
@@ -84,17 +84,20 @@ export class RtcSession {
         await ViewerApp.ViewerHubConnection.SendRtcAnswer(this.PeerConnection.localDescription);
         console.log("Set RTC offer.");
     }
-    async ReceiveCandidate(candidate: RTCIceCandidate) {
+    async ReceiveCandidate(candidate: string, sdpMid: string, sdpMLineIndex: number, usernameFragment: string) {
         When(() => !!this.PeerConnection).then(async () => {
-            if (!candidate.candidate.startsWith("candidate:")) {
-                var normalizedCandidate = {} as any;
-                Object.assign(normalizedCandidate, candidate);
-                normalizedCandidate.candidate = `candidate:${candidate.candidate}`;
-                await this.PeerConnection.addIceCandidate(normalizedCandidate);
-            }
-            else {
-                await this.PeerConnection.addIceCandidate(candidate);
+            if (!candidate.startsWith("candidate:")) {
+                candidate = `candidate:${candidate}`;
             }
+
+            var rtcCandidate = {
+                candidate: candidate,
+                sdpMid: sdpMid,
+                sdpMLineIndex: sdpMLineIndex,
+                usernameFragment: usernameFragment
+            } as RTCIceCandidateInit;
+
+            await this.PeerConnection.addIceCandidate(rtcCandidate);
             console.log("Set ICE candidate.", candidate);
         });
     }

diff --git a/Server/wwwroot/src/RemoteControl/ViewerHubConnection.ts b/Server/wwwroot/src/RemoteControl/ViewerHubConnection.ts
@@ -55,7 +55,7 @@ export class ViewerHubConnection {
 
     SendIceCandidate(candidate: RTCIceCandidate) {
         if (candidate) {
-            this.Connection.invoke("SendIceCandidateToAgent", JSON.stringify(candidate));
+            this.Connection.invoke("SendIceCandidateToAgent", candidate.candidate, candidate.sdpMid, candidate.sdpMLineIndex, candidate.usernameFragment);
         }
         else {
             this.Connection.invoke("SendIceCandidateToAgent", "{}");
@@ -147,10 +147,9 @@ export class ViewerHubConnection {
             await ViewerApp.RtcSession.ReceiveRtcOffer(sdp);
 
         });
-        hubConnection.on("ReceiveIceCandidate", async (candidateJson: string) => {
-            var candidate = JSON.parse(candidateJson);
+        hubConnection.on("ReceiveIceCandidate", async (candidate: string, sdpMid: string, sdpMLineIndex: number, usernameFragment: string) => {
             console.log("Ice candidate received.", candidate);
-            await ViewerApp.RtcSession.ReceiveCandidate(candidate);
+            await ViewerApp.RtcSession.ReceiveCandidate(candidate, sdpMid, sdpMLineIndex, usernameFragment);
         });
         hubConnection.on("ShowMessage", (message: string) => {
             ShowMessage(message);