feat(WebClientService): add TimeoutException catch (#5283)

* refactor: 过滤掉超时异常

* refactor: 更新代码

* test: 更新单元测试

* refactor: 重构代码

* refactor: 更新代码

Author: ArgoZhang

src/BootstrapBlazor/Components/Affix/Affix.razor.cs

@@ -41,7 +41,7 @@ public partial class Affix
 
     private string? StyleString => CssBuilder.Default("position: sticky;")
         .AddStyle("z-index", $"{ZIndex}", ZIndex.HasValue)
-        .AddStyle($"{Position.ToDescriptionString()}", $"{Offset}px")
+        .AddStyle(Position.ToDescriptionString(), $"{Offset}px")
         .AddStyleFromAttributes(AdditionalAttributes)
         .Build();
 }

src/BootstrapBlazor/Components/Drawer/Drawer.razor.cs

@@ -19,16 +19,16 @@ public partial class Drawer
         .Build();
 
     private string? StyleString => CssBuilder.Default()
-        .AddStyle("--bb-drawer-position", $"{Position}", !string.IsNullOrEmpty(Position))
+        .AddStyle("--bb-drawer-position", Position)
         .AddStyleFromAttributes(AdditionalAttributes)
         .Build();
 
     /// <summary>
     /// 获得 抽屉 Style 字符串
     /// </summary>
     private string? DrawerStyleString => CssBuilder.Default()
-        .AddStyle("--bb-drawer-width", $"{Width}", !string.IsNullOrEmpty(Width) && Placement != Placement.Top && Placement != Placement.Bottom)
-        .AddStyle("--bb-drawer-height", $"{Height}", !string.IsNullOrEmpty(Height) && (Placement == Placement.Top || Placement == Placement.Bottom))
+        .AddStyle("--bb-drawer-width", Width, Placement != Placement.Top && Placement != Placement.Bottom)
+        .AddStyle("--bb-drawer-height", Height, Placement == Placement.Top || Placement == Placement.Bottom)
         .Build();
 
     /// <summary>

src/BootstrapBlazor/Services/WebClientService.cs

@@ -39,15 +39,17 @@ public async Task<ClientInfo> GetClientInfo()
         {
             RequestUrl = navigation.Uri
         };
-        _jsModule ??= await runtime.LoadModule("./_content/BootstrapBlazor/modules/client.js");
-        _interop ??= DotNetObjectReference.Create(this);
-        await _jsModule.InvokeVoidAsync("ping", "ip.axd", _interop, nameof(SetData));
 
-        // 等待 SetData 方法执行完毕
         try
         {
-            await _taskCompletionSource.Task.WaitAsync(TimeSpan.FromSeconds(1));
+            _jsModule ??= await runtime.LoadModule("./_content/BootstrapBlazor/modules/client.js");
+            _interop ??= DotNetObjectReference.Create(this);
+            await _jsModule.InvokeVoidAsync("ping", "ip.axd", _interop, nameof(SetData));
+
+            // 等待 SetData 方法执行完毕
+            await _taskCompletionSource.Task.WaitAsync(TimeSpan.FromSeconds(3));
         }
+        catch (TimeoutException) { }
         catch (Exception ex)
         {
             logger.LogError(ex, "method GetClientInfo failed");

test/UnitTest/Services/WebClientServiceTest.cs

@@ -59,11 +59,17 @@ public async Task WebClientOptions_Ok()
     }
 
     [Fact]
-    public async Task Timeout_Ok()
+    public async Task GetClientInfo_Error()
     {
         var service = Context.Services.GetRequiredService<WebClientService>();
         var client = await service.GetClientInfo();
+
+        // TimeoutException
         Assert.Null(client.Ip);
+
+        // Exception
+        Context.JSInterop.SetupVoid("ping", _ => true).SetException(new Exception("test-exception"));
+        client = await service.GetClientInfo();
     }
 
     [Fact]