Move library.

bitbound · Nov 23, 2024 · 5728802 · 5728802
1 parent 9128a86
commit 5728802
Show file tree

Hide file tree

Showing 77 changed files with 294 additions and 244 deletions.
diff --git a/...ies.Agent/ControlR.Libraries.Agent.csproj → ...Agent.Common/ControlR.Agent.Common.csproj b/...ies.Agent/ControlR.Libraries.Agent.csproj → ...Agent.Common/ControlR.Agent.Common.csproj
@@ -19,9 +19,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ControlR.Libraries.Clients\ControlR.Libraries.Clients.csproj" />
-    <ProjectReference Include="..\ControlR.Libraries.DevicesCommon\ControlR.Libraries.DevicesCommon.csproj" />
-    <ProjectReference Include="..\ControlR.Libraries.DevicesNative\ControlR.Libraries.DevicesNative.csproj" />
-    <ProjectReference Include="..\ControlR.Libraries.Signalr.Client\ControlR.Libraries.Signalr.Client.csproj" />
+    <ProjectReference Include="..\Libraries\ControlR.Libraries.Clients\ControlR.Libraries.Clients.csproj" />
+    <ProjectReference Include="..\Libraries\ControlR.Libraries.DevicesCommon\ControlR.Libraries.DevicesCommon.csproj" />
+    <ProjectReference Include="..\Libraries\ControlR.Libraries.DevicesNative\ControlR.Libraries.DevicesNative.csproj" />
+    <ProjectReference Include="..\Libraries\ControlR.Libraries.Signalr.Client\ControlR.Libraries.Signalr.Client.csproj" />
   </ItemGroup>
 </Project>
