mirror of
https://github.com/chylex/Minecraft-Phantom-Panel.git
synced 2026-02-20 13:46:36 +01:00
Compare commits
5 Commits
wip-forge
...
wip-recipe
| Author | SHA1 | Date | |
|---|---|---|---|
|
1983748036
|
|||
|
03ba1407e8
|
|||
|
ea66f9f056
|
|||
|
9a69a6b2bb
|
|||
|
27e70d47c3
|
@@ -3,7 +3,7 @@
|
|||||||
"isRoot": true,
|
"isRoot": true,
|
||||||
"tools": {
|
"tools": {
|
||||||
"dotnet-ef": {
|
"dotnet-ef": {
|
||||||
"version": "9.0.9",
|
"version": "10.0.1",
|
||||||
"commands": [
|
"commands": [
|
||||||
"dotnet-ef"
|
"dotnet-ef"
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -1,17 +1,6 @@
|
|||||||
using System.Collections.Immutable;
|
namespace Phantom.Agent.Minecraft.Instance;
|
||||||
using Phantom.Agent.Minecraft.Java;
|
|
||||||
using Phantom.Agent.Minecraft.Properties;
|
|
||||||
using Phantom.Common.Data.Instance;
|
|
||||||
|
|
||||||
namespace Phantom.Agent.Minecraft.Instance;
|
|
||||||
|
|
||||||
public sealed record InstanceProperties(
|
public sealed record InstanceProperties(
|
||||||
Guid InstanceGuid,
|
Guid InstanceGuid,
|
||||||
Guid JavaRuntimeGuid,
|
string InstanceFolder
|
||||||
JvmProperties JvmProperties,
|
|
||||||
ImmutableArray<string> JvmArguments,
|
|
||||||
string InstanceFolder,
|
|
||||||
string ServerVersion,
|
|
||||||
ServerProperties ServerProperties,
|
|
||||||
InstanceLaunchProperties LaunchProperties
|
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -7,6 +7,12 @@ sealed class JavaPropertiesFileEditor {
|
|||||||
overriddenProperties[key] = value;
|
overriddenProperties[key] = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void SetAll(IDictionary<string, string> values) {
|
||||||
|
foreach ((string key, string value) in values) {
|
||||||
|
Set(key, value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public async Task EditOrCreate(string filePath, string comment, CancellationToken cancellationToken) {
|
public async Task EditOrCreate(string filePath, string comment, CancellationToken cancellationToken) {
|
||||||
if (File.Exists(filePath)) {
|
if (File.Exists(filePath)) {
|
||||||
string tmpFilePath = filePath + ".tmp";
|
string tmpFilePath = filePath + ".tmp";
|
||||||
|
|||||||
@@ -2,4 +2,4 @@
|
|||||||
|
|
||||||
namespace Phantom.Agent.Minecraft.Java;
|
namespace Phantom.Agent.Minecraft.Java;
|
||||||
|
|
||||||
sealed record JavaRuntimeExecutable(string ExecutablePath, JavaRuntime Runtime);
|
public sealed record JavaRuntimeExecutable(string ExecutablePath, JavaRuntime Runtime);
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ public sealed class JavaRuntimeRepository {
|
|||||||
.ToImmutableArray();
|
.ToImmutableArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
internal bool TryGetByGuid(Guid guid, [MaybeNullWhen(false)] out JavaRuntimeExecutable runtime) {
|
public bool TryGetByGuid(Guid guid, [MaybeNullWhen(false)] out JavaRuntimeExecutable runtime) {
|
||||||
return runtimesByGuid.TryGetValue(guid, out runtime);
|
return runtimesByGuid.TryGetValue(guid, out runtime);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,119 +0,0 @@
|
|||||||
using System.Collections.ObjectModel;
|
|
||||||
using System.Text;
|
|
||||||
using Phantom.Agent.Minecraft.Instance;
|
|
||||||
using Phantom.Agent.Minecraft.Java;
|
|
||||||
using Phantom.Agent.Minecraft.Server;
|
|
||||||
using Phantom.Utils.Processes;
|
|
||||||
using Serilog;
|
|
||||||
|
|
||||||
namespace Phantom.Agent.Minecraft.Launcher;
|
|
||||||
|
|
||||||
public abstract class BaseLauncher : IServerLauncher {
|
|
||||||
private readonly InstanceProperties instanceProperties;
|
|
||||||
|
|
||||||
protected string MinecraftVersion => instanceProperties.ServerVersion;
|
|
||||||
protected string InstanceFolder => instanceProperties.InstanceFolder;
|
|
||||||
private protected BaseLauncher(InstanceProperties instanceProperties) {
|
|
||||||
this.instanceProperties = instanceProperties;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<LaunchResult> Launch(ILogger logger, LaunchServices services, EventHandler<DownloadProgressEventArgs> downloadProgressEventHandler, CancellationToken cancellationToken) {
|
|
||||||
if (!services.JavaRuntimeRepository.TryGetByGuid(instanceProperties.JavaRuntimeGuid, out var javaRuntimeExecutable)) {
|
|
||||||
return new LaunchResult.InvalidJavaRuntime();
|
|
||||||
}
|
|
||||||
|
|
||||||
var vanillaServerJarPath = await services.ServerExecutables.DownloadAndGetPath(instanceProperties.LaunchProperties.ServerDownloadInfo, MinecraftVersion, downloadProgressEventHandler, cancellationToken);
|
|
||||||
if (vanillaServerJarPath == null) {
|
|
||||||
return new LaunchResult.CouldNotDownloadMinecraftServer();
|
|
||||||
}
|
|
||||||
|
|
||||||
ServerJarInfo? serverJar;
|
|
||||||
try {
|
|
||||||
serverJar = await PrepareServerJar(logger, vanillaServerJarPath, cancellationToken);
|
|
||||||
} catch (OperationCanceledException) {
|
|
||||||
throw;
|
|
||||||
} catch (Exception e) {
|
|
||||||
logger.Error(e, "Caught exception while preparing the server jar.");
|
|
||||||
return new LaunchResult.CouldNotPrepareMinecraftServerLauncher();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!File.Exists(serverJar.FilePath)) {
|
|
||||||
logger.Error("Missing prepared server or launcher jar: {FilePath}", serverJar.FilePath);
|
|
||||||
return new LaunchResult.CouldNotPrepareMinecraftServerLauncher();
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
await AcceptEula(instanceProperties);
|
|
||||||
await UpdateServerProperties(instanceProperties, cancellationToken);
|
|
||||||
} catch (Exception e) {
|
|
||||||
logger.Error(e, "Caught exception while configuring the server.");
|
|
||||||
return new LaunchResult.CouldNotConfigureMinecraftServer();
|
|
||||||
}
|
|
||||||
|
|
||||||
var processConfigurator = new ProcessConfigurator {
|
|
||||||
FileName = javaRuntimeExecutable.ExecutablePath,
|
|
||||||
WorkingDirectory = InstanceFolder,
|
|
||||||
RedirectInput = true,
|
|
||||||
UseShellExecute = false,
|
|
||||||
};
|
|
||||||
|
|
||||||
var processArguments = processConfigurator.ArgumentList;
|
|
||||||
PrepareJvmArguments(serverJar).Build(processArguments);
|
|
||||||
PrepareJavaProcessArguments(processArguments, serverJar.FilePath);
|
|
||||||
var process = processConfigurator.CreateProcess();
|
|
||||||
var instanceProcess = new InstanceProcess(instanceProperties, process);
|
|
||||||
|
|
||||||
try {
|
|
||||||
process.Start();
|
|
||||||
} catch (Exception launchException) {
|
|
||||||
logger.Error(launchException, "Caught exception launching the server process.");
|
|
||||||
|
|
||||||
try {
|
|
||||||
process.Kill();
|
|
||||||
} catch (Exception killException) {
|
|
||||||
logger.Error(killException, "Caught exception trying to kill the server process after a failed launch.");
|
|
||||||
}
|
|
||||||
|
|
||||||
return new LaunchResult.CouldNotStartMinecraftServer();
|
|
||||||
}
|
|
||||||
|
|
||||||
return new LaunchResult.Success(instanceProcess);
|
|
||||||
}
|
|
||||||
|
|
||||||
private JvmArgumentBuilder PrepareJvmArguments(ServerJarInfo serverJar) {
|
|
||||||
var builder = new JvmArgumentBuilder(instanceProperties.JvmProperties);
|
|
||||||
|
|
||||||
foreach (string argument in instanceProperties.JvmArguments) {
|
|
||||||
builder.Add(argument);
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var argument in serverJar.ExtraArgs) {
|
|
||||||
builder.Add(argument);
|
|
||||||
}
|
|
||||||
|
|
||||||
CustomizeJvmArguments(builder);
|
|
||||||
return builder;
|
|
||||||
}
|
|
||||||
|
|
||||||
private protected virtual void CustomizeJvmArguments(JvmArgumentBuilder arguments) {}
|
|
||||||
|
|
||||||
protected virtual void PrepareJavaProcessArguments(Collection<string> processArguments, string serverJarFilePath) {
|
|
||||||
processArguments.Add("-jar");
|
|
||||||
processArguments.Add(serverJarFilePath);
|
|
||||||
processArguments.Add("nogui");
|
|
||||||
}
|
|
||||||
private protected virtual Task<ServerJarInfo> PrepareServerJar(ILogger logger, string serverJarPath, CancellationToken cancellationToken) {
|
|
||||||
return Task.FromResult(new ServerJarInfo(serverJarPath));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static async Task AcceptEula(InstanceProperties instanceProperties) {
|
|
||||||
var eulaFilePath = Path.Combine(instanceProperties.InstanceFolder, "eula.txt");
|
|
||||||
await File.WriteAllLinesAsync(eulaFilePath, ["# EULA", "eula=true"], Encoding.UTF8);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static async Task UpdateServerProperties(InstanceProperties instanceProperties, CancellationToken cancellationToken) {
|
|
||||||
var serverPropertiesEditor = new JavaPropertiesFileEditor();
|
|
||||||
instanceProperties.ServerProperties.SetTo(serverPropertiesEditor);
|
|
||||||
await serverPropertiesEditor.EditOrCreate(Path.Combine(instanceProperties.InstanceFolder, "server.properties"), comment: "server.properties", cancellationToken);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
using Phantom.Agent.Minecraft.Server;
|
|
||||||
using Serilog;
|
|
||||||
|
|
||||||
namespace Phantom.Agent.Minecraft.Launcher;
|
|
||||||
|
|
||||||
public interface IServerLauncher {
|
|
||||||
Task<LaunchResult> Launch(ILogger logger, LaunchServices services, EventHandler<DownloadProgressEventArgs> downloadProgressEventHandler, CancellationToken cancellationToken);
|
|
||||||
}
|
|
||||||
115
Agent/Phantom.Agent.Minecraft/Launcher/InstanceLauncher.cs
Normal file
115
Agent/Phantom.Agent.Minecraft/Launcher/InstanceLauncher.cs
Normal file
@@ -0,0 +1,115 @@
|
|||||||
|
using System.Collections.Immutable;
|
||||||
|
using Phantom.Agent.Minecraft.Instance;
|
||||||
|
using Phantom.Agent.Minecraft.Java;
|
||||||
|
using Phantom.Agent.Minecraft.Server;
|
||||||
|
using Phantom.Common.Data.Instance;
|
||||||
|
using Phantom.Common.Data.Instance.Launch;
|
||||||
|
using Phantom.Common.Data.Minecraft;
|
||||||
|
using Phantom.Utils.Processes;
|
||||||
|
using Serilog;
|
||||||
|
|
||||||
|
namespace Phantom.Agent.Minecraft.Launcher;
|
||||||
|
|
||||||
|
public sealed class InstanceLauncher(
|
||||||
|
FileDownloadManager downloadManager,
|
||||||
|
IInstancePathResolver pathResolver,
|
||||||
|
IInstanceValueResolver valueResolver,
|
||||||
|
InstanceProperties instanceProperties,
|
||||||
|
InstanceLaunchRecipe launchRecipe
|
||||||
|
) {
|
||||||
|
public async Task<LaunchResult> Launch(ILogger logger, Action<IInstanceStatus?> reportStatus, CancellationToken cancellationToken) {
|
||||||
|
string? executablePath = launchRecipe.Executable.Resolve(pathResolver);
|
||||||
|
if (executablePath == null) {
|
||||||
|
logger.Error("Could not resolve server executable: {Path}", launchRecipe.Executable);
|
||||||
|
return new LaunchResult.CouldNotFindServerExecutable();
|
||||||
|
}
|
||||||
|
|
||||||
|
var stepVisitor = new StepExecutor(downloadManager, pathResolver, reportStatus, cancellationToken);
|
||||||
|
var steps = launchRecipe.Preparation;
|
||||||
|
|
||||||
|
for (int stepIndex = 0; stepIndex < steps.Length; stepIndex++) {
|
||||||
|
var step = steps[stepIndex];
|
||||||
|
try {
|
||||||
|
await step.Run(stepVisitor);
|
||||||
|
} catch (Exception e) {
|
||||||
|
logger.Error(e, "Failed preparation step {StepIndex} out of {StepCount}: {Step}", stepIndex, steps.Length, step);
|
||||||
|
return new LaunchResult.CouldNotPrepareServerInstance();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var processConfigurator = new ProcessConfigurator {
|
||||||
|
FileName = executablePath,
|
||||||
|
WorkingDirectory = instanceProperties.InstanceFolder,
|
||||||
|
RedirectInput = true,
|
||||||
|
UseShellExecute = false,
|
||||||
|
};
|
||||||
|
|
||||||
|
var processArguments = processConfigurator.ArgumentList;
|
||||||
|
|
||||||
|
foreach (var value in launchRecipe.Arguments) {
|
||||||
|
if (value.Resolve(valueResolver) is {} resolved) {
|
||||||
|
processArguments.Add(resolved);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
logger.Error("Could not resolve server executable argument: {Value}", value);
|
||||||
|
return new LaunchResult.CouldNotPrepareServerInstance();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var process = processConfigurator.CreateProcess();
|
||||||
|
var instanceProcess = new InstanceProcess(instanceProperties, process);
|
||||||
|
|
||||||
|
try {
|
||||||
|
process.Start();
|
||||||
|
} catch (Exception launchException) {
|
||||||
|
logger.Error(launchException, "Caught exception launching the server process.");
|
||||||
|
|
||||||
|
try {
|
||||||
|
process.Kill();
|
||||||
|
} catch (Exception killException) {
|
||||||
|
logger.Error(killException, "Caught exception trying to kill the server process after a failed launch.");
|
||||||
|
}
|
||||||
|
|
||||||
|
return new LaunchResult.CouldNotStartServerExecutable();
|
||||||
|
}
|
||||||
|
|
||||||
|
return new LaunchResult.Success(instanceProcess);
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class StepExecutor(FileDownloadManager downloadManager, IInstancePathResolver pathResolver, Action<IInstanceStatus?> reportStatus, CancellationToken cancellationToken) : IInstanceLaunchStepExecutor {
|
||||||
|
public async Task DownloadFile(FileDownloadInfo downloadInfo, IInstancePath path) {
|
||||||
|
string? filePath = path.Resolve(pathResolver);
|
||||||
|
if (filePath == null) {
|
||||||
|
throw new FileNotFoundException("Could not resolve path");
|
||||||
|
}
|
||||||
|
|
||||||
|
byte? lastDownloadProgress = null;
|
||||||
|
|
||||||
|
void OnDownloadProgress(object? sender, DownloadProgressEventArgs args) {
|
||||||
|
byte? progress = args.TotalBytes is not {} totalBytes ? null : (byte) Math.Min(args.DownloadedBytes * 100 / totalBytes, val2: 100);
|
||||||
|
|
||||||
|
if (lastDownloadProgress != progress) {
|
||||||
|
lastDownloadProgress = progress;
|
||||||
|
reportStatus(InstanceStatus.Downloading(progress));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (await downloadManager.DownloadAndGetPath(downloadInfo, filePath, OnDownloadProgress, cancellationToken) == null) {
|
||||||
|
throw new FileNotFoundException("Could not download file");
|
||||||
|
}
|
||||||
|
|
||||||
|
reportStatus(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task EditPropertiesFile(InstancePath.Local path, string comment, ImmutableDictionary<string, string> newValues) {
|
||||||
|
string? filePath = path.Resolve(pathResolver);
|
||||||
|
if (filePath == null) {
|
||||||
|
throw new FileNotFoundException("Could not resolve path");
|
||||||
|
}
|
||||||
|
|
||||||
|
var editor = new JavaPropertiesFileEditor();
|
||||||
|
editor.SetAll(newValues);
|
||||||
|
await editor.EditOrCreate(filePath, comment, cancellationToken);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,13 +7,9 @@ public abstract record LaunchResult {
|
|||||||
|
|
||||||
public sealed record Success(InstanceProcess Process) : LaunchResult;
|
public sealed record Success(InstanceProcess Process) : LaunchResult;
|
||||||
|
|
||||||
public sealed record InvalidJavaRuntime : LaunchResult;
|
public sealed record CouldNotPrepareServerInstance : LaunchResult;
|
||||||
|
|
||||||
public sealed record CouldNotDownloadMinecraftServer : LaunchResult;
|
public sealed record CouldNotFindServerExecutable : LaunchResult;
|
||||||
|
|
||||||
public sealed record CouldNotPrepareMinecraftServerLauncher : LaunchResult;
|
public sealed record CouldNotStartServerExecutable : LaunchResult;
|
||||||
|
|
||||||
public sealed record CouldNotConfigureMinecraftServer : LaunchResult;
|
|
||||||
|
|
||||||
public sealed record CouldNotStartMinecraftServer : LaunchResult;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
using Phantom.Agent.Minecraft.Java;
|
|
||||||
using Phantom.Agent.Minecraft.Server;
|
|
||||||
|
|
||||||
namespace Phantom.Agent.Minecraft.Launcher;
|
|
||||||
|
|
||||||
public sealed record LaunchServices(MinecraftServerExecutables ServerExecutables, JavaRuntimeRepository JavaRuntimeRepository);
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
using Phantom.Agent.Minecraft.Instance;
|
|
||||||
using Phantom.Utils.IO;
|
|
||||||
using Serilog;
|
|
||||||
|
|
||||||
namespace Phantom.Agent.Minecraft.Launcher.Types;
|
|
||||||
|
|
||||||
public sealed class FabricLauncher : BaseLauncher {
|
|
||||||
public FabricLauncher(InstanceProperties instanceProperties) : base(instanceProperties) {}
|
|
||||||
|
|
||||||
private protected override async Task<ServerJarInfo> PrepareServerJar(ILogger logger, string serverJarPath, CancellationToken cancellationToken) {
|
|
||||||
var serverJarParentFolderPath = Directory.GetParent(serverJarPath);
|
|
||||||
if (serverJarParentFolderPath == null) {
|
|
||||||
throw new ArgumentException("Could not get parent folder from: " + serverJarPath, nameof(serverJarPath));
|
|
||||||
}
|
|
||||||
|
|
||||||
var launcherJarPath = Path.Combine(serverJarParentFolderPath.FullName, "fabric.jar");
|
|
||||||
|
|
||||||
if (!File.Exists(launcherJarPath)) {
|
|
||||||
await DownloadLauncher(logger, launcherJarPath, cancellationToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
return new ServerJarInfo(launcherJarPath, ["-Dfabric.installer.server.gameJar=" + Paths.NormalizeSlashes(serverJarPath)]);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task DownloadLauncher(ILogger logger, string targetFilePath, CancellationToken cancellationToken) {
|
|
||||||
// TODO customizable loader version, probably with a dedicated temporary folder
|
|
||||||
string installerUrl = $"https://meta.fabricmc.net/v2/versions/loader/{MinecraftVersion}/stable/stable/server/jar";
|
|
||||||
logger.Information("Downloading Fabric launcher from: {Url}", installerUrl);
|
|
||||||
|
|
||||||
using var http = new HttpClient();
|
|
||||||
|
|
||||||
var response = await http.GetAsync(installerUrl, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
|
|
||||||
response.EnsureSuccessStatusCode();
|
|
||||||
|
|
||||||
try {
|
|
||||||
await using var fileStream = new FileStream(targetFilePath, FileMode.CreateNew, FileAccess.Write, FileShare.Read);
|
|
||||||
await using var responseStream = await response.Content.ReadAsStreamAsync(cancellationToken);
|
|
||||||
await responseStream.CopyToAsync(fileStream, cancellationToken);
|
|
||||||
} catch (Exception) {
|
|
||||||
TryDeleteLauncherAfterFailure(logger, targetFilePath);
|
|
||||||
throw;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void TryDeleteLauncherAfterFailure(ILogger logger, string filePath) {
|
|
||||||
if (File.Exists(filePath)) {
|
|
||||||
try {
|
|
||||||
File.Delete(filePath);
|
|
||||||
} catch (Exception e) {
|
|
||||||
logger.Warning(e, "Could not clean up partially downloaded Fabric launcher: {FilePath}", filePath);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
using System.Collections.ObjectModel;
|
|
||||||
using Phantom.Agent.Minecraft.Instance;
|
|
||||||
using Phantom.Agent.Minecraft.Java;
|
|
||||||
using Serilog;
|
|
||||||
|
|
||||||
namespace Phantom.Agent.Minecraft.Launcher.Types;
|
|
||||||
|
|
||||||
public sealed class ForgeLauncher : BaseLauncher {
|
|
||||||
public ForgeLauncher(InstanceProperties instanceProperties) : base(instanceProperties) {}
|
|
||||||
|
|
||||||
private protected override void CustomizeJvmArguments(JvmArgumentBuilder arguments) {
|
|
||||||
arguments.AddProperty("terminal.ansi", "true"); // TODO
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void PrepareJavaProcessArguments(Collection<string> processArguments, string serverJarFilePath) {
|
|
||||||
if (OperatingSystem.IsWindows()) {
|
|
||||||
processArguments.Add("@libraries/net/minecraftforge/forge/1.20.1-47.2.0/win_args.txt");
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
processArguments.Add("@libraries/net/minecraftforge/forge/1.20.1-47.2.0/unix_args.txt");
|
|
||||||
}
|
|
||||||
|
|
||||||
processArguments.Add("nogui");
|
|
||||||
}
|
|
||||||
|
|
||||||
private protected override Task<ServerJarInfo> PrepareServerJar(ILogger logger, string serverJarPath, CancellationToken cancellationToken) {
|
|
||||||
return Task.FromResult(new ServerJarInfo(Path.Combine(InstanceFolder, "run.sh")));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
using Phantom.Agent.Minecraft.Server;
|
|
||||||
using Serilog;
|
|
||||||
|
|
||||||
namespace Phantom.Agent.Minecraft.Launcher.Types;
|
|
||||||
|
|
||||||
public sealed class InvalidLauncher : IServerLauncher {
|
|
||||||
public static InvalidLauncher Instance { get; } = new ();
|
|
||||||
|
|
||||||
private InvalidLauncher() {}
|
|
||||||
|
|
||||||
public Task<LaunchResult> Launch(ILogger logger, LaunchServices services, EventHandler<DownloadProgressEventArgs> downloadProgressEventHandler, CancellationToken cancellationToken) {
|
|
||||||
return Task.FromResult<LaunchResult>(new LaunchResult.CouldNotPrepareMinecraftServerLauncher());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
using Phantom.Agent.Minecraft.Instance;
|
|
||||||
|
|
||||||
namespace Phantom.Agent.Minecraft.Launcher.Types;
|
|
||||||
|
|
||||||
public sealed class VanillaLauncher : BaseLauncher {
|
|
||||||
public VanillaLauncher(InstanceProperties instanceProperties) : base(instanceProperties) {}
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
namespace Phantom.Agent.Minecraft.Properties;
|
|
||||||
|
|
||||||
static class MinecraftServerProperties {
|
|
||||||
private sealed class Boolean : MinecraftServerProperty<bool> {
|
|
||||||
public Boolean(string key) : base(key) {}
|
|
||||||
|
|
||||||
protected override bool Read(string value) => value.Equals("true", StringComparison.OrdinalIgnoreCase);
|
|
||||||
protected override string Write(bool value) => value ? "true" : "false";
|
|
||||||
}
|
|
||||||
|
|
||||||
private sealed class UnsignedShort : MinecraftServerProperty<ushort> {
|
|
||||||
public UnsignedShort(string key) : base(key) {}
|
|
||||||
|
|
||||||
protected override ushort Read(string value) => ushort.Parse(value);
|
|
||||||
protected override string Write(ushort value) => value.ToString();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static readonly MinecraftServerProperty<ushort> ServerPort = new UnsignedShort("server-port");
|
|
||||||
public static readonly MinecraftServerProperty<ushort> RconPort = new UnsignedShort("rcon.port");
|
|
||||||
public static readonly MinecraftServerProperty<bool> EnableRcon = new Boolean("enable-rcon");
|
|
||||||
public static readonly MinecraftServerProperty<bool> SyncChunkWrites = new Boolean("sync-chunk-writes");
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
using Phantom.Agent.Minecraft.Java;
|
|
||||||
|
|
||||||
namespace Phantom.Agent.Minecraft.Properties;
|
|
||||||
|
|
||||||
abstract class MinecraftServerProperty<T> {
|
|
||||||
private readonly string key;
|
|
||||||
|
|
||||||
protected MinecraftServerProperty(string key) {
|
|
||||||
this.key = key;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected abstract T Read(string value);
|
|
||||||
protected abstract string Write(T value);
|
|
||||||
|
|
||||||
public void Set(JavaPropertiesFileEditor properties, T value) {
|
|
||||||
properties.Set(key, Write(value));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
using Phantom.Agent.Minecraft.Java;
|
|
||||||
|
|
||||||
namespace Phantom.Agent.Minecraft.Properties;
|
|
||||||
|
|
||||||
public sealed record ServerProperties(
|
|
||||||
ushort ServerPort,
|
|
||||||
ushort RconPort,
|
|
||||||
bool EnableRcon = true,
|
|
||||||
bool SyncChunkWrites = false
|
|
||||||
) {
|
|
||||||
internal void SetTo(JavaPropertiesFileEditor properties) {
|
|
||||||
MinecraftServerProperties.ServerPort.Set(properties, ServerPort);
|
|
||||||
MinecraftServerProperties.RconPort.Set(properties, RconPort);
|
|
||||||
MinecraftServerProperties.EnableRcon.Set(properties, EnableRcon);
|
|
||||||
MinecraftServerProperties.SyncChunkWrites.Set(properties, SyncChunkWrites);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2,9 +2,9 @@
|
|||||||
|
|
||||||
public sealed class DownloadProgressEventArgs : EventArgs {
|
public sealed class DownloadProgressEventArgs : EventArgs {
|
||||||
public ulong DownloadedBytes { get; }
|
public ulong DownloadedBytes { get; }
|
||||||
public ulong TotalBytes { get; }
|
public ulong? TotalBytes { get; }
|
||||||
|
|
||||||
internal DownloadProgressEventArgs(ulong downloadedBytes, ulong totalBytes) {
|
internal DownloadProgressEventArgs(ulong downloadedBytes, ulong? totalBytes) {
|
||||||
DownloadedBytes = downloadedBytes;
|
DownloadedBytes = downloadedBytes;
|
||||||
TotalBytes = totalBytes;
|
TotalBytes = totalBytes;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
namespace Phantom.Agent.Minecraft.Server;
|
||||||
|
|
||||||
|
sealed record FileDownloadListener(EventHandler<DownloadProgressEventArgs> DownloadProgressEventHandler, CancellationToken CancellationToken);
|
||||||
52
Agent/Phantom.Agent.Minecraft/Server/FileDownloadManager.cs
Normal file
52
Agent/Phantom.Agent.Minecraft/Server/FileDownloadManager.cs
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
using Phantom.Common.Data.Minecraft;
|
||||||
|
using Phantom.Utils.IO;
|
||||||
|
using Phantom.Utils.Logging;
|
||||||
|
using Serilog;
|
||||||
|
|
||||||
|
namespace Phantom.Agent.Minecraft.Server;
|
||||||
|
|
||||||
|
public sealed class FileDownloadManager {
|
||||||
|
private static readonly ILogger Logger = PhantomLogger.Create<FileDownloadManager>();
|
||||||
|
|
||||||
|
private readonly Dictionary<string, FileDownloader> runningDownloadersByPath = new ();
|
||||||
|
|
||||||
|
internal async Task<string?> DownloadAndGetPath(FileDownloadInfo fileDownloadInfo, string filePath, EventHandler<DownloadProgressEventArgs> progressEventHandler, CancellationToken cancellationToken) {
|
||||||
|
var fileInfo = new FileInfo(filePath);
|
||||||
|
if (fileInfo.Exists) {
|
||||||
|
return filePath;
|
||||||
|
}
|
||||||
|
|
||||||
|
filePath = fileInfo.FullName;
|
||||||
|
|
||||||
|
if (Directory.GetParent(filePath) is {} parentPath) {
|
||||||
|
try {
|
||||||
|
Directories.Create(parentPath.FullName, Chmod.URWX_GRX);
|
||||||
|
} catch (Exception e) {
|
||||||
|
Logger.Error(e, "Unable to create folder: {FolderName}", parentPath.FullName);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
FileDownloader? downloader;
|
||||||
|
FileDownloadListener listener = new (progressEventHandler, cancellationToken);
|
||||||
|
|
||||||
|
lock (this) {
|
||||||
|
if (runningDownloadersByPath.TryGetValue(filePath, out downloader)) {
|
||||||
|
Logger.Information("A download for {Path} is already running, waiting for it to finish...", filePath);
|
||||||
|
downloader.Register(listener);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
downloader = new FileDownloader(fileDownloadInfo, filePath, listener);
|
||||||
|
downloader.Completed += (_, _) => {
|
||||||
|
lock (this) {
|
||||||
|
runningDownloadersByPath.Remove(filePath);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
runningDownloadersByPath[filePath] = downloader;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return await downloader.Task.WaitAsync(cancellationToken);
|
||||||
|
}
|
||||||
|
}
|
||||||
202
Agent/Phantom.Agent.Minecraft/Server/FileDownloader.cs
Normal file
202
Agent/Phantom.Agent.Minecraft/Server/FileDownloader.cs
Normal file
@@ -0,0 +1,202 @@
|
|||||||
|
using System.Security.Cryptography;
|
||||||
|
using Phantom.Common.Data.Minecraft;
|
||||||
|
using Phantom.Utils.Cryptography;
|
||||||
|
using Phantom.Utils.IO;
|
||||||
|
using Phantom.Utils.Logging;
|
||||||
|
using Phantom.Utils.Net;
|
||||||
|
using Phantom.Utils.Runtime;
|
||||||
|
using Serilog;
|
||||||
|
|
||||||
|
namespace Phantom.Agent.Minecraft.Server;
|
||||||
|
|
||||||
|
sealed class FileDownloader {
|
||||||
|
private static readonly ILogger Logger = PhantomLogger.Create<FileDownloader>();
|
||||||
|
|
||||||
|
public Task<string?> Task { get; }
|
||||||
|
public event EventHandler<DownloadProgressEventArgs>? DownloadProgress;
|
||||||
|
public event EventHandler? Completed;
|
||||||
|
|
||||||
|
private readonly CancellationTokenSource cancellationTokenSource = new ();
|
||||||
|
|
||||||
|
private readonly List<CancellationTokenRegistration> listenerCancellationRegistrations = [];
|
||||||
|
private int listenerCount = 0;
|
||||||
|
|
||||||
|
public FileDownloader(FileDownloadInfo fileDownloadInfo, string filePath, FileDownloadListener listener) {
|
||||||
|
Register(listener);
|
||||||
|
Task = DownloadFileAndGetFinalPath(fileDownloadInfo, filePath, new DownloadProgressCallback(this), cancellationTokenSource.Token);
|
||||||
|
Task.ContinueWith(OnCompleted, TaskScheduler.Default);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Register(FileDownloadListener listener) {
|
||||||
|
int newListenerCount;
|
||||||
|
|
||||||
|
lock (this) {
|
||||||
|
newListenerCount = ++listenerCount;
|
||||||
|
|
||||||
|
DownloadProgress += listener.DownloadProgressEventHandler;
|
||||||
|
listenerCancellationRegistrations.Add(listener.CancellationToken.Register(Unregister, listener));
|
||||||
|
}
|
||||||
|
|
||||||
|
Logger.Debug("Registered download listener, current listener count: {Listeners}", newListenerCount);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Unregister(object? listenerObject) {
|
||||||
|
int newListenerCount;
|
||||||
|
|
||||||
|
lock (this) {
|
||||||
|
FileDownloadListener listener = (FileDownloadListener) listenerObject!;
|
||||||
|
DownloadProgress -= listener.DownloadProgressEventHandler;
|
||||||
|
|
||||||
|
newListenerCount = --listenerCount;
|
||||||
|
if (newListenerCount <= 0) {
|
||||||
|
cancellationTokenSource.Cancel();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (newListenerCount <= 0) {
|
||||||
|
Logger.Debug("Unregistered last download listener, cancelling download.");
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
Logger.Debug("Unregistered download listener, current listener count: {Listeners}", newListenerCount);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ReportDownloadProgress(DownloadProgressEventArgs args) {
|
||||||
|
DownloadProgress?.Invoke(this, args);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnCompleted(Task task) {
|
||||||
|
Logger.Debug("Download task completed.");
|
||||||
|
|
||||||
|
lock (this) {
|
||||||
|
Completed?.Invoke(this, EventArgs.Empty);
|
||||||
|
Completed = null;
|
||||||
|
DownloadProgress = null;
|
||||||
|
|
||||||
|
foreach (var registration in listenerCancellationRegistrations) {
|
||||||
|
registration.Dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
listenerCancellationRegistrations.Clear();
|
||||||
|
cancellationTokenSource.Dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class DownloadProgressCallback(FileDownloader downloader) {
|
||||||
|
public void ReportProgress(ulong downloadedBytes, ulong? totalBytes) {
|
||||||
|
downloader.ReportDownloadProgress(new DownloadProgressEventArgs(downloadedBytes, totalBytes));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static async Task<string?> DownloadFileAndGetFinalPath(FileDownloadInfo fileDownloadInfo, string filePath, DownloadProgressCallback progressCallback, CancellationToken cancellationToken) {
|
||||||
|
string tmpFilePath = filePath + ".tmp";
|
||||||
|
|
||||||
|
try {
|
||||||
|
await DownloadFile(tmpFilePath, fileDownloadInfo, progressCallback, cancellationToken);
|
||||||
|
MoveDownloadedFile(filePath, tmpFilePath);
|
||||||
|
} catch (Exception) {
|
||||||
|
TryDeletePartiallyDownloadedFile(tmpFilePath);
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
|
||||||
|
return filePath;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static async Task DownloadFile(string filePath, FileDownloadInfo fileDownloadInfo, DownloadProgressCallback progressCallback, CancellationToken cancellationToken) {
|
||||||
|
string downloadUrl = fileDownloadInfo.DownloadUrl;
|
||||||
|
|
||||||
|
DownloadResult result;
|
||||||
|
try {
|
||||||
|
var httpClient = new HttpClient();
|
||||||
|
var response = await httpClient.GetAsync(downloadUrl, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
|
||||||
|
response.EnsureSuccessStatusCode();
|
||||||
|
|
||||||
|
FileSize? fileSize = response.Headers.ContentLength;
|
||||||
|
ulong? fileSizeBytes = fileSize?.Bytes;
|
||||||
|
|
||||||
|
Logger.Information("Downloading {Url} ({Size})...", downloadUrl, FormatFileSize(fileSize));
|
||||||
|
progressCallback.ReportProgress(downloadedBytes: 0, fileSizeBytes);
|
||||||
|
|
||||||
|
await using var fileStream = new FileStream(filePath, FileMode.CreateNew, FileAccess.Write, FileShare.Read);
|
||||||
|
await using var responseStream = await response.Content.ReadAsStreamAsync(cancellationToken);
|
||||||
|
|
||||||
|
using var streamCopier = new DownloadStreamCopier(progressCallback, fileSizeBytes);
|
||||||
|
result = await streamCopier.Copy(responseStream, fileStream, cancellationToken);
|
||||||
|
} catch (OperationCanceledException) {
|
||||||
|
Logger.Information("File download was cancelled: {Url}", downloadUrl);
|
||||||
|
throw;
|
||||||
|
} catch (Exception e) {
|
||||||
|
Logger.Error(e, "Could not download file: {Url}", downloadUrl);
|
||||||
|
throw StopProcedureException.Instance;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fileDownloadInfo.Hash is {} expectedHash && !result.Hash.Equals(expectedHash)) {
|
||||||
|
Logger.Error("Downloaded file from {Url} has mismatched SHA1 hash. Expected {Expected}, got {Actual}.", downloadUrl, expectedHash, result.Hash);
|
||||||
|
throw StopProcedureException.Instance;
|
||||||
|
}
|
||||||
|
|
||||||
|
Logger.Information("Finished downloading {Url} ({Size}).", downloadUrl, FormatFileSize(result.Size));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string FormatFileSize(FileSize? fileSize) {
|
||||||
|
return fileSize?.ToHumanReadable(decimalPlaces: 1) ?? "unknown size";
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void MoveDownloadedFile(string filePath, string tmpFilePath) {
|
||||||
|
try {
|
||||||
|
File.Move(tmpFilePath, filePath, overwrite: true);
|
||||||
|
} catch (Exception e) {
|
||||||
|
Logger.Error(e, "Could not move downloaded file from {SourcePath} to {TargetPath}", tmpFilePath, filePath);
|
||||||
|
throw StopProcedureException.Instance;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void TryDeletePartiallyDownloadedFile(string filePath) {
|
||||||
|
if (!File.Exists(filePath)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
File.Delete(filePath);
|
||||||
|
} catch (Exception e) {
|
||||||
|
Logger.Warning(e, "Could not clean up partially downloaded file: {FilePath}", filePath);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class DownloadStreamCopier : IDisposable {
|
||||||
|
private readonly StreamCopier streamCopier = new ();
|
||||||
|
private readonly IncrementalHash sha1 = IncrementalHash.CreateHash(HashAlgorithmName.SHA1);
|
||||||
|
|
||||||
|
private readonly DownloadProgressCallback progressCallback;
|
||||||
|
private readonly ulong? totalBytes;
|
||||||
|
private ulong readBytes;
|
||||||
|
|
||||||
|
public DownloadStreamCopier(DownloadProgressCallback progressCallback, ulong? totalBytes) {
|
||||||
|
this.progressCallback = progressCallback;
|
||||||
|
this.totalBytes = totalBytes;
|
||||||
|
this.streamCopier.BufferReady += OnBufferReady;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnBufferReady(object? sender, StreamCopier.BufferEventArgs args) {
|
||||||
|
sha1.AppendData(args.Buffer.Span);
|
||||||
|
|
||||||
|
readBytes += (uint) args.Buffer.Length;
|
||||||
|
progressCallback.ReportProgress(readBytes, totalBytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<DownloadResult> Copy(Stream source, Stream destination, CancellationToken cancellationToken) {
|
||||||
|
await streamCopier.Copy(source, destination, cancellationToken);
|
||||||
|
|
||||||
|
FileSize size = new FileSize(readBytes);
|
||||||
|
Sha1String hash = Sha1String.FromBytes(sha1.GetHashAndReset());
|
||||||
|
return new DownloadResult(size, hash);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose() {
|
||||||
|
sha1.Dispose();
|
||||||
|
streamCopier.Dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private readonly record struct DownloadResult(FileSize Size, Sha1String Hash);
|
||||||
|
}
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
namespace Phantom.Agent.Minecraft.Server;
|
|
||||||
|
|
||||||
sealed record MinecraftServerExecutableDownloadListener(EventHandler<DownloadProgressEventArgs> DownloadProgressEventHandler, CancellationToken CancellationToken);
|
|
||||||
@@ -1,190 +0,0 @@
|
|||||||
using System.Security.Cryptography;
|
|
||||||
using Phantom.Common.Data.Minecraft;
|
|
||||||
using Phantom.Utils.Cryptography;
|
|
||||||
using Phantom.Utils.IO;
|
|
||||||
using Phantom.Utils.Logging;
|
|
||||||
using Phantom.Utils.Runtime;
|
|
||||||
using Serilog;
|
|
||||||
|
|
||||||
namespace Phantom.Agent.Minecraft.Server;
|
|
||||||
|
|
||||||
sealed class MinecraftServerExecutableDownloader {
|
|
||||||
private static readonly ILogger Logger = PhantomLogger.Create<MinecraftServerExecutableDownloader>();
|
|
||||||
|
|
||||||
public Task<string?> Task { get; }
|
|
||||||
public event EventHandler<DownloadProgressEventArgs>? DownloadProgress;
|
|
||||||
public event EventHandler? Completed;
|
|
||||||
|
|
||||||
private readonly CancellationTokenSource cancellationTokenSource = new ();
|
|
||||||
|
|
||||||
private readonly List<CancellationTokenRegistration> listenerCancellationRegistrations = [];
|
|
||||||
private int listenerCount = 0;
|
|
||||||
|
|
||||||
public MinecraftServerExecutableDownloader(FileDownloadInfo fileDownloadInfo, string minecraftVersion, string filePath, MinecraftServerExecutableDownloadListener listener) {
|
|
||||||
Register(listener);
|
|
||||||
Task = DownloadAndGetPath(fileDownloadInfo, minecraftVersion, filePath, new DownloadProgressCallback(this), cancellationTokenSource.Token);
|
|
||||||
Task.ContinueWith(OnCompleted, TaskScheduler.Default);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Register(MinecraftServerExecutableDownloadListener listener) {
|
|
||||||
int newListenerCount;
|
|
||||||
|
|
||||||
lock (this) {
|
|
||||||
newListenerCount = ++listenerCount;
|
|
||||||
|
|
||||||
DownloadProgress += listener.DownloadProgressEventHandler;
|
|
||||||
listenerCancellationRegistrations.Add(listener.CancellationToken.Register(Unregister, listener));
|
|
||||||
}
|
|
||||||
|
|
||||||
Logger.Debug("Registered download listener, current listener count: {Listeners}", newListenerCount);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void Unregister(object? listenerObject) {
|
|
||||||
int newListenerCount;
|
|
||||||
|
|
||||||
lock (this) {
|
|
||||||
MinecraftServerExecutableDownloadListener listener = (MinecraftServerExecutableDownloadListener) listenerObject!;
|
|
||||||
DownloadProgress -= listener.DownloadProgressEventHandler;
|
|
||||||
|
|
||||||
newListenerCount = --listenerCount;
|
|
||||||
if (newListenerCount <= 0) {
|
|
||||||
cancellationTokenSource.Cancel();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (newListenerCount <= 0) {
|
|
||||||
Logger.Debug("Unregistered last download listener, cancelling download.");
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
Logger.Debug("Unregistered download listener, current listener count: {Listeners}", newListenerCount);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ReportDownloadProgress(DownloadProgressEventArgs args) {
|
|
||||||
DownloadProgress?.Invoke(this, args);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnCompleted(Task task) {
|
|
||||||
Logger.Debug("Download task completed.");
|
|
||||||
|
|
||||||
lock (this) {
|
|
||||||
Completed?.Invoke(this, EventArgs.Empty);
|
|
||||||
Completed = null;
|
|
||||||
DownloadProgress = null;
|
|
||||||
|
|
||||||
foreach (var registration in listenerCancellationRegistrations) {
|
|
||||||
registration.Dispose();
|
|
||||||
}
|
|
||||||
|
|
||||||
listenerCancellationRegistrations.Clear();
|
|
||||||
cancellationTokenSource.Dispose();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private sealed class DownloadProgressCallback {
|
|
||||||
private readonly MinecraftServerExecutableDownloader downloader;
|
|
||||||
|
|
||||||
public DownloadProgressCallback(MinecraftServerExecutableDownloader downloader) {
|
|
||||||
this.downloader = downloader;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void ReportProgress(ulong downloadedBytes, ulong totalBytes) {
|
|
||||||
downloader.ReportDownloadProgress(new DownloadProgressEventArgs(downloadedBytes, totalBytes));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static async Task<string?> DownloadAndGetPath(FileDownloadInfo fileDownloadInfo, string minecraftVersion, string filePath, DownloadProgressCallback progressCallback, CancellationToken cancellationToken) {
|
|
||||||
string tmpFilePath = filePath + ".tmp";
|
|
||||||
|
|
||||||
try {
|
|
||||||
Logger.Information("Downloading server version {Version} from: {Url} ({Size})", minecraftVersion, fileDownloadInfo.DownloadUrl, fileDownloadInfo.Size.ToHumanReadable(decimalPlaces: 1));
|
|
||||||
try {
|
|
||||||
using var http = new HttpClient();
|
|
||||||
await FetchServerExecutableFile(http, progressCallback, fileDownloadInfo, tmpFilePath, cancellationToken);
|
|
||||||
} catch (Exception) {
|
|
||||||
TryDeleteExecutableAfterFailure(tmpFilePath);
|
|
||||||
throw;
|
|
||||||
}
|
|
||||||
|
|
||||||
File.Move(tmpFilePath, filePath, overwrite: true);
|
|
||||||
Logger.Information("Server version {Version} downloaded.", minecraftVersion);
|
|
||||||
|
|
||||||
return filePath;
|
|
||||||
} catch (OperationCanceledException) {
|
|
||||||
Logger.Information("Download for server version {Version} was cancelled.", minecraftVersion);
|
|
||||||
throw;
|
|
||||||
} catch (StopProcedureException) {
|
|
||||||
return null;
|
|
||||||
} catch (Exception e) {
|
|
||||||
Logger.Error(e, "An unexpected error occurred.");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static async Task FetchServerExecutableFile(HttpClient http, DownloadProgressCallback progressCallback, FileDownloadInfo fileDownloadInfo, string filePath, CancellationToken cancellationToken) {
|
|
||||||
Sha1String downloadedFileHash;
|
|
||||||
|
|
||||||
try {
|
|
||||||
var response = await http.GetAsync(fileDownloadInfo.DownloadUrl, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
|
|
||||||
response.EnsureSuccessStatusCode();
|
|
||||||
|
|
||||||
await using var fileStream = new FileStream(filePath, FileMode.CreateNew, FileAccess.Write, FileShare.Read);
|
|
||||||
await using var responseStream = await response.Content.ReadAsStreamAsync(cancellationToken);
|
|
||||||
|
|
||||||
using var streamCopier = new MinecraftServerDownloadStreamCopier(progressCallback, fileDownloadInfo.Size.Bytes);
|
|
||||||
downloadedFileHash = await streamCopier.Copy(responseStream, fileStream, cancellationToken);
|
|
||||||
} catch (OperationCanceledException) {
|
|
||||||
throw;
|
|
||||||
} catch (Exception e) {
|
|
||||||
Logger.Error(e, "Unable to download server executable.");
|
|
||||||
throw StopProcedureException.Instance;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!downloadedFileHash.Equals(fileDownloadInfo.Hash)) {
|
|
||||||
Logger.Error("Downloaded server executable has mismatched SHA1 hash. Expected {Expected}, got {Actual}.", fileDownloadInfo.Hash, downloadedFileHash);
|
|
||||||
throw StopProcedureException.Instance;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void TryDeleteExecutableAfterFailure(string filePath) {
|
|
||||||
if (File.Exists(filePath)) {
|
|
||||||
try {
|
|
||||||
File.Delete(filePath);
|
|
||||||
} catch (Exception e) {
|
|
||||||
Logger.Warning(e, "Could not clean up partially downloaded server executable: {FilePath}", filePath);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private sealed class MinecraftServerDownloadStreamCopier : IDisposable {
|
|
||||||
private readonly StreamCopier streamCopier = new ();
|
|
||||||
private readonly IncrementalHash sha1 = IncrementalHash.CreateHash(HashAlgorithmName.SHA1);
|
|
||||||
|
|
||||||
private readonly DownloadProgressCallback progressCallback;
|
|
||||||
private readonly ulong totalBytes;
|
|
||||||
private ulong readBytes;
|
|
||||||
|
|
||||||
public MinecraftServerDownloadStreamCopier(DownloadProgressCallback progressCallback, ulong totalBytes) {
|
|
||||||
this.progressCallback = progressCallback;
|
|
||||||
this.totalBytes = totalBytes;
|
|
||||||
this.streamCopier.BufferReady += OnBufferReady;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnBufferReady(object? sender, StreamCopier.BufferEventArgs args) {
|
|
||||||
sha1.AppendData(args.Buffer.Span);
|
|
||||||
|
|
||||||
readBytes += (uint) args.Buffer.Length;
|
|
||||||
progressCallback.ReportProgress(readBytes, totalBytes);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<Sha1String> Copy(Stream source, Stream destination, CancellationToken cancellationToken) {
|
|
||||||
await streamCopier.Copy(source, destination, cancellationToken);
|
|
||||||
return Sha1String.FromBytes(sha1.GetHashAndReset());
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Dispose() {
|
|
||||||
sha1.Dispose();
|
|
||||||
streamCopier.Dispose();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
using System.Text.RegularExpressions;
|
|
||||||
using Phantom.Common.Data.Minecraft;
|
|
||||||
using Phantom.Utils.IO;
|
|
||||||
using Phantom.Utils.Logging;
|
|
||||||
using Serilog;
|
|
||||||
|
|
||||||
namespace Phantom.Agent.Minecraft.Server;
|
|
||||||
|
|
||||||
public sealed partial class MinecraftServerExecutables {
|
|
||||||
private static readonly ILogger Logger = PhantomLogger.Create<MinecraftServerExecutables>();
|
|
||||||
|
|
||||||
[GeneratedRegex(@"[^a-zA-Z0-9_\-\.]", RegexOptions.Compiled)]
|
|
||||||
private static partial Regex SanitizePathRegex();
|
|
||||||
|
|
||||||
private readonly string basePath;
|
|
||||||
private readonly Dictionary<string, MinecraftServerExecutableDownloader> runningDownloadersByVersion = new ();
|
|
||||||
|
|
||||||
public MinecraftServerExecutables(string basePath) {
|
|
||||||
this.basePath = basePath;
|
|
||||||
}
|
|
||||||
|
|
||||||
internal async Task<string?> DownloadAndGetPath(FileDownloadInfo? fileDownloadInfo, string minecraftVersion, EventHandler<DownloadProgressEventArgs> progressEventHandler, CancellationToken cancellationToken) {
|
|
||||||
string serverExecutableFolderPath = Path.Combine(basePath, SanitizePathRegex().IsMatch(minecraftVersion) ? SanitizePathRegex().Replace(minecraftVersion, "_") : minecraftVersion);
|
|
||||||
string serverExecutableFilePath = Path.Combine(serverExecutableFolderPath, "server.jar");
|
|
||||||
|
|
||||||
if (File.Exists(serverExecutableFilePath)) {
|
|
||||||
return serverExecutableFilePath;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fileDownloadInfo == null) {
|
|
||||||
Logger.Error("Unable to download server executable for version {Version} because no download info was provided.", minecraftVersion);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
Directories.Create(serverExecutableFolderPath, Chmod.URWX_GRX);
|
|
||||||
} catch (Exception e) {
|
|
||||||
Logger.Error(e, "Unable to create folder for server executable: {ServerExecutableFolderPath}", serverExecutableFolderPath);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
MinecraftServerExecutableDownloader? downloader;
|
|
||||||
MinecraftServerExecutableDownloadListener listener = new (progressEventHandler, cancellationToken);
|
|
||||||
|
|
||||||
lock (this) {
|
|
||||||
if (runningDownloadersByVersion.TryGetValue(minecraftVersion, out downloader)) {
|
|
||||||
Logger.Information("A download for server version {Version} is already running, waiting for it to finish...", minecraftVersion);
|
|
||||||
downloader.Register(listener);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
downloader = new MinecraftServerExecutableDownloader(fileDownloadInfo, minecraftVersion, serverExecutableFilePath, listener);
|
|
||||||
downloader.Completed += (_, _) => {
|
|
||||||
lock (this) {
|
|
||||||
runningDownloadersByVersion.Remove(minecraftVersion);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
runningDownloadersByVersion[minecraftVersion] = downloader;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return await downloader.Task.WaitAsync(cancellationToken);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -7,12 +7,12 @@ namespace Phantom.Agent.Services;
|
|||||||
public sealed class AgentFolders {
|
public sealed class AgentFolders {
|
||||||
private static readonly ILogger Logger = PhantomLogger.Create<AgentFolders>();
|
private static readonly ILogger Logger = PhantomLogger.Create<AgentFolders>();
|
||||||
|
|
||||||
public string DataFolderPath { get; }
|
internal string DataFolderPath { get; }
|
||||||
public string InstancesFolderPath { get; }
|
internal string InstancesFolderPath { get; }
|
||||||
public string BackupsFolderPath { get; }
|
internal string BackupsFolderPath { get; }
|
||||||
|
|
||||||
public string TemporaryFolderPath { get; }
|
internal string TemporaryFolderPath { get; }
|
||||||
public string ServerExecutableFolderPath { get; }
|
internal string ServerExecutableFolderPath { get; }
|
||||||
|
|
||||||
public string JavaSearchFolderPath { get; }
|
public string JavaSearchFolderPath { get; }
|
||||||
|
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ public sealed class AgentRegistrationHandler {
|
|||||||
foreach (var configureInstanceMessage in configureInstanceMessages) {
|
foreach (var configureInstanceMessage in configureInstanceMessages) {
|
||||||
var configureInstanceResult = await agentServices.InstanceManager.Request(GetCommand(configureInstanceMessage), cancellationToken);
|
var configureInstanceResult = await agentServices.InstanceManager.Request(GetCommand(configureInstanceMessage), cancellationToken);
|
||||||
if (!configureInstanceResult.Is(ConfigureInstanceResult.Success)) {
|
if (!configureInstanceResult.Is(ConfigureInstanceResult.Success)) {
|
||||||
logger.Fatal("Unable to configure instance \"{Name}\" (GUID {Guid}), shutting down.", configureInstanceMessage.Configuration.InstanceName, configureInstanceMessage.InstanceGuid);
|
logger.Fatal("Unable to configure instance \"{Name}\" (GUID {Guid}), shutting down.", configureInstanceMessage.Info.InstanceName, configureInstanceMessage.InstanceGuid);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -66,7 +66,7 @@ public sealed class AgentRegistrationHandler {
|
|||||||
foreach (var configureInstanceMessage in configureInstanceMessages) {
|
foreach (var configureInstanceMessage in configureInstanceMessages) {
|
||||||
var configureInstanceResult = await agentServices.InstanceManager.Request(GetCommand(configureInstanceMessage), cancellationToken);
|
var configureInstanceResult = await agentServices.InstanceManager.Request(GetCommand(configureInstanceMessage), cancellationToken);
|
||||||
if (!configureInstanceResult.Is(ConfigureInstanceResult.Success)) {
|
if (!configureInstanceResult.Is(ConfigureInstanceResult.Success)) {
|
||||||
logger.Error("Unable to configure instance \"{Name}\" (GUID {Guid}).", configureInstanceMessage.Configuration.InstanceName, configureInstanceMessage.InstanceGuid);
|
logger.Error("Unable to configure instance \"{Name}\" (GUID {Guid}).", configureInstanceMessage.Info.InstanceName, configureInstanceMessage.InstanceGuid);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -76,8 +76,8 @@ public sealed class AgentRegistrationHandler {
|
|||||||
private static InstanceManagerActor.ConfigureInstanceCommand GetCommand(ConfigureInstanceMessage configureInstanceMessage) {
|
private static InstanceManagerActor.ConfigureInstanceCommand GetCommand(ConfigureInstanceMessage configureInstanceMessage) {
|
||||||
return new InstanceManagerActor.ConfigureInstanceCommand(
|
return new InstanceManagerActor.ConfigureInstanceCommand(
|
||||||
configureInstanceMessage.InstanceGuid,
|
configureInstanceMessage.InstanceGuid,
|
||||||
configureInstanceMessage.Configuration,
|
configureInstanceMessage.Info,
|
||||||
configureInstanceMessage.LaunchProperties,
|
configureInstanceMessage.LaunchRecipe,
|
||||||
configureInstanceMessage.LaunchNow,
|
configureInstanceMessage.LaunchNow,
|
||||||
AlwaysReportStatus: true
|
AlwaysReportStatus: true
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ sealed class InstanceActor : ReceiveActor<InstanceActor.ICommand> {
|
|||||||
|
|
||||||
public sealed record ReportInstanceStatusCommand : ICommand;
|
public sealed record ReportInstanceStatusCommand : ICommand;
|
||||||
|
|
||||||
public sealed record LaunchInstanceCommand(InstanceConfiguration Configuration, IServerLauncher Launcher, InstanceTicketManager.Ticket Ticket, bool IsRestarting) : ICommand;
|
public sealed record LaunchInstanceCommand(InstanceInfo Info, InstanceLauncher Launcher, InstanceTicketManager.Ticket Ticket, bool IsRestarting) : ICommand;
|
||||||
|
|
||||||
public sealed record StopInstanceCommand(MinecraftStopStrategy StopStrategy) : ICommand;
|
public sealed record StopInstanceCommand(MinecraftStopStrategy StopStrategy) : ICommand;
|
||||||
|
|
||||||
@@ -100,9 +100,14 @@ sealed class InstanceActor : ReceiveActor<InstanceActor.ICommand> {
|
|||||||
|
|
||||||
private async Task LaunchInstance(LaunchInstanceCommand command) {
|
private async Task LaunchInstance(LaunchInstanceCommand command) {
|
||||||
if (command.IsRestarting || runningState is null) {
|
if (command.IsRestarting || runningState is null) {
|
||||||
SetAndReportStatus(command.IsRestarting ? InstanceStatus.Restarting : InstanceStatus.Launching);
|
var defaultLaunchStatus = command.IsRestarting ? InstanceStatus.Restarting : InstanceStatus.Launching;
|
||||||
|
SetAndReportStatus(defaultLaunchStatus);
|
||||||
|
|
||||||
var newState = await InstanceLaunchProcedure.Run(context, command.Configuration, command.Launcher, instanceTicketManager, command.Ticket, SetAndReportStatus, shutdownCancellationToken);
|
void UpdateStatus(IInstanceStatus? newStatus) {
|
||||||
|
SetAndReportStatus(newStatus ?? defaultLaunchStatus);
|
||||||
|
}
|
||||||
|
|
||||||
|
var newState = await InstanceLaunchProcedure.Run(context, command.Info, command.Launcher, instanceTicketManager, command.Ticket, UpdateStatus, shutdownCancellationToken);
|
||||||
if (newState is null) {
|
if (newState is null) {
|
||||||
instanceTicketManager.Release(command.Ticket);
|
instanceTicketManager.Release(command.Ticket);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,12 @@
|
|||||||
using Phantom.Agent.Minecraft.Instance;
|
using Phantom.Agent.Minecraft.Instance;
|
||||||
using Phantom.Agent.Minecraft.Java;
|
using Phantom.Agent.Minecraft.Java;
|
||||||
using Phantom.Agent.Minecraft.Launcher;
|
using Phantom.Agent.Minecraft.Launcher;
|
||||||
using Phantom.Agent.Minecraft.Launcher.Types;
|
|
||||||
using Phantom.Agent.Minecraft.Properties;
|
|
||||||
using Phantom.Agent.Minecraft.Server;
|
using Phantom.Agent.Minecraft.Server;
|
||||||
using Phantom.Agent.Services.Backups;
|
using Phantom.Agent.Services.Backups;
|
||||||
using Phantom.Agent.Services.Rpc;
|
using Phantom.Agent.Services.Rpc;
|
||||||
using Phantom.Common.Data;
|
using Phantom.Common.Data;
|
||||||
using Phantom.Common.Data.Instance;
|
using Phantom.Common.Data.Instance;
|
||||||
|
using Phantom.Common.Data.Instance.Launch;
|
||||||
using Phantom.Common.Data.Minecraft;
|
using Phantom.Common.Data.Minecraft;
|
||||||
using Phantom.Common.Data.Replies;
|
using Phantom.Common.Data.Replies;
|
||||||
using Phantom.Utils.Actor;
|
using Phantom.Utils.Actor;
|
||||||
@@ -27,11 +26,11 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
|
|||||||
}
|
}
|
||||||
|
|
||||||
private readonly AgentState agentState;
|
private readonly AgentState agentState;
|
||||||
private readonly string basePath;
|
private readonly AgentFolders agentFolders;
|
||||||
|
|
||||||
private readonly InstanceServices instanceServices;
|
private readonly InstanceServices instanceServices;
|
||||||
private readonly InstanceTicketManager instanceTicketManager;
|
private readonly InstanceTicketManager instanceTicketManager;
|
||||||
private readonly Dictionary<Guid, InstanceInfo> instances = new ();
|
private readonly Dictionary<Guid, Instance> instances = new ();
|
||||||
|
|
||||||
private readonly CancellationTokenSource shutdownCancellationTokenSource = new ();
|
private readonly CancellationTokenSource shutdownCancellationTokenSource = new ();
|
||||||
private readonly CancellationToken shutdownCancellationToken;
|
private readonly CancellationToken shutdownCancellationToken;
|
||||||
@@ -40,15 +39,12 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
|
|||||||
|
|
||||||
private InstanceManagerActor(Init init) {
|
private InstanceManagerActor(Init init) {
|
||||||
this.agentState = init.AgentState;
|
this.agentState = init.AgentState;
|
||||||
this.basePath = init.AgentFolders.InstancesFolderPath;
|
this.agentFolders = init.AgentFolders;
|
||||||
|
|
||||||
|
this.instanceServices = new InstanceServices(init.ControllerConnection, init.BackupManager, new FileDownloadManager(), init.JavaRuntimeRepository);
|
||||||
this.instanceTicketManager = init.InstanceTicketManager;
|
this.instanceTicketManager = init.InstanceTicketManager;
|
||||||
this.shutdownCancellationToken = shutdownCancellationTokenSource.Token;
|
this.shutdownCancellationToken = shutdownCancellationTokenSource.Token;
|
||||||
|
|
||||||
var minecraftServerExecutables = new MinecraftServerExecutables(init.AgentFolders.ServerExecutableFolderPath);
|
|
||||||
var launchServices = new LaunchServices(minecraftServerExecutables, init.JavaRuntimeRepository);
|
|
||||||
|
|
||||||
this.instanceServices = new InstanceServices(init.ControllerConnection, init.BackupManager, launchServices);
|
|
||||||
|
|
||||||
ReceiveAndReply<ConfigureInstanceCommand, Result<ConfigureInstanceResult, InstanceActionFailure>>(ConfigureInstance);
|
ReceiveAndReply<ConfigureInstanceCommand, Result<ConfigureInstanceResult, InstanceActionFailure>>(ConfigureInstance);
|
||||||
ReceiveAndReply<LaunchInstanceCommand, Result<LaunchInstanceResult, InstanceActionFailure>>(LaunchInstance);
|
ReceiveAndReply<LaunchInstanceCommand, Result<LaunchInstanceResult, InstanceActionFailure>>(LaunchInstance);
|
||||||
ReceiveAndReply<StopInstanceCommand, Result<StopInstanceResult, InstanceActionFailure>>(StopInstance);
|
ReceiveAndReply<StopInstanceCommand, Result<StopInstanceResult, InstanceActionFailure>>(StopInstance);
|
||||||
@@ -56,11 +52,11 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
|
|||||||
ReceiveAsync<ShutdownCommand>(Shutdown);
|
ReceiveAsync<ShutdownCommand>(Shutdown);
|
||||||
}
|
}
|
||||||
|
|
||||||
private sealed record InstanceInfo(ActorRef<InstanceActor.ICommand> Actor, InstanceConfiguration Configuration, IServerLauncher Launcher);
|
private sealed record Instance(ActorRef<InstanceActor.ICommand> Actor, InstanceInfo Info, InstanceProperties Properties, InstanceLaunchRecipe? LaunchRecipe);
|
||||||
|
|
||||||
public interface ICommand;
|
public interface ICommand;
|
||||||
|
|
||||||
public sealed record ConfigureInstanceCommand(Guid InstanceGuid, InstanceConfiguration Configuration, InstanceLaunchProperties LaunchProperties, bool LaunchNow, bool AlwaysReportStatus) : ICommand, ICanReply<Result<ConfigureInstanceResult, InstanceActionFailure>>;
|
public sealed record ConfigureInstanceCommand(Guid InstanceGuid, InstanceInfo Info, InstanceLaunchRecipe? LaunchRecipe, bool LaunchNow, bool AlwaysReportStatus) : ICommand, ICanReply<Result<ConfigureInstanceResult, InstanceActionFailure>>;
|
||||||
|
|
||||||
public sealed record LaunchInstanceCommand(Guid InstanceGuid) : ICommand, ICanReply<Result<LaunchInstanceResult, InstanceActionFailure>>;
|
public sealed record LaunchInstanceCommand(Guid InstanceGuid) : ICommand, ICanReply<Result<LaunchInstanceResult, InstanceActionFailure>>;
|
||||||
|
|
||||||
@@ -72,42 +68,16 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
|
|||||||
|
|
||||||
private Result<ConfigureInstanceResult, InstanceActionFailure> ConfigureInstance(ConfigureInstanceCommand command) {
|
private Result<ConfigureInstanceResult, InstanceActionFailure> ConfigureInstance(ConfigureInstanceCommand command) {
|
||||||
var instanceGuid = command.InstanceGuid;
|
var instanceGuid = command.InstanceGuid;
|
||||||
var configuration = command.Configuration;
|
var instanceInfo = command.Info;
|
||||||
|
var launchRecipe = command.LaunchRecipe;
|
||||||
var instanceFolder = Path.Combine(basePath, instanceGuid.ToString());
|
|
||||||
Directories.Create(instanceFolder, Chmod.URWX_GRX);
|
|
||||||
|
|
||||||
var heapMegabytes = configuration.MemoryAllocation.InMegabytes;
|
|
||||||
var jvmProperties = new JvmProperties(
|
|
||||||
InitialHeapMegabytes: heapMegabytes / 2,
|
|
||||||
MaximumHeapMegabytes: heapMegabytes
|
|
||||||
);
|
|
||||||
|
|
||||||
var properties = new InstanceProperties(
|
|
||||||
instanceGuid,
|
|
||||||
configuration.JavaRuntimeGuid,
|
|
||||||
jvmProperties,
|
|
||||||
configuration.JvmArguments,
|
|
||||||
instanceFolder,
|
|
||||||
configuration.MinecraftVersion,
|
|
||||||
new ServerProperties(configuration.ServerPort, configuration.RconPort),
|
|
||||||
command.LaunchProperties
|
|
||||||
);
|
|
||||||
|
|
||||||
IServerLauncher launcher = configuration.MinecraftServerKind switch {
|
|
||||||
MinecraftServerKind.Vanilla => new VanillaLauncher(properties),
|
|
||||||
MinecraftServerKind.Fabric => new FabricLauncher(properties),
|
|
||||||
MinecraftServerKind.Forge => new ForgeLauncher(properties),
|
|
||||||
_ => InvalidLauncher.Instance,
|
|
||||||
};
|
|
||||||
|
|
||||||
if (instances.TryGetValue(instanceGuid, out var instance)) {
|
if (instances.TryGetValue(instanceGuid, out var instance)) {
|
||||||
instances[instanceGuid] = instance with {
|
instances[instanceGuid] = instance with {
|
||||||
Configuration = configuration,
|
Info = instanceInfo,
|
||||||
Launcher = launcher,
|
LaunchRecipe = launchRecipe,
|
||||||
};
|
};
|
||||||
|
|
||||||
Logger.Information("Reconfigured instance \"{Name}\" (GUID {Guid}).", configuration.InstanceName, instanceGuid);
|
Logger.Information("Reconfigured instance \"{Name}\" (GUID {Guid}).", instanceInfo.InstanceName, instanceGuid);
|
||||||
|
|
||||||
if (command.AlwaysReportStatus) {
|
if (command.AlwaysReportStatus) {
|
||||||
instance.Actor.Tell(new InstanceActor.ReportInstanceStatusCommand());
|
instance.Actor.Tell(new InstanceActor.ReportInstanceStatusCommand());
|
||||||
@@ -115,14 +85,23 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
var instanceLoggerName = PhantomLogger.ShortenGuid(instanceGuid) + "/" + Interlocked.Increment(ref instanceLoggerSequenceId);
|
var instanceLoggerName = PhantomLogger.ShortenGuid(instanceGuid) + "/" + Interlocked.Increment(ref instanceLoggerSequenceId);
|
||||||
|
var instanceProperties = new InstanceProperties(instanceGuid, Path.Combine(agentFolders.InstancesFolderPath, instanceGuid.ToString()));
|
||||||
var instanceInit = new InstanceActor.Init(agentState, instanceGuid, instanceLoggerName, instanceServices, instanceTicketManager, shutdownCancellationToken);
|
var instanceInit = new InstanceActor.Init(agentState, instanceGuid, instanceLoggerName, instanceServices, instanceTicketManager, shutdownCancellationToken);
|
||||||
instances[instanceGuid] = instance = new InstanceInfo(Context.ActorOf(InstanceActor.Factory(instanceInit), "Instance-" + instanceGuid), configuration, launcher);
|
instances[instanceGuid] = instance = new Instance(Context.ActorOf(InstanceActor.Factory(instanceInit), "Instance-" + instanceGuid), instanceInfo, instanceProperties, launchRecipe);
|
||||||
|
|
||||||
Logger.Information("Created instance \"{Name}\" (GUID {Guid}).", configuration.InstanceName, instanceGuid);
|
Logger.Information("Created instance \"{Name}\" (GUID {Guid}).", instanceInfo.InstanceName, instanceGuid);
|
||||||
|
|
||||||
instance.Actor.Tell(new InstanceActor.ReportInstanceStatusCommand());
|
instance.Actor.Tell(new InstanceActor.ReportInstanceStatusCommand());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
string instanceFolder = instance.Properties.InstanceFolder;
|
||||||
|
try {
|
||||||
|
Directories.Create(instanceFolder, Chmod.URWX_GRX);
|
||||||
|
} catch (Exception e) {
|
||||||
|
Logger.Error(e, "Could not create instance folder: {Path}", instanceFolder);
|
||||||
|
return ConfigureInstanceResult.CouldNotCreateInstanceFolder;
|
||||||
|
}
|
||||||
|
|
||||||
if (command.LaunchNow) {
|
if (command.LaunchNow) {
|
||||||
LaunchInstance(new LaunchInstanceCommand(instanceGuid));
|
LaunchInstance(new LaunchInstanceCommand(instanceGuid));
|
||||||
}
|
}
|
||||||
@@ -132,17 +111,21 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
|
|||||||
|
|
||||||
private Result<LaunchInstanceResult, InstanceActionFailure> LaunchInstance(LaunchInstanceCommand command) {
|
private Result<LaunchInstanceResult, InstanceActionFailure> LaunchInstance(LaunchInstanceCommand command) {
|
||||||
var instanceGuid = command.InstanceGuid;
|
var instanceGuid = command.InstanceGuid;
|
||||||
if (!instances.TryGetValue(instanceGuid, out var instanceInfo)) {
|
if (!instances.TryGetValue(instanceGuid, out var instance)) {
|
||||||
return InstanceActionFailure.InstanceDoesNotExist;
|
return InstanceActionFailure.InstanceDoesNotExist;
|
||||||
}
|
}
|
||||||
|
|
||||||
var ticket = instanceTicketManager.Reserve(instanceInfo.Configuration);
|
if (instance.LaunchRecipe is not {} launchRecipe) {
|
||||||
|
return LaunchInstanceResult.InvalidConfiguration;
|
||||||
|
}
|
||||||
|
|
||||||
|
var ticket = instanceTicketManager.Reserve(instance.Info);
|
||||||
if (!ticket) {
|
if (!ticket) {
|
||||||
return ticket.Error;
|
return ticket.Error;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (agentState.InstancesByGuid.TryGetValue(instanceGuid, out var instance)) {
|
if (agentState.InstancesByGuid.TryGetValue(instanceGuid, out var agentInstance)) {
|
||||||
var status = instance.Status;
|
var status = agentInstance.Status;
|
||||||
if (status.IsRunning()) {
|
if (status.IsRunning()) {
|
||||||
return LaunchInstanceResult.InstanceAlreadyRunning;
|
return LaunchInstanceResult.InstanceAlreadyRunning;
|
||||||
}
|
}
|
||||||
@@ -151,7 +134,12 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
instanceInfo.Actor.Tell(new InstanceActor.LaunchInstanceCommand(instanceInfo.Configuration, instanceInfo.Launcher, ticket.Value, IsRestarting: false));
|
var pathResolver = new InstancePathResolver(agentFolders, instanceServices.JavaRuntimeRepository, instance.Properties);
|
||||||
|
var valueResolver = new InstanceValueResolver(pathResolver);
|
||||||
|
var launcher = new InstanceLauncher(instanceServices.DownloadManager, pathResolver, valueResolver, instance.Properties, launchRecipe);
|
||||||
|
|
||||||
|
instance.Actor.Tell(new InstanceActor.LaunchInstanceCommand(instance.Info, launcher, ticket.Value, IsRestarting: false));
|
||||||
|
|
||||||
return LaunchInstanceResult.LaunchInitiated;
|
return LaunchInstanceResult.LaunchInitiated;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
using System.Collections.Immutable;
|
||||||
|
using Phantom.Agent.Minecraft.Instance;
|
||||||
|
using Phantom.Agent.Minecraft.Java;
|
||||||
|
using Phantom.Common.Data.Instance;
|
||||||
|
|
||||||
|
namespace Phantom.Agent.Services.Instances;
|
||||||
|
|
||||||
|
sealed class InstancePathResolver(AgentFolders agentFolders, JavaRuntimeRepository javaRuntimeRepository, InstanceProperties instanceProperties) : IInstancePathResolver {
|
||||||
|
public string Global(ImmutableArray<string> path) {
|
||||||
|
return CombinePath(agentFolders.ServerExecutableFolderPath, path);
|
||||||
|
}
|
||||||
|
|
||||||
|
public string Local(ImmutableArray<string> path) {
|
||||||
|
return CombinePath(instanceProperties.InstanceFolder, path);
|
||||||
|
}
|
||||||
|
|
||||||
|
public string? Runtime(Guid guid) {
|
||||||
|
if (javaRuntimeRepository.TryGetByGuid(guid, out var runtime)) {
|
||||||
|
return runtime.ExecutablePath;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private string CombinePath(string basePath, ImmutableArray<string> additionalParts) {
|
||||||
|
// TODO validation
|
||||||
|
return Path.Combine([basePath, ..additionalParts]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +1,13 @@
|
|||||||
using Phantom.Agent.Minecraft.Launcher;
|
using Phantom.Agent.Minecraft.Java;
|
||||||
|
using Phantom.Agent.Minecraft.Server;
|
||||||
using Phantom.Agent.Services.Backups;
|
using Phantom.Agent.Services.Backups;
|
||||||
using Phantom.Agent.Services.Rpc;
|
using Phantom.Agent.Services.Rpc;
|
||||||
|
|
||||||
namespace Phantom.Agent.Services.Instances;
|
namespace Phantom.Agent.Services.Instances;
|
||||||
|
|
||||||
sealed record InstanceServices(ControllerConnection ControllerConnection, BackupManager BackupManager, LaunchServices LaunchServices);
|
sealed record InstanceServices(
|
||||||
|
ControllerConnection ControllerConnection,
|
||||||
|
BackupManager BackupManager,
|
||||||
|
FileDownloadManager DownloadManager,
|
||||||
|
JavaRuntimeRepository JavaRuntimeRepository
|
||||||
|
);
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using Phantom.Agent.Services.Rpc;
|
using System.Collections.Immutable;
|
||||||
|
using Phantom.Agent.Services.Rpc;
|
||||||
using Phantom.Common.Data;
|
using Phantom.Common.Data;
|
||||||
using Phantom.Common.Data.Agent;
|
using Phantom.Common.Data.Agent;
|
||||||
using Phantom.Common.Data.Instance;
|
using Phantom.Common.Data.Instance;
|
||||||
@@ -18,17 +19,15 @@ sealed class InstanceTicketManager(AgentInfo agentInfo, ControllerConnection con
|
|||||||
private readonly HashSet<ushort> usedPorts = [];
|
private readonly HashSet<ushort> usedPorts = [];
|
||||||
private RamAllocationUnits usedMemory = new ();
|
private RamAllocationUnits usedMemory = new ();
|
||||||
|
|
||||||
public Result<Ticket, LaunchInstanceResult> Reserve(InstanceConfiguration configuration) {
|
public Result<Ticket, LaunchInstanceResult> Reserve(InstanceInfo info) {
|
||||||
var memoryAllocation = configuration.MemoryAllocation;
|
var memoryAllocation = info.MemoryAllocation;
|
||||||
var serverPort = configuration.ServerPort;
|
|
||||||
var rconPort = configuration.RconPort;
|
|
||||||
|
|
||||||
if (!agentInfo.AllowedServerPorts.Contains(serverPort)) {
|
if (!agentInfo.AllowedServerPorts.Contains(info.ServerPort)) {
|
||||||
return LaunchInstanceResult.ServerPortNotAllowed;
|
return LaunchInstanceResult.ServerPortNotAllowed;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!agentInfo.AllowedRconPorts.Contains(rconPort)) {
|
if (info.AdditionalPorts.Any(port => !agentInfo.AllowedAdditionalPorts.Contains(port))) {
|
||||||
return LaunchInstanceResult.RconPortNotAllowed;
|
return LaunchInstanceResult.AdditionalPortNotAllowed;
|
||||||
}
|
}
|
||||||
|
|
||||||
lock (this) {
|
lock (this) {
|
||||||
@@ -40,23 +39,23 @@ sealed class InstanceTicketManager(AgentInfo agentInfo, ControllerConnection con
|
|||||||
return LaunchInstanceResult.MemoryLimitExceeded;
|
return LaunchInstanceResult.MemoryLimitExceeded;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (usedPorts.Contains(serverPort)) {
|
if (usedPorts.Contains(info.ServerPort)) {
|
||||||
return LaunchInstanceResult.ServerPortAlreadyInUse;
|
return LaunchInstanceResult.ServerPortAlreadyInUse;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (usedPorts.Contains(rconPort)) {
|
if (info.AdditionalPorts.Any(port => usedPorts.Contains(port))) {
|
||||||
return LaunchInstanceResult.RconPortAlreadyInUse;
|
return LaunchInstanceResult.AdditionalPortAlreadyInUse;
|
||||||
}
|
}
|
||||||
|
|
||||||
var ticket = new Ticket(Guid.NewGuid(), memoryAllocation, serverPort, rconPort);
|
var ticket = new Ticket(Guid.NewGuid(), memoryAllocation, info.ServerPort, info.AdditionalPorts);
|
||||||
|
|
||||||
activeTicketGuids.Add(ticket.TicketGuid);
|
activeTicketGuids.Add(ticket.TicketGuid);
|
||||||
usedMemory += memoryAllocation;
|
usedMemory += memoryAllocation;
|
||||||
usedPorts.Add(serverPort);
|
usedPorts.Add(ticket.ServerPort);
|
||||||
usedPorts.Add(rconPort);
|
usedPorts.UnionWith(ticket.AdditionalPorts);
|
||||||
|
|
||||||
RefreshAgentStatus();
|
RefreshAgentStatus();
|
||||||
Logger.Debug("Reserved ticket {TicketGuid} (server port {ServerPort}, rcon port {RconPort}, memory allocation {MemoryAllocation} MB).", ticket.TicketGuid, ticket.ServerPort, ticket.RconPort, ticket.MemoryAllocation.InMegabytes);
|
Logger.Debug("Reserved ticket {TicketGuid} (server port {ServerPort}, additional ports [{AdditionalPorts}], memory allocation {MemoryAllocation} MB).", ticket.TicketGuid, ticket.ServerPort, string.Join(", ", ticket.AdditionalPorts), ticket.MemoryAllocation.InMegabytes);
|
||||||
|
|
||||||
return ticket;
|
return ticket;
|
||||||
}
|
}
|
||||||
@@ -76,10 +75,10 @@ sealed class InstanceTicketManager(AgentInfo agentInfo, ControllerConnection con
|
|||||||
|
|
||||||
usedMemory -= ticket.MemoryAllocation;
|
usedMemory -= ticket.MemoryAllocation;
|
||||||
usedPorts.Remove(ticket.ServerPort);
|
usedPorts.Remove(ticket.ServerPort);
|
||||||
usedPorts.Remove(ticket.RconPort);
|
usedPorts.ExceptWith(ticket.AdditionalPorts);
|
||||||
|
|
||||||
RefreshAgentStatus();
|
RefreshAgentStatus();
|
||||||
Logger.Debug("Released ticket {TicketGuid} (server port {ServerPort}, rcon port {RconPort}, memory allocation {MemoryAllocation} MB).", ticket.TicketGuid, ticket.ServerPort, ticket.RconPort, ticket.MemoryAllocation.InMegabytes);
|
Logger.Debug("Released ticket {TicketGuid} (server port {ServerPort}, additional ports [{AdditionalPorts}], memory allocation {MemoryAllocation} MB).", ticket.TicketGuid, ticket.ServerPort, string.Join(", ", ticket.AdditionalPorts), ticket.MemoryAllocation.InMegabytes);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -93,5 +92,5 @@ sealed class InstanceTicketManager(AgentInfo agentInfo, ControllerConnection con
|
|||||||
await reportStatusQueue.Shutdown(TimeSpan.FromSeconds(5));
|
await reportStatusQueue.Shutdown(TimeSpan.FromSeconds(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
public sealed record Ticket(Guid TicketGuid, RamAllocationUnits MemoryAllocation, ushort ServerPort, ushort RconPort);
|
public sealed record Ticket(Guid TicketGuid, RamAllocationUnits MemoryAllocation, ushort ServerPort, ImmutableSortedSet<ushort> AdditionalPorts);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
using Phantom.Common.Data.Instance;
|
||||||
|
|
||||||
|
namespace Phantom.Agent.Services.Instances;
|
||||||
|
|
||||||
|
sealed class InstanceValueResolver(IInstancePathResolver pathResolver) : IInstanceValueResolver {
|
||||||
|
public string? Path(IInstancePath value) {
|
||||||
|
return value.Resolve(pathResolver);
|
||||||
|
}
|
||||||
|
|
||||||
|
public string? Variable(InstanceVariable value) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,13 +1,13 @@
|
|||||||
using Phantom.Agent.Minecraft.Instance;
|
using Phantom.Agent.Minecraft.Instance;
|
||||||
using Phantom.Agent.Minecraft.Launcher;
|
using Phantom.Agent.Minecraft.Launcher;
|
||||||
using Phantom.Agent.Minecraft.Server;
|
|
||||||
using Phantom.Common.Data;
|
using Phantom.Common.Data;
|
||||||
using Phantom.Common.Data.Instance;
|
using Phantom.Common.Data.Instance;
|
||||||
|
using Phantom.Common.Data.Instance.Launch;
|
||||||
|
|
||||||
namespace Phantom.Agent.Services.Instances.State;
|
namespace Phantom.Agent.Services.Instances.State;
|
||||||
|
|
||||||
static class InstanceLaunchProcedure {
|
static class InstanceLaunchProcedure {
|
||||||
public static async Task<InstanceRunningState?> Run(InstanceContext context, InstanceConfiguration configuration, IServerLauncher launcher, InstanceTicketManager ticketManager, InstanceTicketManager.Ticket ticket, Action<IInstanceStatus> reportStatus, CancellationToken cancellationToken) {
|
public static async Task<InstanceRunningState?> Run(InstanceContext context, InstanceInfo info, InstanceLauncher launcher, InstanceTicketManager ticketManager, InstanceTicketManager.Ticket ticket, Action<IInstanceStatus?> reportStatus, CancellationToken cancellationToken) {
|
||||||
context.Logger.Information("Session starting...");
|
context.Logger.Information("Session starting...");
|
||||||
|
|
||||||
Result<InstanceProcess, InstanceLaunchFailReason> result;
|
Result<InstanceProcess, InstanceLaunchFailReason> result;
|
||||||
@@ -31,7 +31,7 @@ static class InstanceLaunchProcedure {
|
|||||||
if (result) {
|
if (result) {
|
||||||
reportStatus(InstanceStatus.Running);
|
reportStatus(InstanceStatus.Running);
|
||||||
context.ReportEvent(InstanceEvent.LaunchSucceeded);
|
context.ReportEvent(InstanceEvent.LaunchSucceeded);
|
||||||
return new InstanceRunningState(context, configuration, launcher, ticket, result.Value, cancellationToken);
|
return new InstanceRunningState(context, info, launcher, ticket, result.Value, cancellationToken);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
reportStatus(InstanceStatus.Failed(result.Error));
|
reportStatus(InstanceStatus.Failed(result.Error));
|
||||||
@@ -40,43 +40,24 @@ static class InstanceLaunchProcedure {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static async Task<Result<InstanceProcess, InstanceLaunchFailReason>> LaunchInstance(InstanceContext context, IServerLauncher launcher, Action<IInstanceStatus> reportStatus, CancellationToken cancellationToken) {
|
private static async Task<Result<InstanceProcess, InstanceLaunchFailReason>> LaunchInstance(InstanceContext context, InstanceLauncher launcher, Action<IInstanceStatus?> reportStatus, CancellationToken cancellationToken) {
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
cancellationToken.ThrowIfCancellationRequested();
|
||||||
|
|
||||||
byte lastDownloadProgress = byte.MaxValue;
|
switch (await launcher.Launch(context.Logger, reportStatus, cancellationToken)) {
|
||||||
|
|
||||||
void OnDownloadProgress(object? sender, DownloadProgressEventArgs args) {
|
|
||||||
byte progress = (byte) Math.Min(args.DownloadedBytes * 100 / args.TotalBytes, val2: 100);
|
|
||||||
|
|
||||||
if (lastDownloadProgress != progress) {
|
|
||||||
lastDownloadProgress = progress;
|
|
||||||
reportStatus(InstanceStatus.Downloading(progress));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (await launcher.Launch(context.Logger, context.Services.LaunchServices, OnDownloadProgress, cancellationToken)) {
|
|
||||||
case LaunchResult.Success launchSuccess:
|
case LaunchResult.Success launchSuccess:
|
||||||
return launchSuccess.Process;
|
return launchSuccess.Process;
|
||||||
|
|
||||||
case LaunchResult.InvalidJavaRuntime:
|
case LaunchResult.CouldNotPrepareServerInstance:
|
||||||
context.Logger.Error("Session failed to launch, invalid Java runtime.");
|
context.Logger.Error("Session failed to launch, could not prepare server instance.");
|
||||||
return InstanceLaunchFailReason.JavaRuntimeNotFound;
|
return InstanceLaunchFailReason.CouldNotPrepareServerInstance;
|
||||||
|
|
||||||
case LaunchResult.CouldNotDownloadMinecraftServer:
|
case LaunchResult.CouldNotFindServerExecutable:
|
||||||
context.Logger.Error("Session failed to launch, could not download Minecraft server.");
|
context.Logger.Error("Session failed to launch, could not find server executable.");
|
||||||
return InstanceLaunchFailReason.CouldNotDownloadMinecraftServer;
|
return InstanceLaunchFailReason.CouldNotFindServerExecutable;
|
||||||
|
|
||||||
case LaunchResult.CouldNotPrepareMinecraftServerLauncher:
|
case LaunchResult.CouldNotStartServerExecutable:
|
||||||
context.Logger.Error("Session failed to launch, could not prepare Minecraft server launcher.");
|
context.Logger.Error("Session failed to launch, could not start server executable.");
|
||||||
return InstanceLaunchFailReason.CouldNotPrepareMinecraftServerLauncher;
|
return InstanceLaunchFailReason.CouldNotStartServerExecutable;
|
||||||
|
|
||||||
case LaunchResult.CouldNotConfigureMinecraftServer:
|
|
||||||
context.Logger.Error("Session failed to launch, could not configure Minecraft server.");
|
|
||||||
return InstanceLaunchFailReason.CouldNotConfigureMinecraftServer;
|
|
||||||
|
|
||||||
case LaunchResult.CouldNotStartMinecraftServer:
|
|
||||||
context.Logger.Error("Session failed to launch, could not start Minecraft server.");
|
|
||||||
return InstanceLaunchFailReason.CouldNotStartMinecraftServer;
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
context.Logger.Error("Session failed to launch.");
|
context.Logger.Error("Session failed to launch.");
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ using Phantom.Agent.Minecraft.Launcher;
|
|||||||
using Phantom.Agent.Services.Backups;
|
using Phantom.Agent.Services.Backups;
|
||||||
using Phantom.Common.Data.Backups;
|
using Phantom.Common.Data.Backups;
|
||||||
using Phantom.Common.Data.Instance;
|
using Phantom.Common.Data.Instance;
|
||||||
|
using Phantom.Common.Data.Instance.Launch;
|
||||||
using Phantom.Common.Data.Replies;
|
using Phantom.Common.Data.Replies;
|
||||||
|
|
||||||
namespace Phantom.Agent.Services.Instances.State;
|
namespace Phantom.Agent.Services.Instances.State;
|
||||||
@@ -14,8 +15,8 @@ sealed class InstanceRunningState : IDisposable {
|
|||||||
internal bool IsStopping { get; set; }
|
internal bool IsStopping { get; set; }
|
||||||
|
|
||||||
private readonly InstanceContext context;
|
private readonly InstanceContext context;
|
||||||
private readonly InstanceConfiguration configuration;
|
private readonly InstanceInfo info;
|
||||||
private readonly IServerLauncher launcher;
|
private readonly InstanceLauncher launcher;
|
||||||
private readonly CancellationToken cancellationToken;
|
private readonly CancellationToken cancellationToken;
|
||||||
|
|
||||||
private readonly InstanceLogSender logSender;
|
private readonly InstanceLogSender logSender;
|
||||||
@@ -24,16 +25,16 @@ sealed class InstanceRunningState : IDisposable {
|
|||||||
|
|
||||||
private bool isDisposed;
|
private bool isDisposed;
|
||||||
|
|
||||||
public InstanceRunningState(InstanceContext context, InstanceConfiguration configuration, IServerLauncher launcher, InstanceTicketManager.Ticket ticket, InstanceProcess process, CancellationToken cancellationToken) {
|
public InstanceRunningState(InstanceContext context, InstanceInfo info, InstanceLauncher launcher, InstanceTicketManager.Ticket ticket, InstanceProcess process, CancellationToken cancellationToken) {
|
||||||
this.context = context;
|
this.context = context;
|
||||||
this.configuration = configuration;
|
this.info = info;
|
||||||
this.launcher = launcher;
|
this.launcher = launcher;
|
||||||
this.Ticket = ticket;
|
this.Ticket = ticket;
|
||||||
this.Process = process;
|
this.Process = process;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
|
||||||
this.logSender = new InstanceLogSender(context.Services.ControllerConnection, context.InstanceGuid, context.ShortName);
|
this.logSender = new InstanceLogSender(context.Services.ControllerConnection, context.InstanceGuid, context.ShortName);
|
||||||
this.playerCountTracker = new InstancePlayerCountTracker(context, process, configuration.ServerPort);
|
this.playerCountTracker = new InstancePlayerCountTracker(context, process, info.ServerPort);
|
||||||
|
|
||||||
this.backupScheduler = new BackupScheduler(context, playerCountTracker);
|
this.backupScheduler = new BackupScheduler(context, playerCountTracker);
|
||||||
this.backupScheduler.BackupCompleted += OnScheduledBackupCompleted;
|
this.backupScheduler.BackupCompleted += OnScheduledBackupCompleted;
|
||||||
@@ -74,7 +75,7 @@ sealed class InstanceRunningState : IDisposable {
|
|||||||
else {
|
else {
|
||||||
context.Logger.Information("Session ended unexpectedly, restarting...");
|
context.Logger.Information("Session ended unexpectedly, restarting...");
|
||||||
context.ReportEvent(InstanceEvent.Crashed);
|
context.ReportEvent(InstanceEvent.Crashed);
|
||||||
context.Actor.Tell(new InstanceActor.LaunchInstanceCommand(configuration, launcher, Ticket, IsRestarting: true));
|
context.Actor.Tell(new InstanceActor.LaunchInstanceCommand(info, launcher, Ticket, IsRestarting: true));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ public sealed class ControllerMessageHandlerActor : ReceiveActor<IMessageToAgent
|
|||||||
}
|
}
|
||||||
|
|
||||||
private async Task<Result<ConfigureInstanceResult, InstanceActionFailure>> HandleConfigureInstance(ConfigureInstanceMessage message) {
|
private async Task<Result<ConfigureInstanceResult, InstanceActionFailure>> HandleConfigureInstance(ConfigureInstanceMessage message) {
|
||||||
return await agent.InstanceManager.Request(new InstanceManagerActor.ConfigureInstanceCommand(message.InstanceGuid, message.Configuration, message.LaunchProperties, message.LaunchNow, AlwaysReportStatus: false));
|
return await agent.InstanceManager.Request(new InstanceManagerActor.ConfigureInstanceCommand(message.InstanceGuid, message.Info, message.LaunchRecipe, message.LaunchNow, AlwaysReportStatus: false));
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task<Result<LaunchInstanceResult, InstanceActionFailure>> HandleLaunchInstance(LaunchInstanceMessage message) {
|
private async Task<Result<LaunchInstanceResult, InstanceActionFailure>> HandleLaunchInstance(LaunchInstanceMessage message) {
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ sealed record Variables(
|
|||||||
ushort MaxInstances,
|
ushort MaxInstances,
|
||||||
RamAllocationUnits MaxMemory,
|
RamAllocationUnits MaxMemory,
|
||||||
AllowedPorts AllowedServerPorts,
|
AllowedPorts AllowedServerPorts,
|
||||||
AllowedPorts AllowedRconPorts,
|
AllowedPorts AllowedAdditionalPorts,
|
||||||
ushort MaxConcurrentBackupCompressionTasks
|
ushort MaxConcurrentBackupCompressionTasks
|
||||||
) {
|
) {
|
||||||
private static Variables LoadOrThrow() {
|
private static Variables LoadOrThrow() {
|
||||||
@@ -30,7 +30,7 @@ sealed record Variables(
|
|||||||
(ushort) EnvironmentVariables.GetInteger("MAX_INSTANCES", min: 1, max: 10000).Require,
|
(ushort) EnvironmentVariables.GetInteger("MAX_INSTANCES", min: 1, max: 10000).Require,
|
||||||
EnvironmentVariables.GetString("MAX_MEMORY").MapParse(RamAllocationUnits.FromString).Require,
|
EnvironmentVariables.GetString("MAX_MEMORY").MapParse(RamAllocationUnits.FromString).Require,
|
||||||
EnvironmentVariables.GetString("ALLOWED_SERVER_PORTS").MapParse(AllowedPorts.FromString).Require,
|
EnvironmentVariables.GetString("ALLOWED_SERVER_PORTS").MapParse(AllowedPorts.FromString).Require,
|
||||||
EnvironmentVariables.GetString("ALLOWED_RCON_PORTS").MapParse(AllowedPorts.FromString).Require,
|
EnvironmentVariables.GetString("ALLOWED_ADDITIONAL_PORTS").MapParse(AllowedPorts.FromString).Require,
|
||||||
(ushort) EnvironmentVariables.GetInteger("MAX_CONCURRENT_BACKUP_COMPRESSION_TASKS", min: 1, max: 10000).WithDefault(1)
|
(ushort) EnvironmentVariables.GetInteger("MAX_CONCURRENT_BACKUP_COMPRESSION_TASKS", min: 1, max: 10000).WithDefault(1)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,9 +9,9 @@ public sealed partial record AgentRuntimeInfo(
|
|||||||
[property: MemoryPackOrder(1)] ushort? MaxInstances = null,
|
[property: MemoryPackOrder(1)] ushort? MaxInstances = null,
|
||||||
[property: MemoryPackOrder(2)] RamAllocationUnits? MaxMemory = null,
|
[property: MemoryPackOrder(2)] RamAllocationUnits? MaxMemory = null,
|
||||||
[property: MemoryPackOrder(3)] AllowedPorts? AllowedServerPorts = null,
|
[property: MemoryPackOrder(3)] AllowedPorts? AllowedServerPorts = null,
|
||||||
[property: MemoryPackOrder(4)] AllowedPorts? AllowedRconPorts = null
|
[property: MemoryPackOrder(4)] AllowedPorts? AllowedAdditionalPorts = null
|
||||||
) {
|
) {
|
||||||
public static AgentRuntimeInfo From(AgentInfo agentInfo) {
|
public static AgentRuntimeInfo From(AgentInfo agentInfo) {
|
||||||
return new AgentRuntimeInfo(new AgentVersionInfo(agentInfo.ProtocolVersion, agentInfo.BuildVersion), agentInfo.MaxInstances, agentInfo.MaxMemory, agentInfo.AllowedServerPorts, agentInfo.AllowedRconPorts);
|
return new AgentRuntimeInfo(new AgentVersionInfo(agentInfo.ProtocolVersion, agentInfo.BuildVersion), agentInfo.MaxInstances, agentInfo.MaxMemory, agentInfo.AllowedServerPorts, agentInfo.AllowedAdditionalPorts);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,5 +9,5 @@ public sealed partial record AgentInfo(
|
|||||||
[property: MemoryPackOrder(2)] ushort MaxInstances,
|
[property: MemoryPackOrder(2)] ushort MaxInstances,
|
||||||
[property: MemoryPackOrder(3)] RamAllocationUnits MaxMemory,
|
[property: MemoryPackOrder(3)] RamAllocationUnits MaxMemory,
|
||||||
[property: MemoryPackOrder(4)] AllowedPorts AllowedServerPorts,
|
[property: MemoryPackOrder(4)] AllowedPorts AllowedServerPorts,
|
||||||
[property: MemoryPackOrder(5)] AllowedPorts AllowedRconPorts
|
[property: MemoryPackOrder(5)] AllowedPorts AllowedAdditionalPorts
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
using MemoryPack;
|
using MemoryPack;
|
||||||
using Phantom.Common.Data.Backups;
|
using Phantom.Common.Data.Backups;
|
||||||
|
using Phantom.Common.Data.Instance.Launch;
|
||||||
|
|
||||||
namespace Phantom.Common.Data.Instance;
|
namespace Phantom.Common.Data.Instance;
|
||||||
|
|
||||||
|
|||||||
41
Common/Phantom.Common.Data/Instance/IInstancePath.cs
Normal file
41
Common/Phantom.Common.Data/Instance/IInstancePath.cs
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
using System.Collections.Immutable;
|
||||||
|
using MemoryPack;
|
||||||
|
|
||||||
|
namespace Phantom.Common.Data.Instance;
|
||||||
|
|
||||||
|
[MemoryPackable]
|
||||||
|
[MemoryPackUnion(tag: 0, typeof(InstancePath.Global))]
|
||||||
|
[MemoryPackUnion(tag: 1, typeof(InstancePath.Local))]
|
||||||
|
[MemoryPackUnion(tag: 2, typeof(InstancePath.Runtime))]
|
||||||
|
public partial interface IInstancePath {
|
||||||
|
string? Resolve(IInstancePathResolver resolver);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static partial class InstancePath {
|
||||||
|
[MemoryPackable(GenerateType.VersionTolerant)]
|
||||||
|
public sealed partial record Global(
|
||||||
|
[property: MemoryPackOrder(0)] ImmutableArray<string> Path
|
||||||
|
) : IInstancePath {
|
||||||
|
public string? Resolve(IInstancePathResolver resolver) {
|
||||||
|
return resolver.Global(Path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[MemoryPackable(GenerateType.VersionTolerant)]
|
||||||
|
public sealed partial record Local(
|
||||||
|
[property: MemoryPackOrder(0)] ImmutableArray<string> Path
|
||||||
|
) : IInstancePath {
|
||||||
|
public string? Resolve(IInstancePathResolver resolver) {
|
||||||
|
return resolver.Local(Path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[MemoryPackable(GenerateType.VersionTolerant)]
|
||||||
|
public sealed partial record Runtime(
|
||||||
|
[property: MemoryPackOrder(0)] Guid Guid
|
||||||
|
) : IInstancePath {
|
||||||
|
public string? Resolve(IInstancePathResolver resolver) {
|
||||||
|
return resolver.Runtime(Guid);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
using System.Collections.Immutable;
|
||||||
|
|
||||||
|
namespace Phantom.Common.Data.Instance;
|
||||||
|
|
||||||
|
public interface IInstancePathResolver {
|
||||||
|
string? Global(ImmutableArray<string> path);
|
||||||
|
string? Local(ImmutableArray<string> path);
|
||||||
|
string? Runtime(Guid guid);
|
||||||
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
using MemoryPack;
|
using MemoryPack;
|
||||||
|
using Phantom.Common.Data.Instance.Launch;
|
||||||
|
|
||||||
namespace Phantom.Common.Data.Instance;
|
namespace Phantom.Common.Data.Instance;
|
||||||
|
|
||||||
@@ -25,7 +26,7 @@ public sealed partial record InstanceIsInvalid([property: MemoryPackOrder(0)] st
|
|||||||
public sealed partial record InstanceIsNotRunning : IInstanceStatus;
|
public sealed partial record InstanceIsNotRunning : IInstanceStatus;
|
||||||
|
|
||||||
[MemoryPackable(GenerateType.VersionTolerant)]
|
[MemoryPackable(GenerateType.VersionTolerant)]
|
||||||
public sealed partial record InstanceIsDownloading([property: MemoryPackOrder(0)] byte Progress) : IInstanceStatus;
|
public sealed partial record InstanceIsDownloading([property: MemoryPackOrder(0)] byte? Progress) : IInstanceStatus;
|
||||||
|
|
||||||
[MemoryPackable(GenerateType.VersionTolerant)]
|
[MemoryPackable(GenerateType.VersionTolerant)]
|
||||||
public sealed partial record InstanceIsLaunching : IInstanceStatus;
|
public sealed partial record InstanceIsLaunching : IInstanceStatus;
|
||||||
@@ -55,7 +56,7 @@ public static class InstanceStatus {
|
|||||||
public static readonly IInstanceStatus Stopping = new InstanceIsStopping();
|
public static readonly IInstanceStatus Stopping = new InstanceIsStopping();
|
||||||
|
|
||||||
public static IInstanceStatus Invalid(string reason) => new InstanceIsInvalid(reason);
|
public static IInstanceStatus Invalid(string reason) => new InstanceIsInvalid(reason);
|
||||||
public static IInstanceStatus Downloading(byte progress) => new InstanceIsDownloading(progress);
|
public static IInstanceStatus Downloading(byte? progress) => new InstanceIsDownloading(progress);
|
||||||
public static IInstanceStatus Failed(InstanceLaunchFailReason reason) => new InstanceIsFailed(reason);
|
public static IInstanceStatus Failed(InstanceLaunchFailReason reason) => new InstanceIsFailed(reason);
|
||||||
|
|
||||||
public static bool IsLaunching(this IInstanceStatus status) {
|
public static bool IsLaunching(this IInstanceStatus status) {
|
||||||
|
|||||||
57
Common/Phantom.Common.Data/Instance/IInstanceValue.cs
Normal file
57
Common/Phantom.Common.Data/Instance/IInstanceValue.cs
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
using System.Collections.Immutable;
|
||||||
|
using System.Text;
|
||||||
|
using MemoryPack;
|
||||||
|
|
||||||
|
namespace Phantom.Common.Data.Instance;
|
||||||
|
|
||||||
|
[MemoryPackable]
|
||||||
|
[MemoryPackUnion(tag: 0, typeof(InstanceValues.Concatenation))]
|
||||||
|
[MemoryPackUnion(tag: 1, typeof(InstanceValues.Text))]
|
||||||
|
[MemoryPackUnion(tag: 2, typeof(InstanceValues.Path))]
|
||||||
|
[MemoryPackUnion(tag: 3, typeof(InstanceValues.Variable))]
|
||||||
|
public partial interface IInstanceValue {
|
||||||
|
string? Resolve(IInstanceValueResolver resolver);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static partial class InstanceValues {
|
||||||
|
[MemoryPackable]
|
||||||
|
public sealed partial record Concatenation(ImmutableArray<IInstanceValue> Values) : IInstanceValue {
|
||||||
|
public string? Resolve(IInstanceValueResolver resolver) {
|
||||||
|
var result = new StringBuilder();
|
||||||
|
|
||||||
|
foreach (IInstanceValue value in Values) {
|
||||||
|
if (value.Resolve(resolver) is {} resolved) {
|
||||||
|
result.Append(resolved);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result.ToString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[MemoryPackable]
|
||||||
|
public sealed partial record Text(string Value) : IInstanceValue {
|
||||||
|
public string Resolve(IInstanceValueResolver resolver) {
|
||||||
|
return Value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[MemoryPackable]
|
||||||
|
public sealed partial record Path(IInstancePath Value) : IInstanceValue {
|
||||||
|
public string? Resolve(IInstanceValueResolver resolver) {
|
||||||
|
return resolver.Path(Value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[MemoryPackable]
|
||||||
|
public sealed partial record Variable(InstanceVariable Value) : IInstanceValue {
|
||||||
|
public string? Resolve(IInstanceValueResolver resolver) {
|
||||||
|
return resolver.Variable(Value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public enum InstanceVariable {}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
namespace Phantom.Common.Data.Instance;
|
||||||
|
|
||||||
|
public interface IInstanceValueResolver {
|
||||||
|
string? Path(IInstancePath value);
|
||||||
|
string? Variable(InstanceVariable value);
|
||||||
|
}
|
||||||
@@ -15,4 +15,7 @@ public sealed partial record InstanceConfiguration(
|
|||||||
[property: MemoryPackOrder(6)] RamAllocationUnits MemoryAllocation,
|
[property: MemoryPackOrder(6)] RamAllocationUnits MemoryAllocation,
|
||||||
[property: MemoryPackOrder(7)] Guid JavaRuntimeGuid,
|
[property: MemoryPackOrder(7)] Guid JavaRuntimeGuid,
|
||||||
[property: MemoryPackOrder(8)] ImmutableArray<string> JvmArguments
|
[property: MemoryPackOrder(8)] ImmutableArray<string> JvmArguments
|
||||||
);
|
) {
|
||||||
|
[MemoryPackIgnore]
|
||||||
|
public InstanceInfo AsInfo => new (InstanceName, ServerPort, [RconPort], MemoryAllocation);
|
||||||
|
}
|
||||||
|
|||||||
12
Common/Phantom.Common.Data/Instance/InstanceInfo.cs
Normal file
12
Common/Phantom.Common.Data/Instance/InstanceInfo.cs
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
using System.Collections.Immutable;
|
||||||
|
using MemoryPack;
|
||||||
|
|
||||||
|
namespace Phantom.Common.Data.Instance;
|
||||||
|
|
||||||
|
[MemoryPackable(GenerateType.VersionTolerant)]
|
||||||
|
public sealed partial record InstanceInfo(
|
||||||
|
[property: MemoryPackOrder(0)] string InstanceName,
|
||||||
|
[property: MemoryPackOrder(1)] ushort ServerPort,
|
||||||
|
[property: MemoryPackOrder(2)] ImmutableSortedSet<ushort> AdditionalPorts,
|
||||||
|
[property: MemoryPackOrder(3)] RamAllocationUnits MemoryAllocation
|
||||||
|
);
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
namespace Phantom.Common.Data.Instance;
|
|
||||||
|
|
||||||
public enum InstanceLaunchFailReason : byte {
|
|
||||||
UnknownError = 0,
|
|
||||||
JavaRuntimeNotFound = 5,
|
|
||||||
CouldNotDownloadMinecraftServer = 6,
|
|
||||||
CouldNotConfigureMinecraftServer = 7,
|
|
||||||
CouldNotPrepareMinecraftServerLauncher = 8,
|
|
||||||
CouldNotStartMinecraftServer = 9,
|
|
||||||
}
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
using MemoryPack;
|
|
||||||
using Phantom.Common.Data.Minecraft;
|
|
||||||
|
|
||||||
namespace Phantom.Common.Data.Instance;
|
|
||||||
|
|
||||||
[MemoryPackable(GenerateType.VersionTolerant)]
|
|
||||||
public sealed partial record InstanceLaunchProperties(
|
|
||||||
[property: MemoryPackOrder(0)] FileDownloadInfo? ServerDownloadInfo
|
|
||||||
);
|
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
using System.Collections.Immutable;
|
||||||
|
using MemoryPack;
|
||||||
|
using Phantom.Common.Data.Minecraft;
|
||||||
|
|
||||||
|
namespace Phantom.Common.Data.Instance.Launch;
|
||||||
|
|
||||||
|
[MemoryPackable]
|
||||||
|
[MemoryPackUnion(tag: 0, typeof(InstanceLaunchStep.DownloadFile))]
|
||||||
|
[MemoryPackUnion(tag: 1, typeof(InstanceLaunchStep.EditPropertiesFile))]
|
||||||
|
public partial interface IInstanceLaunchStep {
|
||||||
|
Task Run(IInstanceLaunchStepExecutor executor);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static partial class InstanceLaunchStep {
|
||||||
|
[MemoryPackable(GenerateType.VersionTolerant)]
|
||||||
|
public sealed partial record DownloadFile(
|
||||||
|
[property: MemoryPackOrder(0)] FileDownloadInfo DownloadInfo,
|
||||||
|
[property: MemoryPackOrder(1)] IInstancePath Path
|
||||||
|
) : IInstanceLaunchStep {
|
||||||
|
public Task Run(IInstanceLaunchStepExecutor executor) {
|
||||||
|
return executor.DownloadFile(DownloadInfo, Path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[MemoryPackable(GenerateType.VersionTolerant)]
|
||||||
|
public sealed partial record EditPropertiesFile(
|
||||||
|
[property: MemoryPackOrder(0)] InstancePath.Local Path,
|
||||||
|
[property: MemoryPackOrder(1)] string Comment,
|
||||||
|
[property: MemoryPackOrder(2)] ImmutableDictionary<string, string> NewValues
|
||||||
|
) : IInstanceLaunchStep {
|
||||||
|
public Task Run(IInstanceLaunchStepExecutor executor) {
|
||||||
|
return executor.EditPropertiesFile(Path, Comment, NewValues);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
using System.Collections.Immutable;
|
||||||
|
using Phantom.Common.Data.Minecraft;
|
||||||
|
|
||||||
|
namespace Phantom.Common.Data.Instance.Launch;
|
||||||
|
|
||||||
|
public interface IInstanceLaunchStepExecutor {
|
||||||
|
Task DownloadFile(FileDownloadInfo downloadInfo, IInstancePath path);
|
||||||
|
Task EditPropertiesFile(InstancePath.Local path, string comment, ImmutableDictionary<string, string> newValues);
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
namespace Phantom.Common.Data.Instance.Launch;
|
||||||
|
|
||||||
|
public enum InstanceLaunchFailReason : byte {
|
||||||
|
UnknownError = 0,
|
||||||
|
CouldNotPrepareServerInstance = 1,
|
||||||
|
CouldNotFindServerExecutable = 2,
|
||||||
|
CouldNotStartServerExecutable = 3,
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
using System.Collections.Immutable;
|
||||||
|
using MemoryPack;
|
||||||
|
|
||||||
|
namespace Phantom.Common.Data.Instance.Launch;
|
||||||
|
|
||||||
|
[MemoryPackable(GenerateType.VersionTolerant)]
|
||||||
|
public sealed partial record InstanceLaunchRecipe(
|
||||||
|
[property: MemoryPackOrder(0)] ImmutableArray<IInstanceLaunchStep> Preparation,
|
||||||
|
[property: MemoryPackOrder(1)] IInstancePath Executable,
|
||||||
|
[property: MemoryPackOrder(2)] ImmutableArray<IInstanceValue> Arguments
|
||||||
|
);
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
using MemoryPack;
|
using MemoryPack;
|
||||||
using Phantom.Utils.Cryptography;
|
using Phantom.Utils.Cryptography;
|
||||||
using Phantom.Utils.IO;
|
|
||||||
|
|
||||||
namespace Phantom.Common.Data.Minecraft;
|
namespace Phantom.Common.Data.Minecraft;
|
||||||
|
|
||||||
@@ -11,20 +10,16 @@ public sealed partial class FileDownloadInfo {
|
|||||||
|
|
||||||
[MemoryPackOrder(1)]
|
[MemoryPackOrder(1)]
|
||||||
[MemoryPackInclude]
|
[MemoryPackInclude]
|
||||||
private readonly string hash;
|
private readonly string? hash;
|
||||||
|
|
||||||
[MemoryPackIgnore]
|
[MemoryPackIgnore]
|
||||||
public Sha1String Hash => Sha1String.FromString(hash);
|
public Sha1String? Hash => hash == null ? null : Sha1String.FromString(hash);
|
||||||
|
|
||||||
[MemoryPackOrder(2)]
|
public FileDownloadInfo(string downloadUrl, Sha1String? hash = null) : this(downloadUrl, hash?.ToString()) {}
|
||||||
public FileSize Size { get; }
|
|
||||||
|
|
||||||
public FileDownloadInfo(string downloadUrl, Sha1String hash, FileSize size) : this(downloadUrl, hash.ToString(), size) {}
|
|
||||||
|
|
||||||
[MemoryPackConstructor]
|
[MemoryPackConstructor]
|
||||||
private FileDownloadInfo(string downloadUrl, string hash, FileSize size) {
|
private FileDownloadInfo(string downloadUrl, string? hash) {
|
||||||
this.DownloadUrl = downloadUrl;
|
this.DownloadUrl = downloadUrl;
|
||||||
this.hash = hash;
|
this.hash = hash;
|
||||||
this.Size = size;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,5 +3,4 @@
|
|||||||
public enum MinecraftServerKind : ushort {
|
public enum MinecraftServerKind : ushort {
|
||||||
Vanilla = 1,
|
Vanilla = 1,
|
||||||
Fabric = 2,
|
Fabric = 2,
|
||||||
Forge = 3,
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,16 @@
|
|||||||
namespace Phantom.Common.Data.Replies;
|
namespace Phantom.Common.Data.Replies;
|
||||||
|
|
||||||
public enum ConfigureInstanceResult : byte {
|
public enum ConfigureInstanceResult : byte {
|
||||||
Success,
|
Success = 0,
|
||||||
|
CouldNotCreateInstanceFolder = 1,
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class ConfigureInstanceResultExtensions {
|
public static class ConfigureInstanceResultExtensions {
|
||||||
public static string ToSentence(this ConfigureInstanceResult reason) {
|
public static string ToSentence(this ConfigureInstanceResult reason) {
|
||||||
return reason switch {
|
return reason switch {
|
||||||
ConfigureInstanceResult.Success => "Success.",
|
ConfigureInstanceResult.Success => "Success.",
|
||||||
_ => "Unknown error.",
|
ConfigureInstanceResult.CouldNotCreateInstanceFolder => "Could not create instance folder.",
|
||||||
|
_ => "Unknown error.",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,14 @@
|
|||||||
namespace Phantom.Common.Data.Replies;
|
namespace Phantom.Common.Data.Replies;
|
||||||
|
|
||||||
public enum LaunchInstanceResult : byte {
|
public enum LaunchInstanceResult : byte {
|
||||||
LaunchInitiated = 1,
|
LaunchInitiated = 1,
|
||||||
InstanceAlreadyLaunching = 2,
|
InstanceAlreadyLaunching = 2,
|
||||||
InstanceAlreadyRunning = 3,
|
InstanceAlreadyRunning = 3,
|
||||||
InstanceLimitExceeded = 4,
|
InstanceLimitExceeded = 4,
|
||||||
MemoryLimitExceeded = 5,
|
MemoryLimitExceeded = 5,
|
||||||
ServerPortNotAllowed = 6,
|
ServerPortNotAllowed = 6,
|
||||||
ServerPortAlreadyInUse = 7,
|
ServerPortAlreadyInUse = 7,
|
||||||
RconPortNotAllowed = 8,
|
AdditionalPortNotAllowed = 8,
|
||||||
RconPortAlreadyInUse = 9,
|
AdditionalPortAlreadyInUse = 9,
|
||||||
|
InvalidConfiguration = 10,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
using MemoryPack;
|
using MemoryPack;
|
||||||
using Phantom.Common.Data;
|
using Phantom.Common.Data;
|
||||||
using Phantom.Common.Data.Instance;
|
using Phantom.Common.Data.Instance;
|
||||||
|
using Phantom.Common.Data.Instance.Launch;
|
||||||
using Phantom.Common.Data.Replies;
|
using Phantom.Common.Data.Replies;
|
||||||
using Phantom.Utils.Actor;
|
using Phantom.Utils.Actor;
|
||||||
|
|
||||||
@@ -9,7 +10,7 @@ namespace Phantom.Common.Messages.Agent.ToAgent;
|
|||||||
[MemoryPackable(GenerateType.VersionTolerant)]
|
[MemoryPackable(GenerateType.VersionTolerant)]
|
||||||
public sealed partial record ConfigureInstanceMessage(
|
public sealed partial record ConfigureInstanceMessage(
|
||||||
[property: MemoryPackOrder(0)] Guid InstanceGuid,
|
[property: MemoryPackOrder(0)] Guid InstanceGuid,
|
||||||
[property: MemoryPackOrder(1)] InstanceConfiguration Configuration,
|
[property: MemoryPackOrder(1)] InstanceInfo Info,
|
||||||
[property: MemoryPackOrder(2)] InstanceLaunchProperties LaunchProperties,
|
[property: MemoryPackOrder(2)] InstanceLaunchRecipe? LaunchRecipe,
|
||||||
[property: MemoryPackOrder(3)] bool LaunchNow = false
|
[property: MemoryPackOrder(3)] bool LaunchNow = false
|
||||||
) : IMessageToAgent, ICanReply<Result<ConfigureInstanceResult, InstanceActionFailure>>;
|
) : IMessageToAgent, ICanReply<Result<ConfigureInstanceResult, InstanceActionFailure>>;
|
||||||
|
|||||||
@@ -0,0 +1,357 @@
|
|||||||
|
// <auto-generated />
|
||||||
|
using System;
|
||||||
|
using System.Text.Json;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||||
|
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||||
|
using Phantom.Controller.Database;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace Phantom.Controller.Database.Postgres.Migrations
|
||||||
|
{
|
||||||
|
[DbContext(typeof(ApplicationDbContext))]
|
||||||
|
[Migration("20251228211902_AgentAuthSecretNullability")]
|
||||||
|
partial class AgentAuthSecretNullability
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
||||||
|
{
|
||||||
|
#pragma warning disable 612, 618
|
||||||
|
modelBuilder
|
||||||
|
.HasAnnotation("ProductVersion", "9.0.9")
|
||||||
|
.HasAnnotation("Relational:MaxIdentifierLength", 63);
|
||||||
|
|
||||||
|
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
||||||
|
|
||||||
|
modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("AgentGuid")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<byte[]>("AuthSecret")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(12)
|
||||||
|
.HasColumnType("bytea");
|
||||||
|
|
||||||
|
b.Property<string>("BuildVersion")
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<int?>("MaxInstances")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<int?>("MaxMemory")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<string>("Name")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<int?>("ProtocolVersion")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.HasKey("AgentGuid");
|
||||||
|
|
||||||
|
b.ToTable("Agents", "agents");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
|
||||||
|
{
|
||||||
|
b.Property<long>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
|
||||||
|
|
||||||
|
b.Property<JsonDocument>("Data")
|
||||||
|
.HasColumnType("jsonb");
|
||||||
|
|
||||||
|
b.Property<string>("EventType")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<string>("SubjectId")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<string>("SubjectType")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<Guid?>("UserGuid")
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<DateTime>("UtcTime")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("UserGuid");
|
||||||
|
|
||||||
|
b.ToTable("AuditLog", "system");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Phantom.Controller.Database.Entities.EventLogEntity", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("EventGuid")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<Guid?>("AgentGuid")
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<JsonDocument>("Data")
|
||||||
|
.HasColumnType("jsonb");
|
||||||
|
|
||||||
|
b.Property<string>("EventType")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<string>("SubjectId")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<string>("SubjectType")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<DateTime>("UtcTime")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.HasKey("EventGuid");
|
||||||
|
|
||||||
|
b.ToTable("EventLog", "system");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("InstanceGuid")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<Guid>("AgentGuid")
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<string>("InstanceName")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<Guid>("JavaRuntimeGuid")
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<string>("JvmArguments")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<bool>("LaunchAutomatically")
|
||||||
|
.HasColumnType("boolean");
|
||||||
|
|
||||||
|
b.Property<int>("MemoryAllocation")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<string>("MinecraftServerKind")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<string>("MinecraftVersion")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<int>("RconPort")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<int>("ServerPort")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.HasKey("InstanceGuid");
|
||||||
|
|
||||||
|
b.ToTable("Instances", "agents");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Phantom.Controller.Database.Entities.PermissionEntity", b =>
|
||||||
|
{
|
||||||
|
b.Property<string>("Id")
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("Permissions", "identity");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Phantom.Controller.Database.Entities.RoleEntity", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("RoleGuid")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<string>("Name")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.HasKey("RoleGuid");
|
||||||
|
|
||||||
|
b.ToTable("Roles", "identity");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("RoleGuid")
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<string>("PermissionId")
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.HasKey("RoleGuid", "PermissionId");
|
||||||
|
|
||||||
|
b.HasIndex("PermissionId");
|
||||||
|
|
||||||
|
b.ToTable("RolePermissions", "identity");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Phantom.Controller.Database.Entities.UserAgentAccessEntity", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("UserGuid")
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<Guid>("AgentGuid")
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.HasKey("UserGuid", "AgentGuid");
|
||||||
|
|
||||||
|
b.HasIndex("AgentGuid");
|
||||||
|
|
||||||
|
b.ToTable("UserAgentAccess", "identity");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Phantom.Controller.Database.Entities.UserEntity", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("UserGuid")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<string>("Name")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<string>("PasswordHash")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.HasKey("UserGuid");
|
||||||
|
|
||||||
|
b.HasIndex("Name")
|
||||||
|
.IsUnique();
|
||||||
|
|
||||||
|
b.ToTable("Users", "identity");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("UserGuid")
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<string>("PermissionId")
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.HasKey("UserGuid", "PermissionId");
|
||||||
|
|
||||||
|
b.HasIndex("PermissionId");
|
||||||
|
|
||||||
|
b.ToTable("UserPermissions", "identity");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Phantom.Controller.Database.Entities.UserRoleEntity", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("UserGuid")
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<Guid>("RoleGuid")
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.HasKey("UserGuid", "RoleGuid");
|
||||||
|
|
||||||
|
b.HasIndex("RoleGuid");
|
||||||
|
|
||||||
|
b.ToTable("UserRoles", "identity");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("Phantom.Controller.Database.Entities.UserEntity", "User")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("UserGuid")
|
||||||
|
.OnDelete(DeleteBehavior.SetNull);
|
||||||
|
|
||||||
|
b.Navigation("User");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("PermissionId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.HasOne("Phantom.Controller.Database.Entities.RoleEntity", null)
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("RoleGuid")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Phantom.Controller.Database.Entities.UserAgentAccessEntity", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("Phantom.Controller.Database.Entities.AgentEntity", null)
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("AgentGuid")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.HasOne("Phantom.Controller.Database.Entities.UserEntity", null)
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("UserGuid")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("PermissionId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.HasOne("Phantom.Controller.Database.Entities.UserEntity", null)
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("UserGuid")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Phantom.Controller.Database.Entities.UserRoleEntity", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("Phantom.Controller.Database.Entities.RoleEntity", "Role")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("RoleGuid")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.HasOne("Phantom.Controller.Database.Entities.UserEntity", "User")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("UserGuid")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.Navigation("Role");
|
||||||
|
|
||||||
|
b.Navigation("User");
|
||||||
|
});
|
||||||
|
#pragma warning restore 612, 618
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace Phantom.Controller.Database.Postgres.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class AgentAuthSecretNullability : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AlterColumn<byte[]>(
|
||||||
|
name: "AuthSecret",
|
||||||
|
schema: "agents",
|
||||||
|
table: "Agents",
|
||||||
|
type: "bytea",
|
||||||
|
maxLength: 12,
|
||||||
|
nullable: false,
|
||||||
|
defaultValue: new byte[0],
|
||||||
|
oldClrType: typeof(byte[]),
|
||||||
|
oldType: "bytea",
|
||||||
|
oldMaxLength: 12,
|
||||||
|
oldNullable: true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AlterColumn<byte[]>(
|
||||||
|
name: "AuthSecret",
|
||||||
|
schema: "agents",
|
||||||
|
table: "Agents",
|
||||||
|
type: "bytea",
|
||||||
|
maxLength: 12,
|
||||||
|
nullable: true,
|
||||||
|
oldClrType: typeof(byte[]),
|
||||||
|
oldType: "bytea",
|
||||||
|
oldMaxLength: 12);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -30,6 +30,7 @@ namespace Phantom.Controller.Database.Postgres.Migrations
|
|||||||
.HasColumnType("uuid");
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
b.Property<byte[]>("AuthSecret")
|
b.Property<byte[]>("AuthSecret")
|
||||||
|
.IsRequired()
|
||||||
.HasMaxLength(12)
|
.HasMaxLength(12)
|
||||||
.HasColumnType("bytea");
|
.HasColumnType("bytea");
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ public sealed class AgentEntity {
|
|||||||
public RamAllocationUnits? MaxMemory { get; set; }
|
public RamAllocationUnits? MaxMemory { get; set; }
|
||||||
|
|
||||||
[MaxLength(AuthSecret.Length)]
|
[MaxLength(AuthSecret.Length)]
|
||||||
public AuthSecret? AuthSecret { get; set; }
|
public AuthSecret AuthSecret { get; set; }
|
||||||
|
|
||||||
public AgentConfiguration Configuration => new (Name);
|
public AgentConfiguration Configuration => new (Name);
|
||||||
public AgentVersionInfo? VersionInfo => ProtocolVersion is {} protocolVersion && BuildVersion is {} buildVersion ? new AgentVersionInfo(protocolVersion, buildVersion) : null;
|
public AgentVersionInfo? VersionInfo => ProtocolVersion is {} protocolVersion && BuildVersion is {} buildVersion ? new AgentVersionInfo(protocolVersion, buildVersion) : null;
|
||||||
@@ -30,5 +30,6 @@ public sealed class AgentEntity {
|
|||||||
AgentGuid = agentGuid;
|
AgentGuid = agentGuid;
|
||||||
Name = null!;
|
Name = null!;
|
||||||
BuildVersion = null!;
|
BuildVersion = null!;
|
||||||
|
AuthSecret = null!;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,6 @@
|
|||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="System.Linq.Async" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -0,0 +1,77 @@
|
|||||||
|
using System.Collections.Immutable;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
using Phantom.Common.Data.Instance;
|
||||||
|
using Phantom.Common.Data.Instance.Launch;
|
||||||
|
using Phantom.Common.Data.Minecraft;
|
||||||
|
using Phantom.Utils.Collections;
|
||||||
|
|
||||||
|
namespace Phantom.Controller.Minecraft;
|
||||||
|
|
||||||
|
public sealed partial class MinecraftLaunchRecipes(MinecraftVersions minecraftVersions) {
|
||||||
|
[GeneratedRegex(@"[^a-zA-Z0-9_\-\.]", RegexOptions.Compiled)]
|
||||||
|
private static partial Regex SanitizePathRegex();
|
||||||
|
|
||||||
|
private static readonly ImmutableDictionary<string, string> Eula = ImmutableDictionary.From([
|
||||||
|
("eula", "true"),
|
||||||
|
]);
|
||||||
|
|
||||||
|
public async Task<InstanceLaunchRecipe?> Create(InstanceConfiguration configuration, CancellationToken cancellationToken) {
|
||||||
|
string minecraftVersion = configuration.MinecraftVersion;
|
||||||
|
string minecraftVersionPath = SanitizePathRegex().IsMatch(minecraftVersion) ? SanitizePathRegex().Replace(minecraftVersion, "_") : minecraftVersion;
|
||||||
|
|
||||||
|
uint maximumHeapSizeMegabvtes = configuration.MemoryAllocation.InMegabytes;
|
||||||
|
uint initialHeapSizeMegabytes = maximumHeapSizeMegabvtes / 2;
|
||||||
|
|
||||||
|
var serverExecutableInfo = await minecraftVersions.GetServerExecutableInfo(minecraftVersion, cancellationToken);
|
||||||
|
if (serverExecutableInfo == null) {
|
||||||
|
// TODO
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
var vanillaJarFilePath = new InstancePath.Global(["minecraft", "vanilla", minecraftVersionPath, "server.jar"]);
|
||||||
|
|
||||||
|
var steps = ImmutableArray.CreateBuilder<IInstanceLaunchStep>();
|
||||||
|
|
||||||
|
steps.Add(new InstanceLaunchStep.DownloadFile(serverExecutableInfo, vanillaJarFilePath));
|
||||||
|
steps.Add(new InstanceLaunchStep.EditPropertiesFile(new InstancePath.Local(["eula.txt"]), "EULA", Eula));
|
||||||
|
steps.Add(new InstanceLaunchStep.EditPropertiesFile(new InstancePath.Local(["server.properties"]), "Server Properties", ServerProperties(configuration)));
|
||||||
|
|
||||||
|
var serverExecutableFilePath = vanillaJarFilePath;
|
||||||
|
var additionalJvmArguments = new List<IInstanceValue>();
|
||||||
|
|
||||||
|
if (configuration.MinecraftServerKind == MinecraftServerKind.Fabric) {
|
||||||
|
// TODO customizable loader version
|
||||||
|
string fabricLauncherUrl = $"https://meta.fabricmc.net/v2/versions/loader/{minecraftVersion}/stable/stable/server/jar";
|
||||||
|
|
||||||
|
var fabricLauncherFilePath = new InstancePath.Global(["minecraft", "fabric", minecraftVersionPath, "loader.jar"]);
|
||||||
|
|
||||||
|
steps.Add(new InstanceLaunchStep.DownloadFile(new FileDownloadInfo(fabricLauncherUrl), fabricLauncherFilePath));
|
||||||
|
|
||||||
|
serverExecutableFilePath = fabricLauncherFilePath;
|
||||||
|
|
||||||
|
additionalJvmArguments.Add(new InstanceValues.Concatenation([
|
||||||
|
new InstanceValues.Text("-Dfabric.installer.server.gameJar="),
|
||||||
|
new InstanceValues.Path(vanillaJarFilePath),
|
||||||
|
]));
|
||||||
|
}
|
||||||
|
|
||||||
|
return new InstanceLaunchRecipe(steps.ToImmutable(), new InstancePath.Runtime(configuration.JavaRuntimeGuid), [
|
||||||
|
..configuration.JvmArguments.Select(static arg => new InstanceValues.Text(arg)),
|
||||||
|
..additionalJvmArguments,
|
||||||
|
new InstanceValues.Text("-Xms" + initialHeapSizeMegabytes + "M"),
|
||||||
|
new InstanceValues.Text("-Xmx" + maximumHeapSizeMegabvtes + "M"),
|
||||||
|
new InstanceValues.Text("-jar"),
|
||||||
|
new InstanceValues.Path(serverExecutableFilePath),
|
||||||
|
new InstanceValues.Text("-nogui"),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static ImmutableDictionary<string, string> ServerProperties(InstanceConfiguration configuration) {
|
||||||
|
return ImmutableDictionary.From([
|
||||||
|
("server-port", configuration.ServerPort.ToString()),
|
||||||
|
("rcon.port", configuration.RconPort.ToString()),
|
||||||
|
("enable-rcon", "true"),
|
||||||
|
("sync-chunk-writes", "false"),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,7 +3,6 @@ using System.Net.Http.Json;
|
|||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using Phantom.Common.Data.Minecraft;
|
using Phantom.Common.Data.Minecraft;
|
||||||
using Phantom.Utils.Cryptography;
|
using Phantom.Utils.Cryptography;
|
||||||
using Phantom.Utils.IO;
|
|
||||||
using Phantom.Utils.Logging;
|
using Phantom.Utils.Logging;
|
||||||
using Phantom.Utils.Runtime;
|
using Phantom.Utils.Runtime;
|
||||||
using Serilog;
|
using Serilog;
|
||||||
@@ -127,15 +126,6 @@ sealed class MinecraftVersionApi : IDisposable {
|
|||||||
throw StopProcedureException.Instance;
|
throw StopProcedureException.Instance;
|
||||||
}
|
}
|
||||||
|
|
||||||
JsonElement sizeElement = GetJsonPropertyOrThrow(serverElement, "size", JsonValueKind.Number, "downloads.server object in version metadata");
|
|
||||||
ulong size;
|
|
||||||
try {
|
|
||||||
size = sizeElement.GetUInt64();
|
|
||||||
} catch (FormatException) {
|
|
||||||
Logger.Error("The \"size\" key in downloads.server object in version metadata contains an invalid file size: {Size}", sizeElement);
|
|
||||||
throw StopProcedureException.Instance;
|
|
||||||
}
|
|
||||||
|
|
||||||
JsonElement sha1Element = GetJsonPropertyOrThrow(serverElement, "sha1", JsonValueKind.String, "downloads.server object in version metadata");
|
JsonElement sha1Element = GetJsonPropertyOrThrow(serverElement, "sha1", JsonValueKind.String, "downloads.server object in version metadata");
|
||||||
Sha1String hash;
|
Sha1String hash;
|
||||||
try {
|
try {
|
||||||
@@ -145,7 +135,7 @@ sealed class MinecraftVersionApi : IDisposable {
|
|||||||
throw StopProcedureException.Instance;
|
throw StopProcedureException.Instance;
|
||||||
}
|
}
|
||||||
|
|
||||||
return new FileDownloadInfo(url, hash, new FileSize(size));
|
return new FileDownloadInfo(url, hash);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static JsonElement GetJsonPropertyOrThrow(JsonElement parentElement, string propertyKey, JsonValueKind expectedKind, string location) {
|
private static JsonElement GetJsonPropertyOrThrow(JsonElement parentElement, string propertyKey, JsonValueKind expectedKind, string location) {
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ using Microsoft.EntityFrameworkCore;
|
|||||||
using Phantom.Common.Data;
|
using Phantom.Common.Data;
|
||||||
using Phantom.Common.Data.Agent;
|
using Phantom.Common.Data.Agent;
|
||||||
using Phantom.Common.Data.Instance;
|
using Phantom.Common.Data.Instance;
|
||||||
|
using Phantom.Common.Data.Instance.Launch;
|
||||||
using Phantom.Common.Data.Java;
|
using Phantom.Common.Data.Java;
|
||||||
using Phantom.Common.Data.Minecraft;
|
using Phantom.Common.Data.Minecraft;
|
||||||
using Phantom.Common.Data.Replies;
|
using Phantom.Common.Data.Replies;
|
||||||
@@ -41,7 +42,7 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
|
|||||||
AgentRuntimeInfo AgentRuntimeInfo,
|
AgentRuntimeInfo AgentRuntimeInfo,
|
||||||
AgentConnectionKeys AgentConnectionKeys,
|
AgentConnectionKeys AgentConnectionKeys,
|
||||||
ControllerState ControllerState,
|
ControllerState ControllerState,
|
||||||
MinecraftVersions MinecraftVersions,
|
MinecraftLaunchRecipes LaunchRecipes,
|
||||||
IDbContextProvider DbProvider,
|
IDbContextProvider DbProvider,
|
||||||
CancellationToken CancellationToken
|
CancellationToken CancellationToken
|
||||||
);
|
);
|
||||||
@@ -54,7 +55,7 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
|
|||||||
|
|
||||||
private readonly AgentConnectionKeys agentConnectionKeys;
|
private readonly AgentConnectionKeys agentConnectionKeys;
|
||||||
private readonly ControllerState controllerState;
|
private readonly ControllerState controllerState;
|
||||||
private readonly MinecraftVersions minecraftVersions;
|
private readonly MinecraftLaunchRecipes launchRecipes;
|
||||||
private readonly IDbContextProvider dbProvider;
|
private readonly IDbContextProvider dbProvider;
|
||||||
private readonly CancellationToken cancellationToken;
|
private readonly CancellationToken cancellationToken;
|
||||||
|
|
||||||
@@ -95,7 +96,7 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
|
|||||||
private AgentActor(Init init) {
|
private AgentActor(Init init) {
|
||||||
this.agentConnectionKeys = init.AgentConnectionKeys;
|
this.agentConnectionKeys = init.AgentConnectionKeys;
|
||||||
this.controllerState = init.ControllerState;
|
this.controllerState = init.ControllerState;
|
||||||
this.minecraftVersions = init.MinecraftVersions;
|
this.launchRecipes = init.LaunchRecipes;
|
||||||
this.dbProvider = init.DbProvider;
|
this.dbProvider = init.DbProvider;
|
||||||
this.cancellationToken = init.CancellationToken;
|
this.cancellationToken = init.CancellationToken;
|
||||||
|
|
||||||
@@ -190,13 +191,17 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
|
|||||||
var configurationMessages = ImmutableArray.CreateBuilder<ConfigureInstanceMessage>();
|
var configurationMessages = ImmutableArray.CreateBuilder<ConfigureInstanceMessage>();
|
||||||
|
|
||||||
foreach (var (instanceGuid, instanceConfiguration, _, _, launchAutomatically) in instanceDataByGuid.Values.ToImmutableArray()) {
|
foreach (var (instanceGuid, instanceConfiguration, _, _, launchAutomatically) in instanceDataByGuid.Values.ToImmutableArray()) {
|
||||||
var serverExecutableInfo = await minecraftVersions.GetServerExecutableInfo(instanceConfiguration.MinecraftVersion, cancellationToken);
|
var launchRecipe = await CreateInstanceLaunchRecipe(instanceConfiguration);
|
||||||
configurationMessages.Add(new ConfigureInstanceMessage(instanceGuid, instanceConfiguration, new InstanceLaunchProperties(serverExecutableInfo), launchAutomatically));
|
configurationMessages.Add(new ConfigureInstanceMessage(instanceGuid, instanceConfiguration.AsInfo, launchRecipe, launchAutomatically));
|
||||||
}
|
}
|
||||||
|
|
||||||
return configurationMessages.ToImmutable();
|
return configurationMessages.ToImmutable();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async Task<InstanceLaunchRecipe?> CreateInstanceLaunchRecipe(InstanceConfiguration configuration) {
|
||||||
|
return await launchRecipes.Create(configuration, cancellationToken);
|
||||||
|
}
|
||||||
|
|
||||||
public interface ICommand;
|
public interface ICommand;
|
||||||
|
|
||||||
private sealed record InitializeCommand : ICommand;
|
private sealed record InitializeCommand : ICommand;
|
||||||
@@ -340,13 +345,14 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
|
|||||||
return Task.FromResult<Result<CreateOrUpdateInstanceResult, InstanceActionFailure>>(CreateOrUpdateInstanceResult.InstanceMemoryMustNotBeZero);
|
return Task.FromResult<Result<CreateOrUpdateInstanceResult, InstanceActionFailure>>(CreateOrUpdateInstanceResult.InstanceMemoryMustNotBeZero);
|
||||||
}
|
}
|
||||||
|
|
||||||
return minecraftVersions.GetServerExecutableInfo(instanceConfiguration.MinecraftVersion, cancellationToken)
|
return launchRecipes.Create(instanceConfiguration, cancellationToken)
|
||||||
.ContinueOnActor(CreateOrUpdateInstance1, command)
|
.ContinueOnActor(CreateOrUpdateInstance1, command)
|
||||||
.Unwrap();
|
.Unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
private Task<Result<CreateOrUpdateInstanceResult, InstanceActionFailure>> CreateOrUpdateInstance1(FileDownloadInfo? serverExecutableInfo, CreateOrUpdateInstanceCommand command) {
|
private Task<Result<CreateOrUpdateInstanceResult, InstanceActionFailure>> CreateOrUpdateInstance1(InstanceLaunchRecipe? launchRecipe, CreateOrUpdateInstanceCommand command) {
|
||||||
if (serverExecutableInfo == null) {
|
if (launchRecipe == null) {
|
||||||
|
// TODO
|
||||||
return Task.FromResult<Result<CreateOrUpdateInstanceResult, InstanceActionFailure>>(CreateOrUpdateInstanceResult.MinecraftVersionDownloadInfoNotFound);
|
return Task.FromResult<Result<CreateOrUpdateInstanceResult, InstanceActionFailure>>(CreateOrUpdateInstanceResult.MinecraftVersionDownloadInfoNotFound);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -357,7 +363,7 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
|
|||||||
instanceActorRef = CreateNewInstance(Instance.Offline(command.InstanceGuid, instanceConfiguration));
|
instanceActorRef = CreateNewInstance(Instance.Offline(command.InstanceGuid, instanceConfiguration));
|
||||||
}
|
}
|
||||||
|
|
||||||
var configureInstanceCommand = new InstanceActor.ConfigureInstanceCommand(command.LoggedInUserGuid, command.InstanceGuid, instanceConfiguration, new InstanceLaunchProperties(serverExecutableInfo), isCreatingInstance);
|
var configureInstanceCommand = new InstanceActor.ConfigureInstanceCommand(command.LoggedInUserGuid, command.InstanceGuid, instanceConfiguration, launchRecipe, isCreatingInstance);
|
||||||
|
|
||||||
return instanceActorRef.Request(configureInstanceCommand, cancellationToken)
|
return instanceActorRef.Request(configureInstanceCommand, cancellationToken)
|
||||||
.ContinueOnActor(CreateOrUpdateInstance2, configureInstanceCommand);
|
.ContinueOnActor(CreateOrUpdateInstance2, configureInstanceCommand);
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
using System.Collections.Concurrent;
|
using System.Collections.Concurrent;
|
||||||
using System.Collections.Immutable;
|
using System.Collections.Immutable;
|
||||||
using Akka.Actor;
|
using Akka.Actor;
|
||||||
using Microsoft.EntityFrameworkCore;
|
|
||||||
using Phantom.Common.Data;
|
using Phantom.Common.Data;
|
||||||
using Phantom.Common.Data.Replies;
|
using Phantom.Common.Data.Replies;
|
||||||
using Phantom.Common.Data.Web.Agent;
|
using Phantom.Common.Data.Web.Agent;
|
||||||
@@ -9,7 +8,6 @@ using Phantom.Common.Data.Web.Users;
|
|||||||
using Phantom.Common.Messages.Agent.Handshake;
|
using Phantom.Common.Messages.Agent.Handshake;
|
||||||
using Phantom.Common.Messages.Agent.ToAgent;
|
using Phantom.Common.Messages.Agent.ToAgent;
|
||||||
using Phantom.Controller.Database;
|
using Phantom.Controller.Database;
|
||||||
using Phantom.Controller.Database.Entities;
|
|
||||||
using Phantom.Controller.Minecraft;
|
using Phantom.Controller.Minecraft;
|
||||||
using Phantom.Controller.Services.Users.Sessions;
|
using Phantom.Controller.Services.Users.Sessions;
|
||||||
using Phantom.Utils.Actor;
|
using Phantom.Utils.Actor;
|
||||||
@@ -23,7 +21,7 @@ sealed class AgentManager(
|
|||||||
IActorRefFactory actorSystem,
|
IActorRefFactory actorSystem,
|
||||||
AgentConnectionKeys agentConnectionKeys,
|
AgentConnectionKeys agentConnectionKeys,
|
||||||
ControllerState controllerState,
|
ControllerState controllerState,
|
||||||
MinecraftVersions minecraftVersions,
|
MinecraftLaunchRecipes launchRecipes,
|
||||||
IDbContextProvider dbProvider,
|
IDbContextProvider dbProvider,
|
||||||
CancellationToken cancellationToken
|
CancellationToken cancellationToken
|
||||||
) {
|
) {
|
||||||
@@ -33,36 +31,22 @@ sealed class AgentManager(
|
|||||||
|
|
||||||
public async Task Initialize() {
|
public async Task Initialize() {
|
||||||
await using var ctx = dbProvider.Eager();
|
await using var ctx = dbProvider.Eager();
|
||||||
await Migrate(ctx);
|
|
||||||
|
|
||||||
await foreach (var entity in ctx.Agents.AsAsyncEnumerable().WithCancellation(cancellationToken)) {
|
await foreach (var entity in ctx.Agents.AsAsyncEnumerable().WithCancellation(cancellationToken)) {
|
||||||
var agentGuid = entity.AgentGuid;
|
var agentGuid = entity.AgentGuid;
|
||||||
|
|
||||||
if (AddAgent(loggedInUserGuid: null, agentGuid, entity.Configuration, entity.AuthSecret!, entity.RuntimeInfo)) {
|
if (AddAgent(loggedInUserGuid: null, agentGuid, entity.Configuration, entity.AuthSecret, entity.RuntimeInfo)) {
|
||||||
Logger.Information("Loaded agent \"{AgentName}\" (GUID {AgentGuid}) from database.", entity.Name, agentGuid);
|
Logger.Information("Loaded agent \"{AgentName}\" (GUID {AgentGuid}) from database.", entity.Name, agentGuid);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool AddAgent(Guid? loggedInUserGuid, Guid agentGuid, AgentConfiguration configuration, AuthSecret authSecret, AgentRuntimeInfo runtimeInfo) {
|
private bool AddAgent(Guid? loggedInUserGuid, Guid agentGuid, AgentConfiguration configuration, AuthSecret authSecret, AgentRuntimeInfo runtimeInfo) {
|
||||||
var init = new AgentActor.Init(loggedInUserGuid, agentGuid, configuration, authSecret, runtimeInfo, agentConnectionKeys, controllerState, minecraftVersions, dbProvider, cancellationToken);
|
var init = new AgentActor.Init(loggedInUserGuid, agentGuid, configuration, authSecret, runtimeInfo, agentConnectionKeys, controllerState, launchRecipes, dbProvider, cancellationToken);
|
||||||
var name = "Agent:" + agentGuid;
|
var name = "Agent:" + agentGuid;
|
||||||
return agentsByAgentGuid.TryAdd(agentGuid, actorSystem.ActorOf(AgentActor.Factory(init), name));
|
return agentsByAgentGuid.TryAdd(agentGuid, actorSystem.ActorOf(AgentActor.Factory(init), name));
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task Migrate(ApplicationDbContext ctx) {
|
|
||||||
List<AgentEntity> agentsWithoutSecrets = await ctx.Agents.Where(static entity => entity.AuthSecret == null).ToListAsync(cancellationToken);
|
|
||||||
if (agentsWithoutSecrets.Count == 0) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var entity in agentsWithoutSecrets) {
|
|
||||||
entity.AuthSecret = AuthSecret.Generate();
|
|
||||||
}
|
|
||||||
|
|
||||||
await ctx.SaveChangesAsync(cancellationToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<ImmutableArray<ConfigureInstanceMessage>?> RegisterAgent(Guid agentGuid, AgentRegistration registration) {
|
public async Task<ImmutableArray<ConfigureInstanceMessage>?> RegisterAgent(Guid agentGuid, AgentRegistration registration) {
|
||||||
if (!agentsByAgentGuid.TryGetValue(agentGuid, out var agentActor)) {
|
if (!agentsByAgentGuid.TryGetValue(agentGuid, out var agentActor)) {
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ public sealed class ControllerServices : IDisposable {
|
|||||||
|
|
||||||
private ControllerState ControllerState { get; }
|
private ControllerState ControllerState { get; }
|
||||||
private MinecraftVersions MinecraftVersions { get; }
|
private MinecraftVersions MinecraftVersions { get; }
|
||||||
|
private MinecraftLaunchRecipes LaunchRecipes { get; }
|
||||||
|
|
||||||
private AuthenticatedUserCache AuthenticatedUserCache { get; }
|
private AuthenticatedUserCache AuthenticatedUserCache { get; }
|
||||||
private UserManager UserManager { get; }
|
private UserManager UserManager { get; }
|
||||||
@@ -50,6 +51,7 @@ public sealed class ControllerServices : IDisposable {
|
|||||||
|
|
||||||
this.ControllerState = new ControllerState();
|
this.ControllerState = new ControllerState();
|
||||||
this.MinecraftVersions = new MinecraftVersions();
|
this.MinecraftVersions = new MinecraftVersions();
|
||||||
|
this.LaunchRecipes = new MinecraftLaunchRecipes(MinecraftVersions);
|
||||||
|
|
||||||
this.AuthenticatedUserCache = new AuthenticatedUserCache();
|
this.AuthenticatedUserCache = new AuthenticatedUserCache();
|
||||||
this.UserManager = new UserManager(AuthenticatedUserCache, ControllerState, dbProvider);
|
this.UserManager = new UserManager(AuthenticatedUserCache, ControllerState, dbProvider);
|
||||||
@@ -58,7 +60,7 @@ public sealed class ControllerServices : IDisposable {
|
|||||||
this.UserLoginManager = new UserLoginManager(AuthenticatedUserCache, dbProvider);
|
this.UserLoginManager = new UserLoginManager(AuthenticatedUserCache, dbProvider);
|
||||||
this.PermissionManager = new PermissionManager(dbProvider);
|
this.PermissionManager = new PermissionManager(dbProvider);
|
||||||
|
|
||||||
this.AgentManager = new AgentManager(ActorSystem, new AgentConnectionKeys(agentCertificateThumbprint), ControllerState, MinecraftVersions, dbProvider, cancellationToken);
|
this.AgentManager = new AgentManager(ActorSystem, new AgentConnectionKeys(agentCertificateThumbprint), ControllerState, LaunchRecipes, dbProvider, cancellationToken);
|
||||||
this.InstanceLogManager = new InstanceLogManager();
|
this.InstanceLogManager = new InstanceLogManager();
|
||||||
|
|
||||||
this.AuditLogManager = new AuditLogManager(dbProvider);
|
this.AuditLogManager = new AuditLogManager(dbProvider);
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
using Phantom.Common.Data;
|
using Phantom.Common.Data;
|
||||||
using Phantom.Common.Data.Instance;
|
using Phantom.Common.Data.Instance;
|
||||||
|
using Phantom.Common.Data.Instance.Launch;
|
||||||
using Phantom.Common.Data.Minecraft;
|
using Phantom.Common.Data.Minecraft;
|
||||||
using Phantom.Common.Data.Replies;
|
using Phantom.Common.Data.Replies;
|
||||||
using Phantom.Common.Data.Web.Instance;
|
using Phantom.Common.Data.Web.Instance;
|
||||||
@@ -70,7 +71,7 @@ sealed class InstanceActor : ReceiveActor<InstanceActor.ICommand> {
|
|||||||
|
|
||||||
public sealed record SetPlayerCountsCommand(InstancePlayerCounts? PlayerCounts) : ICommand;
|
public sealed record SetPlayerCountsCommand(InstancePlayerCounts? PlayerCounts) : ICommand;
|
||||||
|
|
||||||
public sealed record ConfigureInstanceCommand(Guid AuditLogUserGuid, Guid InstanceGuid, InstanceConfiguration Configuration, InstanceLaunchProperties LaunchProperties, bool IsCreatingInstance) : ICommand, ICanReply<Result<ConfigureInstanceResult, InstanceActionFailure>>;
|
public sealed record ConfigureInstanceCommand(Guid AuditLogUserGuid, Guid InstanceGuid, InstanceConfiguration Configuration, InstanceLaunchRecipe LaunchRecipe, bool IsCreatingInstance) : ICommand, ICanReply<Result<ConfigureInstanceResult, InstanceActionFailure>>;
|
||||||
|
|
||||||
public sealed record LaunchInstanceCommand(Guid AuditLogUserGuid) : ICommand, ICanReply<Result<LaunchInstanceResult, InstanceActionFailure>>;
|
public sealed record LaunchInstanceCommand(Guid AuditLogUserGuid) : ICommand, ICanReply<Result<LaunchInstanceResult, InstanceActionFailure>>;
|
||||||
|
|
||||||
@@ -94,7 +95,7 @@ sealed class InstanceActor : ReceiveActor<InstanceActor.ICommand> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private async Task<Result<ConfigureInstanceResult, InstanceActionFailure>> ConfigureInstance(ConfigureInstanceCommand command) {
|
private async Task<Result<ConfigureInstanceResult, InstanceActionFailure>> ConfigureInstance(ConfigureInstanceCommand command) {
|
||||||
var message = new ConfigureInstanceMessage(command.InstanceGuid, command.Configuration, command.LaunchProperties);
|
var message = new ConfigureInstanceMessage(command.InstanceGuid, command.Configuration.AsInfo, command.LaunchRecipe);
|
||||||
var result = await SendInstanceActionMessage<ConfigureInstanceMessage, ConfigureInstanceResult>(message);
|
var result = await SendInstanceActionMessage<ConfigureInstanceMessage, ConfigureInstanceResult>(message);
|
||||||
|
|
||||||
if (result.Is(ConfigureInstanceResult.Success)) {
|
if (result.Is(ConfigureInstanceResult.Success)) {
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
<Project>
|
<Project>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net9.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
<LangVersion>13</LangVersion>
|
<LangVersion>14</LangVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# +---------------+
|
# +---------------+
|
||||||
# | Prepare build |
|
# | Prepare build |
|
||||||
# +---------------+
|
# +---------------+
|
||||||
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/nightly/sdk:9.0 AS phantom-builder
|
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/nightly/sdk:10.0 AS phantom-builder
|
||||||
ARG TARGETARCH
|
ARG TARGETARCH
|
||||||
|
|
||||||
ADD . /app
|
ADD . /app
|
||||||
@@ -19,7 +19,7 @@ RUN find .artifacts/publish/*/* -maxdepth 0 -execdir mv '{}' 'release' \;
|
|||||||
# +---------------------+
|
# +---------------------+
|
||||||
# | Phantom Agent image |
|
# | Phantom Agent image |
|
||||||
# +---------------------+
|
# +---------------------+
|
||||||
FROM mcr.microsoft.com/dotnet/nightly/runtime:9.0 AS phantom-agent
|
FROM mcr.microsoft.com/dotnet/nightly/runtime:10.0 AS phantom-agent
|
||||||
|
|
||||||
RUN mkdir /data && chmod 777 /data
|
RUN mkdir /data && chmod 777 /data
|
||||||
WORKDIR /data
|
WORKDIR /data
|
||||||
@@ -46,7 +46,7 @@ ENTRYPOINT ["dotnet", "/app/Phantom.Agent.dll"]
|
|||||||
# +--------------------------+
|
# +--------------------------+
|
||||||
# | Phantom Controller image |
|
# | Phantom Controller image |
|
||||||
# +--------------------------+
|
# +--------------------------+
|
||||||
FROM mcr.microsoft.com/dotnet/nightly/runtime:9.0 AS phantom-controller
|
FROM mcr.microsoft.com/dotnet/nightly/runtime:10.0 AS phantom-controller
|
||||||
|
|
||||||
RUN mkdir /data && chmod 777 /data
|
RUN mkdir /data && chmod 777 /data
|
||||||
WORKDIR /data
|
WORKDIR /data
|
||||||
|
|||||||
@@ -1,15 +1,14 @@
|
|||||||
<Project>
|
<Project>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Update="Microsoft.AspNetCore.Components.Authorization" Version="9.0.9" />
|
<PackageReference Update="Microsoft.AspNetCore.Components.Authorization" Version="10.0.1" />
|
||||||
<PackageReference Update="Microsoft.AspNetCore.Components.Web" Version="9.0.9" />
|
<PackageReference Update="Microsoft.AspNetCore.Components.Web" Version="10.0.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="9.0.9" />
|
<PackageReference Update="Microsoft.EntityFrameworkCore.Tools" Version="10.0.1" />
|
||||||
<PackageReference Update="Microsoft.EntityFrameworkCore.Tools" Version="9.0.9" />
|
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="10.0.1" />
|
||||||
<PackageReference Update="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
|
<PackageReference Update="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
|
||||||
<PackageReference Update="System.Linq.Async" Version="6.0.3" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@@ -23,7 +22,7 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Update="Serilog" Version="4.3.0" />
|
<PackageReference Update="Serilog" Version="4.3.0" />
|
||||||
<PackageReference Update="Serilog.AspNetCore" Version="9.0.0" />
|
<PackageReference Update="Serilog.AspNetCore" Version="10.0.0" />
|
||||||
<PackageReference Update="Serilog.Sinks.Async" Version="2.1.0" />
|
<PackageReference Update="Serilog.Sinks.Async" Version="2.1.0" />
|
||||||
<PackageReference Update="Serilog.Sinks.Console" Version="6.0.0" />
|
<PackageReference Update="Serilog.Sinks.Console" Version="6.0.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
using System.Collections.Immutable;
|
||||||
|
|
||||||
|
namespace Phantom.Utils.Collections;
|
||||||
|
|
||||||
|
public static class ImmutableCollectionExtensions {
|
||||||
|
extension(ImmutableDictionary) {
|
||||||
|
public static ImmutableDictionary<TKey, TValue> From<TKey, TValue>(ReadOnlySpan<(TKey, TValue)> pairs) where TKey : notnull {
|
||||||
|
var builder = ImmutableDictionary.CreateBuilder<TKey, TValue>();
|
||||||
|
|
||||||
|
foreach ((TKey key, TValue value) in pairs) {
|
||||||
|
builder.Add(key, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
return builder.ToImmutable();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,13 +8,17 @@ public readonly record struct FileSize(ulong Bytes) {
|
|||||||
];
|
];
|
||||||
|
|
||||||
public string ToHumanReadable(int decimalPlaces) {
|
public string ToHumanReadable(int decimalPlaces) {
|
||||||
int power = Bytes == 0L ? 0 : (int) Math.Log(Bytes, Scale);
|
return ToHumanReadable(Bytes, decimalPlaces);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string ToHumanReadable(ulong bytes, int decimalPlaces) {
|
||||||
|
int power = bytes == 0L ? 0 : (int) Math.Log(bytes, Scale);
|
||||||
int unit = power >= Units.Length ? Units.Length - 1 : power;
|
int unit = power >= Units.Length ? Units.Length - 1 : power;
|
||||||
if (unit == 0) {
|
if (unit == 0) {
|
||||||
return Bytes + " B";
|
return bytes + " B";
|
||||||
}
|
}
|
||||||
|
|
||||||
string format = "{0:n" + decimalPlaces + "} {1}";
|
string format = "{0:n" + decimalPlaces + "} {1}";
|
||||||
return string.Format(format, Bytes / Math.Pow(Scale, unit), Units[unit]);
|
return string.Format(format, bytes / Math.Pow(Scale, unit), Units[unit]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,32 +2,24 @@
|
|||||||
|
|
||||||
namespace Phantom.Utils.IO;
|
namespace Phantom.Utils.IO;
|
||||||
|
|
||||||
public sealed class StreamCopier : IDisposable {
|
public sealed class StreamCopier(int bufferSize = StreamCopier.DefaultBufferSize) : IDisposable {
|
||||||
private const int DefaultBufferSize = 81920;
|
private const int DefaultBufferSize = 81920;
|
||||||
|
|
||||||
public event EventHandler<BufferEventArgs>? BufferReady;
|
public event EventHandler<BufferEventArgs>? BufferReady;
|
||||||
|
|
||||||
private readonly int bufferSize;
|
private readonly byte[] buffer = ArrayPool<byte>.Shared.Rent(bufferSize);
|
||||||
|
|
||||||
public StreamCopier(int bufferSize = DefaultBufferSize) {
|
|
||||||
this.bufferSize = bufferSize;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task Copy(Stream source, Stream destination, CancellationToken cancellationToken) {
|
public async Task Copy(Stream source, Stream destination, CancellationToken cancellationToken) {
|
||||||
byte[] buffer = ArrayPool<byte>.Shared.Rent(bufferSize);
|
int bytesRead;
|
||||||
try {
|
while ((bytesRead = await source.ReadAsync(buffer.AsMemory(), cancellationToken)) != 0) {
|
||||||
int bytesRead;
|
var dataRead = new ReadOnlyMemory<byte>(buffer, start: 0, bytesRead);
|
||||||
while ((bytesRead = await source.ReadAsync(buffer.AsMemory(), cancellationToken)) != 0) {
|
BufferReady?.Invoke(this, new BufferEventArgs(dataRead));
|
||||||
var dataRead = new ReadOnlyMemory<byte>(buffer, start: 0, bytesRead);
|
await destination.WriteAsync(dataRead, cancellationToken);
|
||||||
BufferReady?.Invoke(this, new BufferEventArgs(dataRead));
|
|
||||||
await destination.WriteAsync(dataRead, cancellationToken);
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
ArrayPool<byte>.Shared.Return(buffer);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Dispose() {
|
public void Dispose() {
|
||||||
|
ArrayPool<byte>.Shared.Return(buffer);
|
||||||
BufferReady = null;
|
BufferReady = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
21
Utils/Phantom.Utils/Net/HttpHeadersExtensions.cs
Normal file
21
Utils/Phantom.Utils/Net/HttpHeadersExtensions.cs
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
using System.Net.Http.Headers;
|
||||||
|
using Phantom.Utils.IO;
|
||||||
|
|
||||||
|
namespace Phantom.Utils.Net;
|
||||||
|
|
||||||
|
public static class HttpHeadersExtensions {
|
||||||
|
private const string ContentLength = "Content-Length";
|
||||||
|
|
||||||
|
extension(HttpResponseHeaders headers) {
|
||||||
|
public FileSize? ContentLength {
|
||||||
|
get {
|
||||||
|
if (!headers.TryGetValues(ContentLength, out var values)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
string? value = values.FirstOrDefault();
|
||||||
|
return value != null && ulong.TryParse(value, out ulong result) ? new FileSize(result) : null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,17 +2,9 @@
|
|||||||
|
|
||||||
namespace Phantom.Utils.Processes;
|
namespace Phantom.Utils.Processes;
|
||||||
|
|
||||||
public sealed class OneShotProcess {
|
public sealed class OneShotProcess(ILogger logger, ProcessConfigurator configurator) {
|
||||||
private readonly ILogger logger;
|
|
||||||
private readonly ProcessConfigurator configurator;
|
|
||||||
|
|
||||||
public event EventHandler<Process.Output>? OutputReceived;
|
public event EventHandler<Process.Output>? OutputReceived;
|
||||||
|
|
||||||
public OneShotProcess(ILogger logger, ProcessConfigurator configurator) {
|
|
||||||
this.logger = logger;
|
|
||||||
this.configurator = configurator;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<bool> Run(CancellationToken cancellationToken) {
|
public async Task<bool> Run(CancellationToken cancellationToken) {
|
||||||
using var process = configurator.CreateProcess();
|
using var process = configurator.CreateProcess();
|
||||||
process.OutputReceived += OutputReceived;
|
process.OutputReceived += OutputReceived;
|
||||||
|
|||||||
@@ -31,6 +31,12 @@ public sealed class ProcessConfigurator {
|
|||||||
set => startInfo.UseShellExecute = value;
|
set => startInfo.UseShellExecute = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ProcessConfigurator() {
|
||||||
|
if (OperatingSystem.IsWindows()) {
|
||||||
|
startInfo.CreateNewProcessGroup = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public Process CreateProcess() {
|
public Process CreateProcess() {
|
||||||
return new Process(new System.Diagnostics.Process { StartInfo = startInfo });
|
return new Process(new System.Diagnostics.Process { StartInfo = startInfo });
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
@using Phantom.Web.Services
|
@using Phantom.Web.Errors
|
||||||
|
@using Phantom.Web.Services
|
||||||
@inject Navigation Navigation
|
@inject Navigation Navigation
|
||||||
|
|
||||||
<CascadingAuthenticationState>
|
<CascadingAuthenticationState>
|
||||||
<Router AppAssembly="@typeof(App).Assembly">
|
<Router AppAssembly="@typeof(App).Assembly" NotFoundPage="typeof(NotFound)">
|
||||||
<Found Context="routeData">
|
<Found Context="routeData">
|
||||||
<AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)">
|
<AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)">
|
||||||
<NotAuthorized>
|
<NotAuthorized>
|
||||||
@@ -17,11 +18,5 @@
|
|||||||
</AuthorizeRouteView>
|
</AuthorizeRouteView>
|
||||||
<FocusOnNavigate RouteData="@routeData" Selector="h1" />
|
<FocusOnNavigate RouteData="@routeData" Selector="h1" />
|
||||||
</Found>
|
</Found>
|
||||||
<NotFound>
|
|
||||||
<LayoutView Layout="@typeof(MainLayout)">
|
|
||||||
<h1>Not Found</h1>
|
|
||||||
<p role="alert">Sorry, there's nothing at this address.</p>
|
|
||||||
</LayoutView>
|
|
||||||
</NotFound>
|
|
||||||
</Router>
|
</Router>
|
||||||
</CascadingAuthenticationState>
|
</CascadingAuthenticationState>
|
||||||
|
|||||||
5
Web/Phantom.Web/Errors/NotFound.razor
Normal file
5
Web/Phantom.Web/Errors/NotFound.razor
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
@page "/error/404"
|
||||||
|
@layout MainLayout
|
||||||
|
|
||||||
|
<h1>Not Found</h1>
|
||||||
|
<p role="alert">Sorry, there's nothing at this address.</p>
|
||||||
@@ -34,7 +34,7 @@
|
|||||||
<script src="_framework/blazor.server.js"></script>
|
<script src="_framework/blazor.server.js"></script>
|
||||||
@* ReSharper restore Html.PathError *@
|
@* ReSharper restore Html.PathError *@
|
||||||
<script src="lib/bootstrap/bootstrap.bundle.min.js"></script>
|
<script src="lib/bootstrap/bootstrap.bundle.min.js"></script>
|
||||||
<script src="js/site.js"></script>
|
<script src="js/site.js?v=2"></script>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -93,7 +93,7 @@
|
|||||||
<Cell>
|
<Cell>
|
||||||
<PermissionView Permission="Permission.ManageAllAgents">
|
<PermissionView Permission="Permission.ManageAllAgents">
|
||||||
<a href="agents/@agent.AgentGuid/edit" type="button" class="btn btn-primary btn-sm">Edit Agent</a>
|
<a href="agents/@agent.AgentGuid/edit" type="button" class="btn btn-primary btn-sm">Edit Agent</a>
|
||||||
<button type="button" class="btn btn-danger btn-sm" data-clipboard="@connectionKey" onclick="copyToClipboard(this);">Copy Agent Key</button>
|
<button type="button" class="btn btn-warning btn-sm" data-clipboard="@connectionKey" onclick="copyToClipboard(this);">Copy Agent Key</button>
|
||||||
</PermissionView>
|
</PermissionView>
|
||||||
</Cell>
|
</Cell>
|
||||||
</ItemRow>
|
</ItemRow>
|
||||||
|
|||||||
@@ -108,7 +108,7 @@
|
|||||||
|
|
||||||
@{
|
@{
|
||||||
string? allowedServerPorts = selectedAgent?.RuntimeInfo.AllowedServerPorts?.ToString();
|
string? allowedServerPorts = selectedAgent?.RuntimeInfo.AllowedServerPorts?.ToString();
|
||||||
string? allowedRconPorts = selectedAgent?.RuntimeInfo.AllowedRconPorts?.ToString();
|
string? allowedRconPorts = selectedAgent?.RuntimeInfo.AllowedAdditionalPorts?.ToString();
|
||||||
}
|
}
|
||||||
<div class="col-sm-6 col-xl-2 mb-3">
|
<div class="col-sm-6 col-xl-2 mb-3">
|
||||||
<FormNumberInput Id="instance-server-port" @bind-Value="form.ServerPort" min="0" max="65535">
|
<FormNumberInput Id="instance-server-port" @bind-Value="form.ServerPort" min="0" max="65535">
|
||||||
@@ -261,7 +261,7 @@
|
|||||||
|
|
||||||
public sealed class RconPortMustBeAllowedAttribute : FormValidationAttribute<ConfigureInstanceFormModel, int> {
|
public sealed class RconPortMustBeAllowedAttribute : FormValidationAttribute<ConfigureInstanceFormModel, int> {
|
||||||
protected override string FieldName => nameof(RconPort);
|
protected override string FieldName => nameof(RconPort);
|
||||||
protected override bool IsValid(ConfigureInstanceFormModel model, int value) => model.SelectedAgent is not {} agent || agent.RuntimeInfo.AllowedRconPorts?.Contains((ushort) value) == true;
|
protected override bool IsValid(ConfigureInstanceFormModel model, int value) => model.SelectedAgent is not {} agent || agent.RuntimeInfo.AllowedAdditionalPorts?.Contains((ushort) value) == true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public sealed class RconPortMustDifferFromServerPortAttribute : FormValidationAttribute<ConfigureInstanceFormModel, int?> {
|
public sealed class RconPortMustDifferFromServerPortAttribute : FormValidationAttribute<ConfigureInstanceFormModel, int?> {
|
||||||
|
|||||||
@@ -14,9 +14,15 @@
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case InstanceIsDownloading downloading:
|
case InstanceIsDownloading downloading:
|
||||||
<ProgressBar Value="@downloading.Progress" Maximum="100">
|
if (downloading.Progress is {} progress) {
|
||||||
<span class="fw-semibold">Downloading Server</span> (@downloading.Progress%)
|
<ProgressBar Value="@progress" Maximum="100">
|
||||||
</ProgressBar>
|
<span class="fw-semibold">Downloading</span> (@downloading.Progress%)
|
||||||
|
</ProgressBar>
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
<span class="fw-semibold">Downloading</span>
|
||||||
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case InstanceIsLaunching:
|
case InstanceIsLaunching:
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
using Phantom.Common.Data.Instance;
|
using Phantom.Common.Data.Instance.Launch;
|
||||||
using Phantom.Common.Data.Replies;
|
using Phantom.Common.Data.Replies;
|
||||||
using Phantom.Common.Data.Web.Minecraft;
|
using Phantom.Common.Data.Web.Minecraft;
|
||||||
using Phantom.Common.Data.Web.Users;
|
using Phantom.Common.Data.Web.Users;
|
||||||
@@ -52,27 +52,25 @@ static class Messages {
|
|||||||
|
|
||||||
public static string ToSentence(this LaunchInstanceResult reason) {
|
public static string ToSentence(this LaunchInstanceResult reason) {
|
||||||
return reason switch {
|
return reason switch {
|
||||||
LaunchInstanceResult.LaunchInitiated => "Launch initiated.",
|
LaunchInstanceResult.LaunchInitiated => "Launch initiated.",
|
||||||
LaunchInstanceResult.InstanceAlreadyLaunching => "Instance is already launching.",
|
LaunchInstanceResult.InstanceAlreadyLaunching => "Instance is already launching.",
|
||||||
LaunchInstanceResult.InstanceAlreadyRunning => "Instance is already running.",
|
LaunchInstanceResult.InstanceAlreadyRunning => "Instance is already running.",
|
||||||
LaunchInstanceResult.InstanceLimitExceeded => "Agent does not have any more available instances.",
|
LaunchInstanceResult.InstanceLimitExceeded => "Agent does not have any more available instances.",
|
||||||
LaunchInstanceResult.MemoryLimitExceeded => "Agent does not have enough available memory.",
|
LaunchInstanceResult.MemoryLimitExceeded => "Agent does not have enough available memory.",
|
||||||
LaunchInstanceResult.ServerPortNotAllowed => "Server port not allowed.",
|
LaunchInstanceResult.ServerPortNotAllowed => "Server port is not allowed.",
|
||||||
LaunchInstanceResult.ServerPortAlreadyInUse => "Server port already in use.",
|
LaunchInstanceResult.ServerPortAlreadyInUse => "Server port is already in use.",
|
||||||
LaunchInstanceResult.RconPortNotAllowed => "Rcon port not allowed.",
|
LaunchInstanceResult.AdditionalPortNotAllowed => "One of additional ports is not allowed.",
|
||||||
LaunchInstanceResult.RconPortAlreadyInUse => "Rcon port already in use.",
|
LaunchInstanceResult.AdditionalPortAlreadyInUse => "One of additional ports is already in use.",
|
||||||
_ => "Unknown error.",
|
_ => "Unknown error.",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string ToSentence(this InstanceLaunchFailReason reason) {
|
public static string ToSentence(this InstanceLaunchFailReason reason) {
|
||||||
return reason switch {
|
return reason switch {
|
||||||
InstanceLaunchFailReason.JavaRuntimeNotFound => "Java runtime not found.",
|
InstanceLaunchFailReason.CouldNotPrepareServerInstance => "Could not prepare server instance.",
|
||||||
InstanceLaunchFailReason.CouldNotDownloadMinecraftServer => "Could not download Minecraft server.",
|
InstanceLaunchFailReason.CouldNotFindServerExecutable => "Could not find server executable.",
|
||||||
InstanceLaunchFailReason.CouldNotConfigureMinecraftServer => "Could not configure Minecraft server.",
|
InstanceLaunchFailReason.CouldNotStartServerExecutable => "Could not start server executable.",
|
||||||
InstanceLaunchFailReason.CouldNotPrepareMinecraftServerLauncher => "Could not prepare Minecraft server launcher.",
|
_ => "Unknown error.",
|
||||||
InstanceLaunchFailReason.CouldNotStartMinecraftServer => "Could not start Minecraft server.",
|
|
||||||
_ => "Unknown error.",
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"sdk": {
|
"sdk": {
|
||||||
"version": "9.0.0",
|
"version": "10.0.0",
|
||||||
"rollForward": "latestMinor",
|
"rollForward": "latestMinor",
|
||||||
"allowPrerelease": true
|
"allowPrerelease": true
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user