chore(tasks): complete remaining backlog items

Author: lxhtt

MCServerLauncher.Benchmarks/Infrastructure/DaemonActionBenchmarkHarness.cs

@@ -228,7 +228,7 @@ private sealed class SnapshotActionExecutor(IReadOnlyDictionary<ActionType, Acti
             AsyncHandlers { get; } =
             new Dictionary<ActionType, Func<JsonElement?, Guid, WsContext, IResolver, CancellationToken, Task<ActionResponse>>>();
 
-        public ActionResponse? ProcessAction(string text, WsContext ctx)
+        public ActionResponse? ProcessAction(ReadOnlyMemory<byte> utf8Json, WsContext ctx)
         {
             throw new NotSupportedException("Benchmark executor only supports CheckHandler metadata access.");
         }

MCServerLauncher.Daemon.Generators/AnalyzerReleases.Shipped.md

@@ -0,0 +1,3 @@
+; Shipped analyzer releases
+; https://github.com/dotnet/roslyn-analyzers/blob/main/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md
+

MCServerLauncher.Daemon.Generators/AnalyzerReleases.Unshipped.md

@@ -0,0 +1,13 @@
+; Unshipped analyzer release
+; https://github.com/dotnet/roslyn-analyzers/blob/main/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md
+
+### New Rules
+
+Rule ID    | Category                      | Severity | Notes
+-----------|-------------------------------|----------|----------------------------------------------
+MCSLDAG001 | DaemonActionRegistryGenerator | Error    | Duplicate ActionHandler registration
+MCSLDAG002 | DaemonActionRegistryGenerator | Error    | ActionHandler attribute is missing required arguments
+MCSLDAG003 | DaemonActionRegistryGenerator | Error    | Annotated handler does not implement a supported handler interface
+MCSLDAG004 | DaemonActionRegistryGenerator | Error    | Malformed dual-interface ActionHandler
+MCSLDAG005 | DaemonActionRegistryGenerator | Error    | Unsupported ActionHandler shape
+

MCServerLauncher.Daemon/Management/InstanceConfigExtensions.cs

@@ -44,17 +44,34 @@ public static Result<Unit, Error> ValidateConfig(this InstanceConfig config)
                 return ResultExt.Err<Unit>("Could not parse mc_version");
             }
 
-        if (
-            config.TargetType is TargetType.Jar
-            && config.JavaPath.ToLower() != "java"
-            && !File.Exists(config.JavaPath)
-        ) return ResultExt.Err<Unit>("Could not found java in java_path");
+        var javaPathValidation = config.ValidateJavaPathExists();
+        if (javaPathValidation.IsErr(out var javaPathError) && javaPathError is not null)
+            return ResultExt.Err<Unit>(javaPathError);
 
         if (config.Uuid == Guid.Empty) return ResultExt.Err<Unit>("uuid should not be empty");
 
         return ResultExt.Ok(Unit.Default);
     }
 
+    private static Result<Unit, Error> ValidateJavaPathExists(this InstanceConfig config)
+    {
+        if (
+            config.TargetType is not TargetType.Jar
+            || config.JavaPath.Equals("java", StringComparison.OrdinalIgnoreCase)
+        ) return ResultExt.Ok(Unit.Default);
+
+        try
+        {
+            return File.Exists(config.JavaPath)
+                ? ResultExt.Ok(Unit.Default)
+                : ResultExt.Err<Unit>("Could not found java in java_path");
+        }
+        catch (Exception ex)
+        {
+            return ResultExt.Err<Unit>(new Error("Failed to inspect java_path").CauseBy(ex));
+        }
+    }
+
     public static bool IsMinecraftJavaInstance(InstanceType type)
     {
         return type.IsMinecraftJavaRuntimeType();
@@ -172,14 +189,35 @@ private static string[] GenerateEula()
     public static async Task<Result<Unit, Error>> FixEula(this InstanceConfig config)
     {
         var eulaPath = Path.Combine(config.GetWorkingDirectory(), "eula.txt");
-        return await ResultExt.TryAsync(async Task () =>
+
+        var eula = await ReadOrGenerateEula(eulaPath);
+        if (eula.IsErr(out var readError) && readError is not null) return ResultExt.Err<Unit>(readError);
+
+        return await WriteEula(eulaPath, eula.Unwrap());
+    }
+
+    private static async Task<Result<string[], Error>> ReadOrGenerateEula(string eulaPath)
+    {
+        var result = await ResultExt.TryAsync(async path =>
         {
-            var text = File.Exists(eulaPath)
-                ? (await File.ReadAllLinesAsync(eulaPath))
+            return File.Exists(path)
+                ? (await File.ReadAllLinesAsync(path))
                 .Select(x => x.Trim().StartsWith("eula") ? "eula=true" : x)
                 .ToArray()
                 : GenerateEula();
-            await File.WriteAllLinesAsync(eulaPath, text, Encoding.UTF8);
-        }).MapTask(result => result.MapErr(ex => new Error().CauseBy(ex)));
+        }, eulaPath);
+
+        return result.MapErr(ex => new Error("Failed to read EULA").CauseBy(ex));
+    }
+
+    private static async Task<Result<Unit, Error>> WriteEula(string eulaPath, string[] text)
+    {
+        var result = await ResultExt.TryAsync(async state =>
+        {
+            var (path, lines) = state;
+            await File.WriteAllLinesAsync(path, lines, Encoding.UTF8);
+        }, (eulaPath, text));
+
+        return result.MapErr(ex => new Error("Failed to write EULA").CauseBy(ex));
     }
 }

