feat: make SendTimeout effect (#32)

* feat: 增加 SendTimeout 参数生效问题

* test: 增加 ReceiveAsync 单元测试代码覆盖率

* test: 增加 SendTimeout 单元测试

* doc: 项目文件格式化

* chore: bump version 9.0.11

* refactor: 统一 Options 类

Author: ArgoZhang

src/Longbow.TcpSocket/Interface/DefaultTcpSocketClient.cs

@@ -27,7 +27,7 @@ sealed class DefaultTcpSocketClient(IOptions<TcpSocketClientOptions> options) :
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
-    public IPEndPoint LocalEndPoint => _localEndPoint ?? _options.LocalEndPoint;
+    public IPEndPoint LocalEndPoint => _localEndPoint ?? Options.LocalEndPoint;
 
     /// <summary>
     /// <inheritdoc/>
@@ -97,7 +97,7 @@ public async ValueTask<bool> ConnectAsync(IPEndPoint endPoint, CancellationToken
                 ret = true;
             }
 
-            if (_options.IsAutoReceive)
+            if (Options.IsAutoReceive)
             {
                 _ = Task.Run(AutoReceiveAsync, CancellationToken.None).ConfigureAwait(false);
             }
@@ -117,7 +117,7 @@ private async ValueTask AutoReceiveAsync()
         // 自动接收方法
         _autoReceiveTokenSource ??= new();
 
-        using var block = MemoryPool<byte>.Shared.Rent(_options.ReceiveBufferSize);
+        using var block = MemoryPool<byte>.Shared.Rent(Options.ReceiveBufferSize);
         var buffer = block.Memory;
         while (_autoReceiveTokenSource is { IsCancellationRequested: false })
         {
@@ -133,10 +133,10 @@ private async ValueTask<int> ReceiveCoreAsync(Memory<byte> buffer, CancellationT
             if (_client is { Connected: true })
             {
                 var receiveToken = token;
-                if (_options.ReceiveTimeout > 0)
+                if (Options.ReceiveTimeout > 0)
                 {
                     // 设置接收超时时间
-                    using var receiveTokenSource = new CancellationTokenSource(_options.ReceiveTimeout);
+                    using var receiveTokenSource = new CancellationTokenSource(Options.ReceiveTimeout);
                     using var link = CancellationTokenSource.CreateLinkedTokenSource(receiveToken, receiveTokenSource.Token);
                     receiveToken = link.Token;
                 }
@@ -178,7 +178,14 @@ public async ValueTask<bool> SendAsync(ReadOnlyMemory<byte> data, CancellationTo
         var ret = false;
         if (_sender != null)
         {
-            ret = await _sender.SendAsync(data, token);
+            var sendToken = token;
+            if (Options.SendTimeout > 0)
+            {
+                using var sendTokenSource = new CancellationTokenSource(Options.SendTimeout);
+                using var link = CancellationTokenSource.CreateLinkedTokenSource(token, sendTokenSource.Token);
+                sendToken = link.Token;
+            }
+            ret = await _sender.SendAsync(data, sendToken);
         }
 
         return ret;

src/Longbow.TcpSocket/Longbow.TcpSocket.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>9.0.10</Version>
+    <Version>9.0.11</Version>
   </PropertyGroup>
 
   <PropertyGroup>

test/UnitTestTcpSocket/TcpSocketFactoryTest.cs

@@ -77,6 +77,7 @@ public async Task SendAsync_Ok()
         // 测试正常电文
         cst.Dispose();
         cst = new();
+        client.Options.SendTimeout = 1000;
         var result = await client.SendAsync("test", Encoding.UTF8, cst.Token);
         Assert.True(result);
 
@@ -132,9 +133,8 @@ public async Task ReceiveAsync_Zero()
         var server = StartTcpServer(port, MockZeroPackageAsync);
         await client.ConnectAsync("localhost", port);
 
-        var buffer = new byte[10];
-        var len = await client.ReceiveAsync(buffer);
-        Assert.Equal(0, len);
+        var buffer = await client.ReceiveAsync();
+        Assert.Equal(ReadOnlyMemory<byte>.Empty, buffer);
         server.Stop();
     }
 
@@ -190,8 +190,9 @@ public async Task ReceiveAsync_Ok()
         Assert.Equal([1, 2, 3, 4, 5], buffer[0..len]);
 
         // 由于服务器端模拟了拆包发送第二段数据，所以这里可以再次调用 ReceiveAsync 方法获取第二段数据
-        len = await client.ReceiveAsync(buffer);
-        Assert.Equal([3, 4], buffer[0..len]);
+        // 调用扩展方法直接获得到接收数据
+        var payload = await client.ReceiveAsync();
+        Assert.Equal([3, 4], payload.ToArray());
     }
 
     [Fact]

test/UnitTestTcpSocket/UnitTestTcpSocket.csproj

@@ -29,9 +29,9 @@
     <Using Include="Longbow.Sockets.DataHandlers" />
     <Using Include="Longbow.Sockets.DataConverters" />
     <Using Include="Longbow.TcpSocket" />
-    <Using Include="System.Diagnostics.CodeAnalysis"/>
-    <Using Include="Xunit"/>
-    <Using Include="Xunit.Abstractions"/>
+    <Using Include="System.Diagnostics.CodeAnalysis" />
+    <Using Include="Xunit" />
+    <Using Include="Xunit.Abstractions" />
   </ItemGroup>
 
 </Project>