Control channel almost working

Author: fubar-coder

samples/FtpServer/FtpClientInactivityJob.cs

@@ -0,0 +1,32 @@
+// <copyright file="FtpClientInactivityJob.cs" company="Fubar Development Junker">
+// Copyright (c) Fubar Development Junker. All rights reserved.
+// </copyright>
+
+using Quartz;
+
+namespace FtpServer;
+
+public class FtpClientInactivityJob : IJob
+{
+ private readonly IFtpClientManager _clientManager;
+ private readonly TimeSpan _inactivityTimeSpan = TimeSpan.FromSeconds(10);
+
+ public FtpClientInactivityJob(IFtpClientManager clientManager)
+ {
+ _clientManager = clientManager;
+ }
+
+ public async Task Execute(IJobExecutionContext context)
+ {
+ foreach (var clientInfo in _clientManager.Clients)
+ {
+ var client = clientInfo.Client;
+ // clientInfo.ConnectionContext.ConnectionId;
+ var inactivity = await client.Control.GetInactivityAsync(context.CancellationToken);
+ if (inactivity >= _inactivityTimeSpan)
+ {
+ clientInfo.ConnectionContext.Abort();
+ }
+ }
+ }
+}

samples/FtpServer/FtpClientInformation.cs

@@ -6,7 +6,7 @@
 
 using Microsoft.AspNetCore.Connections;
 