MCServerLauncher.Daemon/Remote/Action/ActionExecutor.cs

@@ -143,12 +143,12 @@ await task.AsyncHandler.Invoke(task.Param, task.Id, task.Context, task.Resolver,
     /// <summary>
     ///     处理请求，返回响应（如果是异步handler, 不立即返回响应）
     /// </summary>
-    /// <param name="text"></param>
+    /// <param name="utf8Json"></param>
     /// <param name="ctx"></param>
     /// <returns></returns>
-    public ActionResponse? ProcessAction(string text, WsContext ctx)
+    public ActionResponse? ProcessAction(ReadOnlyMemory<byte> utf8Json, WsContext ctx)
     {
-        return this.ProcessParsedRequest(this.ParseRequest(text), ctx);
+        return this.ProcessParsedRequest(this.ParseRequest(utf8Json), ctx);
     }
 
     public async Task ShutdownAsync()

MCServerLauncher.Daemon/Remote/Action/IActionExecutor.cs

@@ -4,6 +4,7 @@
 using MCServerLauncher.Daemon.Utils;
 using RustyOptions;
 using Serilog;
+using System.Text;
 using System.Text.Json;
 using TouchSocket.Core;
 using JsonElement = System.Text.Json.JsonElement;
@@ -23,31 +24,15 @@ public interface IActionExecutor
             Func<JsonElement?, Guid, WsContext, IResolver, CancellationToken, Task<ActionResponse>>>
         AsyncHandlers { get; }
 
-    ActionResponse? ProcessAction(string text, WsContext ctx);
+    ActionResponse? ProcessAction(ReadOnlyMemory<byte> utf8Json, WsContext ctx);
     Task ShutdownAsync();
 }
 
 public static class ActionExecutorExtensions
 {
-    // TODO 后续换成输入Span<byte>（System.Text.Json的反序列化）
     public static Result<ActionRequest, ActionResponse> ParseRequest(this IActionExecutor _, string text)
     {
-        try
-        {
-            var request = JsonElementHotPathAdapters.Deserialize(
-                text,
-                DaemonRpcTypeInfoCache<ActionRequest>.TypeInfo);
-            if (request is null)
-                return Result.Err<ActionRequest, ActionResponse>(
-                    ResponseUtils.Err(ActionRetcode.BadRequest.WithMessage("Received null action request envelope"), null));
-            Log.Verbose("[Remote] Received message:{0}", request);
-            return Result.Ok<ActionRequest, ActionResponse>(request);
-        }
-        catch (Exception exception) when (exception is JsonException or NullReferenceException)
-        {
-            return Result.Err<ActionRequest, ActionResponse>(
-                ResponseUtils.Err(ActionRetcode.BadRequest.WithMessage("Could not parse action json"), null));
-        }
+        return _.ParseRequest(Encoding.UTF8.GetBytes(text));
     }
 
     public static Result<ActionRequest, ActionResponse> ParseRequest(this IActionExecutor _, ReadOnlySpan<byte> utf8Json)
@@ -80,9 +65,9 @@ public static Result<ActionRequest, ActionResponse> ParseRequest(this IActionExe
         return executor.ProcessParsedRequest(executor.ParseRequest(utf8Json), ctx);
     }
 
-    public static ActionResponse? ProcessAction(this IActionExecutor executor, ReadOnlyMemory<byte> utf8Json, WsContext ctx)
+    public static ActionResponse? ProcessAction(this IActionExecutor executor, string text, WsContext ctx)
     {
-        return executor.ProcessParsedRequest(executor.ParseRequest(utf8Json), ctx);
+        return executor.ProcessAction(Encoding.UTF8.GetBytes(text), ctx);
     }
 
     public static ActionResponse? ProcessParsedRequest(this IActionExecutor executor,

MCServerLauncher.Daemon/Utils/Status/SystemInfoHelper.cs

@@ -1,5 +1,4 @@
 using System.Diagnostics;
-using System.Reflection;
 using System.Runtime.InteropServices;
 using MCServerLauncher.Common.ProtoType.Status;
 
@@ -24,16 +23,7 @@ public static OsInfo GetOsInfo()
 
     public static DriveInformation GetDiskInfo()
     {
-        // 获取程序集路径并验证
-        var assembly = Assembly.GetEntryAssembly()
-                       ?? throw new InvalidOperationException("无法获取入口程序集");
-
-        var location = assembly.Location;
-
-        // 处理单文件发布场景和Linux特殊路径
-        if (string.IsNullOrEmpty(location))
-            location = Process.GetCurrentProcess().MainModule?.FileName ??
-                       throw new InvalidOperationException("无法获取程序路径");
+        var location = AppContext.BaseDirectory;
 
         // 获取根路径并进行跨平台处理
         var rootPath = Path.GetPathRoot(location);
@@ -121,4 +111,4 @@ public static async Task<string> RunCommandAsync(string command, string argument
         await process.WaitForExitAsync();
         return result.Trim();
     }
-}
+}

MCServerLauncher.DaemonClient/Connection/ClientConnection.cs

@@ -35,6 +35,7 @@ private ClientConnection(ClientConnectionConfig config)
         Config = config;
 
         _transport.EventReceived += (t, l, m, d) => OnEventReceived?.Invoke(t, l, m, d);
+        _transport.EventReceivedAsync += InvokeEventReceivedAsync;
         _transport.ActionResponseReceived += HandleActionResponse;
         _transport.BinaryUploadResponseReceived += HandleBinaryUploadResponse;
         _transport.Reconnected += async () =>
@@ -76,6 +77,7 @@ private ClientConnection(ClientConnectionConfig config)
     public event Action? ConnectionClosed;
 
     public event Action<EventType, long, IEventMeta?, IEventData?>? OnEventReceived;
+    public event Func<EventType, long, IEventMeta?, IEventData?, Task>? OnEventReceivedAsync;
 
     /// <summary>
     ///     建立连接
@@ -391,6 +393,14 @@ private void HandleBinaryUploadResponse(WsReceivedPlugin.BinaryUploadResponse re
         }
     }
 
