ADIX7/FileTime2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remote write

Browse Source
This commit is contained in:
Ádám Kovács
2023-07-26 21:21:55 +02:00
parent 144745a558
commit d26401948a
25 changed files with 293 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Server/FileTime.Server.Common.Abstractions/ConnectionHandlerParameters.cs Normal file
View File

@@ -0,0 +1,11 @@
using Autofac;
using Microsoft.Extensions.Configuration;
namespace FileTime.Server.Common;
public record ConnectionHandlerParameters(
string[] Args,
IContainer RootContainer,
IConfigurationRoot ConfigurationRoot,
CancellationToken ApplicationExit
);

10
src/Server/FileTime.Server.Common.Abstractions/ContentAccess/IContentAccessManager.cs Normal file
View File

@@ -0,0 +1,10 @@
using FileTime.Core.ContentAccess;
namespace FileTime.Server.Common.ContentAccess;
public interface IContentAccessManager
{
void AddContentWriter(string transactionId, IContentWriter contentWriter);
IContentWriter GetContentWriter(string transactionId);
void RemoveContentWriter(string transactionId);
}

5
src/Server/FileTime.Server.Common.Abstractions/FileTime.Server.Common.Abstractions.csproj
View File

@@ -11,4 +11,9 @@
<ProjectReference Include="..\..\Core\FileTime.Core.Abstraction\FileTime.Core.Abstraction.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Autofac" Version="6.4.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
</ItemGroup>
</Project>

4
src/Server/FileTime.Server.Common.Abstractions/IRemoteConnection.cs
View File

@@ -9,4 +9,8 @@ public interface IRemoteConnection
Task CreateElementAsync(string contentProviderId, FullName fullName);
Task DeleteItemAsync(string contentProviderId, FullName fullName);
Task MoveItemAsync(string contentProviderId, FullName fullName, FullName newPath);
Task InitializeRemoteWriter(string contentProviderId, string transactionId, NativePath nativePath);
Task WriteBytesAsync(string transactionId, byte[] data, int? index);
Task FlushWriterAsync(string transactionId);
Task CloseWriterAsync(string transactionId);
}

4
src/Server/FileTime.Server.Common/Connections/SignalR/ISignalRHub.cs
View File

@@ -7,4 +7,8 @@ public interface ISignalRHub
Task CreateElementAsync(string contentProviderId, string fullName);
Task DeleteItemAsync(string contentProviderId, string fullName);
Task MoveItemAsync(string contentProviderId, string fullName, string newPath);
Task FlushWriterAsync(string transactionId);
Task InitializeRemoteWriter(string contentProviderId, string transactionId, string nativePath);
Task WriteBytesAsync(string transactionId, string data, int index);
Task CloseWriterAsync(string transactionId);
}

31
src/Server/FileTime.Server.Common/Connections/SignalR/SignalRConnection.cs
View File

