Moonlight-Panel/Servers
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented restorer, wired up for basic testing. Improved abstractions and fixed observer pattern issues

Browse Source
This commit is contained in:
ChiaraBm
2025-07-26 23:19:57 +02:00
parent 84b3d1caf6
commit b546a168d2
17 changed files with 355 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MoonlightServers.Daemon/ServerSys/Abstractions/IConsole.cs
View File

@@ -2,8 +2,8 @@ namespace MoonlightServers.Daemon.ServerSys.Abstractions;
public interface IConsole : IServerComponent
{
public IAsyncObservable<string> OnOutput { get; }
public IAsyncObservable<string> OnInput { get; }
public IObservable<string> OnOutput { get; }
public IObservable<string> OnInput { get; }
public Task AttachToRuntime();
public Task AttachToInstallation();

3
MoonlightServers.Daemon/ServerSys/Abstractions/IInstaller.cs
View File

@@ -2,7 +2,8 @@ namespace MoonlightServers.Daemon.ServerSys.Abstractions;
public interface IInstaller : IServerComponent
{
public IAsyncObservable<object> OnExited { get; set; }
public IObservable<object> OnExited { get; }
public bool IsRunning { get; }
public Task Start();
public Task Abort();

3
MoonlightServers.Daemon/ServerSys/Abstractions/IProvisioner.cs
View File

@@ -2,7 +2,8 @@ namespace MoonlightServers.Daemon.ServerSys.Abstractions;
public interface IProvisioner : IServerComponent
{
public IAsyncObservable<object> OnExited { get; set; }
public IObservable<object> OnExited { get; }
public bool IsProvisioned { get; }
public Task Provision();
public Task Start();

2
MoonlightServers.Daemon/ServerSys/Abstractions/IStatistics.cs
View File

@@ -2,7 +2,7 @@ namespace MoonlightServers.Daemon.ServerSys.Abstractions;
public interface IStatistics : IServerComponent
{
public IAsyncObservable<ServerStats> Stats { get; }
public IAsyncObservable<ServerStats> OnStats { get; }
public Task SubscribeToRuntime();
public Task SubscribeToInstallation();

46
MoonlightServers.Daemon/ServerSys/Abstractions/Server.cs
View File

@@ -1,3 +1,4 @@
using System.Reactive.Subjects;
using MoonlightServers.Daemon.ServerSystem;
using Stateless;
@@ -12,11 +13,14 @@ public class Server : IAsyncDisposable
public IRestorer Restorer { get; private set; }
public IStatistics Statistics { get; private set; }
public StateMachine<ServerState, ServerTrigger> StateMachine { get; private set; }
public ServerContext Context { get; private set; }
public IObservable<ServerState> OnState => OnStateSubject;
private readonly Subject<ServerState> OnStateSubject = new();
private readonly ILogger<Server> Logger;
private IAsyncDisposable? ProvisionExitSubscription;
private IAsyncDisposable? InstallerExitSubscription;
private IDisposable? ProvisionExitSubscription;
private IDisposable? InstallerExitSubscription;
public Server(
ILogger<Server> logger,
@@ -26,7 +30,7 @@ public class Server : IAsyncDisposable
IProvisioner provisioner,
IRestorer restorer,
IStatistics statistics,
StateMachine<ServerState, ServerTrigger> stateMachine
ServerContext context
)
{
Logger = logger;
@@ -36,7 +40,7 @@ public class Server : IAsyncDisposable
Provisioner = provisioner;
Restorer = restorer;
Statistics = statistics;
StateMachine = stateMachine;
Context = context;
}
public async Task Initialize()
@@ -74,20 +78,22 @@ public class Server : IAsyncDisposable
CreateStateMachine(restoredState);
// Setup event handling
ProvisionExitSubscription = await Provisioner.OnExited.SubscribeAsync(async o =>
ProvisionExitSubscription = Provisioner.OnExited.Subscribe(o =>
{
await StateMachine.FireAsync(ServerTrigger.Exited);
StateMachine.Fire(ServerTrigger.Exited);
});
InstallerExitSubscription = await Installer.OnExited.SubscribeAsync(async o =>
InstallerExitSubscription = Installer.OnExited.Subscribe(o =>
{
await StateMachine.FireAsync(ServerTrigger.Exited);
StateMachine.Fire(ServerTrigger.Exited);
});
}
private void CreateStateMachine(ServerState initialState)
{
StateMachine = new StateMachine<ServerState, ServerTrigger>(initialState, FiringMode.Queued);
StateMachine.OnTransitioned(transition => OnStateSubject.OnNext(transition.Destination));
// Configure basic state machine flow
@@ -120,7 +126,10 @@ public class Server : IAsyncDisposable
// Handle transitions
StateMachine.Configure(ServerState.Starting)
.OnActivateAsync(HandleStart);
.OnEntryAsync(HandleStart);
StateMachine.Configure(ServerState.Stopping)
.OnEntryFromAsync(ServerTrigger.Stop, HandleStop);
}
#region State machine handlers
@@ -136,7 +145,7 @@ public class Server : IAsyncDisposable
// 4. Provision the container
// 5. Attach console to container
// 6. Start the container
// 1. Fetch latest configuration from panel
// TODO: Implement
@@ -153,14 +162,14 @@ public class Server : IAsyncDisposable
await Console.WriteToMoonlight("Mounting storage");
await FileSystem.Mount();
}
// 4. Provision the container
await Console.WriteToMoonlight("Provisioning runtime");
await Provisioner.Provision();
// 5. Attach console to container
await Console.AttachToRuntime();
// 6. Start the container
await Provisioner.Start();
}
@@ -169,16 +178,21 @@ public class Server : IAsyncDisposable
Logger.LogError(e, "An error occured while starting the server");
}
}
private async Task HandleStop()
{
await Provisioner.Stop();
}
#endregion
public async ValueTask DisposeAsync()
{
if (ProvisionExitSubscription != null)
await ProvisionExitSubscription.DisposeAsync();
ProvisionExitSubscription.Dispose();
if (InstallerExitSubscription != null)
await InstallerExitSubscription.DisposeAsync();
InstallerExitSubscription.Dispose();
await Console.DisposeAsync();
await FileSystem.DisposeAsync();

5
MoonlightServers.Daemon/ServerSys/Abstractions/ServerMeta.cs
View File

@@ -2,9 +2,8 @@ using MoonlightServers.Daemon.Models.Cache;
namespace MoonlightServers.Daemon.ServerSys.Abstractions;
public record ServerMeta
public record ServerContext
{
public ServerConfiguration Configuration { get; set; }
public IServiceCollection ServiceCollection { get; set; }
public IServiceProvider ServiceProvider { get; set; }
public AsyncServiceScope ServiceScope { get; set; }
}