amacocian/MTSC
1
0
Fork 0
mirror of https://github.com/AlexMacocian/MTSC.git synced 2026-07-21 01:39:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Integrate ServiceCollection from Microsoft.Extensions.DependencyInjection (#21)

Browse Source
This commit is contained in:
Alexandru Victor Macocian
2022-10-07 11:07:20 +02:00
committed by GitHub
parent 0fe9f9957c
commit c21c6e2a11
4 changed files with 28 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MTSC.UnitTests/E2ETests.cs
+3 -2
View File
@@ -1,4 +1,5 @@
using FluentAssertions;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using MTSC.Common.Http;
@@ -65,8 +66,8 @@ namespace MTSC.UnitTests
.AddExceptionHandler(new ExceptionConsoleLogger())
.SetScheduler(new ParallelScheduler())
.WithSslAuthenticationTimeout(TimeSpan.FromMilliseconds(100));
Server.ServiceManager.RegisterSingleton<ILogger, ConsoleLogger>();
Server.ServiceManager.RegisterSingleton<IteratingService>();
Server.ServiceCollection.AddSingleton<ILogger, ConsoleLogger>();
Server.ServiceCollection.AddSingleton<IteratingService>();
Server.RunAsync();
}
MTSC/MTSC.csproj
+6 -5
View File
@@ -5,13 +5,13 @@
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<ApplicationIcon />
<StartupObject />
<Version>5.4.3</Version>
<Version>5.5</Version>
<LangVersion>latest</LangVersion>
<Authors>Alexandru-Victor Macocian</Authors>
<Product>MTSC</Product>
<Description>Modular TCP Server and Client</Description>
<AssemblyVersion>5.4.3.0</AssemblyVersion>
<FileVersion>5.4.3.0</FileVersion>
<AssemblyVersion>5.5.0.0</AssemblyVersion>
<FileVersion>5.5.0.0</FileVersion>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Platforms>AnyCPU;x64</Platforms>
<PackageProjectUrl>https://github.com/AlexMacocian/MTSC</PackageProjectUrl>
@@ -27,9 +27,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Slim" Version="1.7.3" />
<PackageReference Include="Slim" Version="1.9.2" />
<PackageReference Include="Slim.Integration" Version="1.0.4" />
</ItemGroup>
<ItemGroup>
MTSC/ServerSide/BackgroundServices/BackgroundServicesHolder.cs
+3 -2
View File
@@ -1,4 +1,5 @@
using System;
using Microsoft.Extensions.DependencyInjection;
using System;
using System.Collections.Generic;
namespace MTSC.ServerSide.BackgroundServices
@@ -16,7 +17,7 @@ namespace MTSC.ServerSide.BackgroundServices
public void RegisterBackgroundService<T>(TimeSpan activationInterval)
where T : BackgroundServiceBase
{
this.server.ServiceManager.RegisterSingleton<T>();
this.server.ServiceCollection.AddSingleton<T>();
this.backgroundServices.Add(new BackgroundServiceMetadata { ActivationInterval = activationInterval, RegisteredType = typeof(T) });
}
MTSC/ServerSide/Server.cs
+16 -107
View File
@@ -1,4 +1,5 @@
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using MTSC.Common;
using MTSC.Exceptions;
using MTSC.ServerSide.BackgroundServices;
@@ -7,6 +8,7 @@ using MTSC.ServerSide.Listeners;
using MTSC.ServerSide.Schedulers;
using MTSC.ServerSide.UsageMonitors;
using Slim;
using Slim.Integration.ServiceCollection;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -104,9 +106,13 @@ namespace MTSC.ServerSide
/// </summary>
public IReadOnlyCollection<ClientData> Clients { get => this.clients.AsReadOnly(); }
/// <summary>
/// <see cref="IServiceManager"/> for configuring and retrieving services.
/// <see cref="IServiceManager"/> for configuring and retrieving services. Will be initialized at server startup from the <see cref="ServiceCollection"/>.
/// </summary>
public IServiceManager ServiceManager { get; } = new ServiceManager();
public IServiceManager ServiceManager { get; private set; }
/// <summary>
/// <see cref="IServiceCollection"/> used to create the <see cref="IServiceManager"/> at server startup.
/// </summary>
public IServiceCollection ServiceCollection { get; } = new ServiceCollection();
#endregion
#region Constructors
/// <summary>
@@ -114,8 +120,7 @@ namespace MTSC.ServerSide
/// </summary>
public Server()
{
this.ServiceManager.RegisterServiceManager();
this.ServiceManager.RegisterSingleton<Server, Server>(sp => this);
this.ServiceCollection.AddSingleton(this);
this.backgroundServicesHolder = new(this);
}
/// <summary>
@@ -125,8 +130,7 @@ namespace MTSC.ServerSide
public Server(int port)
{
this.Port = port;
this.ServiceManager.RegisterServiceManager();
this.ServiceManager.RegisterSingleton<Server, Server>(sp => this);
this.ServiceCollection.AddSingleton(this);
this.backgroundServicesHolder = new(this);
}
/// <summary>
@@ -138,8 +142,7 @@ namespace MTSC.ServerSide
{
this.certificate = certificate;
this.Port = port;
this.ServiceManager.RegisterServiceManager();
this.ServiceManager.RegisterSingleton<Server, Server>(sp => this);
this.ServiceCollection.AddSingleton(this);
this.backgroundServicesHolder = new(this);
}
/// <summary>
@@ -151,8 +154,7 @@ namespace MTSC.ServerSide
{
this.IPAddress = ipAddress;
this.Port = port;
this.ServiceManager.RegisterServiceManager();
this.ServiceManager.RegisterSingleton<Server, Server>(sp => this);
this.ServiceCollection.AddSingleton(this);
this.backgroundServicesHolder = new(this);
}
/// <summary>
@@ -166,97 +168,12 @@ namespace MTSC.ServerSide
this.certificate = certificate;
this.Port = port;
this.IPAddress = ipAddress;
this.ServiceManager.RegisterServiceManager();
this.ServiceManager.RegisterSingleton<Server, Server>(sp => this);
this.ServiceCollection.AddSingleton(this);
this.backgroundServicesHolder = new(this);
}
#endregion
#region Public Methods
/// <summary>
/// Adds a service with transient lifetime.
/// </summary>
/// <returns>This server object.</returns>
public Server AddTransientService<TInterface, TService>()
where TService : TInterface
where TInterface : class
{
this.ServiceManager.RegisterTransient<TInterface, TService>();
return this;
}
/// <summary>
/// Adds a service with transient lifetime. Registers the service for all the interfaces it implements.
/// </summary>
/// <returns>This server object.</returns>
public Server AddTransientService<TService>()
where TService : class
{
this.ServiceManager.RegisterTransient<TService>();
return this;
}
/// <summary>
/// Adds a service with transient lifetime.
/// </summary>
/// <returns>This server object.</returns>
public Server AddTransientService<TInterface, TService>(Func<Slim.IServiceProvider, TService> serviceFactory)
where TService : TInterface
where TInterface : class
{
this.ServiceManager.RegisterTransient<TInterface, TService>(serviceFactory);
return this;
}
/// <summary>
/// Adds a service with transient lifetime. Registers the service for all the interfaces it implements.
/// </summary>
/// <returns>This server object.</returns>
public Server AddTransientService<TService>(Func<Slim.IServiceProvider, TService> serviceFactory)
where TService : class
{
this.ServiceManager.RegisterTransient<TService>(serviceFactory);
return this;
}
/// <summary>
/// Adds a service with singleton lifetime.
/// </summary>
/// <returns>This server object.</returns>
public Server AddSingletonService<TInterface, TService>()
where TService : TInterface
where TInterface : class
{
this.ServiceManager.RegisterSingleton<TInterface, TService>();
return this;
}
/// <summary>
/// Adds a service with singleton lifetime. Registers the service for all the interfaces it implements.
/// </summary>
/// <returns>This server object.</returns>
public Server AddSingletonService<TService>()
where TService : class
{
this.ServiceManager.RegisterSingleton<TService>();
return this;
}
/// <summary>
/// Adds a service with singleton lifetime.
/// </summary>
/// <returns>This server object.</returns>
public Server AddSingletonService<TInterface, TService>(Func<Slim.IServiceProvider, TService> serviceFactory)
where TService : TInterface
where TInterface : class
{
this.ServiceManager.RegisterSingleton<TInterface, TService>(serviceFactory);
return this;
}
/// <summary>
/// Adds a service with singleton lifetime. Registers the service for all the interfaces it implements.
/// </summary>
/// <returns>This server object.</returns>
public Server AddSingletonService<TService>(Func<Slim.IServiceProvider, TService> serviceFactory)
where TService : class
{
this.ServiceManager.RegisterSingleton<TService>(serviceFactory);
return this;
}
/// <summary>
/// Adds a <see cref="BackgroundServiceBase"/> to the server.
/// </summary>
/// <param name="interval">Interval between ticks.</param>
@@ -419,16 +336,6 @@ namespace MTSC.ServerSide
return this;
}
/// <summary>
/// Gets a required service.
/// </summary>
/// <typeparam name="T">Type of the service used during registration.</typeparam>
/// <returns></returns>
public T GetService<T>()
where T : class
{
return this.ServiceManager.GetService<T>();
}
/// <summary>
/// Get handler of provided type
/// </summary>
/// <typeparam name="T"></typeparam>
@@ -521,6 +428,8 @@ namespace MTSC.ServerSide
return;
}
this.ServiceManager?.Dispose();
this.ServiceManager = this.ServiceCollection.BuildSlimServiceProvider() as IServiceManager;
this.Listener?.Stop();
if (this.logger is null)
{