JSON RPC control connection is working now

Author: fubar-coder

samples/FtpServer/FtpClientInactivityJob.cs

@@ -22,7 +22,7 @@ public async Task Execute(IJobExecutionContext context)
  {
  var client = clientInfo.Client;
  // clientInfo.ConnectionContext.ConnectionId;
- var inactivity = await client.Control.GetInactivityAsync(context.CancellationToken);
+ var inactivity = await client.Control.GetInactivity(context.CancellationToken);
  if (inactivity >= _inactivityTimeSpan)
  {
  clientInfo.ConnectionContext.Abort();

src/FubarDev.FtpServer.Abstractions/IFtpClientControl.cs

@@ -6,7 +6,7 @@ namespace FubarDev.FtpServer.Abstractions;
 
 public interface IFtpClientControl
 {
- Task PingAsync(CancellationToken cancellationToken = default);
- Task<DateTimeOffset> GetLastActivityAsync(CancellationToken cancellationToken = default);
- Task<TimeSpan> GetInactivityAsync(CancellationToken cancellationToken = default);
+ Task Ping(CancellationToken cancellationToken = default);
+ Task<DateTimeOffset> GetLastActivity(CancellationToken cancellationToken = default);
+ Task<TimeSpan> GetInactivity(CancellationToken cancellationToken = default);
 }

src/FubarDev.FtpServer.Client.Embedded/EmbeddedFtpClientControl.cs

@@ -16,18 +16,18 @@ public EmbeddedFtpClientControl(FtpConnection connection)
  _connection = connection;
  }
 
- public Task PingAsync(CancellationToken cancellationToken = default)
+ public Task Ping(CancellationToken cancellationToken = default)
  {
  _connection.Ping();
  return Task.CompletedTask;
  }
 
- public Task<DateTimeOffset> GetLastActivityAsync(CancellationToken cancellationToken = default)
+ public Task<DateTimeOffset> GetLastActivity(CancellationToken cancellationToken = default)
  {
  return Task.FromResult(_connection.GetLastActivity());
  }
 
- public Task<TimeSpan> GetInactivityAsync(CancellationToken cancellationToken = default)
+ public Task<TimeSpan> GetInactivity(CancellationToken cancellationToken = default)
  {
  return Task.FromResult(_connection.GetInactivity());
  }

src/FubarDev.FtpServer.Client.External/ExternalFtpClientData.cs

@@ -9,6 +9,7 @@
 using FubarDev.FtpServer.Abstractions;
 
 using Microsoft.AspNetCore.Connections;
+using Microsoft.Extensions.Logging;
 
 using Nerdbank.Streams;
 
@@ -19,6 +20,7 @@ namespace FubarDev.FtpServer.Client.External;
 internal class ExternalFtpClientData : IAsyncDisposable
 {
  private readonly ExternalFtpClientFactory _clientFactory;
+ private readonly ILogger _logger;
  private Stream? _clientTransportStream;
  private Stream? _serverTransportStream;
  private MultiplexingStream? _multiplexer;
@@ -29,10 +31,12 @@ internal class ExternalFtpClientData : IAsyncDisposable
 
  public ExternalFtpClientData(
  ConnectionContext connectionContext,
- ExternalFtpClientFactory clientFactory)
+ ExternalFtpClientFactory clientFactory,
+ ILogger logger)
  {
  ConnectionContext = connectionContext;
  _clientFactory = clientFactory;
+ _logger = logger;
  }
 
  public ConnectionContext ConnectionContext { get; }
@@ -84,7 +88,9 @@ public async ValueTask InitializeAsync(CancellationToken cancellationToken)
  // new LengthHeaderMessageHandler(clientControlPipe, new MessagePackFormatter());
  IJsonRpcMessageHandler handler =
  new HeaderDelimitedMessageHandler(clientControlPipe, new JsonMessageFormatter());
- _clientControl = JsonRpc.Attach<IFtpClientControl>(handler);
+ var rpc = new JsonRpc(handler);
+ _clientControl = rpc.Attach<IFtpClientControl>();
+ rpc.StartListening();
  }
 
  public async ValueTask DisposeAsync()

src/FubarDev.FtpServer.Client.External/ExternalFtpClientFactory.cs

@@ -11,20 +11,24 @@
 
 using Microsoft.AspNetCore.Connections;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 
 namespace FubarDev.FtpServer.Client.External;
 
 public class ExternalFtpClientFactory : IFtpClientFactory
 {
  private readonly IServiceProvider _serviceProvider;
+ private readonly ILogger<ExternalFtpClientFactory> _logger;
  private readonly Assembly _clientAssembly;
  private readonly string _clientExecutable;
  private readonly bool _startedWithDotnetTool;
 
  public ExternalFtpClientFactory(
- IServiceProvider serviceProvider)
+ IServiceProvider serviceProvider,
+ ILogger<ExternalFtpClientFactory> logger)
  {
  _serviceProvider = serviceProvider;
+ _logger = logger;
  var startExecutable = Path.GetFileName(Environment.ProcessPath)
  ?? throw new InvalidOperationException();
  _startedWithDotnetTool = startExecutable.ToLowerInvariant() switch
@@ -49,7 +53,7 @@ public async ValueTask<IFtpClient> CreateClientAsync(
  ConnectionContext connectionContext,
  CancellationToken cancellationToken = default)
  {
- var data = new ExternalFtpClientData(connectionContext, this);
+ var data = new ExternalFtpClientData(connectionContext, this, _logger);
  await data.InitializeAsync(cancellationToken);
  var ftpClient = ActivatorUtilities.CreateInstance<ExternalFtpClient>(_serviceProvider, data);
  return ftpClient;

src/FubarDev.FtpServer.Client.External/HostedFtpConnection.cs

@@ -39,6 +39,8 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
  new HeaderDelimitedMessageHandler(serverControlPipe, new JsonMessageFormatter());
 
  using var rpc = new JsonRpc(handler, _connection);
+ rpc.StartListening();
+ 
  await _connection.RunAsync(stoppingToken);
  }
 }