refactor: 重构MyBitmap

.github/workflows/reusable-build.yml

@@ -59,7 +59,7 @@ jobs:
           PCL_LOBBY_DEFAULT_SECRET: ${{ secrets.LOBBY_DEFAULT_SECRET }}
           PCL_GITHUB_SHA: ${{ github.sha }}
         run: |
-          dotnet publish "Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj" \
+          dotnet publish "Plain Craft Launcher 2/Plain Craft Launcher 2.csproj" \
           -p:Configuration=${{ inputs.configuration }} -p:Platform=${{ inputs.architecture }} \
           -p:DeleteExistingFiles=true -o ./artifact --no-self-contained
 

PCL.Core.Test/PCL.Core.Test.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net8.0-windows</TargetFramework>
     <OutputType>Library</OutputType>
@@ -44,9 +44,9 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageReference Include="Microsoft.TestPlatform.AdapterUtilities" Version="18.0.1" />
     <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="18.0.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
-    <PackageReference Include="System.Text.Json" Version="10.0.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="4.1.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="4.1.0" />
+    <PackageReference Include="System.Text.Json" Version="10.0.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PCL.Core\PCL.Core.csproj" />

PCL.Core/App/Basics.cs

@@ -5,6 +5,7 @@
 using System.Reflection;
 using System.Text.Json;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Windows;
 using PCL.Core.Logging;
 using PCL.Core.Utils;
@@ -155,6 +156,19 @@ public static void OpenPath(string path, string? workingDirectory = null)
         };
         Process.Start(psi);
     }
+
+    /// <summary>
+    /// 以默认程序打开 Uri
+    /// </summary>
+    /// <param name="uri">Uri 地址</param>
+    public static void OpenUri(string uri)
+    {
+        var psi = new ProcessStartInfo(uri)
+        {
+            UseShellExecute = true,
+        };
+        _ = Task.Run(() => Process.Start(psi));
+    }
     #endregion
 
     #region 应用程序操作

PCL.Core/App/Configuration/ConfigItem.cs

@@ -58,6 +58,10 @@ public ConfigItem(string key, TValue defaultValue, ConfigSource source)
 
     private ConfigValueCache<TValue> _valueCache = new();
 
+    /// <summary>
+    /// 指定是否启用缓存。<br/>
+    /// <b>NOTE</b>: 禁用缓存将造成一些功能（如自动监听内容更改）不按预期工作，请仅在真正需要的时候禁用。
+    /// </summary>
     public bool EnableCache
     {
         get;
@@ -72,23 +76,24 @@ public bool EnableCache
     /// 处理看起来是新的值，并返回是否真的是新的。<br/>
     /// 只有启用缓存时该方法才会生效，未启用缓存将始终直接返回 <see langword="true"/>。
     /// </summary>
-    private bool _ProcessNewCache(TValue newCache, object? argument)
+    private bool _ProcessNewCache(TValue newCache, object? argument, bool force = false)
     {
         if (!EnableCache) return true;
-        var existsOld = _valueCache.TryRead(out var oldCache, argument);
-        if (existsOld)
+        if (!force)
         {
-            // 判断一下是否是新值
-            if (EqualityComparer<TValue>.Default.Equals(oldCache, newCache)) return false;
-            // 对新缓存值执行准备工作
-            if (newCache is INotifyPropertyChanged reactive)
-                reactive.PropertyChanged += (_, _) => OnContentChanged();
-            else if (newCache is INotifyCollectionChanged reactiveCollection)
-                reactiveCollection.CollectionChanged += (_, _) => OnContentChanged();
+            // 判断是否是新值
+            var existsOld = _valueCache.TryRead(out var oldCache, argument);
+            if (existsOld && EqualityComparer<TValue>.Default.Equals(oldCache, newCache)) return false;
         }
+        // 对新缓存值执行准备工作
+        if (newCache is INotifyPropertyChanged reactive)
+            reactive.PropertyChanged += (_, _) => OnContentChanged();
+        else if (newCache is INotifyCollectionChanged reactiveCollection)
+            reactiveCollection.CollectionChanged += (_, _) => OnContentChanged();
+        // 写入缓存
         _valueCache.Write(newCache, argument);
         return true;
-        void OnContentChanged() => SetValue(newCache, argument, true);
+        void OnContentChanged() => SetValue(newCache, argument, bypassCache: true);
     }
 
     /// <summary>
@@ -127,17 +132,19 @@ public object GetValueNoType(object? argument = null)
     /// </summary>
     /// <param name="value">用于设置的值</param>
     /// <param name="argument">上下文参数</param>
-    /// <param name="bypassCacheCheck">跳过缓存检查，<b>将造成一些功能不按预期工作，请仅在真正需要的时候指定该参数</b></param>
+    /// <param name="forceNewValue">强制将传入的值视为新值，不检查缓存，仅在 <see cref="EnableCache"/> 为 <see langword="true"/> 时生效</param>
+    /// <param name="bypassCache">跳过缓存检查和写入，相当于对本次操作临时将 <see cref="EnableCache"/> 设为 <see langword="false"/></param>
     /// <returns>是否成功设置值，若成功则为 <c>true</c></returns>
-    public bool SetValue(TValue value, object? argument = null, bool bypassCacheCheck = false)
+    public bool SetValue(TValue value, object? argument = null, bool forceNewValue = false, bool bypassCache = false)
     {
         var e = _TriggerEvent(ConfigEvent.Set, argument, value, isPreview: true);
         if (e != null)
         {
             if (e.Cancelled) return false;
             if (e.NewValueReplacement != null) value = (TValue)e.NewValueReplacement;
         }
-        if (bypassCacheCheck || _ProcessNewCache(value, argument)) _Provider.SetValue(Key, value, argument);
+        if (bypassCache || _ProcessNewCache(value, argument, forceNewValue))
+            _Provider.SetValue(Key, value, argument);
         _TriggerEvent(ConfigEvent.Set, argument, value, e: e, isPreview: false);
         return true;
     }
@@ -157,9 +164,9 @@ public bool SetValueNoType(object value, object? argument = null)
         }
     }
 