+    private async Task InvokeEventReceivedAsync(EventType type, long timestamp, IEventMeta? meta, IEventData? data)
+    {
+        if (OnEventReceivedAsync is not { } handlers) return;
+
+        foreach (Func<EventType, long, IEventMeta?, IEventData?, Task> handler in handlers.GetInvocationList())
+            await handler(type, timestamp, meta, data);
+    }
+
     private async Task OnReconnectedEventHandler()
     {
         var cts = new CancellationTokenSource();

MCServerLauncher.DaemonClient/Connection/TouchSocketClientTransport.cs

@@ -33,6 +33,9 @@ public TouchSocketClientTransport(ClientConnectionConfig config)
     public event Action<EventType, long, IEventMeta?, IEventData?>? EventReceived;
     public event Action<ActionResponse>? ActionResponseReceived;
     public event Action<WsReceivedPlugin.BinaryUploadResponse>? BinaryUploadResponseReceived;
+    public event Func<EventType, long, IEventMeta?, IEventData?, Task>? EventReceivedAsync;
+    public event Func<ActionResponse, Task>? ActionResponseReceivedAsync;
+    public event Func<WsReceivedPlugin.BinaryUploadResponse, Task>? BinaryUploadResponseReceivedAsync;
 
     public async Task OpenAsync(string address, int port, string token, bool isSecure, CancellationToken cancellationToken = default)
     {
@@ -76,13 +79,32 @@ private TouchSocketConfig CreateTransportConfig(string address, int port, string
                 receivedPlugin.OnEventReceived += (t, l, m, d) => EventReceived?.Invoke(t, l, m, d);
                 receivedPlugin.OnActionResponseReceived += response => ActionResponseReceived?.Invoke(response);
                 receivedPlugin.OnBinaryUploadResponseReceived += response => BinaryUploadResponseReceived?.Invoke(response);
+                receivedPlugin.OnEventReceivedAsync += InvokeEventReceivedAsync;
+                receivedPlugin.OnActionResponseReceivedAsync += response => InvokeAsync(ActionResponseReceivedAsync, response);
+                receivedPlugin.OnBinaryUploadResponseReceivedAsync += response => InvokeAsync(BinaryUploadResponseReceivedAsync, response);
                 a.Add(receivedPlugin);
 
                 a.Add(new WsConnectionLifecyclePlugin(this));
                 a.UseReconnection<WebSocketClient>();
             });
     }
 
