Server mode for Gui&Console

src/AppCommon/FileTime.App.Core/Configuration/MainConfiguration.cs

@@ -13,13 +13,7 @@ public class MainConfiguration
 
     static MainConfiguration()
     {
-        var serverFileName = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
+        Configuration = new();
-            ? "FileTime.Server.exe"
-            : "FileTime.Server";
-        Configuration = new()
-        {
-            {AdminElevationConfiguration.SectionName + ":" + nameof(AdminElevationConfiguration.ServerExecutablePath), serverFileName},
-        };
 
         PopulateDefaultEditorPrograms(Configuration);
         PopulateDefaultKeyBindings(Configuration, DefaultKeybindings.Value,

src/ConsoleApp/FileTime.ConsoleUI/FileTime.ConsoleUI.csproj

@@ -18,6 +18,7 @@
     <ProjectReference Include="..\..\AppCommon\FileTime.App.FrequencyNavigation\FileTime.App.FrequencyNavigation.csproj" />
     <ProjectReference Include="..\..\Library\TerminalUI.DependencyInjection\TerminalUI.DependencyInjection.csproj" />
     <ProjectReference Include="..\..\Server\FileTime.Server.Extensions.DependencyInjection\FileTime.Server.Extensions.DependencyInjection.csproj" />
+    <ProjectReference Include="..\..\Server\FileTime.Server\FileTime.Server.csproj" />
     <ProjectReference Include="..\..\Tools\FileTime.Tools.Compression\FileTime.Tools.Compression.csproj" />
     <ProjectReference Include="..\FileTime.ConsoleUI.App\FileTime.ConsoleUI.App.csproj" />
   </ItemGroup>

src/ConsoleApp/FileTime.ConsoleUI/Program.cs

@@ -15,6 +15,12 @@ using TerminalUI.ConsoleDrivers;
 using ITheme = FileTime.ConsoleUI.App.Styling.ITheme;
 using Version = FileTime.ConsoleUI.InfoProviders.Version;
 
+if(args.Length > 0 && args[0] == "--server")
+{
+    FileTime.Server.Program.Main(args.Skip(1).ToArray());
+    return;
+}
+
 Console.OutputEncoding = System.Text.Encoding.UTF8;
 IConsoleDriver? driver = null;
 

src/GuiApp/Avalonia/FileTime.GuiApp/FileTime.GuiApp.csproj

@@ -47,6 +47,7 @@
     <ProjectReference Include="..\..\..\AppCommon\FileTime.App.FrequencyNavigation\FileTime.App.FrequencyNavigation.csproj" />
     <ProjectReference Include="..\..\..\AppCommon\FileTime.App.Search\FileTime.App.Search.csproj" />
     <ProjectReference Include="..\..\..\Server\FileTime.Server.Extensions.DependencyInjection\FileTime.Server.Extensions.DependencyInjection.csproj" />
+    <ProjectReference Include="..\..\..\Server\FileTime.Server\FileTime.Server.csproj" />
     <ProjectReference Include="..\..\..\Tools\FileTime.Tools.Compression\FileTime.Tools.Compression.csproj" />
     <ProjectReference Include="..\FileTime.GuiApp.CustomImpl\FileTime.GuiApp.CustomImpl.csproj" />
     <ProjectReference Include="..\FileTime.GuiApp.Font\FileTime.GuiApp.Font.csproj" />

src/GuiApp/Avalonia/FileTime.GuiApp/Program.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.ExceptionServices;
 using System.Threading.Tasks;
@@ -56,6 +57,12 @@ public static class Program
     [STAThread]
     public static async Task Main(string[] args)
     {
+        if(args.Length > 0 && args[0] == "--server")
+        {
+            Server.Program.Main(args.Skip(1).ToArray());
+            return;
+        }
+        
 #if DEBUG
         (AppDataRoot, EnvironmentName) = Init.InitDevelopment();
 #endif

src/Providers/FileTime.Providers.LocalAdmin.Abstractions/AdminElevationConfiguration.cs

@@ -3,7 +3,7 @@
 public class AdminElevationConfiguration
 {
     public const string SectionName = "AdminElevation";
-    public string ServerExecutablePath { get; set; }
+    public string? ServerExecutablePath { get; set; }
     public string LinuxElevationTool { get; set; }
     public int? ServerPort { get; set; }
     public bool? StartProcess { get; set; }

src/Providers/FileTime.Providers.LocalAdmin/AdminElevationManager.cs

@@ -16,6 +16,7 @@ namespace FileTime.Providers.LocalAdmin;
 public class AdminElevationManager : IAdminElevationManager, INotifyPropertyChanged, IExitHandler
 {
     private const string AdminContentProviderName = "localAdminRemote";
+
     private class ConnectionInfo
     {
         public string? SignalRBaseUrl { get; init; }
@@ -60,8 +61,6 @@ public class AdminElevationManager : IAdminElevationManager, INotifyPropertyChan
 
     public async Task CreateAdminInstanceIfNecessaryAsync(string? confirmationMessage = null)
     {
-        ArgumentNullException.ThrowIfNull(_configuration.CurrentValue.ServerExecutablePath, "ServerExecutablePath");
-
         await _lock.WaitAsync();
         try
         {
@@ -74,11 +73,11 @@ public class AdminElevationManager : IAdminElevationManager, INotifyPropertyChan
             var port = _configuration.CurrentValue.ServerPort;
             _logger.LogTrace("Admin server port is {Port}", port is null ? "<not set>" : $"{port}");
             if (StartProcess || port is null)
-            {                
+            {
                 var portFileName = Path.GetTempFileName();
                 File.Delete(portFileName);
-                
+
-                var process = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) 
+                var process = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
                     ? CreateWindowsAdminProcess(portFileName)
                     : CreateLinuxAdminProcess(portFileName);
                 process.Exited += ProcessExitHandler;
@@ -131,40 +130,74 @@ public class AdminElevationManager : IAdminElevationManager, INotifyPropertyChan
         }
     }
 
-    private Process CreateWindowsAdminProcess(string portFileName) 
+    private Process CreateWindowsAdminProcess(string portFileName)
-        => new()
+    {
+        var (fileName, arguments) = GetServerPathAndArgs(portFileName);
+        var process = new Process
         {
             StartInfo = new()
             {
-                FileName = _configuration.CurrentValue.ServerExecutablePath,
+                FileName = fileName,
-                ArgumentList =
-                {
-                    "--PortWriter:FileName",
-                    portFileName
-                },
                 UseShellExecute = true,
                 Verb = "runas"
             },
             EnableRaisingEvents = true
         };
 
+        foreach (var argument in arguments)
+        {
+            process.StartInfo.ArgumentList.Add(argument);
+        }
+
+        return process;
+    }
+
     private Process CreateLinuxAdminProcess(string portFileName)
     {
-        return new Process
+        var (fileName, arguments) = GetServerPathAndArgs(portFileName);
+
+        arguments = arguments.Prepend(fileName);
+
+        var process = new Process
         {
             StartInfo = new()
             {
                 FileName = _configuration.CurrentValue.LinuxElevationTool,
-                ArgumentList =
-                {
-                    _configuration.CurrentValue.ServerExecutablePath,
-                    "--PortWriter:FileName",
-                    portFileName
-                },
                 CreateNoWindow = true
             },
             EnableRaisingEvents = true
         };
+
+        foreach (var argument in arguments)
+        {
+            process.StartInfo.ArgumentList.Add(argument);
+        }
+
+        return process;
+    }
+
+    private (string fileName, IEnumerable<string> arguments) GetServerPathAndArgs(string portFileName)
+    {
+        var selfStart = _configuration.CurrentValue.ServerExecutablePath is null;
+        
+        var fileName = selfStart
+            ? Process.GetCurrentProcess().MainModule?.FileName
+            : _configuration.CurrentValue.ServerExecutablePath;
+
+        if(fileName is null) throw new Exception("Could not get server executable path");
+        
+        IEnumerable<string> arguments = new[]
+        {
+            "--PortWriter:FileName",
+            portFileName
+        };
+
+        if (selfStart)
+        {
+            arguments = arguments.Prepend("--server");
+        }
+
+        return (fileName, arguments);
     }
 
     //Note: this does not have to return a task
@@ -172,7 +205,7 @@ public class AdminElevationManager : IAdminElevationManager, INotifyPropertyChan
     {
         try
         {
-            if (_remoteContentProvider != null) return Task.FromResult((IRemoteContentProvider)_remoteContentProvider);
+            if (_remoteContentProvider != null) return Task.FromResult((IRemoteContentProvider) _remoteContentProvider);
 
             ArgumentNullException.ThrowIfNull(_connectionInfo);
             //TODO: use other connections too (if there will be any)
@@ -186,7 +219,7 @@ public class AdminElevationManager : IAdminElevationManager, INotifyPropertyChan
                 AdminContentProviderName
             );
 
-            return Task.FromResult((IRemoteContentProvider)_remoteContentProvider);
+            return Task.FromResult((IRemoteContentProvider) _remoteContentProvider);
         }
         catch (Exception ex)
         {

src/Server/FileTime.Server/Program.cs

@@ -2,83 +2,89 @@
 using Autofac.Extensions.DependencyInjection;
 using FileTime.App.DependencyInjection;
 using FileTime.Providers.Local;
-using FileTime.Server;
 using FileTime.Server.App;
 using FileTime.Server.Common;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Serilog;
 
+namespace FileTime.Server;
 
-var applicationCancellation = new CancellationTokenSource();
+public static class Program
-var configurationRoot = CreateConfiguration();
+{
+    public static void Main(string[] args)
+    {
+        var applicationCancellation = new CancellationTokenSource();
+        var configurationRoot = CreateConfiguration();
 
-Log.Logger = new LoggerConfiguration()
+        Log.Logger = new LoggerConfiguration()
 #if DEBUG
-    .MinimumLevel.Verbose()
+            .MinimumLevel.Verbose()
-    .ReadFrom.Configuration(configurationRoot)
+            .ReadFrom.Configuration(configurationRoot)
 #else
     .MinimumLevel.Information()
 #endif
-    .WriteTo.Console()
+            .WriteTo.Console()
-    .CreateLogger();
+            .CreateLogger();
 
-var rootContainer = CreateRootDiContainer(configurationRoot);
+        var rootContainer = CreateRootDiContainer(configurationRoot);
 
-var handlerParameters = new ConnectionHandlerParameters(
+        var handlerParameters = new ConnectionHandlerParameters(
-    args,
+            args,
-    rootContainer,
+            rootContainer,
-    configurationRoot,
+            configurationRoot,
-    applicationCancellation.Token
+            applicationCancellation.Token
-);
+        );
 
-var webThread = CreateStartup(FileTime.Server.Web.Program.Start);
+        var webThread = CreateStartup(FileTime.Server.Web.Program.Start);
-webThread.Start();
+        webThread.Start();
 
-Thread CreateStartup(Func<ConnectionHandlerParameters, Task> startup)
+        Thread CreateStartup(Func<ConnectionHandlerParameters, Task> startup)
-{
+        {
-    var thread = new Thread(() => { HandleStartup(() => startup(handlerParameters).Wait()); });
+            var thread = new Thread(() => { HandleStartup(() => startup(handlerParameters).Wait()); });
-    return thread;
+            return thread;
-}
+        }
 
-void HandleStartup(Action action)
+        void HandleStartup(Action action)
-{
+        {
-    try
+            try
-    {
+            {
-        action();
+                action();
-    }
+            }
-    catch (Exception e)
+            catch (Exception e)
-    {
+            {
-        Console.WriteLine(e);
+                Console.WriteLine(e);
-        throw;
+                throw;
-    }
+            }
-}
+        }
 
-IConfigurationRoot CreateConfiguration()
+        IConfigurationRoot CreateConfiguration()
-{
+        {
-    var configurationBuilder = new ConfigurationBuilder();
+            var configurationBuilder = new ConfigurationBuilder();
 #if DEBUG
-    configurationBuilder.AddJsonFile("appsettings.Development.json", optional: true);
+            configurationBuilder.AddJsonFile("appsettings.Development.json", optional: true);
-    configurationBuilder.AddJsonFile("appsettings.Local.json", optional: true);
+            configurationBuilder.AddJsonFile("appsettings.Local.json", optional: true);
 #endif
-    configurationBuilder.AddCommandLine(args);
+            configurationBuilder.AddCommandLine(args);
-    return configurationBuilder.Build();
+            return configurationBuilder.Build();
-}
+        }
 
-IContainer CreateRootDiContainer(IConfigurationRoot configuration)
+        IContainer CreateRootDiContainer(IConfigurationRoot configuration)
-{
+        {
-    var serviceCollection = DependencyInjection
+            var serviceCollection = DependencyInjection
-        .RegisterDefaultServices(configuration)
+                .RegisterDefaultServices(configuration)
-        .AddLocalProviderServices()
+                .AddLocalProviderServices()
-        .AddServerServices()
+                .AddServerServices()
-        .AddServerCoreServices()
+                .AddServerCoreServices()
-        .AddLogging(loggingBuilder => loggingBuilder.AddSerilog());
+                .AddLogging(loggingBuilder => loggingBuilder.AddSerilog());
 
-    serviceCollection.AddSingleton<IApplicationStopper>(
+            serviceCollection.AddSingleton<IApplicationStopper>(
-        new ApplicationStopper(() => applicationCancellation.Cancel())
+                new ApplicationStopper(() => applicationCancellation.Cancel())
-    );
+            );
 
-    var containerBuilder = new ContainerBuilder();
+            var containerBuilder = new ContainerBuilder();
-    containerBuilder.Populate(serviceCollection);
+            containerBuilder.Populate(serviceCollection);
-    return containerBuilder.Build();
+            return containerBuilder.Build();
+        }
+    }
 }