-    public bool SetDefaultValue(object? argument = null)
+    public bool SetDefaultValue(object? argument = null, bool? forceNewValue = null)
     {
-        return SetValue(DefaultValue, argument);
+        return SetValue(DefaultValue, argument, forceNewValue ?? IsDefault(argument));
     }
 
     public bool Reset(object? argument = null)
@@ -333,8 +340,9 @@ public event ConfigEventHandler Changed
     /// 将配置项的值设置为默认值，设置后 <see cref="IsDefault"/> 将返回 <c>false</c>。
     /// </summary>
     /// <param name="argument">上下文参数</param>
+    /// <param name="forceNewValue">强制视为新值，不检查缓存，仅在 <see cref="EnableCache"/> 为 <see langword="true"/> 时生效</param>
     /// <returns>是否成功设置值，若成功则为 <c>true</c></returns>
-    public bool SetDefaultValue(object? argument = null);
+    public bool SetDefaultValue(object? argument = null, bool? forceNewValue = null);
 
     /// <summary>
     /// 没有泛型的 <see cref="ConfigItem{T}.GetValue"/>。<br/>

PCL.Core/App/IoC/Lifecycle.cs

@@ -240,10 +240,17 @@ private static void _RemoveRunningInstance(ILifecycleService service)
         removed?.MarkAsStopped();
     }
 
