fix(McPing): 遇到不回复的端口会无限制等待的问题

Author: tangge233

Helper/VarInt.cs

@@ -5,7 +5,7 @@
 
 namespace PCL.Core.Helper;
 
-public class VarInt
+public static class VarInt
 {
     /// <summary>
     /// 将无符号长整数编码为VarInt字节序列
@@ -92,11 +92,11 @@ public static uint DecodeUInt(byte[] bytes, out int readLength)
     /// 从流中读取并解码无符号长整数，并将流前进所读取的字节数
     /// </summary>
     /// <param name="stream">输入流</param>
-    /// <param name="token"></param>
+    /// <param name="cancellationToken">要监视取消请求的标记</param>
     /// <returns>解码后的64位无符号整数</returns>
     /// <exception cref="EndOfStreamException">流提前结束</exception>
     /// <exception cref="FormatException">VarInt格式无效</exception>
-    public async static Task<ulong> ReadFromStream(Stream stream, CancellationToken token = default)
+    public static async Task<ulong> ReadFromStream(Stream stream, CancellationToken cancellationToken = default)
     {
         ulong result = 0;
         int shift = 0;
@@ -105,7 +105,7 @@ public async static Task<ulong> ReadFromStream(Stream stream, CancellationToken
         var buffer = new byte[1];
         while (true)
         {
-            int readLength =  await stream.ReadAsync(buffer, 0, 1, token);
+            int readLength = await stream.ReadAsync(buffer, 0, 1, cancellationToken);
             if (readLength == 0)
                 throw new EndOfStreamException();
 
@@ -128,11 +128,11 @@ public async static Task<ulong> ReadFromStream(Stream stream, CancellationToken
     /// 从流中读取并解码无符号整数，并将流前进所读取的字节数
     /// </summary>
     /// <param name="stream">输入流</param>
-    /// <param name="token"></param>
+    /// <param name="cancellationToken"></param>
     /// <returns>解码后的32位无符号整数</returns>
-    public async static Task<uint> ReadUIntFromStream(Stream stream, CancellationToken token = default)
+    public static async Task<uint> ReadUIntFromStream(Stream stream, CancellationToken cancellationToken = default)
     {
-        ulong result = await ReadFromStream(stream, token);
+        ulong result = await ReadFromStream(stream, cancellationToken);
         if (result > uint.MaxValue)
             throw new OverflowException("Decoded value exceeds UInt32 range");
         return (uint)result;

Utils/Minecraft/McPing.cs

@@ -21,22 +21,25 @@ public class McPing : IDisposable
     private readonly string _host;
     private readonly Socket _socket;
     private const int DefaultTimeout = 10000;
+    private int _timeout;
 
-    public McPing(IPEndPoint endpoint)
+    public McPing(IPEndPoint endpoint, int timeout = DefaultTimeout)
     {
         _endpoint  = endpoint;
         _host = _endpoint.Address.ToString();
         _socket =new Socket(SocketType.Stream, ProtocolType.Tcp);
+        _timeout = timeout;
     }
 
-    public McPing(string ip, int port = 25565)
+    public McPing(string ip, int port = 25565, int timeout = DefaultTimeout)
     {
         if (IPAddress.TryParse(ip, out var ipAddress))
             _endpoint = new IPEndPoint(ipAddress, port);
         else
             _endpoint = new IPEndPoint(Dns.GetHostAddresses(ip).First(), port);
         _host = ip;
         _socket = new Socket(SocketType.Stream, ProtocolType.Tcp);
+        _timeout = timeout;
     }
 
     /// <summary>
@@ -47,7 +50,16 @@ public McPing(string ip, int port = 25565)
     public async Task<McPingResult> PingAsync()
     {
         using var cts = new CancellationTokenSource();
-        cts.CancelAfter(DefaultTimeout);
+        cts.CancelAfter(_timeout);
+        // 注册超时回调：强制关闭Socket中断阻塞操作
+        cts.Token.Register(() =>
+        {
+            try
+            {
+                if (_socket?.Connected == true) _socket.Close(); // 强制关闭连接，中断 ReadAsync 阻塞
+            }
+            catch (ObjectDisposedException) { /* 忽略已释放的异常 */ }
+        });
         // 信息获取
         LogWrapper.Debug("McPing",$"Connecting to {_endpoint}");
         await _socket.ConnectAsync(_endpoint);
@@ -260,6 +272,6 @@ public void Dispose()
         if (_disposed) return;
         _disposed = true;
         GC.SuppressFinalize(this);
-        _socket.Dispose();
+        _socket?.Dispose();
     }
 }