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

Implemented online detection. Extended ServerContext to include self reference so sub components can subscribe to the state. Improved console module detach handling. Implemented new server service to replace the old one. Added log restore when restoring

Browse Source
This commit is contained in:
ChiaraBm
2025-07-30 20:52:24 +02:00
parent eaf8c36f7f
commit 5c170935b4
15 changed files with 419 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
MoonlightServers.Daemon/Http/Controllers/Servers/ServerPowerController.cs
View File

@@ -12,9 +12,9 @@ namespace MoonlightServers.Daemon.Http.Controllers.Servers;
[Route("api/servers")]
public class ServerPowerController : Controller
{
private readonly ServerService ServerService;
private readonly NewServerService ServerService;
public ServerPowerController(ServerService serverService)
public ServerPowerController(NewServerService serverService)
{
ServerService = serverService;
}
@@ -27,7 +27,7 @@ public class ServerPowerController : Controller
if (server == null)
throw new HttpApiException("No server with this id found", 404);
await server.Trigger(ServerTrigger.Start);
await server.StateMachine.FireAsync(ServerTrigger.Start);
}
[HttpPost("{serverId:int}/stop")]
@@ -38,7 +38,7 @@ public class ServerPowerController : Controller
if (server == null)
throw new HttpApiException("No server with this id found", 404);
await server.Trigger(ServerTrigger.Stop);
await server.StateMachine.FireAsync(ServerTrigger.Stop);
}
[HttpPost("{serverId:int}/install")]
@@ -49,7 +49,7 @@ public class ServerPowerController : Controller
if (server == null)
throw new HttpApiException("No server with this id found", 404);
await server.Trigger(ServerTrigger.Install);
await server.StateMachine.FireAsync(ServerTrigger.Install);
}
[HttpPost("{serverId:int}/kill")]
@@ -60,6 +60,6 @@ public class ServerPowerController : Controller
if (server == null)
throw new HttpApiException("No server with this id found", 404);
await server.Trigger(ServerTrigger.Kill);
await server.StateMachine.FireAsync(ServerTrigger.Kill);
}
}

25
MoonlightServers.Daemon/Http/Controllers/Servers/ServersController.cs
View File

@@ -14,9 +14,9 @@ namespace MoonlightServers.Daemon.Http.Controllers.Servers;
[Route("api/servers/{serverId:int}")]
public class ServersController : Controller
{
private readonly ServerService ServerService;
private readonly NewServerService ServerService;
public ServersController(ServerService serverService)
public ServersController(NewServerService serverService)
{
ServerService = serverService;
}
@@ -57,8 +57,7 @@ public class ServersController : Controller
if (server == null)
throw new HttpApiException("No server with this id found", 404);
var consoleSubSystem = server.GetRequiredSubSystem<ConsoleSubSystem>();
var messages = await consoleSubSystem.RetrieveCache();
var messages = server.Console.GetOutput();
return new ServerLogsResponse()
{
@@ -73,7 +72,7 @@ public class ServersController : Controller
if (server == null)
throw new HttpApiException("No server with this id found", 404);
/*
var statsSubSystem = server.GetRequiredSubSystem<StatsSubSystem>();
return Task.FromResult<ServerStatsResponse>(new()
@@ -84,6 +83,16 @@ public class ServersController : Controller
NetworkWrite = statsSubSystem.CurrentStats.NetworkWrite,
IoRead = statsSubSystem.CurrentStats.IoRead,
IoWrite = statsSubSystem.CurrentStats.IoWrite
});*/
return Task.FromResult<ServerStatsResponse>(new()
{
CpuUsage = 0,
MemoryUsage = 0,
NetworkRead = 0,
NetworkWrite = 0,
IoRead = 0,
IoWrite = 0
});
}
@@ -94,9 +103,7 @@ public class ServersController : Controller
if (server == null)
throw new HttpApiException("No server with this id found", 404);
var consoleSubSystem = server.GetRequiredSubSystem<ConsoleSubSystem>();
await consoleSubSystem.WriteInput(request.Command);
await server.Console.WriteToInput(request.Command);
}
}