+    private async Task InvokeEventReceivedAsync(EventType type, long timestamp, IEventMeta? meta, IEventData? data)
+    {
+        if (EventReceivedAsync is not { } handlers) return;
+
+        foreach (Func<EventType, long, IEventMeta?, IEventData?, Task> handler in handlers.GetInvocationList())
+            await handler(type, timestamp, meta, data);
+    }
+
+    private static async Task InvokeAsync<T>(Func<T, Task>? handlers, T arg)
+    {
+        if (handlers == null) return;
+
+        foreach (Func<T, Task> handler in handlers.GetInvocationList())
+            await handler(arg);
+    }
+
     private static string BuildServerEndpoint(string address, int port, string token, bool isSecure)
     {
         var scheme = isSecure ? "wss" : "ws";

MCServerLauncher.DaemonClient/Daemon.cs

@@ -25,6 +25,7 @@ private Daemon(ClientConnection connection)
         _connection = connection;
 
         _connection.OnEventReceived += OnEvent;
+        _connection.OnEventReceivedAsync += OnEventAsync;
         _connection.Reconnected += () => Reconnected?.Invoke();
         _connection.ConnectionLost += () => ConnectionLost?.Invoke();
         _connection.ConnectionClosed += () => ConnectionClosed?.Invoke();
@@ -137,7 +138,6 @@ private void OnEvent(EventType type, long timestamp, IEventMeta? meta, IEventDat
         switch (type)
         {
             case EventType.InstanceLog:
-                // TODO 改为异步? 
                 InstanceLogEvent?.Invoke(
                     (meta as InstanceLogEventMeta)!.InstanceId,
                     (data as InstanceLogEventData)!.Log
@@ -154,6 +154,33 @@ private void OnEvent(EventType type, long timestamp, IEventMeta? meta, IEventDat
         }
     }
 
+    private async Task OnEventAsync(EventType type, long timestamp, IEventMeta? meta, IEventData? data)
+    {
+        switch (type)
+        {
+            case EventType.InstanceLog:
+                if (InstanceLogEventAsync is { } logHandlers)
+                {
+                    var instanceId = (meta as InstanceLogEventMeta)!.InstanceId;
+                    var log = (data as InstanceLogEventData)!.Log;
+                    foreach (DaemonInstanceLogEventHandler handler in logHandlers.GetInvocationList())
+                        await handler(instanceId, log);
+                }
+                break;
+            case EventType.DaemonReport:
+                if (DaemonReportEventAsync is { } reportHandlers)
+                {
+                    var report = (data as DaemonReportEventData)!.Report;
+                    var latency = DateTime.UtcNow.ToUnixTimeMilliSeconds() - timestamp;
+                    foreach (DaemonReportEventHandler handler in reportHandlers.GetInvocationList())
+                        await handler(report, latency);
+                }
+                break;
+            default:
+                throw new NotImplementedException(type.ToString());
+        }
+    }
+
 
     private static async Task Main()
     {
@@ -312,6 +339,8 @@ private void Dispose(bool disposed)
 
     public event Action<Guid, string>? InstanceLogEvent;
     public event Action<DaemonReport, long>? DaemonReportEvent;
+    public event DaemonInstanceLogEventHandler? InstanceLogEventAsync;
+    public event DaemonReportEventHandler? DaemonReportEventAsync;
 
     #endregion