Web server - Added web server service

UI - Added remote management for bringing to foreground, restarting and shutting down
UI - Simplified services namespaces
This commit is contained in:
Robert committed 2021-01-27 20:52:51 +01:00
1 parent 7d7a985d35
commit 28e1532064
31 files changed
+351 -59

No files matched your search

+1
View File
@@ -39,6 +39,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Ben.Demystifier" Version="0.1.6" />
<PackageReference Include="EmbedIO" Version="3.4.3" />
<PackageReference Include="HidSharp" Version="2.1.0" />
<PackageReference Include="Humanizer.Core" Version="2.8.26" />
<PackageReference Include="LiteDB" Version="5.0.9" />
@@ -64,6 +64,8 @@
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=services_005Cregistration_005Cinterfaces/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=services_005Cstorage/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=services_005Cstorage_005Cinterfaces/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=services_005Cwebserver/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=services_005Cwebserver_005Cinterfaces/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=stores/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=stores_005Cregistrations/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=utilities/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
@@ -78,7 +78,7 @@ namespace Artemis.Core
public event EventHandler<LayerPropertyEventArgs>? CurrentValueSet;
/// <summary>
/// Occurs when the <see cref="IsHidden" /> value of the layer property was updated
/// Occurs when the visibility value of the layer property was updated
/// </summary>
public event EventHandler<LayerPropertyEventArgs>? VisibilityChanged;
@@ -0,0 +1,34 @@
using System;
using EmbedIO;
using EmbedIO.WebApi;
namespace Artemis.Core.Services
{
/// <summary>
/// A service that provides access to the local Artemis web server
/// </summary>
public interface IWebServerService : IArtemisService
{
/// <summary>
/// Gets the currently active instance of the web server
/// </summary>
WebServer? Server { get; }
/// <summary>
/// Adds a new Web API controller and restarts the web server
/// </summary>
/// <typeparam name="T">The type of Web API controller to remove</typeparam>
void AddController<T>() where T : WebApiController;
/// <summary>
/// Removes an existing Web API controller and restarts the web server
/// </summary>
/// <typeparam name="T">The type of Web API controller to remove</typeparam>
void RemoveController<T>() where T : WebApiController;
/// <summary>
/// Occurs when a new instance of the web server was been created
/// </summary>
event EventHandler? WebServerCreated;
}
}
@@ -0,0 +1,25 @@
using System.Threading.Tasks;
using EmbedIO;
namespace Artemis.Core.Services
{
internal class PluginsModule : WebModuleBase
{
/// <inheritdoc />
public PluginsModule(string baseRoute) : base(baseRoute)
{
}
#region Overrides of WebModuleBase
/// <inheritdoc />
protected override async Task OnRequestAsync(IHttpContext context)
{
}
/// <inheritdoc />
public override bool IsFinalHandler => true;
#endregion
}
}
@@ -0,0 +1,28 @@
using System;
using EmbedIO.WebApi;
using Ninject;
namespace Artemis.Core.Services
{
internal class WebApiControllerRegistration<T> : WebApiControllerRegistration where T : WebApiController
{
public WebApiControllerRegistration(IKernel kernel) : base(typeof(T))
{
Factory = () => kernel.Get<T>();
}
public Func<T> Factory { get; set; }
public override object UntypedFactory => Factory;
}
internal abstract class WebApiControllerRegistration
{
protected WebApiControllerRegistration(Type controllerType)
{
ControllerType = controllerType;
}
public abstract object UntypedFactory { get; }
public Type ControllerType { get; set; }
}
}
@@ -0,0 +1,117 @@
using System;
using System.Collections.Generic;
using System.IO;
using EmbedIO;
using EmbedIO.Actions;
using EmbedIO.WebApi;
using Ninject;
using Serilog;
namespace Artemis.Core.Services
{
internal class WebServerService : IWebServerService, IDisposable
{
private readonly IKernel _kernel;
private readonly ILogger _logger;
private readonly PluginsModule _pluginModule;
private readonly PluginSetting<int> _webServerPortSetting;
private readonly List<WebApiControllerRegistration> _controllers;
public WebServerService(IKernel kernel, ILogger logger, ISettingsService settingsService)
{
_kernel = kernel;
_logger = logger;
_controllers = new List<WebApiControllerRegistration>();
_webServerPortSetting = settingsService.GetSetting("WebServer.Port", 9696);
_webServerPortSetting.SettingChanged += WebServerPortSettingOnSettingChanged;
_pluginModule = new PluginsModule("/plugin");
Server = CreateWebServer();
Server.Start();
}
public WebServer? Server { get; private set; }
#region Web server managament
private WebServer CreateWebServer()
{
Server?.Dispose();
Server = null;
string url = $"http://localhost:{_webServerPortSetting.Value}/";
WebApiModule apiModule = new("/api/");
WebServer server = new WebServer(o => o.WithUrlPrefix(url).WithMode(HttpListenerMode.EmbedIO))
.WithLocalSessionManager()
.WithModule(apiModule)
.WithModule(_pluginModule)
.WithModule(new ActionModule("/", HttpVerbs.Any, ctx => ctx.SendDataAsync(new {Message = "Error"})));
// Add controllers to the API module
foreach (WebApiControllerRegistration registration in _controllers)
apiModule.RegisterController(registration.ControllerType, (Func<WebApiController>) registration.UntypedFactory);
// Listen for state changes.
server.StateChanged += (s, e) => _logger.Verbose("WebServer new state - {state}", e.NewState);
// Store the URL in a webserver.txt file so that remote applications can find it
File.WriteAllText(Path.Combine(Constants.DataFolder, "webserver.txt"), url);
OnWebServerCreated();
return server;
}
#endregion
#region Event handlers
private void WebServerPortSettingOnSettingChanged(object? sender, EventArgs e)
{
Server = CreateWebServer();
Server.Start();
}
#endregion
#region IDisposable
/// <inheritdoc />
public void Dispose()
{
Server?.Dispose();
_webServerPortSetting.SettingChanged -= WebServerPortSettingOnSettingChanged;
}
#endregion
#region Controller management
public void AddController<T>() where T : WebApiController
{
_controllers.Add(new WebApiControllerRegistration<T>(_kernel));
Server = CreateWebServer();
Server.Start();
}
public void RemoveController<T>() where T : WebApiController
{
_controllers.RemoveAll(r => r.ControllerType == typeof(T));
Server = CreateWebServer();
Server.Start();
}
#endregion
#region Events
public event EventHandler? WebServerCreated;
protected virtual void OnWebServerCreated()
{
WebServerCreated?.Invoke(this, EventArgs.Empty);
}
#endregion
}
}
+14
View File
@@ -12,6 +12,15 @@
"System.Threading.Tasks.Extensions": "4.5.3"
}
},
"EmbedIO": {
"type": "Direct",
"requested": "[3.4.3, )",
"resolved": "3.4.3",
"contentHash": "YM6hpZNAfvbbixfG9T4lWDGfF0D/TqutbTROL4ogVcHKwPF1hp+xS3ABwd3cxxTxvDFkj/zZl57QgWuFA8Igxw==",
"dependencies": {
"Unosquare.Swan.Lite": "3.0.0"
}
},
"HidSharp": {
"type": "Direct",
"requested": "[2.1.0, )",
@@ -1226,6 +1235,11 @@
"System.Xml.ReaderWriter": "4.3.0"
}
},
"Unosquare.Swan.Lite": {
"type": "Transitive",
"resolved": "3.0.0",
"contentHash": "noPwJJl1Q9uparXy1ogtkmyAPGNfSGb0BLT1292nFH1jdMKje6o2kvvrQUvF9Xklj+IoiAI0UzF6Aqxlvo10lw=="
},
"artemis.storage": {
"type": "Project",
"dependencies": {