@@ -1,6 +1,9 @@
using FileTime.Core.Models;
using System.Text;
using FileTime.Core.Models;
using InitableService;
using Microsoft.AspNetCore.SignalR.Client;
using Microsoft.Extensions.Logging;
using Serilog;
using TypedSignalR.Client;
namespace FileTime.Server.Common.Connections.SignalR;
@@ -8,8 +11,8 @@ namespace FileTime.Server.Common.Connections.SignalR;
public class SignalRConnection : IRemoteConnection, IAsyncInitable<string>
{
private static readonly Dictionary<string, SignalRConnection> Connections = new();
private static readonly object ConnectionsLock = new();
private static readonly object ConnectionsLock = new();
private string _baseUrl = null!;
private HubConnection _connection = null!;
private ISignalRHub _client = null!;
@@ -18,13 +21,15 @@ public class SignalRConnection : IRemoteConnection, IAsyncInitable<string>
{
_baseUrl = baseUrl;
_connection = new HubConnectionBuilder()
.WithUrl(_baseUrl)
.Build();
var connectionBuilder = new HubConnectionBuilder()
.ConfigureLogging(logging => { logging.AddSerilog(); })
.WithUrl(_baseUrl);
_connection = connectionBuilder.Build();
await _connection.StartAsync();
_client = _connection.CreateHubProxy<ISignalRHub>();
}
public static async Task<SignalRConnection> GetOrCreateForAsync(string baseUrl)
{
SignalRConnection? connection;
@@ -62,4 +67,16 @@ public class SignalRConnection : IRemoteConnection, IAsyncInitable<string>
public async Task MoveItemAsync(string contentProviderId, FullName fullName, FullName newPath)
=> await _client.MoveItemAsync(contentProviderId, fullName.Path, newPath.Path);
public async Task WriteBytesAsync(string transactionId, byte[] data, int? index)
=> await _client.WriteBytesAsync(transactionId, Encoding.UTF8.GetString(data), index ?? -1);
public async Task FlushWriterAsync(string transactionId)
=> await _client.FlushWriterAsync(transactionId);
public async Task InitializeRemoteWriter(string contentProviderId, string transactionId, NativePath nativePath)
=> await _client.InitializeRemoteWriter(contentProviderId, transactionId, nativePath.Path);
public async Task CloseWriterAsync(string transactionId)
=> await _client.CloseWriterAsync(transactionId);
}

13
src/Server/FileTime.Server.Common/ContentAccess/ContentAccessManager.cs Normal file
View File

@@ -0,0 +1,13 @@
using FileTime.Core.ContentAccess;
namespace FileTime.Server.Common.ContentAccess;
public class ContentAccessManager : IContentAccessManager
{
private readonly Dictionary<string, IContentWriter> _contentWriters = new();
public void AddContentWriter(string transactionId, IContentWriter contentWriter)
=> _contentWriters.Add(transactionId, contentWriter);
public IContentWriter GetContentWriter(string transactionId) => _contentWriters[transactionId];
public void RemoveContentWriter(string transactionId) => _contentWriters.Remove(transactionId);
}

1
src/Server/FileTime.Server.Common/FileTime.Server.Common.csproj
View File

@@ -12,6 +12,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.9" />
<PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="TypedSignalR.Client" Version="3.4.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

7
src/Server/FileTime.Server.Common/Startup.cs
View File

@@ -1,14 +1,17 @@
using FileTime.Server.Common.Connections.SignalR;
using FileTime.Server.Common.ContentAccess;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
namespace FileTime.Server.Common;
public static class Startup
{
public static IServiceCollection AddRemoteServices(this IServiceCollection services)
public static IServiceCollection AddServerCoreServices(this IServiceCollection services)
{
services.AddTransient<SignalRConnection>();
services.AddSingleton<IApplicationStopper, ApplicationStopper>();
services.TryAddSingleton<IApplicationStopper, ApplicationStopper>();
services.AddSingleton<IContentAccessManager, ContentAccessManager>();
return services;
}
}

37
src/Server/FileTime.Server.Web/ConnectionHub.cs
View File

@@ -1,7 +1,10 @@
using FileTime.Core.ContentAccess;
using System.Text;
using FileTime.Core.ContentAccess;
using FileTime.Core.Models;
using FileTime.Core.Timeline;
using FileTime.Server.Common;
using FileTime.Server.Common.Connections.SignalR;
using FileTime.Server.Common.ContentAccess;
using Microsoft.AspNetCore.SignalR;
namespace FileTime.Server.Web;
@@ -11,17 +14,20 @@ public class ConnectionHub : Hub<ISignalRClient>, ISignalRHub
private readonly IContentProviderRegistry _contentProviderRegistry;
private readonly IContentAccessorFactory _contentAccessorFactory;
private readonly IApplicationStopper _applicationStopper;
private readonly IContentAccessManager _contentAccessManager;
public ConnectionHub(
IContentProviderRegistry contentProviderRegistry,
IContentAccessorFactory contentAccessorFactory,
IApplicationStopper applicationStopper)
IApplicationStopper applicationStopper,
IContentAccessManager contentAccessManager)
{
_contentProviderRegistry = contentProviderRegistry;
_contentAccessorFactory = contentAccessorFactory;
_applicationStopper = applicationStopper;
_contentAccessManager = contentAccessManager;
}
public Task Exit()
{
_applicationStopper.Stop();
@@ -56,4 +62,29 @@ public class ConnectionHub : Hub<ISignalRClient>, ISignalRHub
var itemDeleter = _contentAccessorFactory.GetItemMover(contentProvider);
await itemDeleter.RenameAsync(contentProvider, new FullName(fullName), new FullName(newPath));
}
public async Task InitializeRemoteWriter(string contentProviderId, string transactionId, string nativePath)
{
var contentProvider = _contentProviderRegistry.ContentProviders.First(p => p.Name == contentProviderId);
var item = await contentProvider.GetItemByNativePathAsync(new NativePath(nativePath), PointInTime.Present);
if (item is not IElement element)
throw new FileNotFoundException("Item is not an element", nativePath);
var contentWriter = await _contentAccessorFactory.GetContentWriterFactory(contentProvider).CreateContentWriterAsync(element);
_contentAccessManager.AddContentWriter(transactionId, contentWriter);
}
public async Task WriteBytesAsync(string transactionId, string data, int index)
=> await _contentAccessManager.GetContentWriter(transactionId).WriteBytesAsync(Encoding.UTF8.GetBytes(data), index == -1 ? null : index);
public async Task FlushWriterAsync(string transactionId)
=> await _contentAccessManager.GetContentWriter(transactionId).FlushAsync();
public Task CloseWriterAsync(string transactionId)
{
_contentAccessManager.GetContentWriter(transactionId).Dispose();
_contentAccessManager.RemoveContentWriter(transactionId);
return Task.CompletedTask;
}
}

21
src/Server/FileTime.Server.Web/Main.cs
View File