diff --git a/...aries.Agent/Interfaces/IAgentInstaller.cs → ...gent.Common/Interfaces/IAgentInstaller.cs b/...aries.Agent/Interfaces/IAgentInstaller.cs → ...gent.Common/Interfaces/IAgentInstaller.cs
@@ -1,4 +1,4 @@
-namespace ControlR.Libraries.Agent.Interfaces;
+namespace ControlR.Agent.Common.Interfaces;
 
 public interface IAgentInstaller
 {

diff --git a/....Agent/Interfaces/IDeviceDataGenerator.cs → ...Common/Interfaces/IDeviceDataGenerator.cs b/....Agent/Interfaces/IDeviceDataGenerator.cs → ...Common/Interfaces/IDeviceDataGenerator.cs
@@ -1,6 +1,6 @@
-using ControlR.Libraries.Agent.Models;
+using ControlR.Agent.Common.Models;
 
-namespace ControlR.Libraries.Agent.Interfaces;
+namespace ControlR.Agent.Common.Interfaces;
 
 public interface IDeviceDataGenerator
 {

diff --git a/...ies.Agent/Interfaces/IElevationChecker.cs → ...nt.Common/Interfaces/IElevationChecker.cs b/...ies.Agent/Interfaces/IElevationChecker.cs → ...nt.Common/Interfaces/IElevationChecker.cs
@@ -1,4 +1,4 @@
-namespace ControlR.Libraries.Agent.Interfaces;
+namespace ControlR.Agent.Common.Interfaces;
 
 public interface IElevationChecker
 {

diff --git a/...braries.Agent/Interfaces/IPowerControl.cs → ....Agent.Common/Interfaces/IPowerControl.cs b/...braries.Agent/Interfaces/IPowerControl.cs → ....Agent.Common/Interfaces/IPowerControl.cs
@@ -1,6 +1,6 @@
 using ControlR.Libraries.Shared.Enums;
 
-namespace ControlR.Libraries.Agent.Interfaces;
+namespace ControlR.Agent.Common.Interfaces;
 internal interface IPowerControl
 {
   Task ChangeState(PowerStateChangeType type);

diff --git a/...ies.Agent/Interfaces/IStreamerLauncher.cs → ...nt.Common/Interfaces/IStreamerLauncher.cs b/...ies.Agent/Interfaces/IStreamerLauncher.cs → ...nt.Common/Interfaces/IStreamerLauncher.cs
@@ -1,6 +1,6 @@
 using ControlR.Libraries.Shared.Primitives;
 
-namespace ControlR.Libraries.Agent.Interfaces;
+namespace ControlR.Agent.Common.Interfaces;
 internal interface IStreamerLauncher
 {
   Task<Result> CreateSession(

diff --git a/...ries.Agent/Interfaces/IStreamerUpdater.cs → ...ent.Common/Interfaces/IStreamerUpdater.cs b/...ries.Agent/Interfaces/IStreamerUpdater.cs → ...ent.Common/Interfaces/IStreamerUpdater.cs
@@ -1,7 +1,7 @@
 using ControlR.Libraries.Shared.Dtos.StreamerDtos;
 using Microsoft.Extensions.Hosting;
 
-namespace ControlR.Libraries.Agent.Interfaces;
+namespace ControlR.Agent.Common.Interfaces;
 internal interface IStreamerUpdater : IHostedService
 {
   Task<bool> EnsureLatestVersion(

diff --git a/ControlR.Agent.Common/Interfaces/ITerminalSession.cs b/ControlR.Agent.Common/Interfaces/ITerminalSession.cs
@@ -0,0 +1,4 @@
+namespace ControlR.Agent.Common.Interfaces;
+internal interface ITerminalSession
+{
+}
diff --git a/...raries.Agent/IpcDtos/DesktopRequestDto.cs → ...Agent.Common/IpcDtos/DesktopRequestDto.cs b/...raries.Agent/IpcDtos/DesktopRequestDto.cs → ...Agent.Common/IpcDtos/DesktopRequestDto.cs
@@ -1,5 +1,5 @@
 using MessagePack;
-namespace ControlR.Libraries.Agent.IpcDtos;
+namespace ControlR.Agent.Common.IpcDtos;
 
 [MessagePackObject]
 public record DesktopRequestDto();
diff --git a/...aries.Agent/IpcDtos/DesktopResponseDto.cs → ...gent.Common/IpcDtos/DesktopResponseDto.cs b/...aries.Agent/IpcDtos/DesktopResponseDto.cs → ...gent.Common/IpcDtos/DesktopResponseDto.cs
@@ -1,7 +1,7 @@
 using ControlR.Libraries.Shared.Serialization;
 using MessagePack;
 
-namespace ControlR.Libraries.Agent.IpcDtos;
+namespace ControlR.Agent.Common.IpcDtos;
 
 [MessagePackObject]
 public record DesktopResponseDto([property: MsgPackKey] string DesktopName);
diff --git a/...aries.Agent/IpcDtos/ShutdownRequestDto.cs → ...gent.Common/IpcDtos/ShutdownRequestDto.cs b/...aries.Agent/IpcDtos/ShutdownRequestDto.cs → ...gent.Common/IpcDtos/ShutdownRequestDto.cs
@@ -1,6 +1,6 @@
 using MessagePack;
 
-namespace ControlR.Libraries.Agent.IpcDtos;
+namespace ControlR.Agent.Common.IpcDtos;
 
 [MessagePackObject]
 public record ShutdownRequestDto();
diff --git a/...olR.Libraries.Agent/Models/DeviceModel.cs → ControlR.Agent.Common/Models/DeviceModel.cs b/...olR.Libraries.Agent/Models/DeviceModel.cs → ControlR.Agent.Common/Models/DeviceModel.cs
@@ -3,7 +3,7 @@
 using MessagePack;
 using System.Runtime.InteropServices;
 
-namespace ControlR.Libraries.Agent.Models;
+namespace ControlR.Agent.Common.Models;
 
 public class DeviceModel
 {

diff --git a/...olR.Libraries.Agent/Models/StartupMode.cs → ControlR.Agent.Common/Models/StartupMode.cs b/...olR.Libraries.Agent/Models/StartupMode.cs → ControlR.Agent.Common/Models/StartupMode.cs
@@ -1,4 +1,4 @@
-namespace ControlR.Libraries.Agent.Models;
+namespace ControlR.Agent.Common.Models;
 internal enum StartupMode
 {
   None,

diff --git a/...ibraries.Agent/Models/StreamingSession.cs → ...R.Agent.Common/Models/StreamingSession.cs b/...ibraries.Agent/Models/StreamingSession.cs → ...R.Agent.Common/Models/StreamingSession.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics;
 using ControlR.Libraries.Shared.Helpers;
 
-namespace ControlR.Libraries.Agent.Models;
+namespace ControlR.Agent.Common.Models;
 
 internal class StreamingSession(string viewerConnectionId) : IDisposable
 {

diff --git a/...ibraries.Agent/Options/InstanceOptions.cs → ...R.Agent.Common/Options/InstanceOptions.cs b/...ibraries.Agent/Options/InstanceOptions.cs → ...R.Agent.Common/Options/InstanceOptions.cs
@@ -1,4 +1,4 @@
-namespace ControlR.Libraries.Agent.Options;
+namespace ControlR.Agent.Common.Options;
 public class InstanceOptions
 {
   public const string SectionKey = "InstanceOptions";

diff --git a/...ibraries.Agent/Properties/AssemblyInfo.cs → ...R.Agent.Common/Properties/AssemblyInfo.cs b/...ibraries.Agent/Properties/AssemblyInfo.cs → ...R.Agent.Common/Properties/AssemblyInfo.cs
diff --git a/...ies.Agent/Services/AgentHeartbeatTimer.cs → ...nt.Common/Services/AgentHeartbeatTimer.cs b/...ies.Agent/Services/AgentHeartbeatTimer.cs → ...nt.Common/Services/AgentHeartbeatTimer.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Hosting;
 
-namespace ControlR.Libraries.Agent.Services;
+namespace ControlR.Agent.Common.Services;
 
 internal class AgentHeartbeatTimer(
     IAgentHubConnection hubConnection,

diff --git a/...ibraries.Agent/Services/AgentHubClient.cs → ...R.Agent.Common/Services/AgentHubClient.cs b/...ibraries.Agent/Services/AgentHubClient.cs → ...R.Agent.Common/Services/AgentHubClient.cs
@@ -1,13 +1,13 @@
 using System.Diagnostics;
 using System.Runtime.Versioning;
+using ControlR.Agent.Common.Interfaces;
 using ControlR.Devices.Native.Services;
-using ControlR.Libraries.Agent.Interfaces;
 using ControlR.Libraries.Shared.Dtos.StreamerDtos;
 using ControlR.Libraries.Shared.Interfaces.HubClients;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 
-namespace ControlR.Libraries.Agent.Services;
+namespace ControlR.Agent.Common.Services;
 
 internal class AgentHubClient(
   IAgentHubConnection hubConnection,

diff --git a/...ries.Agent/Services/AgentHubConnection.cs → ...ent.Common/Services/AgentHubConnection.cs b/...ries.Agent/Services/AgentHubConnection.cs → ...ent.Common/Services/AgentHubConnection.cs
@@ -1,12 +1,12 @@
-using ControlR.Libraries.Agent.Interfaces;
-using ControlR.Libraries.Agent.Models;
+using ControlR.Agent.Common.Interfaces;
+using ControlR.Agent.Common.Models;
 using ControlR.Libraries.Shared.Dtos.ServerApi;
 using ControlR.Libraries.Shared.Dtos.StreamerDtos;
 using Microsoft.AspNetCore.Http.Connections;
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.Hosting;
 
-namespace ControlR.Libraries.Agent.Services;
+namespace ControlR.Agent.Common.Services;
 
 public interface IAgentHubConnection : IAsyncDisposable
 {

diff --git a/....Libraries.Agent/Services/AgentUpdater.cs → ...olR.Agent.Common/Services/AgentUpdater.cs b/....Libraries.Agent/Services/AgentUpdater.cs → ...olR.Agent.Common/Services/AgentUpdater.cs
@@ -1,11 +1,11 @@
 using System.Security.Cryptography;
-using ControlR.Libraries.Agent.Options;
+using ControlR.Agent.Common.Options;
 using ControlR.Libraries.Shared.Constants;
 using ControlR.Libraries.Shared.Services.Http;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 
-namespace ControlR.Libraries.Agent.Services;
+namespace ControlR.Agent.Common.Services;
 
 internal interface IAgentUpdater : IHostedService
 {
@@ -123,39 +123,39 @@ public async Task CheckForUpdate(CancellationToken cancellationToken = default)
       switch (_environmentHelper.Platform)
       {
         case SystemPlatform.Windows:
-        {
-          await _processInvoker
-            .Start(tempPath, installCommand)
-            .WaitForExitAsync(linkedCts.Token);
-        }
+          {
+            await _processInvoker
+              .Start(tempPath, installCommand)
+              .WaitForExitAsync(linkedCts.Token);
+          }
           break;
 
         case SystemPlatform.Linux:
-        {
-          await _processInvoker
-            .Start("sudo", $"chmod +x {tempPath}")
-            .WaitForExitAsync(linkedCts.Token);
-
-          await _processInvoker.StartAndWaitForExit(
-            "/bin/bash",
-            $"-c \"{tempPath} {installCommand} &\"",
-            true,
-            linkedCts.Token);
-        }
+          {
+            await _processInvoker
+              .Start("sudo", $"chmod +x {tempPath}")
+              .WaitForExitAsync(linkedCts.Token);
+
+            await _processInvoker.StartAndWaitForExit(
+              "/bin/bash",
+              $"-c \"{tempPath} {installCommand} &\"",
+              true,
+              linkedCts.Token);
+          }
           break;
 
         case SystemPlatform.MacOs:
-        {
-          await _processInvoker
-            .Start("sudo", $"chmod +x {tempPath}")
-            .WaitForExitAsync(linkedCts.Token);
-
-          await _processInvoker.StartAndWaitForExit(
-            "/bin/zsh",
-            $"-c \"{tempPath} {installCommand} &\"",
-            true,
-            linkedCts.Token);
-        }
+          {
+            await _processInvoker
+              .Start("sudo", $"chmod +x {tempPath}")
+              .WaitForExitAsync(linkedCts.Token);
+
+            await _processInvoker.StartAndWaitForExit(
+              "/bin/zsh",
+              $"-c \"{tempPath} {installCommand} &\"",
+              true,
+              linkedCts.Token);
+          }
           break;
 
         default:

diff --git a/...Agent/Services/Base/AgentInstallerBase.cs → ...ommon/Services/Base/AgentInstallerBase.cs b/...Agent/Services/Base/AgentInstallerBase.cs → ...ommon/Services/Base/AgentInstallerBase.cs
@@ -2,7 +2,7 @@
 using ControlR.Libraries.Shared.Constants;
 using Microsoft.Extensions.Options;
 
-namespace ControlR.Libraries.Agent.Services.Base;
+namespace ControlR.Agent.Common.Services.Base;
 
 internal abstract class AgentInstallerBase(
   IFileSystem fileSystem,

diff --git a/.../Services/Base/DeviceDataGeneratorBase.cs → .../Services/Base/DeviceDataGeneratorBase.cs b/.../Services/Base/DeviceDataGeneratorBase.cs → .../Services/Base/DeviceDataGeneratorBase.cs
@@ -1,10 +1,10 @@
 using System.Net.NetworkInformation;
 using System.Net.Sockets;
 using System.Runtime.InteropServices;
-using ControlR.Libraries.Agent.Models;
+using ControlR.Agent.Common.Models;
 using Microsoft.Extensions.Options;
 
-namespace ControlR.Libraries.Agent.Services.Base;
+namespace ControlR.Agent.Common.Services.Base;
 
 internal class DeviceDataGeneratorBase(
   ISystemEnvironment environmentHelper,
@@ -69,7 +69,7 @@ public DeviceModel GetDeviceBase(
     double cpuUtilization,
     string agentVersion)
   {
-   
+
     return new DeviceModel
     {
       Id = deviceId,

diff --git a/...s.Agent/Services/CpuUtilizationSampler.cs → ....Common/Services/CpuUtilizationSampler.cs b/...s.Agent/Services/CpuUtilizationSampler.cs → ....Common/Services/CpuUtilizationSampler.cs
@@ -1,8 +1,8 @@
-using ControlR.Libraries.Agent.Interfaces;
+using ControlR.Agent.Common.Interfaces;
 using Microsoft.Extensions.Hosting;
 using System.Diagnostics;
 
-namespace ControlR.Libraries.Agent.Services;
+namespace ControlR.Agent.Common.Services;
 
 internal interface ICpuUtilizationSampler : IHostedService
 {
@@ -13,7 +13,7 @@ internal class CpuUtilizationSampler(IElevationChecker elevationChecker, ILogger
     : BackgroundService, ICpuUtilizationSampler
 {
   private readonly HashSet<int> _ignoredProcesses = [];
-  
+
   private double _currentUtilization;
 
   public double CurrentUtilization => _currentUtilization;

diff --git a/...lR.Libraries.Agent/Services/DtoHandler.cs → ControlR.Agent.Common/Services/DtoHandler.cs b/...lR.Libraries.Agent/Services/DtoHandler.cs → ControlR.Agent.Common/Services/DtoHandler.cs
@@ -1,8 +1,8 @@
-using ControlR.Devices.Native.Services;
-using ControlR.Libraries.Agent.Interfaces;
+using ControlR.Agent.Common.Interfaces;
+using ControlR.Devices.Native.Services;
 using Microsoft.Extensions.Hosting;
 
-namespace ControlR.Libraries.Agent.Services;
+namespace ControlR.Agent.Common.Services;
 
 internal class DtoHandler(
   IAgentHubConnection agentHub,

diff --git a/...nt/Services/Fakes/StreamerLauncherFake.cs → ...on/Services/Fakes/StreamerLauncherFake.cs b/...nt/Services/Fakes/StreamerLauncherFake.cs → ...on/Services/Fakes/StreamerLauncherFake.cs
@@ -1,8 +1,8 @@
-using ControlR.Libraries.Agent.Interfaces;
+using ControlR.Agent.Common.Interfaces;
 using ControlR.Libraries.Shared.Extensions;
 using ControlR.Libraries.Shared.Primitives;
 
-namespace ControlR.Libraries.Agent.Services.Fakes;
+namespace ControlR.Agent.Common.Services.Fakes;
 internal class StreamerLauncherFake : IStreamerLauncher
 {
   public Task<Result> CreateSession(

diff --git a/...ent/Services/Fakes/StreamerUpdaterFake.cs → ...mon/Services/Fakes/StreamerUpdaterFake.cs b/...ent/Services/Fakes/StreamerUpdaterFake.cs → ...mon/Services/Fakes/StreamerUpdaterFake.cs
@@ -1,8 +1,8 @@
-using ControlR.Libraries.Agent.Interfaces;
+using ControlR.Agent.Common.Interfaces;
 using ControlR.Libraries.Shared.Dtos.StreamerDtos;
 using Microsoft.Extensions.Hosting;
 
-namespace ControlR.Libraries.Agent.Services.Fakes;
+namespace ControlR.Agent.Common.Services.Fakes;
 
 internal class StreamerUpdaterFake(ILogger<StreamerUpdaterFake> logger) : BackgroundService, IStreamerUpdater
 {

diff --git a/...gent/Services/HubConnectionInitializer.cs → ...mmon/Services/HubConnectionInitializer.cs b/...gent/Services/HubConnectionInitializer.cs → ...mmon/Services/HubConnectionInitializer.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Hosting;
 
-namespace ControlR.Libraries.Agent.Services;
+namespace ControlR.Agent.Common.Services;
 
 public class HubConnectionInitializer(IAgentHubConnection _agentHubConnection) : IHostedService
 {

diff --git a/...ent/Services/Linux/AgentInstallerLinux.cs → ...mon/Services/Linux/AgentInstallerLinux.cs b/...ent/Services/Linux/AgentInstallerLinux.cs → ...mon/Services/Linux/AgentInstallerLinux.cs
@@ -1,13 +1,13 @@
 using System.Diagnostics;
-using ControlR.Libraries.Agent.Interfaces;
-using ControlR.Libraries.Agent.Options;
-using ControlR.Libraries.Agent.Services.Base;
+using ControlR.Agent.Common.Interfaces;
+using ControlR.Agent.Common.Options;
+using ControlR.Agent.Common.Services.Base;
 using ControlR.Libraries.DevicesNative.Linux;
 using ControlR.Libraries.Shared.Constants;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 
-namespace ControlR.Libraries.Agent.Services.Linux;
+namespace ControlR.Agent.Common.Services.Linux;
 
 internal class AgentInstallerLinux(
   IHostApplicationLifetime lifetime,

diff --git a/...ervices/Linux/DeviceDataGeneratorLinux.cs → ...ervices/Linux/DeviceDataGeneratorLinux.cs b/...ervices/Linux/DeviceDataGeneratorLinux.cs → ...ervices/Linux/DeviceDataGeneratorLinux.cs
@@ -1,9 +1,9 @@
-using ControlR.Libraries.Agent.Interfaces;
-using ControlR.Libraries.Agent.Models;
-using ControlR.Libraries.Agent.Services.Base;
+using ControlR.Agent.Common.Interfaces;
+using ControlR.Agent.Common.Models;
+using ControlR.Agent.Common.Services.Base;
 using Microsoft.Extensions.Options;
 
-namespace ControlR.Libraries.Agent.Services.Linux;
+namespace ControlR.Agent.Common.Services.Linux;
 
 internal class DeviceDataGeneratorLinux(
   IProcessManager processInvoker,

diff --git a/...t/Services/Linux/ElevationCheckerLinux.cs → ...n/Services/Linux/ElevationCheckerLinux.cs b/...t/Services/Linux/ElevationCheckerLinux.cs → ...n/Services/Linux/ElevationCheckerLinux.cs
@@ -1,7 +1,7 @@
-using ControlR.Libraries.Agent.Interfaces;
+using ControlR.Agent.Common.Interfaces;
 using ControlR.Libraries.DevicesNative.Linux;
 
-namespace ControlR.Libraries.Agent.Services.Linux;
+namespace ControlR.Agent.Common.Services.Linux;
 
 public class ElevationCheckerLinux : IElevationChecker
 {

diff --git a/...Agent/Services/Linux/PowerControlLinux.cs → ...ommon/Services/Linux/PowerControlLinux.cs b/...Agent/Services/Linux/PowerControlLinux.cs → ...ommon/Services/Linux/PowerControlLinux.cs
@@ -1,7 +1,7 @@
-using ControlR.Libraries.Agent.Interfaces;
+using ControlR.Agent.Common.Interfaces;
 using ControlR.Libraries.Shared.Enums;
 
-namespace ControlR.Libraries.Agent.Services.Linux;
+namespace ControlR.Agent.Common.Services.Linux;
 internal class PowerControlLinux(IProcessManager processInvoker) : IPowerControl
 {
   private readonly IProcessManager _processInvoker = processInvoker;