Skip to content

feat(WebClientService): add TimeoutException catch #5283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 3, 2025
Merged

feat(WebClientService): add TimeoutException catch #5283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
65ca872
refactor: 过滤掉超时异常
ArgoZhang Feb 2, 2025
df965b1
refactor: 更新代码
ArgoZhang Feb 2, 2025
63af32a
test: 更新单元测试
ArgoZhang Feb 3, 2025
63f99e6
refactor: 重构代码
ArgoZhang Feb 3, 2025
3eb3f4e
refactor: 更新代码
ArgoZhang Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/Components/Affix/Affix.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
6 changes: 3 additions & 3 deletions src/BootstrapBlazor/Components/Drawer/Drawer.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 7 additions & 5 deletions src/BootstrapBlazor/Services/WebClientService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
8 changes: 7 additions & 1 deletion test/UnitTest/Services/WebClientServiceTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down