From cc56974fedb93a8a3dab8a78ca2dac75cfcff4a6 Mon Sep 17 00:00:00 2001 From: Jared Date: Tue, 8 Sep 2020 11:18:33 -0700 Subject: [PATCH] Cleanup. --- Agent/Services/ConfigService.cs | 4 +- Server/API/DevicesController.cs | 4 +- Server/Pages/_IndexLoggedIn.cshtml | 2 +- Server/Server.csproj | 94 +- Server/Services/DataService.cs | 12 +- Server/wwwroot/scripts/Chat.js.map | 1 - .../wwwroot/scripts/CommandCompletion.js.map | 1 - .../wwwroot/scripts/CommandProcessor.js.map | 1 - Server/wwwroot/scripts/DataGrid.js.map | 1 - Server/wwwroot/scripts/HubConnection.js.map | 1 - .../wwwroot/scripts/InputEventHandlers.js.map | 1 - Server/wwwroot/scripts/Main.js.map | 1 - Server/wwwroot/scripts/{ => Main}/Chat.js | 2 +- Server/wwwroot/scripts/Main/Chat.js.map | 1 + Server/wwwroot/scripts/{ => Main}/Chat.ts | 2 +- .../scripts/{ => Main}/CommandCompletion.js | 26 +- .../scripts/Main/CommandCompletion.js.map | 1 + .../scripts/{ => Main}/CommandCompletion.ts | 32 +- .../scripts/{ => Main}/CommandProcessor.js | 13 +- .../scripts/Main/CommandProcessor.js.map | 1 + .../scripts/{ => Main}/CommandProcessor.ts | 19 +- .../{ => Main}/Commands/BashCommands.js | 2 +- .../{ => Main}/Commands/BashCommands.js.map | 2 +- .../{ => Main}/Commands/BashCommands.ts | 4 +- .../{ => Main}/Commands/CMDCommands.js | 4 +- .../{ => Main}/Commands/CMDCommands.js.map | 2 +- .../{ => Main}/Commands/CMDCommands.ts | 4 +- .../scripts/{ => Main}/Commands/PSCommands.js | 4 +- .../{ => Main}/Commands/PSCommands.js.map | 2 +- .../scripts/{ => Main}/Commands/PSCommands.ts | 4 +- .../{ => Main}/Commands/WebCommands.js | 4 +- .../{ => Main}/Commands/WebCommands.js.map | 2 +- .../{ => Main}/Commands/WebCommands.ts | 6 +- Server/wwwroot/scripts/{ => Main}/Console.js | 0 .../wwwroot/scripts/{ => Main}/Console.js.map | 0 Server/wwwroot/scripts/{ => Main}/Console.ts | 0 Server/wwwroot/scripts/{ => Main}/DataGrid.js | 5 +- Server/wwwroot/scripts/Main/DataGrid.js.map | 1 + Server/wwwroot/scripts/{ => Main}/DataGrid.ts | 7 +- .../scripts/{ => Main}/HubConnection.js | 11 +- .../wwwroot/scripts/Main/HubConnection.js.map | 1 + .../scripts/{ => Main}/HubConnection.ts | 24 +- .../scripts/{ => Main}/InputEventHandlers.js | 34 +- .../scripts/Main/InputEventHandlers.js.map | 1 + .../scripts/{ => Main}/InputEventHandlers.ts | 34 +- Server/wwwroot/scripts/{ => Main}/Main.js | 6 +- Server/wwwroot/scripts/Main/Main.js.map | 1 + Server/wwwroot/scripts/{ => Main}/Main.ts | 6 +- .../scripts/{ => Main}/ResultsParser.js | 2 +- .../wwwroot/scripts/Main/ResultsParser.js.map | 1 + .../scripts/{ => Main}/ResultsParser.ts | 10 +- Server/wwwroot/scripts/Main/UI.js | 23 + Server/wwwroot/scripts/Main/UI.js.map | 1 + Server/wwwroot/scripts/Main/UI.ts | 25 + .../scripts/{ => Main}/UserSettings.js | 0 .../scripts/{ => Main}/UserSettings.js.map | 0 .../scripts/{ => Main}/UserSettings.ts | 0 .../scripts/Pages/OrganizationManagement.js | 2 +- .../Pages/OrganizationManagement.js.map | 2 +- .../scripts/Pages/OrganizationManagement.ts | 2 +- .../scripts/RemoteControl/BinaryDto.ts | 2 +- .../scripts/RemoteControl/FileUploader.js | 3 +- .../scripts/RemoteControl/FileUploader.js.map | 2 +- .../scripts/RemoteControl/FileUploader.ts | 3 +- .../RemoteControl/InputEventHandlers.js | 9 +- .../RemoteControl/InputEventHandlers.js.map | 2 +- .../RemoteControl/InputEventHandlers.ts | 1065 +++++++++-------- Server/wwwroot/scripts/RemoteControl/Main.js | 4 +- .../wwwroot/scripts/RemoteControl/Main.js.map | 2 +- Server/wwwroot/scripts/RemoteControl/Main.ts | 4 +- .../scripts/RemoteControl/MessageSender.js | 4 +- .../RemoteControl/MessageSender.js.map | 2 +- .../scripts/RemoteControl/MessageSender.ts | 4 +- .../wwwroot/scripts/RemoteControl/RtcDtos.js | 2 +- .../scripts/RemoteControl/RtcDtos.js.map | 2 +- .../wwwroot/scripts/RemoteControl/RtcDtos.ts | 6 +- .../RemoteControl/RtcMessageHandler.js | 6 +- .../RemoteControl/RtcMessageHandler.js.map | 2 +- .../RemoteControl/RtcMessageHandler.ts | 6 +- .../scripts/RemoteControl/RtcSession.ts | 4 +- Server/wwwroot/scripts/RemoteControl/UI.js | 12 +- .../wwwroot/scripts/RemoteControl/UI.js.map | 2 +- Server/wwwroot/scripts/RemoteControl/UI.ts | 16 +- .../RemoteControl/ViewerHubConnection.js | 20 +- .../RemoteControl/ViewerHubConnection.js.map | 2 +- .../RemoteControl/ViewerHubConnection.ts | 24 +- Server/wwwroot/scripts/ResultsParser.js.map | 1 - .../{ => Shared}/Enums/BinaryDtoType.js | 0 .../{ => Shared}/Enums/BinaryDtoType.js.map | 0 .../{ => Shared}/Enums/BinaryDtoType.ts | 0 .../{ => Shared}/Enums/RemoteControlMode.js | 0 .../Enums/RemoteControlMode.js.map | 0 .../{ => Shared}/Enums/RemoteControlMode.ts | 0 .../Models/CommandLineParameter.js | 0 .../Models/CommandLineParameter.js.map | 0 .../Models/CommandLineParameter.ts | 0 .../{ => Shared}/Models/CommandResult.js | 0 .../{ => Shared}/Models/CommandResult.js.map | 0 .../{ => Shared}/Models/CommandResult.ts | 0 .../{ => Shared}/Models/ConsoleCommand.js | 0 .../{ => Shared}/Models/ConsoleCommand.js.map | 2 +- .../{ => Shared}/Models/ConsoleCommand.ts | 1 - .../scripts/{ => Shared}/Models/CursorInfo.js | 0 .../{ => Shared}/Models/CursorInfo.js.map | 0 .../scripts/{ => Shared}/Models/CursorInfo.ts | 0 .../scripts/{ => Shared}/Models/Device.js | 0 .../scripts/{ => Shared}/Models/Device.js.map | 0 .../scripts/{ => Shared}/Models/Device.ts | 0 .../Models/GenericCommandResult.js | 0 .../Models/GenericCommandResult.js.map | 0 .../Models/GenericCommandResult.ts | 0 .../{ => Shared}/Models/IceServerModel.js | 0 .../{ => Shared}/Models/IceServerModel.js.map | 0 .../{ => Shared}/Models/IceServerModel.ts | 0 .../Models/PSCoreCommandResult.js | 0 .../Models/PSCoreCommandResult.js.map | 0 .../Models/PSCoreCommandResult.ts | 0 .../scripts/{ => Shared}/Models/Parameter.js | 0 .../{ => Shared}/Models/Parameter.js.map | 0 .../scripts/{ => Shared}/Models/Parameter.ts | 0 .../scripts/{ => Shared}/Models/Point.js | 0 .../scripts/{ => Shared}/Models/Point.js.map | 0 .../scripts/{ => Shared}/Models/Point.ts | 0 .../{ => Shared}/Models/UserOptions.js | 0 .../{ => Shared}/Models/UserOptions.js.map | 0 .../{ => Shared}/Models/UserOptions.ts | 0 Server/wwwroot/scripts/{ => Shared}/Sound.js | 0 .../wwwroot/scripts/{ => Shared}/Sound.js.map | 0 Server/wwwroot/scripts/{ => Shared}/Sound.ts | 0 Server/wwwroot/scripts/{ => Shared}/UI.js | 26 +- Server/wwwroot/scripts/Shared/UI.js.map | 1 + Server/wwwroot/scripts/{ => Shared}/UI.ts | 32 +- .../wwwroot/scripts/{ => Shared}/Utilities.js | 0 .../scripts/{ => Shared}/Utilities.js.map | 0 .../wwwroot/scripts/{ => Shared}/Utilities.ts | 0 Server/wwwroot/scripts/Store.js | 8 - Server/wwwroot/scripts/Store.js.map | 1 - Server/wwwroot/scripts/Store.ts | 7 - Server/wwwroot/scripts/UI.js.map | 1 - 139 files changed, 863 insertions(+), 886 deletions(-) delete mode 100644 Server/wwwroot/scripts/Chat.js.map delete mode 100644 Server/wwwroot/scripts/CommandCompletion.js.map delete mode 100644 Server/wwwroot/scripts/CommandProcessor.js.map delete mode 100644 Server/wwwroot/scripts/DataGrid.js.map delete mode 100644 Server/wwwroot/scripts/HubConnection.js.map delete mode 100644 Server/wwwroot/scripts/InputEventHandlers.js.map delete mode 100644 Server/wwwroot/scripts/Main.js.map rename Server/wwwroot/scripts/{ => Main}/Chat.js (98%) create mode 100644 Server/wwwroot/scripts/Main/Chat.js.map rename Server/wwwroot/scripts/{ => Main}/Chat.ts (99%) rename Server/wwwroot/scripts/{ => Main}/CommandCompletion.js (88%) create mode 100644 Server/wwwroot/scripts/Main/CommandCompletion.js.map rename Server/wwwroot/scripts/{ => Main}/CommandCompletion.ts (87%) rename Server/wwwroot/scripts/{ => Main}/CommandProcessor.js (91%) create mode 100644 Server/wwwroot/scripts/Main/CommandProcessor.js.map rename Server/wwwroot/scripts/{ => Main}/CommandProcessor.ts (91%) rename Server/wwwroot/scripts/{ => Main}/Commands/BashCommands.js (99%) rename Server/wwwroot/scripts/{ => Main}/Commands/BashCommands.js.map (99%) rename Server/wwwroot/scripts/{ => Main}/Commands/BashCommands.ts (99%) rename Server/wwwroot/scripts/{ => Main}/Commands/CMDCommands.js (99%) rename Server/wwwroot/scripts/{ => Main}/Commands/CMDCommands.js.map (99%) rename Server/wwwroot/scripts/{ => Main}/Commands/CMDCommands.ts (99%) rename Server/wwwroot/scripts/{ => Main}/Commands/PSCommands.js (99%) rename Server/wwwroot/scripts/{ => Main}/Commands/PSCommands.js.map (99%) rename Server/wwwroot/scripts/{ => Main}/Commands/PSCommands.ts (99%) rename Server/wwwroot/scripts/{ => Main}/Commands/WebCommands.js (99%) rename Server/wwwroot/scripts/{ => Main}/Commands/WebCommands.js.map (98%) rename Server/wwwroot/scripts/{ => Main}/Commands/WebCommands.ts (99%) rename Server/wwwroot/scripts/{ => Main}/Console.js (100%) rename Server/wwwroot/scripts/{ => Main}/Console.js.map (100%) rename Server/wwwroot/scripts/{ => Main}/Console.ts (100%) rename Server/wwwroot/scripts/{ => Main}/DataGrid.js (95%) create mode 100644 Server/wwwroot/scripts/Main/DataGrid.js.map rename Server/wwwroot/scripts/{ => Main}/DataGrid.ts (95%) rename Server/wwwroot/scripts/{ => Main}/HubConnection.js (92%) create mode 100644 Server/wwwroot/scripts/Main/HubConnection.js.map rename Server/wwwroot/scripts/{ => Main}/HubConnection.ts (89%) rename Server/wwwroot/scripts/{ => Main}/InputEventHandlers.js (83%) create mode 100644 Server/wwwroot/scripts/Main/InputEventHandlers.js.map rename Server/wwwroot/scripts/{ => Main}/InputEventHandlers.ts (84%) rename Server/wwwroot/scripts/{ => Main}/Main.js (86%) create mode 100644 Server/wwwroot/scripts/Main/Main.js.map rename Server/wwwroot/scripts/{ => Main}/Main.ts (86%) rename Server/wwwroot/scripts/{ => Main}/ResultsParser.js (97%) create mode 100644 Server/wwwroot/scripts/Main/ResultsParser.js.map rename Server/wwwroot/scripts/{ => Main}/ResultsParser.ts (93%) create mode 100644 Server/wwwroot/scripts/Main/UI.js create mode 100644 Server/wwwroot/scripts/Main/UI.js.map create mode 100644 Server/wwwroot/scripts/Main/UI.ts rename Server/wwwroot/scripts/{ => Main}/UserSettings.js (100%) rename Server/wwwroot/scripts/{ => Main}/UserSettings.js.map (100%) rename Server/wwwroot/scripts/{ => Main}/UserSettings.ts (100%) delete mode 100644 Server/wwwroot/scripts/ResultsParser.js.map rename Server/wwwroot/scripts/{ => Shared}/Enums/BinaryDtoType.js (100%) rename Server/wwwroot/scripts/{ => Shared}/Enums/BinaryDtoType.js.map (100%) rename Server/wwwroot/scripts/{ => Shared}/Enums/BinaryDtoType.ts (100%) rename Server/wwwroot/scripts/{ => Shared}/Enums/RemoteControlMode.js (100%) rename Server/wwwroot/scripts/{ => Shared}/Enums/RemoteControlMode.js.map (100%) rename Server/wwwroot/scripts/{ => Shared}/Enums/RemoteControlMode.ts (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/CommandLineParameter.js (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/CommandLineParameter.js.map (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/CommandLineParameter.ts (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/CommandResult.js (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/CommandResult.js.map (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/CommandResult.ts (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/ConsoleCommand.js (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/ConsoleCommand.js.map (94%) rename Server/wwwroot/scripts/{ => Shared}/Models/ConsoleCommand.ts (98%) rename Server/wwwroot/scripts/{ => Shared}/Models/CursorInfo.js (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/CursorInfo.js.map (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/CursorInfo.ts (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/Device.js (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/Device.js.map (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/Device.ts (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/GenericCommandResult.js (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/GenericCommandResult.js.map (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/GenericCommandResult.ts (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/IceServerModel.js (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/IceServerModel.js.map (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/IceServerModel.ts (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/PSCoreCommandResult.js (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/PSCoreCommandResult.js.map (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/PSCoreCommandResult.ts (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/Parameter.js (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/Parameter.js.map (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/Parameter.ts (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/Point.js (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/Point.js.map (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/Point.ts (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/UserOptions.js (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/UserOptions.js.map (100%) rename Server/wwwroot/scripts/{ => Shared}/Models/UserOptions.ts (100%) rename Server/wwwroot/scripts/{ => Shared}/Sound.js (100%) rename Server/wwwroot/scripts/{ => Shared}/Sound.js.map (100%) rename Server/wwwroot/scripts/{ => Shared}/Sound.ts (100%) rename Server/wwwroot/scripts/{ => Shared}/UI.js (57%) create mode 100644 Server/wwwroot/scripts/Shared/UI.js.map rename Server/wwwroot/scripts/{ => Shared}/UI.ts (53%) rename Server/wwwroot/scripts/{ => Shared}/Utilities.js (100%) rename Server/wwwroot/scripts/{ => Shared}/Utilities.js.map (100%) rename Server/wwwroot/scripts/{ => Shared}/Utilities.ts (100%) delete mode 100644 Server/wwwroot/scripts/Store.js delete mode 100644 Server/wwwroot/scripts/Store.js.map delete mode 100644 Server/wwwroot/scripts/Store.ts delete mode 100644 Server/wwwroot/scripts/UI.js.map diff --git a/Agent/Services/ConfigService.cs b/Agent/Services/ConfigService.cs index 8da99935..fed76fca 100644 --- a/Agent/Services/ConfigService.cs +++ b/Agent/Services/ConfigService.cs @@ -10,9 +10,9 @@ namespace Remotely.Agent.Services { public class ConfigService { - private static object fileLock = new object(); + private static readonly object fileLock = new object(); private ConnectionInfo connectionInfo; - private string debugGuid = "f2b0a595-5ea8-471b-975f-12e70e0f3497"; + private readonly string debugGuid = "f2b0a595-5ea8-471b-975f-12e70e0f3497"; private Dictionary commandLineArgs; private Dictionary CommandLineArgs diff --git a/Server/API/DevicesController.cs b/Server/API/DevicesController.cs index 9cfa8ab5..59aeec5b 100644 --- a/Server/API/DevicesController.cs +++ b/Server/API/DevicesController.cs @@ -16,9 +16,9 @@ namespace Remotely.Server.API public class DevicesController : ControllerBase { - public DevicesController(DataService dataService, UserManager userManager) + public DevicesController(DataService dataService) { - this.DataService = dataService; + DataService = dataService; } private DataService DataService { get; set; } diff --git a/Server/Pages/_IndexLoggedIn.cshtml b/Server/Pages/_IndexLoggedIn.cshtml index e082bd15..9cbb7b99 100644 --- a/Server/Pages/_IndexLoggedIn.cshtml +++ b/Server/Pages/_IndexLoggedIn.cshtml @@ -72,7 +72,7 @@ - +