feat: 更改 DefaultTcpSocketClient 构造函数

Author: ArgoZhang

src/BootstrapBlazor/Extensions/ITcpSocketClientExtensions.cs

@@ -3,14 +3,15 @@
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone
 
-using System.Net;
+using System.Runtime.Versioning;
 using System.Text;
 
 namespace BootstrapBlazor.Components;
 
 /// <summary>
 /// <see cref="ITcpSocketClient"/> 扩展方法类
 /// </summary>
+[UnsupportedOSPlatform("browser")]
 public static class ITcpSocketClientExtensions
 {
     /// <summary>
@@ -44,22 +45,7 @@ public static ValueTask<bool> SendAsync(this ITcpSocketClient client, string con
     /// is successfully established; otherwise, <see langword="false"/>.</returns>
     public static ValueTask<bool> ConnectAsync(this ITcpSocketClient client, string ipString, int port, CancellationToken token = default)
     {
-        if (string.IsNullOrEmpty(ipString))
-        {
-            throw new ArgumentNullException(nameof(ipString), "IP address cannot be null or empty.");
-        }
-
-        if (port < 0 || port > 65535)
-        {
-            throw new ArgumentOutOfRangeException(nameof(port), "Port must be between 0 and 65535.");
-        }
-
-        if (!IPAddress.TryParse(ipString, out var address))
-        {
-            throw new InvalidOperationException($"Invalid IP address format: {ipString}");
-        }
-
-        var endPoint = new IPEndPoint(address, port);
+        var endPoint = Utility.ConvertToIpEndPoint(ipString, port);
         return client.ConnectAsync(endPoint, token);
     }
 }

src/BootstrapBlazor/Services/TcpSocket/DefaultTcpSocketClient.cs

@@ -12,7 +12,7 @@
 namespace BootstrapBlazor.Components;
 
 [UnsupportedOSPlatform("browser")]
-class DefaultTcpSocketClient : ITcpSocketClient
+class DefaultTcpSocketClient(IPEndPoint endPoint) : ITcpSocketClient
 {
     private TcpClient? _client;
     private IDataPackageHandler? _dataPackageHandler;
@@ -21,7 +21,7 @@ class DefaultTcpSocketClient : ITcpSocketClient
 
     public bool IsConnected => _client?.Connected ?? false;
 
-    public IPEndPoint LocalEndPoint { get; set; }
+    public IPEndPoint LocalEndPoint { get; set; } = endPoint;
 
     [NotNull]
     public ILogger<DefaultTcpSocketClient>? Logger { get; set; }
@@ -30,29 +30,11 @@ class DefaultTcpSocketClient : ITcpSocketClient
 
     public Func<ReadOnlyMemory<byte>, ValueTask>? ReceivedCallBack { get; set; }
 
-    public DefaultTcpSocketClient(string host, int port = 0)
-    {
-        LocalEndPoint = new IPEndPoint(GetIPAddress(host), port);
-    }
-
-    private static IPAddress GetIPAddress(string host) => host.Equals("localhost", StringComparison.OrdinalIgnoreCase)
-        ? IPAddress.Loopback
-        : IPAddress.TryParse(host, out var ip) ? ip : IPAddressByHostName;
-
-    [ExcludeFromCodeCoverage]
-    private static IPAddress IPAddressByHostName => Dns.GetHostAddresses(Dns.GetHostName(), AddressFamily.InterNetwork).FirstOrDefault() ?? IPAddress.Loopback;
-
     public void SetDataHandler(IDataPackageHandler handler)
     {
         _dataPackageHandler = handler;
     }
 
-    public ValueTask<bool> ConnectAsync(string host, int port, CancellationToken token = default)
-    {
-        var endPoint = new IPEndPoint(GetIPAddress(host), port);
-        return ConnectAsync(endPoint, token);
-    }
-
     public async ValueTask<bool> ConnectAsync(IPEndPoint endPoint, CancellationToken token = default)
     {
         var ret = false;

src/BootstrapBlazor/Services/TcpSocket/DefaultTcpSocketFactory.cs

@@ -6,6 +6,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using System.Collections.Concurrent;
+using System.Net;
 using System.Runtime.Versioning;
 
 namespace BootstrapBlazor.Components;
@@ -19,7 +20,8 @@ public ITcpSocketClient GetOrCreate(string host, int port = 0)
     {
         return _pool.GetOrAdd($"{host}:{port}", key =>
         {
-            var client = new DefaultTcpSocketClient(host, port)
+            var endPoint = Utility.ConvertToIpEndPoint(host, port);
+            var client = new DefaultTcpSocketClient(endPoint)
             {
                 Logger = provider.GetService<ILogger<DefaultTcpSocketClient>>()
             };