Fix merge issues for SipSorcery.

immense · Apr 18, 2021 · de0a8d3 · de0a8d3
1 parent f72acc8
commit de0a8d3
Show file tree

Hide file tree

Showing 22 changed files with 53 additions and 87 deletions.
diff --git a/Desktop.Core/Desktop.Core.csproj b/Desktop.Core/Desktop.Core.csproj
@@ -47,7 +47,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="5.0.0" />
     <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
-    <PackageReference Include="SIPSorcery" Version="5.1.1" />
+    <PackageReference Include="SIPSorcery" Version="5.1.8-pre" />
     <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
   </ItemGroup>
 

diff --git a/Desktop.Core/Services/Viewer.cs b/Desktop.Core/Services/Viewer.cs
@@ -12,6 +12,8 @@
 using System.Linq;
 using System.Threading.Tasks;
 using System.Text.Json;
+using System.Threading;
+using System.Diagnostics;
 
 namespace Remotely.Desktop.Core.Services
 {

diff --git a/Desktop.Core/Services/WebRtcSession.cs b/Desktop.Core/Services/WebRtcSession.cs
@@ -61,7 +61,7 @@ public void Dispose()
             GC.SuppressFinalize(this);
         }
 
-        public Task Init(IceServerModel[] iceServers)
+        public async Task Init(IceServerModel[] iceServers)
         {
             Logger.Write("Starting WebRTC connection.");
 
@@ -85,23 +85,22 @@ public Task Init(IceServerModel[] iceServers)
             PeerSession.onicecandidate += PeerSession_onicecandidate;
 
             var dataChannelInit = new RTCDataChannelInit();
-            CaptureChannel = PeerSession.createDataChannel("RemoteControl", dataChannelInit);
+            CaptureChannel = await PeerSession.createDataChannel("RemoteControl", dataChannelInit);
 
-            CaptureChannel.onDatamessage += CaptureChannel_onDatamessage;
+            CaptureChannel.onmessage += CaptureChannel_onmessage; ;
             CaptureChannel.onclose += CaptureChannel_onclose;
             CaptureChannel.onopen += CaptureChannel_onopen;
             CaptureChannel.onerror += CaptureChannel_onerror;
 
             var offer = PeerSession.createOffer(new RTCOfferOptions());
             LocalSdpReady?.Invoke(this, offer);
-
-            return Task.CompletedTask;
         }
 
 
-        public async Task SendDto<T>(T dto) where T : BaseDto
+
+        public Task SendDto<T>(T dto) where T : BaseDto
         {
-            await CaptureChannel.sendasync(MessagePackSerializer.Serialize(dto));
+            return Task.Run(() => CaptureChannel.send(MessagePackSerializer.Serialize(dto)));
         }
 
         public Task SetRemoteDescription(string type, string sdp)
@@ -127,13 +126,11 @@ public Task SetRemoteDescription(string type, string sdp)
             return Task.CompletedTask;
         }
 
-        private async void CaptureChannel_onDatamessage(byte[] obj)
+        private async void CaptureChannel_onmessage(RTCDataChannel dc, DataChannelPayloadProtocols protocol, byte[] data)
         {
-            await RtcMessageHandler.ParseMessage(Viewer, obj);
+            await RtcMessageHandler.ParseMessage(Viewer, data);
         }
 
-
-
         private async void CaptureChannel_onerror(string obj)
         {
             // Clear the queue when WebRTC state changes.

diff --git a/Server/wwwroot/src/RemoteControl/Enums/BaseDtoType.js b/Server/wwwroot/src/RemoteControl/Enums/BaseDtoType.js
diff --git a/Server/wwwroot/src/RemoteControl/Enums/BaseDtoType.js.map b/Server/wwwroot/src/RemoteControl/Enums/BaseDtoType.js.map
diff --git a/Server/wwwroot/src/RemoteControl/InputEventHandlers.js b/Server/wwwroot/src/RemoteControl/InputEventHandlers.js
diff --git a/Server/wwwroot/src/RemoteControl/InputEventHandlers.js.map b/Server/wwwroot/src/RemoteControl/InputEventHandlers.js.map
diff --git a/Server/wwwroot/src/RemoteControl/Interfaces/Dtos.js b/Server/wwwroot/src/RemoteControl/Interfaces/Dtos.js
diff --git a/Server/wwwroot/src/RemoteControl/Interfaces/Dtos.js.map b/Server/wwwroot/src/RemoteControl/Interfaces/Dtos.js.map
diff --git a/Server/wwwroot/src/RemoteControl/Interfaces/Settings.ts b/Server/wwwroot/src/RemoteControl/Interfaces/Settings.ts
@@ -1,4 +1,3 @@
 export interface Settings {
-    streamModeEnabled: boolean;
     displayName: string;
 }
diff --git a/Server/wwwroot/src/RemoteControl/MessageSender.js b/Server/wwwroot/src/RemoteControl/MessageSender.js