+    private static readonly ConcurrentBag<Task> _StoppingServiceTasks = [];
+
+    private static void _WaitStoppingServiceTasks()
+    {
+        Task.WaitAll(_StoppingServiceTasks.ToArray());
+    }
+
     private static void _StopService(ILifecycleService service, bool async, bool manual = false)
     {
         var name = _ServiceName(service, manual ? LifecycleState.Manual : CurrentState);
-        if (async) Task.Run(Stop);
+        if (async) _StoppingServiceTasks.Add(Task.Run(Stop));
         else Stop().Wait();
         return;
 
@@ -326,7 +333,7 @@ private static void _UpdateLastException(ILifecycleService service, Exception ex
 
     private static void _RunCurrentExecutable(string? arguments)
     {
-        var fileName = Process.GetCurrentProcess().MainModule!.FileName;
+        var fileName = Environment.ProcessPath!;
         if (arguments == null) Process.Start(fileName);
         else Process.Start(fileName, arguments);
     }
@@ -335,10 +342,15 @@ private static void _RunCurrentExecutable(string? arguments)
     private static string? _requestRestartArguments;
     private static ILifecycleService? _requestRestartService;
 
+    private static readonly object _ExitLock = new();
+
     private static void _Exit(int statusCode = 0)
     {
-        if (HasShutdownStarted) return;
-        HasShutdownStarted = true;
+        lock (_ExitLock)
+        {
+            if (HasShutdownStarted) return;
+            HasShutdownStarted = true;
+        }
         // 结束 Running 计时
         if (_countRunningStart is { } start)
         {
@@ -364,6 +376,7 @@ private static void _Exit(int statusCode = 0)
             // 执行停止流程
             _StopService(service, service.SupportAsync);
         }
+        _WaitStoppingServiceTasks();
         if (logService != null)
         {
             Context.Trace("退出过程已结束，正在停止日志服务");

PCL.Core/Link/Broadcast.cs → PCL.Core/Link/BroadcastLocal.cs

@@ -8,7 +8,7 @@
 
 namespace PCL.Core.Link;
 
-public class Broadcast(string description, int localPort) : IDisposable
+public class BroadcastLocal(string description, int localPort) : IDisposable
 {
     private Socket? _broadcastSocket;
     private CancellationTokenSource? _cts;
@@ -80,6 +80,7 @@ public void Dispose()
     {
         Stop();
         _cts?.Dispose();
+        _broadcastSocket.SafeClose();
         GC.SuppressFinalize(this);
     }
 }

PCL.Core/Link/Lobby/LobbyController.cs

@@ -19,6 +19,7 @@
 using static PCL.Core.Link.Lobby.LobbyInfoProvider;
 using static PCL.Core.Link.Natayark.NatayarkProfileManager;
 using LobbyType = PCL.Core.Link.Scaffolding.Client.Models.LobbyType;
+using PCL.Core.Link.McPing;
 
 namespace PCL.Core.Link.Lobby;
 
@@ -88,7 +89,7 @@ public sealed class LobbyController
 
             var tcpPortForForward = NetworkHelper.NewTcpPort();
             McForward = new TcpForward(IPAddress.Loopback, tcpPortForForward, IPAddress.Loopback, localPort);
-            McBroadcast = new Broadcast($"§ePCL CE 大厅{desc}", tcpPortForForward);
+            McBroadcast = new BroadcastLocal($"§ePCL CE 大厅{desc}", tcpPortForForward);
             McForward.Start();
             McBroadcast.Start();
 
@@ -159,7 +160,7 @@ public sealed class LobbyController
     /// </summary>
     public static async Task<bool> IsHostInstanceAvailableAsync(int port)
     {
-        var ping = new McPing("127.0.0.1", port);
+        using var ping = McPingServiceFactory.CreateService("127.0.0.1", port);
         var info = await ping.PingAsync().ConfigureAwait(false);
 
         if (info != null) return true;

PCL.Core/Link/Lobby/LobbyInfoProvider.cs

@@ -17,7 +17,7 @@ public static class LobbyInfoProvider
     public static bool RequiresRealName { get; set; } = true;
     public static int ProtocolVersion { get; set; } = 6;
 
-    public static Broadcast? McBroadcast { get; internal set; }
+    public static BroadcastLocal? McBroadcast { get; internal set; }
     public static TcpForward? McForward { get; internal set; }
 
     public class LobbyInfo

PCL.Core/Link/Lobby/LobbyService.cs

@@ -16,6 +16,7 @@
 using System.Windows;
 using PCL.Core.App.IoC;
 using PCL.Core.UI;
+using PCL.Core.Link.McPing;
 
 namespace PCL.Core.Link.Lobby;
 
@@ -204,7 +205,7 @@ public static async Task DiscoverWorldAsync()
             {
                 if (!recordedPorts.TryAdd(info.Address.Port)) return;
 
-                using var pinger = new McPing(new IPEndPoint(IPAddress.Loopback, info.Address.Port));
+                using var pinger = McPingServiceFactory.CreateService(new IPEndPoint(IPAddress.Loopback, info.Address.Port));
                 using var cts = new CancellationTokenSource(2000);
 
                 try

PCL.Core/Link/McPing/IMcPingService.cs

@@ -0,0 +1,35 @@
+using PCL.Core.Link.McPing.Model;
+using System;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace PCL.Core.Link.McPing;
+
+/// <summary>
+/// Minecraft服务器探测服务接口
+/// </summary>
+public interface IMcPingService : IDisposable
+{
+    /// <summary>
+    /// 异步探测Minecraft服务器信息
+    /// </summary>
+    /// <param name="cancellationToken">取消令牌</param>
+    /// <returns>服务器探测结果，如果探测失败则返回null</returns>
+    Task<McPingResult?> PingAsync(CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// 获取服务端点信息
+    /// </summary>
+    IPEndPoint Endpoint { get; }
+
+    /// <summary>
+    /// 获取主机地址
+    /// </summary>
+    string Host { get; }
+
+    /// <summary>
+    /// 获取超时时间（毫秒）
+    /// </summary>
+    int Timeout { get; }
+}