@@ -1,11 +1,13 @@
using System.Net;
using Autofac;
using Autofac.Extensions.DependencyInjection;
using FileTime.Server.Common;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Hosting.Server;
using Microsoft.AspNetCore.Hosting.Server.Features;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.HttpLogging;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
@@ -15,14 +17,23 @@ namespace FileTime.Server.Web;
public class Program
{
public static async Task Start(string[] args, IContainer rootContainer, CancellationToken applicationExit)
public static async Task Start(ConnectionHandlerParameters parameters)
{
var builder = WebApplication.CreateBuilder(args);
var builder = WebApplication.CreateBuilder(parameters.Args);
var configuration = builder.Configuration;
//Note: Use app wide configuration instead of the default ASP.NET Core configuration
#pragma warning disable ASP0013
builder.Host.ConfigureAppConfiguration((_, configurationBuilder) =>
{
configurationBuilder.Sources.Clear();
configurationBuilder.AddConfiguration(parameters.ConfigurationRoot);
});
#pragma warning restore ASP0013
builder.Host.UseServiceProviderFactory(
new AutofacChildLifetimeScopeServiceProviderFactory(rootContainer.BeginLifetimeScope("WebScope"))
new AutofacChildLifetimeScopeServiceProviderFactory(parameters.RootContainer.BeginLifetimeScope("WebScope"))
);
builder.Host.UseSerilog();
@@ -32,6 +43,7 @@ public class Program
serverOptions.Listen(new IPEndPoint(IPAddress.Loopback, port));
});
builder.Services.AddHttpLogging(options => options.LoggingFields = HttpLoggingFields.All);
builder.Services.AddSignalR();
builder.Services.AddHealthChecks();
builder.Services.AddHostedService<PortWriterService>();
@@ -43,11 +55,12 @@ public class Program
if (!app.Environment.IsDevelopment())
{
app.UseHttpLogging();
}
app.MapHub<ConnectionHub>("/RemoteHub");
app.UseHealthChecks("/health");
await app.RunAsync(applicationExit);
await app.RunAsync(parameters.ApplicationExit);
}
}

8
src/Server/FileTime.Server/FileTime.Server.csproj
View File

@@ -17,7 +17,15 @@
<ItemGroup>
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Serilog" Version="3.0.1" />
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
</ItemGroup>
<ItemGroup Condition="'$(Configuration)' == 'Debug'">
<Content Include="appsettings.Development.json" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
<ItemGroup Condition="'$(Configuration)' == 'Debug'">
<Content Include="appsettings.Local.json" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
</Project>

30
src/Server/FileTime.Server/Program.cs
View File

@@ -11,21 +11,33 @@ using Serilog;
var applicationCancellation = new CancellationTokenSource();
var configurationRoot = CreateConfiguration();
Log.Logger = new LoggerConfiguration()
.MinimumLevel.Debug()
#if DEBUG
.MinimumLevel.Verbose()
.ReadFrom.Configuration(configurationRoot)
#else
.MinimumLevel.Information()
#endif
.WriteTo.Console()
.CreateLogger();
var bootstrapConfiguration = CreateConfiguration();
var rootContainer = CreateRootDiContainer(configurationRoot);
var rootContainer = CreateRootDiContainer(bootstrapConfiguration);
var handlerParameters = new ConnectionHandlerParameters(
args,
rootContainer,
configurationRoot,
applicationCancellation.Token
);
var webThread = CreateStartup(FileTime.Server.Web.Program.Start);
webThread.Start();
Thread CreateStartup(Func<string[], IContainer, CancellationToken, Task> startup)
Thread CreateStartup(Func<ConnectionHandlerParameters, Task> startup)
{
var thread = new Thread(() => { HandleStartup(() => startup(args, rootContainer, applicationCancellation.Token).Wait()); });
var thread = new Thread(() => { HandleStartup(() => startup(handlerParameters).Wait()); });
return thread;
}
@@ -45,6 +57,11 @@ void HandleStartup(Action action)
IConfigurationRoot CreateConfiguration()
{
var configurationBuilder = new ConfigurationBuilder();
configurationBuilder.AddCommandLine(args);
#if DEBUG
configurationBuilder.AddJsonFile("appsettings.Development.json", optional: true);
configurationBuilder.AddJsonFile("appsettings.Local.json", optional: true);
#endif
return configurationBuilder.Build();
}
@@ -54,9 +71,10 @@ IContainer CreateRootDiContainer(IConfigurationRoot configuration)
.RegisterDefaultServices(configuration)
.AddLocalProviderServices()
.AddServerServices()
.AddServerCoreServices()
.AddLogging(loggingBuilder => loggingBuilder.AddSerilog());
serviceCollection.TryAddSingleton<IApplicationStopper>(
serviceCollection.AddSingleton<IApplicationStopper>(
new ApplicationStopper(() => applicationCancellation.Cancel())
);

13
src/Server/FileTime.Server/appsettings.Development.json Normal file
View File

@@ -0,0 +1,13 @@
{
"Serilog": {
"MinimumLevel": {
"Default": "Verbose",
"Override": {
"System": "Information",
"Microsoft": "Information",
"Microsoft.AspNetCore.SignalR": "Debug",
"Microsoft.AspNetCore.Http.Connections": "Debug"
}
}
}
}