From 74b3d84e59644235abfcfe842e3846f687463518 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Wed, 3 May 2023 05:35:10 -0700 Subject: [PATCH 01/47] Make StreamSignaler disposable. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index a896025eb..6a522f663 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit a896025ebf2f9cbcb2ae280f88a178acc39acfd2 +Subproject commit 6a522f66320c84b1b8860c4e63242f9cf0c72dd5 From e6a83b108788683e423408c0624dd3c5cee57060 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Wed, 3 May 2023 05:38:43 -0700 Subject: [PATCH 02/47] Change IDesktopHubConnection.Connect signature so cancellation token is last param. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index 6a522f663..7deab2d79 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit 6a522f66320c84b1b8860c4e63242f9cf0c72dd5 +Subproject commit 7deab2d79a2bd7fabf8646eb9cd1c519cd7d9380 From a4e6e557002171b50d4f7b0a03e8b71ab5ddac66 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Wed, 3 May 2023 07:15:54 -0700 Subject: [PATCH 03/47] Make transient IScreenCaster service disposable. --- Agent/Services/CpuUtilizationSampler.cs | 13 ++++++++++++- Desktop.Linux/Properties/launchSettings.json | 2 +- Desktop.Win/Properties/launchSettings.json | 2 +- Remotely.sln.startup.json | 11 +++++++++++ submodules/Immense.RemoteControl | 2 +- 5 files changed, 26 insertions(+), 4 deletions(-) diff --git a/Agent/Services/CpuUtilizationSampler.cs b/Agent/Services/CpuUtilizationSampler.cs index 4f2b488c8..23f298f58 100644 --- a/Agent/Services/CpuUtilizationSampler.cs +++ b/Agent/Services/CpuUtilizationSampler.cs @@ -17,6 +17,7 @@ public interface ICpuUtilizationSampler : IHostedService internal class CpuUtilizationSampler : BackgroundService, ICpuUtilizationSampler { + private readonly HashSet _ignoredProcesses = new(); private readonly ILogger _logger; private double _currentUtilization; @@ -47,7 +48,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) } } - private static async Task GetCpuUtilization(CancellationToken cancelToken) + private async Task GetCpuUtilization(CancellationToken cancelToken) { double totalUtilization = 0; var utilizations = new Dictionary>(); @@ -60,14 +61,24 @@ private static async Task GetCpuUtilization(CancellationToken cancelToke return 0; } + try { + // Processes in other sessions (e.g. session 0) will be inaccessible + // when debugging in a non-privileged process. This prevents errors + // from clogging up the output window. + if (_ignoredProcesses.Contains(proc.Id)) + { + continue; + } + var startTime = DateTimeOffset.Now; var startCpuUsage = proc.TotalProcessorTime; utilizations.Add(proc.Id, new Tuple(startTime, startCpuUsage)); } catch { + _ignoredProcesses.Add(proc.Id); continue; } } diff --git a/Desktop.Linux/Properties/launchSettings.json b/Desktop.Linux/Properties/launchSettings.json index cd94c5492..594c0ebb3 100644 --- a/Desktop.Linux/Properties/launchSettings.json +++ b/Desktop.Linux/Properties/launchSettings.json @@ -2,7 +2,7 @@ "profiles": { "Desktop.Linux": { "commandName": "Project", - "commandLineArgs": "-m Attended -s some-session-id -a vERyLonGAndCOMpleXKeY -o Immense -r Han" + "commandLineArgs": "-m Attended -h https://localhost:5001" } } } \ No newline at end of file diff --git a/Desktop.Win/Properties/launchSettings.json b/Desktop.Win/Properties/launchSettings.json index 7490b9ee2..d8c1fbf51 100644 --- a/Desktop.Win/Properties/launchSettings.json +++ b/Desktop.Win/Properties/launchSettings.json @@ -2,7 +2,7 @@ "profiles": { "Desktop.Win": { "commandName": "Project", - "commandLineArgs": "-m Attended -s some-session-id -a vERyLonGAndCOMpleXKeY -o Immense -r Han" + "commandLineArgs": "-m Attended -h https://localhost:5001" } } } \ No newline at end of file diff --git a/Remotely.sln.startup.json b/Remotely.sln.startup.json index 6c33f5d7e..09e8fc189 100644 --- a/Remotely.sln.startup.json +++ b/Remotely.sln.startup.json @@ -74,6 +74,17 @@ "ProfileName": "Agent" } } + }, + "Server+Desktop": { + "Projects": { + "Server\\Server.csproj": { + "ProfileName": "Server" + }, + "Desktop.Win": { + "ProfileName": "Desktop.Win" + } + } } + } } diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index 7deab2d79..ccbba8626 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit 7deab2d79a2bd7fabf8646eb9cd1c519cd7d9380 +Subproject commit ccbba86260b84f9a586da0dd00679527c22c75e6 From f72d6dad02986f59732d083026eccdcb80e9e6e9 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Wed, 3 May 2023 11:23:03 -0700 Subject: [PATCH 04/47] Add capture metrics to viewer. --- Server/API/AgentUpdateController.cs | 2 +- Server/Program.cs | 1 + submodules/Immense.RemoteControl | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Server/API/AgentUpdateController.cs b/Server/API/AgentUpdateController.cs index 16e7b0117..2ed3e877c 100644 --- a/Server/API/AgentUpdateController.cs +++ b/Server/API/AgentUpdateController.cs @@ -37,7 +37,7 @@ public class AgentUpdateController : ControllerBase private readonly IServiceHubSessionCache _serviceSessionCache; public AgentUpdateController(IWebHostEnvironment hostingEnv, - IDataService dataService, + IDataService dataService, IApplicationConfig appConfig, IServiceHubSessionCache serviceSessionCache, IHubContext agentHubContext) diff --git a/Server/Program.cs b/Server/Program.cs index cdc8e3838..84db0337d 100644 --- a/Server/Program.cs +++ b/Server/Program.cs @@ -158,6 +158,7 @@ services.AddSignalR(options => { options.EnableDetailedErrors = builder.Environment.IsDevelopment(); + options.MaximumParallelInvocationsPerClient = 5; options.MaximumReceiveMessageSize = 100_000; }) .AddJsonProtocol(options => diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index ccbba8626..3e702a947 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit ccbba86260b84f9a586da0dd00679527c22c75e6 +Subproject commit 3e702a94778ac3b9a389a3dad0b1b266a48670af From 1efe17df7b310e9bb092a33913230a72eda2d556 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Wed, 3 May 2023 11:23:09 -0700 Subject: [PATCH 05/47] Update submodule. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index 3e702a947..f95f68e35 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit 3e702a94778ac3b9a389a3dad0b1b266a48670af +Subproject commit f95f68e35921f20042e3c7cb66e04fd0bcf2c6a6 From 518c87c21963fc80fe8303d3e1958b4dbaa5c97b Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Thu, 4 May 2023 11:46:43 -0700 Subject: [PATCH 06/47] Update submodule. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index f95f68e35..45e783750 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit f95f68e35921f20042e3c7cb66e04fd0bcf2c6a6 +Subproject commit 45e7837503cfec0611e9f6400dd2153db1267a3a From e94156c033ceb4ba42ddc979209e32a57f8b25cc Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Wed, 10 May 2023 09:02:39 -0700 Subject: [PATCH 07/47] Update submodule. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index 45e783750..bca6e506b 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit 45e7837503cfec0611e9f6400dd2153db1267a3a +Subproject commit bca6e506be0fbdf5c5c39909b4a06f1ff5e5b387 From 80d3b3813b57460a91e0a40a5849b030459d47a2 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Wed, 10 May 2023 09:29:09 -0700 Subject: [PATCH 08/47] Implement changes to IViewerAuthorizer. --- .../Services/RcImplementations/ViewerAuthorizer.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Server/Services/RcImplementations/ViewerAuthorizer.cs b/Server/Services/RcImplementations/ViewerAuthorizer.cs index 0fbd986a1..58fc889ce 100644 --- a/Server/Services/RcImplementations/ViewerAuthorizer.cs +++ b/Server/Services/RcImplementations/ViewerAuthorizer.cs @@ -4,6 +4,7 @@ using Microsoft.Extensions.Caching.Memory; using Remotely.Shared.Utilities; using System; +using System.Threading.Tasks; namespace Remotely.Server.Services.RcImplementations { @@ -20,25 +21,25 @@ public ViewerAuthorizer(IApplicationConfig appConfig, IOtpProvider otpProvider) public string UnauthorizedRedirectUrl { get; } = "/Identity/Account/Login"; - public bool IsAuthorized(AuthorizationFilterContext context) + public Task IsAuthorized(AuthorizationFilterContext context) { if (!_appConfig.RemoteControlRequiresAuthentication) { - return true; + return Task.FromResult(true); } - if (context.HttpContext.User.Identity.IsAuthenticated) + if (context.HttpContext.User.Identity?.IsAuthenticated == true) { - return true; + return Task.FromResult(true); } if (context.HttpContext.Request.Query.TryGetValue("otp", out var otp) && _otpProvider.Exists($"{otp}")) { - return true; + return Task.FromResult(true); } - return false; + return Task.FromResult(false); } } } From 39f72cadf3eaf0da1a9e45c5c630f333ab0e62b2 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Wed, 10 May 2023 16:32:33 -0700 Subject: [PATCH 09/47] Replace redundant instances of ScreenCaptureDto in every frame chunk. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index bca6e506b..76c3d3e90 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit bca6e506be0fbdf5c5c39909b4a06f1ff5e5b387 +Subproject commit 76c3d3e9000239806731a83a48105100038fd47c From 382397304f3b8aa7b1efe6dc58c753bd87baad96 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Wed, 10 May 2023 16:32:42 -0700 Subject: [PATCH 10/47] Update submodule. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index 76c3d3e90..bcb44b281 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit 76c3d3e9000239806731a83a48105100038fd47c +Subproject commit bcb44b281bda090d76267db3e5aeca794995ac02 From 2bed62764d909c08f3b8c9c1551732c9188be013 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Thu, 11 May 2023 09:34:42 -0700 Subject: [PATCH 11/47] Put received chunks into temporary processor. Guard while processing. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index bcb44b281..e26216649 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit bcb44b281bda090d76267db3e5aeca794995ac02 +Subproject commit e26216649d4792148c0eeff65d60fe7059dbe017 From 8164bb260ae4cdbe4f7a7128cc1ddc4b0ea263d8 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Thu, 11 May 2023 09:34:59 -0700 Subject: [PATCH 12/47] Update submodule. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index e26216649..3619ee6f5 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit e26216649d4792148c0eeff65d60fe7059dbe017 +Subproject commit 3619ee6f5388c532806bf1d8076058a1993389ad From 5ca316c7bf3f8f964006bdae189b3226fdc9db3f Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Thu, 11 May 2023 11:19:53 -0700 Subject: [PATCH 13/47] Update submodule. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index 3619ee6f5..d788a4a76 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit 3619ee6f5388c532806bf1d8076058a1993389ad +Subproject commit d788a4a76b9fe3a59fa937ae86b07412a5d8f666 From 50dd11d7b3619a5cd11e813753ac3694d190803d Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Thu, 11 May 2023 15:13:56 -0700 Subject: [PATCH 14/47] Update submodule. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index d788a4a76..d75325764 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit d788a4a76b9fe3a59fa937ae86b07412a5d8f666 +Subproject commit d7532576486353f6b87dca6448b0e723a90adfa5 From 9324e6a1b5174aa3dcd99674d49b574606eddaa0 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Fri, 12 May 2023 07:05:26 -0700 Subject: [PATCH 15/47] Quiet some of the logs. --- Server/appsettings.json | 1 + 1 file changed, 1 insertion(+) diff --git a/Server/appsettings.json b/Server/appsettings.json index e2195ee24..0e09dcc71 100644 --- a/Server/appsettings.json +++ b/Server/appsettings.json @@ -6,6 +6,7 @@ }, "Logging": { "LogLevel": { + "Microsoft.AspNetCore": "Warning", "Microsoft.AspNetCore.HttpLogging.HttpLoggingMiddleware": "Information", "Default": "Information" } From 88211ddb75d491641ef4438c9d91d8220f0cb450 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Fri, 12 May 2023 10:34:31 -0700 Subject: [PATCH 16/47] Remove more redundant code. Remove frame received messages (no longer needed with streaming). --- Shared/Enums/BaseDtoType.cs | 57 ------------------- .../RemoteControlDtos/AudioSampleDto.cs | 22 ------- Shared/Models/RemoteControlDtos/BaseDto.cs | 12 ---- .../RemoteControlDtos/CaptureFrameDto.cs | 32 ----------- .../RemoteControlDtos/ClipboardTextDto.cs | 21 ------- .../RemoteControlDtos/ClipboardTransferDto.cs | 20 ------- .../RemoteControlDtos/CursorChangeDto.cs | 32 ----------- Shared/Models/RemoteControlDtos/FileDto.cs | 28 --------- Shared/Models/RemoteControlDtos/KeyDownDto.cs | 15 ----- .../Models/RemoteControlDtos/KeyPressDto.cs | 15 ----- Shared/Models/RemoteControlDtos/KeyUpDto.cs | 15 ----- .../Models/RemoteControlDtos/MouseDownDto.cs | 21 ------- .../Models/RemoteControlDtos/MouseMoveDto.cs | 19 ------- Shared/Models/RemoteControlDtos/MouseUpDto.cs | 21 ------- .../Models/RemoteControlDtos/MouseWheelDto.cs | 19 ------- .../Models/RemoteControlDtos/ScreenDataDto.cs | 29 ---------- .../Models/RemoteControlDtos/ScreenSizeDto.cs | 24 -------- .../RemoteControlDtos/SelectScreenDto.cs | 15 ----- Shared/Models/RemoteControlDtos/TapDto.cs | 19 ------- .../RemoteControlDtos/ToggleAudioDto.cs | 15 ----- .../RemoteControlDtos/ToggleBlockInputDto.cs | 15 ----- .../RemoteControlDtos/WindowsSessionsDto.cs | 24 -------- submodules/Immense.RemoteControl | 2 +- 23 files changed, 1 insertion(+), 491 deletions(-) delete mode 100644 Shared/Enums/BaseDtoType.cs delete mode 100644 Shared/Models/RemoteControlDtos/AudioSampleDto.cs delete mode 100644 Shared/Models/RemoteControlDtos/BaseDto.cs delete mode 100644 Shared/Models/RemoteControlDtos/CaptureFrameDto.cs delete mode 100644 Shared/Models/RemoteControlDtos/ClipboardTextDto.cs delete mode 100644 Shared/Models/RemoteControlDtos/ClipboardTransferDto.cs delete mode 100644 Shared/Models/RemoteControlDtos/CursorChangeDto.cs delete mode 100644 Shared/Models/RemoteControlDtos/FileDto.cs delete mode 100644 Shared/Models/RemoteControlDtos/KeyDownDto.cs delete mode 100644 Shared/Models/RemoteControlDtos/KeyPressDto.cs delete mode 100644 Shared/Models/RemoteControlDtos/KeyUpDto.cs delete mode 100644 Shared/Models/RemoteControlDtos/MouseDownDto.cs delete mode 100644 Shared/Models/RemoteControlDtos/MouseMoveDto.cs delete mode 100644 Shared/Models/RemoteControlDtos/MouseUpDto.cs delete mode 100644 Shared/Models/RemoteControlDtos/MouseWheelDto.cs delete mode 100644 Shared/Models/RemoteControlDtos/ScreenDataDto.cs delete mode 100644 Shared/Models/RemoteControlDtos/ScreenSizeDto.cs delete mode 100644 Shared/Models/RemoteControlDtos/SelectScreenDto.cs delete mode 100644 Shared/Models/RemoteControlDtos/TapDto.cs delete mode 100644 Shared/Models/RemoteControlDtos/ToggleAudioDto.cs delete mode 100644 Shared/Models/RemoteControlDtos/ToggleBlockInputDto.cs delete mode 100644 Shared/Models/RemoteControlDtos/WindowsSessionsDto.cs diff --git a/Shared/Enums/BaseDtoType.cs b/Shared/Enums/BaseDtoType.cs deleted file mode 100644 index 8c0117968..000000000 --- a/Shared/Enums/BaseDtoType.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System.Runtime.Serialization; - -namespace Remotely.Shared.Enums -{ - [DataContract] - public enum BaseDtoType - { - [EnumMember(Value = "CaptureFrame")] - CaptureFrame = 0, - [EnumMember(Value = "ScreenData")] - ScreenData = 1, - [EnumMember(Value = "ScreenSize")] - ScreenSize = 2, - [EnumMember(Value = "ClipboardText")] - ClipboardText = 4, - [EnumMember(Value = "AudioSample")] - AudioSample = 5, - [EnumMember(Value = "CursorChange")] - CursorChange = 6, - [EnumMember(Value = "SelectScreen")] - SelectScreen = 7, - [EnumMember(Value = "MouseMove")] - MouseMove = 8, - [EnumMember(Value = "MouseDown")] - MouseDown = 9, - [EnumMember(Value = "MouseUp")] - MouseUp = 10, - [EnumMember(Value = "Tap")] - Tap = 11, - [EnumMember(Value = "MouseWheel")] - MouseWheel = 12, - [EnumMember(Value = "KeyDown")] - KeyDown = 13, - [EnumMember(Value = "KeyUp")] - KeyUp = 14, - [EnumMember(Value = "CtrlAltDel")] - CtrlAltDel = 15, - [EnumMember(Value = "ToggleAudio")] - ToggleAudio = 17, - [EnumMember(Value = "ToggleBlockInput")] - ToggleBlockInput = 18, - [EnumMember(Value = "ClipboardTransfer")] - ClipboardTransfer = 19, - [EnumMember(Value = "KeyPress")] - KeyPress = 20, - [EnumMember(Value = "File")] - File = 22, - [EnumMember(Value = "WindowsSessions")] - WindowsSessions = 23, - [EnumMember(Value = "SetKeyStatesUp")] - SetKeyStatesUp = 24, - [EnumMember(Value = "FrameReceived")] - FrameReceived = 25, - [EnumMember(Value = "OpenFileTransferWindow")] - OpenFileTransferWindow = 27 - } -} diff --git a/Shared/Models/RemoteControlDtos/AudioSampleDto.cs b/Shared/Models/RemoteControlDtos/AudioSampleDto.cs deleted file mode 100644 index 57301378b..000000000 --- a/Shared/Models/RemoteControlDtos/AudioSampleDto.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Remotely.Shared.Enums; -using System.Runtime.Serialization; - -namespace Remotely.Shared.Models.RemoteControlDtos -{ - [DataContract] - public class AudioSampleDto : BaseDto - { - public AudioSampleDto(byte[] buffer) - { - Buffer = buffer; - } - - [DataMember(Name = "Buffer")] - public byte[] Buffer { get; } - - - [DataMember(Name = "DtoType")] - public override BaseDtoType DtoType { get; init; } = BaseDtoType.AudioSample; - - } -} diff --git a/Shared/Models/RemoteControlDtos/BaseDto.cs b/Shared/Models/RemoteControlDtos/BaseDto.cs deleted file mode 100644 index c8f25133c..000000000 --- a/Shared/Models/RemoteControlDtos/BaseDto.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Remotely.Shared.Enums; -using System.Runtime.Serialization; - -namespace Remotely.Shared.Models.RemoteControlDtos -{ - [DataContract] - public class BaseDto - { - [DataMember(Name = "DtoType")] - public virtual BaseDtoType DtoType { get; init; } - } -} diff --git a/Shared/Models/RemoteControlDtos/CaptureFrameDto.cs b/Shared/Models/RemoteControlDtos/CaptureFrameDto.cs deleted file mode 100644 index 003160d05..000000000 --- a/Shared/Models/RemoteControlDtos/CaptureFrameDto.cs +++ /dev/null @@ -1,32 +0,0 @@ -using Remotely.Shared.Enums; -using System; -using System.Runtime.Serialization; - -namespace Remotely.Shared.Models.RemoteControlDtos -{ - [DataContract] - public class CaptureFrameDto : BaseDto - { - [DataMember(Name = "DtoType")] - public override BaseDtoType DtoType { get; init; } = BaseDtoType.CaptureFrame; - - [DataMember(Name = "EndOfFrame")] - public bool EndOfFrame { get; init; } - - [DataMember(Name = "Height")] - public int Height { get; init; } - - [DataMember(Name = "ImageBytes")] - public byte[] ImageBytes { get; init; } - - [DataMember(Name = "Left")] - public int Left { get; init; } - [DataMember(Name = "Top")] - public int Top { get; init; } - [DataMember(Name = "Width")] - public int Width { get; init; } - - [DataMember(Name = "Sequence")] - public long Sequence { get; init; } - } -} diff --git a/Shared/Models/RemoteControlDtos/ClipboardTextDto.cs b/Shared/Models/RemoteControlDtos/ClipboardTextDto.cs deleted file mode 100644 index 6fa4743d5..000000000 --- a/Shared/Models/RemoteControlDtos/ClipboardTextDto.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Remotely.Shared.Enums; -using System.Runtime.Serialization; - -namespace Remotely.Shared.Models.RemoteControlDtos -{ - [DataContract] - public class ClipboardTextDto : BaseDto - { - public ClipboardTextDto(string clipboardText) - { - ClipboardText = clipboardText; - } - - [DataMember(Name = "ClipboardText")] - public string ClipboardText { get; } - - - [DataMember(Name = "DtoType")] - public override BaseDtoType DtoType { get; init; } = BaseDtoType.ClipboardText; - } -} diff --git a/Shared/Models/RemoteControlDtos/ClipboardTransferDto.cs b/Shared/Models/RemoteControlDtos/ClipboardTransferDto.cs deleted file mode 100644 index 05981b8f5..000000000 --- a/Shared/Models/RemoteControlDtos/ClipboardTransferDto.cs +++ /dev/null @@ -1,20 +0,0 @@ -using Remotely.Shared.Enums; -using System.Runtime.Serialization; - -namespace Remotely.Shared.Models.RemoteControlDtos -{ - [DataContract] - public class ClipboardTransferDto : BaseDto - { - - [DataMember(Name = "Text")] - public string Text { get; set; } - - [DataMember(Name = "TypeText")] - public bool TypeText { get; set; } - - - [DataMember(Name = "DtoType")] - public override BaseDtoType DtoType { get; init; } = BaseDtoType.ClipboardTransfer; - } -} diff --git a/Shared/Models/RemoteControlDtos/CursorChangeDto.cs b/Shared/Models/RemoteControlDtos/CursorChangeDto.cs deleted file mode 100644 index df66c95fa..000000000 --- a/Shared/Models/RemoteControlDtos/CursorChangeDto.cs +++ /dev/null @@ -1,32 +0,0 @@ -using Remotely.Shared.Enums; -using System.Runtime.Serialization; - -namespace Remotely.Shared.Models.RemoteControlDtos -{ - [DataContract] - public class CursorChangeDto : BaseDto - { - public CursorChangeDto(byte[] imageBytes, int hotSpotX, int hotSpotY, string cssOverride) - { - ImageBytes = imageBytes; - HotSpotX = hotSpotX; - HotSpotY = hotSpotY; - CssOverride = cssOverride; - } - - [DataMember(Name = "CssOverride")] - public string CssOverride { get; } - - [DataMember(Name = "DtoType")] - public override BaseDtoType DtoType { get; init; } = BaseDtoType.CursorChange; - - [DataMember(Name = "HotSpotX")] - public int HotSpotX { get; } - - [DataMember(Name = "HotSpotY")] - public int HotSpotY { get; } - - [DataMember(Name = "ImageBytes")] - public byte[] ImageBytes { get; } - } -} diff --git a/Shared/Models/RemoteControlDtos/FileDto.cs b/Shared/Models/RemoteControlDtos/FileDto.cs deleted file mode 100644 index e3ba4c284..000000000 --- a/Shared/Models/RemoteControlDtos/FileDto.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Remotely.Shared.Enums; -using System.Runtime.Serialization; - -namespace Remotely.Shared.Models.RemoteControlDtos -{ - - [DataContract] - public class FileDto : BaseDto - { - [DataMember(Name = "Buffer")] - public byte[] Buffer { get; set; } - - [DataMember(Name = "FileName")] - public string FileName { get; set; } - - [DataMember(Name = "MessageId")] - public string MessageId { get; set; } - - [DataMember(Name = "EndOfFile")] - public bool EndOfFile { get; set; } - - [DataMember(Name = "StartOfFile")] - public bool StartOfFile { get; set; } - - [DataMember(Name = "DtoType")] - public override BaseDtoType DtoType { get; init; } = BaseDtoType.File; - } -} diff --git a/Shared/Models/RemoteControlDtos/KeyDownDto.cs b/Shared/Models/RemoteControlDtos/KeyDownDto.cs deleted file mode 100644 index 660ff705d..000000000 --- a/Shared/Models/RemoteControlDtos/KeyDownDto.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Remotely.Shared.Enums; -using System.Runtime.Serialization; - -namespace Remotely.Shared.Models.RemoteControlDtos -{ - [DataContract] - public class KeyDownDto : BaseDto - { - [DataMember(Name = "Key")] - public string Key { get; set; } - - [DataMember(Name = "DtoType")] - public override BaseDtoType DtoType { get; init; } = BaseDtoType.KeyDown; - } -} diff --git a/Shared/Models/RemoteControlDtos/KeyPressDto.cs b/Shared/Models/RemoteControlDtos/KeyPressDto.cs deleted file mode 100644 index e44cb1b1b..000000000 --- a/Shared/Models/RemoteControlDtos/KeyPressDto.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Remotely.Shared.Enums; -using System.Runtime.Serialization; - -namespace Remotely.Shared.Models.RemoteControlDtos -{ - [DataContract] - public class KeyPressDto : BaseDto - { - [DataMember(Name = "Key")] - public string Key { get; set; } - - [DataMember(Name = "DtoType")] - public override BaseDtoType DtoType { get; init; } = BaseDtoType.KeyPress; - } -} diff --git a/Shared/Models/RemoteControlDtos/KeyUpDto.cs b/Shared/Models/RemoteControlDtos/KeyUpDto.cs deleted file mode 100644 index c2dd48c2a..000000000 --- a/Shared/Models/RemoteControlDtos/KeyUpDto.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Remotely.Shared.Enums; -using System.Runtime.Serialization; - -namespace Remotely.Shared.Models.RemoteControlDtos -{ - [DataContract] - public class KeyUpDto : BaseDto - { - [DataMember(Name = "Key")] - public string Key { get; set; } - - [DataMember(Name = "DtoType")] - public override BaseDtoType DtoType { get; init; } = BaseDtoType.KeyUp; - } -} diff --git a/Shared/Models/RemoteControlDtos/MouseDownDto.cs b/Shared/Models/RemoteControlDtos/MouseDownDto.cs deleted file mode 100644 index 913416980..000000000 --- a/Shared/Models/RemoteControlDtos/MouseDownDto.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Remotely.Shared.Enums; -using System.Runtime.Serialization; - -namespace Remotely.Shared.Models.RemoteControlDtos -{ - [DataContract] - public class MouseDownDto : BaseDto - { - [DataMember(Name = "Button")] - public int Button { get; set; } - - [DataMember(Name = "DtoType")] - public override BaseDtoType DtoType { get; init; } = BaseDtoType.MouseDown; - - [DataMember(Name = "PercentX")] - public double PercentX { get; set; } - - [DataMember(Name = "PercentY")] - public double PercentY { get; set; } - } -} diff --git a/Shared/Models/RemoteControlDtos/MouseMoveDto.cs b/Shared/Models/RemoteControlDtos/MouseMoveDto.cs deleted file mode 100644 index 8c983c31a..000000000 --- a/Shared/Models/RemoteControlDtos/MouseMoveDto.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Remotely.Shared.Enums; -using System.Runtime.Serialization; - -namespace Remotely.Shared.Models.RemoteControlDtos -{ - [DataContract] - public class MouseMoveDto : BaseDto - { - - [DataMember(Name = "DtoType")] - public override BaseDtoType DtoType { get; init; } = BaseDtoType.MouseMove; - - [DataMember(Name = "PercentX")] - public double PercentX { get; set; } - - [DataMember(Name = "PercentY")] - public double PercentY { get; set; } - } -} diff --git a/Shared/Models/RemoteControlDtos/MouseUpDto.cs b/Shared/Models/RemoteControlDtos/MouseUpDto.cs deleted file mode 100644 index 559567574..000000000 --- a/Shared/Models/RemoteControlDtos/MouseUpDto.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Remotely.Shared.Enums; -using System.Runtime.Serialization; - -namespace Remotely.Shared.Models.RemoteControlDtos -{ - [DataContract] - public class MouseUpDto : BaseDto - { - [DataMember(Name = "Button")] - public int Button { get; set; } - - [DataMember(Name = "DtoType")] - public override BaseDtoType DtoType { get; init; } = BaseDtoType.MouseUp; - - [DataMember(Name = "PercentX")] - public double PercentX { get; set; } - - [DataMember(Name = "PercentY")] - public double PercentY { get; set; } - } -} diff --git a/Shared/Models/RemoteControlDtos/MouseWheelDto.cs b/Shared/Models/RemoteControlDtos/MouseWheelDto.cs deleted file mode 100644 index e32fa71d3..000000000 --- a/Shared/Models/RemoteControlDtos/MouseWheelDto.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Remotely.Shared.Enums; -using System.Runtime.Serialization; - -namespace Remotely.Shared.Models.RemoteControlDtos -{ - [DataContract] - public class MouseWheelDto : BaseDto - { - - [DataMember(Name = "DtoType")] - public override BaseDtoType DtoType { get; init; } = BaseDtoType.MouseWheel; - - [DataMember(Name = "DeltaX")] - public double DeltaX { get; set; } - - [DataMember(Name = "DeltaY")] - public double DeltaY { get; set; } - } -} diff --git a/Shared/Models/RemoteControlDtos/ScreenDataDto.cs b/Shared/Models/RemoteControlDtos/ScreenDataDto.cs deleted file mode 100644 index 070ddd0da..000000000 --- a/Shared/Models/RemoteControlDtos/ScreenDataDto.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Remotely.Shared.Enums; -using System.Collections.Generic; -using System.Runtime.Serialization; - -namespace Remotely.Shared.Models.RemoteControlDtos -{ - [DataContract] - public class ScreenDataDto : BaseDto - { - [DataMember(Name = "DisplayNames")] - public IEnumerable DisplayNames { get; init; } - - - [DataMember(Name = "DtoType")] - public override BaseDtoType DtoType { get; init; } = BaseDtoType.ScreenData; - - [DataMember(Name = "SelectedDisplay")] - public string SelectedDisplay { get; init; } - - [DataMember(Name = "MachineName")] - public string MachineName { get; init; } - - [DataMember(Name = "ScreenWidth")] - public int ScreenWidth { get; init; } - - [DataMember(Name = "ScreenHeight")] - public int ScreenHeight { get; init; } - } -} diff --git a/Shared/Models/RemoteControlDtos/ScreenSizeDto.cs b/Shared/Models/RemoteControlDtos/ScreenSizeDto.cs deleted file mode 100644 index 951694f40..000000000 --- a/Shared/Models/RemoteControlDtos/ScreenSizeDto.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Remotely.Shared.Enums; -using System.Runtime.Serialization; - -namespace Remotely.Shared.Models.RemoteControlDtos -{ - [DataContract] - public class ScreenSizeDto : BaseDto - { - public ScreenSizeDto(int width, int height) - { - Width = width; - Height = height; - } - - [DataMember(Name = "Width")] - public int Width { get; } - - [DataMember(Name = "Height")] - public int Height { get; } - - [DataMember(Name = "DtoType")] - public override BaseDtoType DtoType { get; init; } = BaseDtoType.ScreenSize; - } -} diff --git a/Shared/Models/RemoteControlDtos/SelectScreenDto.cs b/Shared/Models/RemoteControlDtos/SelectScreenDto.cs deleted file mode 100644 index 1860da323..000000000 --- a/Shared/Models/RemoteControlDtos/SelectScreenDto.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Remotely.Shared.Enums; -using System.Runtime.Serialization; - -namespace Remotely.Shared.Models.RemoteControlDtos -{ - [DataContract] - public class SelectScreenDto : BaseDto - { - [DataMember(Name = "DisplayName")] - public string DisplayName { get; set; } - - [DataMember(Name = "DtoType")] - public override BaseDtoType DtoType { get; init; } = BaseDtoType.SelectScreen; - } -} diff --git a/Shared/Models/RemoteControlDtos/TapDto.cs b/Shared/Models/RemoteControlDtos/TapDto.cs deleted file mode 100644 index 9bb469412..000000000 --- a/Shared/Models/RemoteControlDtos/TapDto.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Remotely.Shared.Enums; -using System.Runtime.Serialization; - -namespace Remotely.Shared.Models.RemoteControlDtos -{ - [DataContract] - public class TapDto : BaseDto - { - - [DataMember(Name = "DtoType")] - public override BaseDtoType DtoType { get; init; } = BaseDtoType.Tap; - - [DataMember(Name = "PercentX")] - public double PercentX { get; set; } - - [DataMember(Name = "PercentY")] - public double PercentY { get; set; } - } -} diff --git a/Shared/Models/RemoteControlDtos/ToggleAudioDto.cs b/Shared/Models/RemoteControlDtos/ToggleAudioDto.cs deleted file mode 100644 index 38759ad7e..000000000 --- a/Shared/Models/RemoteControlDtos/ToggleAudioDto.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Remotely.Shared.Enums; -using System.Runtime.Serialization; - -namespace Remotely.Shared.Models.RemoteControlDtos -{ - [DataContract] - public class ToggleAudioDto : BaseDto - { - [DataMember(Name = "ToggleOn")] - public bool ToggleOn { get; set; } - - [DataMember(Name = "DtoType")] - public override BaseDtoType DtoType { get; init; } = BaseDtoType.ToggleAudio; - } -} diff --git a/Shared/Models/RemoteControlDtos/ToggleBlockInputDto.cs b/Shared/Models/RemoteControlDtos/ToggleBlockInputDto.cs deleted file mode 100644 index 6fb7550ae..000000000 --- a/Shared/Models/RemoteControlDtos/ToggleBlockInputDto.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Remotely.Shared.Enums; -using System.Runtime.Serialization; - -namespace Remotely.Shared.Models.RemoteControlDtos -{ - [DataContract] - public class ToggleBlockInputDto : BaseDto - { - [DataMember(Name = "ToggleOn")] - public bool ToggleOn { get; set; } - - [DataMember(Name = "DtoType")] - public override BaseDtoType DtoType { get; init; } = BaseDtoType.ToggleBlockInput; - } -} diff --git a/Shared/Models/RemoteControlDtos/WindowsSessionsDto.cs b/Shared/Models/RemoteControlDtos/WindowsSessionsDto.cs deleted file mode 100644 index 7ca772243..000000000 --- a/Shared/Models/RemoteControlDtos/WindowsSessionsDto.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Immense.RemoteControl.Desktop.Native.DataStructures; -using Remotely.Shared.Enums; -using System.Collections.Generic; -using System.Runtime.Serialization; - -namespace Remotely.Shared.Models.RemoteControlDtos -{ - [DataContract] - public class WindowsSessionsDto : BaseDto - { - public WindowsSessionsDto(List windowsSessions) - { - WindowsSessions = windowsSessions; - } - - - [DataMember(Name = "WindowsSessions")] - public List WindowsSessions { get; set; } - - - [DataMember(Name = "DtoType")] - public override BaseDtoType DtoType { get; init; } = BaseDtoType.WindowsSessions; - } -} diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index d75325764..58495c96e 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit d7532576486353f6b87dca6448b0e723a90adfa5 +Subproject commit 58495c96edede252d1ae8678300c3c6dc9625c2b From de5f07e108240de4419b6dfde72fa83672a9a926 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Fri, 12 May 2023 10:34:59 -0700 Subject: [PATCH 17/47] Remove libraries supplied by libman. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index 58495c96e..38ebd5dba 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit 58495c96edede252d1ae8678300c3c6dc9625c2b +Subproject commit 38ebd5dba638eefabc3b26017c4f44080b987da0 From ee3c722814dfc167440748b625185552ce27426c Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Fri, 12 May 2023 10:36:54 -0700 Subject: [PATCH 18/47] Update submodule. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index 38ebd5dba..bec2d676e 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit 38ebd5dba638eefabc3b26017c4f44080b987da0 +Subproject commit bec2d676e7761e82fa83c5fbc83e85d3f9753490 From c96319d88badef46dc57fb8b2a40b03c548b7d96 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Fri, 12 May 2023 10:39:05 -0700 Subject: [PATCH 19/47] Comment out debug logging from EF Core. --- Server/Data/AppDb.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/Data/AppDb.cs b/Server/Data/AppDb.cs index 8ff00287b..210c5a6bd 100644 --- a/Server/Data/AppDb.cs +++ b/Server/Data/AppDb.cs @@ -42,7 +42,7 @@ public class AppDb : IdentityDbContext protected override void OnConfiguring(DbContextOptionsBuilder options) { options.ConfigureWarnings(x => x.Ignore(RelationalEventId.MultipleCollectionIncludeWarning)); - options.LogTo((message) => System.Diagnostics.Debug.Write(message)); + //options.LogTo((message) => System.Diagnostics.Debug.Write(message)); } protected override void OnModelCreating(ModelBuilder builder) From 5631bbaa70b4bda3708e88f00d32ddf1bdc1b5fb Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Fri, 12 May 2023 11:23:43 -0700 Subject: [PATCH 20/47] Update submodule. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index bec2d676e..a919120db 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit bec2d676e7761e82fa83c5fbc83e85d3f9753490 +Subproject commit a919120dbab811a4cef89d8f035f3d456337f939 From 6f5c015fb2bc8cbfff824ea2353411bf54c7b53a Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Fri, 12 May 2023 12:28:05 -0700 Subject: [PATCH 21/47] Update submodule. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index a919120db..ca325a4a6 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit a919120dbab811a4cef89d8f035f3d456337f939 +Subproject commit ca325a4a68422602da7e50580cdd801930bb2d7a From 30921f9b8726c9a16ae5f5dd48927cdd1097a649 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Sat, 13 May 2023 07:01:43 -0700 Subject: [PATCH 22/47] Update submodule. --- Remotely.sln | 20 +++++++++++++++++++- submodules/Immense.RemoteControl | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Remotely.sln b/Remotely.sln index b1d00fd80..db2acddfe 100644 --- a/Remotely.sln +++ b/Remotely.sln @@ -73,7 +73,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Share EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Desktop", "submodules\Immense.RemoteControl\Immense.RemoteControl.Desktop\Immense.RemoteControl.Desktop.csproj", "{034984DC-4B47-42E9-8648-F258C40C7926}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Immense.RemoteControl.Desktop.Native", "submodules\Immense.RemoteControl\Immense.RemoteControl.Desktop.Native\Immense.RemoteControl.Desktop.Native.csproj", "{7A8378BC-8169-4A33-93C6-47C699C5E74D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Desktop.Native", "submodules\Immense.RemoteControl\Immense.RemoteControl.Desktop.Native\Immense.RemoteControl.Desktop.Native.csproj", "{7A8378BC-8169-4A33-93C6-47C699C5E74D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{E4D83C37-8B98-44FB-898B-9AA1BB223C66}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Shared.Tests", "submodules\Immense.RemoteControl\Tests\Immense.RemoteControl.Shared.Tests\Immense.RemoteControl.Shared.Tests.csproj", "{DEF3026F-E669-42F0-8883-56F4F8D0E790}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -289,6 +293,18 @@ Global {7A8378BC-8169-4A33-93C6-47C699C5E74D}.Release|x64.Build.0 = Release|Any CPU {7A8378BC-8169-4A33-93C6-47C699C5E74D}.Release|x86.ActiveCfg = Release|Any CPU {7A8378BC-8169-4A33-93C6-47C699C5E74D}.Release|x86.Build.0 = Release|Any CPU + {DEF3026F-E669-42F0-8883-56F4F8D0E790}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DEF3026F-E669-42F0-8883-56F4F8D0E790}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DEF3026F-E669-42F0-8883-56F4F8D0E790}.Debug|x64.ActiveCfg = Debug|Any CPU + {DEF3026F-E669-42F0-8883-56F4F8D0E790}.Debug|x64.Build.0 = Debug|Any CPU + {DEF3026F-E669-42F0-8883-56F4F8D0E790}.Debug|x86.ActiveCfg = Debug|Any CPU + {DEF3026F-E669-42F0-8883-56F4F8D0E790}.Debug|x86.Build.0 = Debug|Any CPU + {DEF3026F-E669-42F0-8883-56F4F8D0E790}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DEF3026F-E669-42F0-8883-56F4F8D0E790}.Release|Any CPU.Build.0 = Release|Any CPU + {DEF3026F-E669-42F0-8883-56F4F8D0E790}.Release|x64.ActiveCfg = Release|Any CPU + {DEF3026F-E669-42F0-8883-56F4F8D0E790}.Release|x64.Build.0 = Release|Any CPU + {DEF3026F-E669-42F0-8883-56F4F8D0E790}.Release|x86.ActiveCfg = Release|Any CPU + {DEF3026F-E669-42F0-8883-56F4F8D0E790}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -305,6 +321,8 @@ Global {FEF0D431-EB2F-4C08-A125-8DF59AFDA525} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8} {034984DC-4B47-42E9-8648-F258C40C7926} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8} {7A8378BC-8169-4A33-93C6-47C699C5E74D} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8} + {E4D83C37-8B98-44FB-898B-9AA1BB223C66} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8} + {DEF3026F-E669-42F0-8883-56F4F8D0E790} = {E4D83C37-8B98-44FB-898B-9AA1BB223C66} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EAE10B28-119B-437C-9E68-06F0EE3F968A} diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index ca325a4a6..26dd249da 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit ca325a4a68422602da7e50580cdd801930bb2d7a +Subproject commit 26dd249da6ad21b4b1709379ac12e31b3c924b21 From a0b81764adb4e585c87d407d21186ee6e7adb624 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Sat, 13 May 2023 09:27:20 -0700 Subject: [PATCH 23/47] Revert circular buffer. Use acks. --- Remotely.sln | 15 --------------- Shared/Models/SentFrame.cs | 21 --------------------- 2 files changed, 36 deletions(-) delete mode 100644 Shared/Models/SentFrame.cs diff --git a/Remotely.sln b/Remotely.sln index db2acddfe..d6f72cb50 100644 --- a/Remotely.sln +++ b/Remotely.sln @@ -77,8 +77,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Deskt EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{E4D83C37-8B98-44FB-898B-9AA1BB223C66}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Shared.Tests", "submodules\Immense.RemoteControl\Tests\Immense.RemoteControl.Shared.Tests\Immense.RemoteControl.Shared.Tests.csproj", "{DEF3026F-E669-42F0-8883-56F4F8D0E790}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -293,18 +291,6 @@ Global {7A8378BC-8169-4A33-93C6-47C699C5E74D}.Release|x64.Build.0 = Release|Any CPU {7A8378BC-8169-4A33-93C6-47C699C5E74D}.Release|x86.ActiveCfg = Release|Any CPU {7A8378BC-8169-4A33-93C6-47C699C5E74D}.Release|x86.Build.0 = Release|Any CPU - {DEF3026F-E669-42F0-8883-56F4F8D0E790}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DEF3026F-E669-42F0-8883-56F4F8D0E790}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DEF3026F-E669-42F0-8883-56F4F8D0E790}.Debug|x64.ActiveCfg = Debug|Any CPU - {DEF3026F-E669-42F0-8883-56F4F8D0E790}.Debug|x64.Build.0 = Debug|Any CPU - {DEF3026F-E669-42F0-8883-56F4F8D0E790}.Debug|x86.ActiveCfg = Debug|Any CPU - {DEF3026F-E669-42F0-8883-56F4F8D0E790}.Debug|x86.Build.0 = Debug|Any CPU - {DEF3026F-E669-42F0-8883-56F4F8D0E790}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DEF3026F-E669-42F0-8883-56F4F8D0E790}.Release|Any CPU.Build.0 = Release|Any CPU - {DEF3026F-E669-42F0-8883-56F4F8D0E790}.Release|x64.ActiveCfg = Release|Any CPU - {DEF3026F-E669-42F0-8883-56F4F8D0E790}.Release|x64.Build.0 = Release|Any CPU - {DEF3026F-E669-42F0-8883-56F4F8D0E790}.Release|x86.ActiveCfg = Release|Any CPU - {DEF3026F-E669-42F0-8883-56F4F8D0E790}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -322,7 +308,6 @@ Global {034984DC-4B47-42E9-8648-F258C40C7926} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8} {7A8378BC-8169-4A33-93C6-47C699C5E74D} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8} {E4D83C37-8B98-44FB-898B-9AA1BB223C66} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8} - {DEF3026F-E669-42F0-8883-56F4F8D0E790} = {E4D83C37-8B98-44FB-898B-9AA1BB223C66} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EAE10B28-119B-437C-9E68-06F0EE3F968A} diff --git a/Shared/Models/SentFrame.cs b/Shared/Models/SentFrame.cs deleted file mode 100644 index a969b6368..000000000 --- a/Shared/Models/SentFrame.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Remotely.Shared.Utilities; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Remotely.Shared.Models -{ - public struct SentFrame - { - public SentFrame(int frameSize) - { - Timestamp = Time.Now; - FrameSize = frameSize; - } - - public DateTimeOffset Timestamp { get; } - public int FrameSize { get; } - } -} From 97d742ab1f178160aa7823c75dfb35ef1e22814c Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Sat, 13 May 2023 09:27:26 -0700 Subject: [PATCH 24/47] Update submodule. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index 26dd249da..9643d6a52 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit 26dd249da6ad21b4b1709379ac12e31b3c924b21 +Subproject commit 9643d6a525e290bb945181e18619b87b33569fb3 From f7d8326df299562805f24fa23197b0c87c260166 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Sat, 13 May 2023 10:47:55 -0700 Subject: [PATCH 25/47] Update submodule. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index 9643d6a52..572f039ba 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit 9643d6a525e290bb945181e18619b87b33569fb3 +Subproject commit 572f039baf48dcfe7b8c890be9d79b106a743947 From 1bdc2b432e96540677891865610394fb2ea2009f Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Sat, 13 May 2023 11:59:03 -0700 Subject: [PATCH 26/47] DXGI timeout to 25. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index 572f039ba..5141f7c79 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit 572f039baf48dcfe7b8c890be9d79b106a743947 +Subproject commit 5141f7c7926fb462b84c5761092415771f3aaa30 From e342cd642c26235477ebb618be41b32ad7379e5a Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Sat, 13 May 2023 20:14:53 -0700 Subject: [PATCH 27/47] Prevent publisher from overwhelming consumer bewteen receipts. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index 5141f7c79..05058ba6d 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit 5141f7c7926fb462b84c5761092415771f3aaa30 +Subproject commit 05058ba6deee498204b04fdb5adebce4836f9d97 From 44a7db9e27f70ae958b2010316337a8f6cffb7dc Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Sun, 14 May 2023 08:23:57 -0700 Subject: [PATCH 28/47] Refactor capture processor. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index 05058ba6d..55955a078 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit 05058ba6deee498204b04fdb5adebce4836f9d97 +Subproject commit 55955a0784ed6bfe05c9f2e02f6392fc5c18d288 From e18f53990c260b07e0b0c85a0bcb9b836a90ec33 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Mon, 15 May 2023 09:37:45 -0700 Subject: [PATCH 29/47] Removed CircularBufferTests (no longer used). Removed StreamingState.IsProcessing (no longer used). --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index 55955a078..e1090a164 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit 55955a0784ed6bfe05c9f2e02f6392fc5c18d288 +Subproject commit e1090a1647b6fc90a76112371aacb5c9606e7853 From f732939d9a4597930085eea7261db41d0ef934da Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Mon, 15 May 2023 09:56:50 -0700 Subject: [PATCH 30/47] BeginScreenCastImpl no longer needs to be called in a new thread. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index e1090a164..f572200e9 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit e1090a1647b6fc90a76112371aacb5c9606e7853 +Subproject commit f572200e95b31f531842165531f787987d368fdd From 79d354084d59aac0d932d8337cab1c974a4a6308 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Tue, 16 May 2023 06:49:52 -0700 Subject: [PATCH 31/47] Revert log level change, as it will be handled in another PR. --- Server/appsettings.json | 1 - 1 file changed, 1 deletion(-) diff --git a/Server/appsettings.json b/Server/appsettings.json index 0e09dcc71..e2195ee24 100644 --- a/Server/appsettings.json +++ b/Server/appsettings.json @@ -6,7 +6,6 @@ }, "Logging": { "LogLevel": { - "Microsoft.AspNetCore": "Warning", "Microsoft.AspNetCore.HttpLogging.HttpLoggingMiddleware": "Information", "Default": "Information" } From bea7a0c0f3e3aaa1961cf5019fcfd6e62bd06d00 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Thu, 18 May 2023 09:33:38 -0700 Subject: [PATCH 32/47] WIP on viewer design implementation. --- .../ViewerPageDataProvider.cs | 21 ++++---- .../images/viewer/remotely-logo-dark.svg | 54 +++++++++++++++++++ .../images/viewer/remotely-logo-light.svg | 54 +++++++++++++++++++ 3 files changed, 117 insertions(+), 12 deletions(-) create mode 100644 Server/wwwroot/images/viewer/remotely-logo-dark.svg create mode 100644 Server/wwwroot/images/viewer/remotely-logo-light.svg diff --git a/Server/Services/RcImplementations/ViewerPageDataProvider.cs b/Server/Services/RcImplementations/ViewerPageDataProvider.cs index 049b5e983..a366646d9 100644 --- a/Server/Services/RcImplementations/ViewerPageDataProvider.cs +++ b/Server/Services/RcImplementations/ViewerPageDataProvider.cs @@ -20,29 +20,26 @@ public ViewerPageDataProvider(IDataService dataService, IApplicationConfig appCo _appConfig = appConfig; } - public Task GetFaviconUrl(ViewerModel viewerModel) + public Task GetFaviconUrl(PageModel viewerModel) { return Task.FromResult("/_content/Immense.RemoteControl.Server/favicon.ico"); } - public Task GetPageDescription(ViewerModel viewerModel) + public async Task GetLogoUrl(PageModel viewerModel) { - return Task.FromResult("Open-source remote support tools."); + return await GetTheme(viewerModel) == ViewerPageTheme.Dark ? + "/images/viewer/remotely-logo-dark.svg" : + "/images/viewer/remotely-logo-light.svg"; } - public Task GetPageTitle(PageModel pageModel) + public Task GetPageDescription(PageModel viewerModel) { - return Task.FromResult("Remotely Remote Control"); - } - - public Task GetProductName(PageModel pageModel) - { - return Task.FromResult("Remotely"); + return Task.FromResult("Open-source remote support tools."); } - public Task GetProductSubtitle(PageModel pageModel) + public Task GetPageTitle(PageModel pageModel) { - return Task.FromResult("Remote Control"); + return Task.FromResult("Remotely Remote Control"); } public Task GetTheme(PageModel pageModel) diff --git a/Server/wwwroot/images/viewer/remotely-logo-dark.svg b/Server/wwwroot/images/viewer/remotely-logo-dark.svg new file mode 100644 index 000000000..147025a32 --- /dev/null +++ b/Server/wwwroot/images/viewer/remotely-logo-dark.svg @@ -0,0 +1,54 @@ + + + + + + + + Remotely + + diff --git a/Server/wwwroot/images/viewer/remotely-logo-light.svg b/Server/wwwroot/images/viewer/remotely-logo-light.svg new file mode 100644 index 000000000..4f4af8be7 --- /dev/null +++ b/Server/wwwroot/images/viewer/remotely-logo-light.svg @@ -0,0 +1,54 @@ + + + + + + + + Remotely + + From 7e3b5789a26d00a2a4ef02a6e7af35044420f8ff Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Thu, 18 May 2023 09:33:47 -0700 Subject: [PATCH 33/47] Update submodule. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index f572200e9..3ca84392b 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit f572200e95b31f531842165531f787987d368fdd +Subproject commit 3ca84392bc63b47ead7c3c94e3cdd7bab686c5ce From 95a4c75fb827de2ed29d260f43ec67c2bae31c47 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Thu, 18 May 2023 12:47:36 -0700 Subject: [PATCH 34/47] Update connection UI. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index 3ca84392b..123aa801b 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit 3ca84392bc63b47ead7c3c94e3cdd7bab686c5ce +Subproject commit 123aa801b1b7f8dfbb0d1c5e1221a70c843faa6d From 1ec198113f959cf8ebac7a880cab466a1db3abff Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Thu, 18 May 2023 16:05:08 -0700 Subject: [PATCH 35/47] WIP on implementing new viewer design. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index 123aa801b..a9cdd5ab9 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit 123aa801b1b7f8dfbb0d1c5e1221a70c843faa6d +Subproject commit a9cdd5ab991ee711aca04cc28c37465871cf9d07 From 12d39296ed241ec666f43e64723071730bda5dc7 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Thu, 18 May 2023 16:05:15 -0700 Subject: [PATCH 36/47] Update submodule. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index a9cdd5ab9..2dac1fa32 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit a9cdd5ab991ee711aca04cc28c37465871cf9d07 +Subproject commit 2dac1fa325ad9c458d8f506de3ac39c18c04d0b7 From fbf91b9fc122a7cf756611f079f0362d5747c657 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Fri, 19 May 2023 10:01:28 -0700 Subject: [PATCH 37/47] Remove font-awesome from source control. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index 2dac1fa32..a98c6cf00 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit 2dac1fa325ad9c458d8f506de3ac39c18c04d0b7 +Subproject commit a98c6cf008be49b35a440ab6eec8ee279cca557c From e52343ef2e12be2db050cd75e447bead903a260b Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Fri, 19 May 2023 10:02:40 -0700 Subject: [PATCH 38/47] Git ignore font-awesome. Supply from libman. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index a98c6cf00..a34df631e 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit a98c6cf008be49b35a440ab6eec8ee279cca557c +Subproject commit a34df631ea62accc0791598118708227720ff8ff From 4e331d6be829715fee512a0d48506427c96d4c2a Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Fri, 19 May 2023 10:40:54 -0700 Subject: [PATCH 39/47] Finish implementing menu buttons. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index a34df631e..fdc95aae1 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit a34df631ea62accc0791598118708227720ff8ff +Subproject commit fdc95aae11e50a95502d35c979593a53976bebd0 From 2302f266d783178f9ccab59924befdae6a52a9a5 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Fri, 19 May 2023 10:46:40 -0700 Subject: [PATCH 40/47] Update submodule. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index fdc95aae1..2657ee0e1 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit fdc95aae11e50a95502d35c979593a53976bebd0 +Subproject commit 2657ee0e16b6bfa4e315ecbfd2c1136268dc6406 From 777d9b60838c2dd505986db18847b731a4a39d18 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Fri, 19 May 2023 11:41:18 -0700 Subject: [PATCH 41/47] Update submodule. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index 2657ee0e1..c08cea8a3 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit 2657ee0e16b6bfa4e315ecbfd2c1136268dc6406 +Subproject commit c08cea8a38b893696b4abd1a25d58f2a07aadd03 From 9a0e3ff5afd9d61eaedd9597369760a3f41470e3 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Fri, 19 May 2023 12:17:01 -0700 Subject: [PATCH 42/47] Update submodule. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index c08cea8a3..6b7b19b23 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit c08cea8a38b893696b4abd1a25d58f2a07aadd03 +Subproject commit 6b7b19b23d95f953993dbf61853fd0d231ec9b59 From 6a87a2999fda48a8e448ddfac042b61a6f5d1de8 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Fri, 19 May 2023 12:32:48 -0700 Subject: [PATCH 43/47] Update submodule. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index 6b7b19b23..b449a0687 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit 6b7b19b23d95f953993dbf61853fd0d231ec9b59 +Subproject commit b449a0687daee5ad707536ae7aad7819390bc5e7 From c4938d955fb990b3f30e5f046b2dc1690013325b Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Fri, 19 May 2023 13:27:56 -0700 Subject: [PATCH 44/47] Update submodule. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index b449a0687..1c76bb0a5 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit b449a0687daee5ad707536ae7aad7819390bc5e7 +Subproject commit 1c76bb0a592573501d7a52ba9017dd4df853ba07 From b4186212442c83107a98d3f82ae85d8a9c587f69 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Fri, 19 May 2023 13:31:13 -0700 Subject: [PATCH 45/47] Force dark theme until light theme is implemented on viewer. --- .../ViewerPageDataProvider.cs | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/Server/Services/RcImplementations/ViewerPageDataProvider.cs b/Server/Services/RcImplementations/ViewerPageDataProvider.cs index a366646d9..9db7d3e81 100644 --- a/Server/Services/RcImplementations/ViewerPageDataProvider.cs +++ b/Server/Services/RcImplementations/ViewerPageDataProvider.cs @@ -44,26 +44,28 @@ public Task GetPageTitle(PageModel pageModel) public Task GetTheme(PageModel pageModel) { - if (pageModel.User.Identity.IsAuthenticated) - { - var user = _dataService.GetUserByNameWithOrg(pageModel.User.Identity.Name); + // TODO: Implement light theme in new viewer design. + return Task.FromResult(ViewerPageTheme.Dark); + //if (pageModel.User.Identity.IsAuthenticated) + //{ + // var user = _dataService.GetUserByNameWithOrg(pageModel.User.Identity.Name); - var userTheme = user.UserOptions.Theme switch - { - Theme.Light => ViewerPageTheme.Light, - Theme.Dark => ViewerPageTheme.Dark, - _ => ViewerPageTheme.Dark - }; - return Task.FromResult(userTheme); - } + // var userTheme = user.UserOptions.Theme switch + // { + // Theme.Light => ViewerPageTheme.Light, + // Theme.Dark => ViewerPageTheme.Dark, + // _ => ViewerPageTheme.Dark + // }; + // return Task.FromResult(userTheme); + //} - var appTheme = _appConfig.Theme switch - { - Theme.Light => ViewerPageTheme.Light, - Theme.Dark => ViewerPageTheme.Dark, - _ => ViewerPageTheme.Dark - }; - return Task.FromResult(appTheme); + //var appTheme = _appConfig.Theme switch + //{ + // Theme.Light => ViewerPageTheme.Light, + // Theme.Dark => ViewerPageTheme.Dark, + // _ => ViewerPageTheme.Dark + //}; + //return Task.FromResult(appTheme); } public Task GetUserDisplayName(PageModel pageModel) From dbc16f05fa4d4374db6bb4a654ee7da6ab1b5629 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Fri, 19 May 2023 14:02:51 -0700 Subject: [PATCH 46/47] Update submodule. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index 1c76bb0a5..892350a51 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit 1c76bb0a592573501d7a52ba9017dd4df853ba07 +Subproject commit 892350a510b5c6af388c37d92ab4e3af4c1a8505 From 9f10d68ef500c803b8edb5042d19af3c66b28825 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Fri, 19 May 2023 16:25:17 -0700 Subject: [PATCH 47/47] Update submodule. --- submodules/Immense.RemoteControl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index 892350a51..51063504e 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit 892350a510b5c6af388c37d92ab4e3af4c1a8505 +Subproject commit 51063504e723f2ee5a8fe4e672855d905a3f0eca