-namespace FtpServerRestart01;
+namespace FtpServer;
 
 public record FtpClientInformation(
  IFtpClient Client,

samples/FtpServer/FtpClientManager.cs

@@ -0,0 +1,86 @@
+// <copyright file="FtpClientManager.cs" company="Fubar Development Junker">
+// Copyright (c) Fubar Development Junker. All rights reserved.
+// </copyright>
+
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+
+using FubarDev.FtpServer.Abstractions;
+
+using Microsoft.AspNetCore.Connections;
+
+namespace FtpServer;
+
+public class FtpClientManager : IFtpClientManager
+{
+ private readonly object _activeClientsLock = new();
+ private readonly IFtpClientFactory _clientFactory;
+ private readonly ILogger<FtpClientManager> _logger;
+ private volatile ImmutableList<FtpClientInformation> _activeClients = ImmutableList<FtpClientInformation>.Empty;
+
+ public FtpClientManager(
+ IFtpClientFactory clientFactory,
+ ILogger<FtpClientManager> logger)
+ {
+ _clientFactory = clientFactory;
+ _logger = logger;
+ }
+
+ public IEnumerable<FtpClientInformation> Clients
+ {
+ get
+ {
+ lock (_activeClientsLock)
+ {
+ return _activeClients;
+ }
+ }
+ }
+
+ public ValueTask StartAsync(ConnectionContext connectionContext, CancellationToken stoppingToken = default)
+ {
+ Run(connectionContext, stoppingToken);
+ return default;
+ }
+
+ [SuppressMessage(
+ "Usage",
+ "VSTHRD100",
+ Justification = "It's what we want here, because we're not using the returning task anyway")]
+ private async void Run(ConnectionContext connectionContext, CancellationToken stoppingToken = default)
+ {
+ await using var registration = stoppingToken.Register(
+ connectionContext.Abort);
+ try
+ {
+ var client = await _clientFactory.CreateClientAsync(connectionContext, stoppingToken);
+ var clientInfo = new FtpClientInformation(client, connectionContext);
+ lock (_activeClientsLock)
+ {
+ _activeClients = _activeClients.Add(clientInfo);
+ }
+
+ _logger.LogTrace("FTP client added");
+ try
+ {
+ await client.RunAsync(connectionContext.ConnectionClosed);
+ }
+ finally
+ {
+ lock (_activeClientsLock)
+ {
+ _activeClients = _activeClients.Remove(clientInfo);
+ _logger.LogTrace("FTP client removed");
+ }
+ }
+ }
+ catch (Exception exception)
+ {
+ _logger.LogError(exception, "Error during FTP client handling: {ErrorMessage}", exception.Message);
+ }
+ finally
+ {
+ await connectionContext.DisposeAsync();
+ }
+ }
+}

samples/FtpServer/FtpServer.csproj

@@ -13,7 +13,7 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Sjm.IO" Version="0.1.0" />
+ <PackageReference Include="Quartz.AspNetCore" Version="3.3.3" />
  <PackageReference Include="System.Interactive.Async" Version="5.0.0" />
  </ItemGroup>
 

samples/FtpServer/FtpServerOptions.cs

@@ -4,7 +4,7 @@
 
 using System.Net;
 
-namespace FtpServerRestart01;
+namespace FtpServer;
 
 public class FtpServerOptions
 {

samples/FtpServer/FtpServerService.cs

@@ -2,35 +2,30 @@
 // Copyright (c) Fubar Development Junker. All rights reserved.
 // </copyright>
 
-using System.Collections.Immutable;
 using System.Net;
 using System.Threading.Channels;
 
-using FubarDev.FtpServer.Abstractions;
-
 using Microsoft.AspNetCore.Connections;
 using Microsoft.Extensions.Options;
 
-namespace FtpServerRestart01;
+namespace FtpServer;
 
 public class FtpServerService : BackgroundService
 {
- private readonly object _activeClientsLock = new();
- private readonly IFtpClientFactory _clientFactory;
  private readonly Channel<ConnectionContext> _connectionContextChannel;
  private readonly IConnectionListenerFactory _connectionListenerFactory;
+ private readonly IFtpClientManager _clientManager;
  private readonly ILogger<FtpServerService> _logger;
  private readonly FtpServerOptions _serverOptions;
- private volatile ImmutableList<FtpClientInformation> _activeClients = ImmutableList<FtpClientInformation>.Empty;
 
  public FtpServerService(
  IOptions<FtpServerOptions> serverOptions,
  IConnectionListenerFactory connectionListenerFactory,
- IFtpClientFactory clientFactory,
+ IFtpClientManager clientManager,
  ILogger<FtpServerService> logger)
  {
  _connectionListenerFactory = connectionListenerFactory;
- _clientFactory = clientFactory;
+ _clientManager = clientManager;
  _logger = logger;
  _serverOptions = serverOptions.Value;
  _connectionContextChannel = Channel.CreateUnbounded<ConnectionContext>();
@@ -65,9 +60,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
  while (!stoppingToken.IsCancellationRequested)
  {
  var connectionContext = await _connectionContextChannel.Reader.ReadAsync(stoppingToken);
- _ = Task.Run(
- () => ExecuteClientAsync(connectionContext, stoppingToken),
- CancellationToken.None);
+ await _clientManager.StartAsync(connectionContext, stoppingToken);
  }
  }
  catch (OperationCanceledException)
@@ -116,34 +109,4 @@ private static IAsyncEnumerable<IPEndPoint> GetListenEndPointsAsync(
 
  return options.ListenEndPoints.ToAsyncEnumerable();
  }
-
- private async Task ExecuteClientAsync(
- ConnectionContext connectionContext,
- CancellationToken cancellationToken)
- {
- await using var registration = cancellationToken.Register(
- connectionContext.Abort);
- try
- {
- var client = await _clientFactory.CreateClientAsync(connectionContext, cancellationToken);
- var clientInfo = new FtpClientInformation(client, connectionContext);
- lock (_activeClientsLock)
- {
- _activeClients = _activeClients.Add(clientInfo);
- }
-
- _logger.LogTrace("FTP client added");
- await client.RunAsync(connectionContext.ConnectionClosed);
-
- lock (_activeClientsLock)
- {
- _activeClients = _activeClients.Remove(clientInfo);
- _logger.LogTrace("FTP client removed");
- }
- }
- finally
- {
- await connectionContext.DisposeAsync();
- }
- }
 }

samples/FtpServer/IFtpClientManager.cs

@@ -0,0 +1,16 @@
+// <copyright file="IClientManager.cs" company="Fubar Development Junker">
+// Copyright (c) Fubar Development Junker. All rights reserved.
+// </copyright>
+
+using Microsoft.AspNetCore.Connections;
+
+namespace FtpServer;
+
+public interface IFtpClientManager
+{
+ IEnumerable<FtpClientInformation> Clients { get; }
+
+ ValueTask StartAsync(
+ ConnectionContext connectionContext,
+ CancellationToken stoppingToken = default);
+}

samples/FtpServer/Program.cs

@@ -4,11 +4,13 @@
 
 using System.Net;
 
-using FtpServerRestart01;
+using FtpServer;
 
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets;
 
+using Quartz;
+
 using var host = new HostBuilder()
  .ConfigureDefaults(args)
  .UseConsoleLifetime()
@@ -18,9 +20,25 @@
  .AddLogging()
  .AddOptions()
  .AddSingleton<IConnectionListenerFactory, SocketTransportFactory>()
- .AddEmbeddedClient()
- //.AddExternalClient()
- .AddSingleton<IHostedService, FtpServerService>();
+ //.AddEmbeddedClient()
+ .AddExternalClient()
+ .AddSingleton<IHostedService, FtpServerService>()
+ .AddSingleton<IFtpClientManager, FtpClientManager>()
+ .AddQuartz(cfg =>
+ {
+ cfg.UseMicrosoftDependencyInjectionJobFactory();
+ cfg.AddJob<FtpClientInactivityJob>(
+ jc => jc.WithIdentity("client-cleanup", "ftp-server"));
+ cfg.AddTrigger(tc =>
+ {
+ tc.WithSimpleSchedule(b =>
+ b.WithInterval(TimeSpan.FromSeconds(1))
+ .RepeatForever())
+ .ForJob("client-cleanup", "ftp-server")
+ .WithIdentity("client-cleanup-trigger", "ftp-server");
+ });
+ })
+ .AddQuartzServer();
  services
  .Configure<FtpServerOptions>(opt => { opt.ListenEndPoints.Add(new IPEndPoint(IPAddress.IPv6Any, 8021)); });
  })

samples/FtpServer/appsettings.json

@@ -3,7 +3,8 @@
  "LogLevel": {
  "Default": "Trace",
  "System": "Information",
- "Microsoft": "Information"
+ "Microsoft": "Information",
+ "Quartz": "Information"
  }
  }
 }

src/FubarDev.FtpServer.Abstractions/IFtpClient.cs

@@ -6,5 +6,7 @@ namespace FubarDev.FtpServer.Abstractions;
 
 public interface IFtpClient
 {
+ IFtpClientControl Control { get; }
+
  ValueTask RunAsync(CancellationToken cancellationToken = default);
 }