Add per-device WebRTC setting.

immense · Jan 3, 2021 · f299c34 · f299c34
1 parent 5b51132
commit f299c34
Show file tree

Hide file tree

Showing 21 changed files with 2,540 additions and 25 deletions.
diff --git a/Desktop.Core/Services/CasterSocket.cs b/Desktop.Core/Services/CasterSocket.cs
@@ -196,6 +196,7 @@ private void ApplyConnectionHandlers()
                 string requesterName,
                 bool notifyUser,
                 bool enforceAttendedAccess,
+                bool useWebRtc,
                 string organizationName) =>
             {
                 try
@@ -219,7 +220,8 @@ private void ApplyConnectionHandlers()
                     {
                         NotifyUser = notifyUser,
                         ViewerID = viewerID,
-                        RequesterName = requesterName
+                        RequesterName = requesterName,
+                        UseWebRtc = useWebRtc
                     });
                 }
                 catch (Exception ex)
@@ -260,13 +262,14 @@ private void ApplyConnectionHandlers()
                 }
             });
 
-            Connection.On("RequestScreenCast", (string viewerID, string requesterName, bool notifyUser) =>
+            Connection.On("RequestScreenCast", (string viewerID, string requesterName, bool notifyUser, bool useWebRtc) =>
             {
                 conductor.InvokeScreenCastRequested(new ScreenCastRequest()
                 {
                     NotifyUser = notifyUser,
                     ViewerID = viewerID,
-                    RequesterName = requesterName
+                    RequesterName = requesterName,
+                    UseWebRtc = useWebRtc
                 });
             });
 

diff --git a/Desktop.Core/Services/ScreenCaster.cs b/Desktop.Core/Services/ScreenCaster.cs
@@ -105,7 +105,7 @@ await viewer.SendScreenCapture(new CaptureFrame[]
                 }
 
 
-                if (EnvironmentHelper.IsWindows)
+                if (EnvironmentHelper.IsWindows && screenCastRequest.UseWebRtc)
                 {
                     await viewer.InitializeWebRtc();
                 }
@@ -149,7 +149,7 @@ await viewer.SendScreenCapture(new CaptureFrame[]
                         currentFrame?.Dispose();
                         currentFrame = viewer.Capturer.GetNextFrame();
 
-                        var diffAreas = ImageUtils.GetDiffAreas(currentFrame, previousFrame, viewer.Capturer.CaptureFullscreen);
+                        var diffAreas = ImageUtils.GetDiffAreas2(currentFrame, previousFrame, viewer.Capturer.CaptureFullscreen);
 
                         if (!diffAreas.Any())
                         {

diff --git a/Desktop.Core/Utilities/ImageUtils.cs b/Desktop.Core/Utilities/ImageUtils.cs
@@ -499,10 +499,10 @@ private static void AddChangeToList(List<Rectangle> changes, int left, int top,
         {
             // Bounding box is valid.  Padding is necessary to prevent artifacts from
             // moving windows.
-            left = Math.Max(left - 1, 0);
-            top = Math.Max(top - 1, 0);
-            right = Math.Min(right + 1, width);
-            bottom = Math.Min(bottom + 1, height);
+            left = Math.Max(left - 5, 0);
+            top = Math.Max(top - 5, 0);
+            right = Math.Min(right + 5, width);
+            bottom = Math.Min(bottom + 5, height);
 
             changes.Add(new Rectangle(left, top, right - left, bottom - top));
         }
@@ -511,10 +511,10 @@ private static void AddChangeToList(ConcurrentQueue<Rectangle> changes, int left
         {
             // Bounding box is valid.  Padding is necessary to prevent artifacts from
             // moving windows.
-            left = Math.Max(left - 1, 0);
-            top = Math.Max(top - 1, 0);
-            right = Math.Min(right + 1, width);
-            bottom = Math.Min(bottom + 1, height);
+            left = Math.Max(left - 5, 0);
+            top = Math.Max(top - 5, 0);
+            right = Math.Min(right + 5, width);
+            bottom = Math.Min(bottom + 5, height);
 
             changes.Enqueue(new Rectangle(left, top, right - left, bottom - top));
         }

diff --git a/Server/Hubs/AgentHub.cs b/Server/Hubs/AgentHub.cs
@@ -168,6 +168,7 @@ public Task DeviceHeartbeat(Device device)
 
             DataService.AddOrUpdateDevice(device, out var updatedDevice);
             Device = updatedDevice;
+            ServiceConnections.AddOrUpdate(Context.ConnectionId, Device, (id, d) => Device);
 
             var userIDs = BrowserHub.ConnectionIdToUserLookup.Values.Select(x => x.Id);
 

diff --git a/Server/Hubs/ViewerHub.cs b/Server/Hubs/ViewerHub.cs
@@ -200,23 +200,31 @@ public async Task SendScreenCastRequestToDevice(string screenCasterID, string re
                 OrganizationID = orgId
             });
 
+
             if (Mode == RemoteControlMode.Unattended)
             {
+                var targetDevice = AgentHub.ServiceConnections[SessionInfo.ServiceID];
+
+                var useWebRtc = targetDevice.WebRtcSetting == WebRtcSetting.Default ?
+                            AppConfig.UseWebRtc :
+                            targetDevice.WebRtcSetting == WebRtcSetting.Enabled;
+
+
                 SessionInfo.Mode = RemoteControlMode.Unattended;
-                var deviceID = AgentHub.ServiceConnections[SessionInfo.ServiceID].ID;
 
                 if ((!string.IsNullOrWhiteSpace(otp) &&
-                        RemoteControlFilterAttribute.OtpMatchesDevice(otp, deviceID))
+                        RemoteControlFilterAttribute.OtpMatchesDevice(otp, targetDevice.ID))
                     ||
                     (Context.User.Identity.IsAuthenticated &&
-                        DataService.DoesUserHaveAccessToDevice(deviceID, Context.UserIdentifier)))
+                        DataService.DoesUserHaveAccessToDevice(targetDevice.ID, Context.UserIdentifier)))
                 {
                     var orgName = DataService.GetOrganizationNameById(orgId);
                     await CasterHubContext.Clients.Client(screenCasterID).SendAsync("GetScreenCast", 
                         Context.ConnectionId, 
                         RequesterName, 
                         AppConfig.RemoteControlNotifyUser,
                         AppConfig.EnforceAttendedAccess,
+                        useWebRtc,
                         orgName);
                 }
                 else
@@ -228,7 +236,7 @@ await CasterHubContext.Clients.Client(screenCasterID).SendAsync("GetScreenCast",
             {
                 SessionInfo.Mode = RemoteControlMode.Normal;
                 await Clients.Caller.SendAsync("RequestingScreenCast");
-                await CasterHubContext.Clients.Client(screenCasterID).SendAsync("RequestScreenCast", Context.ConnectionId, RequesterName, AppConfig.RemoteControlNotifyUser);
+                await CasterHubContext.Clients.Client(screenCasterID).SendAsync("RequestScreenCast", Context.ConnectionId, RequesterName, AppConfig.RemoteControlNotifyUser, AppConfig.UseWebRtc);
             }
         }