From 14cbed572b15197f7dd810293f7c33850bfd165b Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sun, 13 Jul 2025 13:16:53 +0800 Subject: [PATCH 01/12] =?UTF-8?q?doc:=20=E7=A7=BB=E9=99=A4=20SDK=20?= =?UTF-8?q?=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor.Server/Components/Layout/HomeLayout.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor.Server/Components/Layout/HomeLayout.razor b/src/BootstrapBlazor.Server/Components/Layout/HomeLayout.razor index 139cca04eb4..338f3e9364e 100644 --- a/src/BootstrapBlazor.Server/Components/Layout/HomeLayout.razor +++ b/src/BootstrapBlazor.Server/Components/Layout/HomeLayout.razor @@ -60,7 +60,7 @@
-
SDK .NET @Version on @OS
+
.NET @Version on @OS
BB @VersionService.Version
From e71e6b0f5d31e71843848a433d617966b44aed8f Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sun, 13 Jul 2025 13:47:50 +0800 Subject: [PATCH 02/12] =?UTF-8?q?doc:=20=E5=A2=9E=E5=8A=A0=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E7=8A=B6=E6=80=81=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Extensions/MenusLocalizerExtensions.cs | 6 ++++++ src/BootstrapBlazor.Server/Locales/en-US.json | 10 +++++++++- src/BootstrapBlazor.Server/Locales/zh-CN.json | 9 ++++++++- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor.Server/Extensions/MenusLocalizerExtensions.cs b/src/BootstrapBlazor.Server/Extensions/MenusLocalizerExtensions.cs index 719494a3aa6..d06f4004bc8 100644 --- a/src/BootstrapBlazor.Server/Extensions/MenusLocalizerExtensions.cs +++ b/src/BootstrapBlazor.Server/Extensions/MenusLocalizerExtensions.cs @@ -1248,6 +1248,12 @@ void AddNotice(DemoMenuItem item) Url = "fullscreen-button" }, new() + { + IsNew = true, + Text = Localizer["NetworkMonitor"], + Url = "network-monitor" + }, + new() { Text = Localizer["Light"], Url = "light" diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json index f83b4ff00a6..81ba74d61d5 100644 --- a/src/BootstrapBlazor.Server/Locales/en-US.json +++ b/src/BootstrapBlazor.Server/Locales/en-US.json @@ -4840,7 +4840,8 @@ "SocketAutoReceive": "Auto Receive", "SocketManualReceive": "Manual Receive", "DataPackageAdapter": "DataPackageAdapter", - "SocketAutoConnect": "Reconnect" + "SocketAutoConnect": "Reconnect", + "NetworkMonitor": "Network Monitor" }, "BootstrapBlazor.Server.Components.Samples.Table.TablesHeader": { "TablesHeaderTitle": "Header grouping function", @@ -7119,5 +7120,12 @@ "AutoReconnectsDescription": "Receive data through the data adapter and display", "NormalTitle": "Basic usage", "NormalIntro": "Enable automatic reconnection by setting IsAutoReconnect" + }, + "BootstrapBlazor.Server.Components.Samples.NetworkMonitors": { + "NetworkMonitorTitle": "NetworkMonitor", + "NetworkMonitorDescription": "链路断开后自动重连示例", + "NormalTitle": "基本用法", + "NormalIntro": "通过设置 IsAutoReconnect 开启自动重连机制", + "NormalDesc": "网络变化时，通过 OnNetworkStateChanged 回调获得当前网络状态信息" } } diff --git a/src/BootstrapBlazor.Server/Locales/zh-CN.json b/src/BootstrapBlazor.Server/Locales/zh-CN.json index bb25e0b8d19..d0eec1b3271 100644 --- a/src/BootstrapBlazor.Server/Locales/zh-CN.json +++ b/src/BootstrapBlazor.Server/Locales/zh-CN.json @@ -4840,7 +4840,8 @@ "SocketAutoReceive": "自动接收数据", "SocketManualReceive": "手动接收数据", "DataPackageAdapter": "数据处理器", - "SocketAutoConnect": "自动重连" + "SocketAutoConnect": "自动重连", + "NetworkMonitor": "网络状态 NetworkMonitor" }, "BootstrapBlazor.Server.Components.Samples.Table.TablesHeader": { "TablesHeaderTitle": "表头分组功能", @@ -7119,5 +7120,11 @@ "AutoReconnectsDescription": "链路断开后自动重连示例", "NormalTitle": "基本用法", "NormalIntro": "通过设置 IsAutoReconnect 开启自动重连机制" + }, + "BootstrapBlazor.Server.Components.Samples.NetworkMonitors": { + "NetworkMonitorTitle": "NetworkMonitor 网络状态", + "NetworkMonitorDescription": "使用浏览器原生 api navigator.connection 实时显示当前网络状态", + "NormalTitle": "基本用法", + "NormalIntro": "网络变化时，通过 OnNetworkStateChanged 回调获得当前网络状态信息" } } From 7276b0268bba073060c823973e686a1e23ac40da Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sun, 13 Jul 2025 13:48:03 +0800 Subject: [PATCH 03/12] =?UTF-8?q?doc:=20=E5=A2=9E=E5=8A=A0=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E7=8A=B6=E6=80=81=E6=BA=90=E7=A0=81=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor.Server/docs.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/BootstrapBlazor.Server/docs.json b/src/BootstrapBlazor.Server/docs.json index f0824c531be..f2dff539944 100644 --- a/src/BootstrapBlazor.Server/docs.json +++ b/src/BootstrapBlazor.Server/docs.json @@ -246,7 +246,8 @@ "socket/manual-receive": "Sockets\\ManualReceives", "socket/auto-receive": "Sockets\\AutoReceives", "socket/adapter": "Sockets\\Adapters", - "socket/auto-connect": "Sockets\\AutoReconnects" + "socket/auto-connect": "Sockets\\AutoReconnects", + "network-monitor": "NetworkMonitors" }, "video": { "table": "BV1ap4y1x7Qn?p=1", From 2b7aecf0a916cd3c05334c52e228314ec44f4ebe Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sun, 13 Jul 2025 13:48:14 +0800 Subject: [PATCH 04/12] =?UTF-8?q?doc:=20=E5=A2=9E=E5=8A=A0=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E7=8A=B6=E6=80=81=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Samples/NetworkMonitors.razor | 21 +++++++++++++++++++ .../Samples/NetworkMonitors.razor.cs | 20 ++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor create mode 100644 src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor.cs diff --git a/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor b/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor new file mode 100644 index 00000000000..3ce47628d88 --- /dev/null +++ b/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor @@ -0,0 +1,21 @@ +@page "/network-monitor" +@inject IStringLocalizer Localizer + +

@Localizer["NetworkMonitorTitle"]

+ +

@((MarkupString)Localizer["NetworkMonitorDescription"].Value)

+ + + +
+ +
+ + + + + diff --git a/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor.cs new file mode 100644 index 00000000000..d29556f3713 --- /dev/null +++ b/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor.cs @@ -0,0 +1,20 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the Apache 2.0 License +// See the LICENSE file in the project root for more information. +// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone + +namespace BootstrapBlazor.Server.Components.Samples; + +/// +/// NetworkMonitor Sample code +/// +public partial class NetworkMonitors +{ + private ConsoleLogger _logger = null!; + + private Task OnNetworkStateChanged(NetworkMonitorState state) + { + _logger.Log($"Online: {state.IsOnline} NetworkType: {state.NetworkType} Downlink: {state.Downlink} RTT: {state.RTT}"); + return Task.CompletedTask; + } +} From 5a7a8c5ed730e206a905975e82c74ad5f185e18e Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sun, 13 Jul 2025 13:57:00 +0800 Subject: [PATCH 05/12] =?UTF-8?q?doc:=20=E5=A2=9E=E5=8A=A0=E6=8C=87?= =?UTF-8?q?=E7=A4=BA=E5=99=A8=E7=A4=BA=E4=BE=8B=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Samples/NetworkMonitors.razor | 8 ++++++++ src/BootstrapBlazor.Server/Locales/en-US.json | 7 ++++++- src/BootstrapBlazor.Server/Locales/zh-CN.json | 8 +++++++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor b/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor index 3ce47628d88..35f02fc3b22 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor @@ -17,5 +17,13 @@ +
+
    +
  • @Localizer["IndicatorLi1"]
    • +
  • @Localizer["IndicatorLi2"]
    • +
  • @Localizer["IndicatorLi3"]
    • +
  • @Localizer["IndicatorLi4"]
    • +
+
diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json index 81ba74d61d5..54bc853d0c5 100644 --- a/src/BootstrapBlazor.Server/Locales/en-US.json +++ b/src/BootstrapBlazor.Server/Locales/en-US.json @@ -7126,6 +7126,11 @@ "NetworkMonitorDescription": "链路断开后自动重连示例", "NormalTitle": "基本用法", "NormalIntro": "通过设置 IsAutoReconnect 开启自动重连机制", - "NormalDesc": "网络变化时，通过 OnNetworkStateChanged 回调获得当前网络状态信息" + "IndicatorTitle": "网络状态指示灯", + "IndicatorIntro": "使用组件 NetworkMonitorIndicator 当网络状态变化时，显示不同颜色的指示灯，鼠标移动到上面时显示网络状态明细", + "IndicatorLi1": "绿色：网络非常好 (4G)", + "IndicatorLi2": "黄色：网络一般 (3G)", + "IndicatorLi3": "红色：网络差 (2G)", + "IndicatorLi4": "灰色：离线状态" } } diff --git a/src/BootstrapBlazor.Server/Locales/zh-CN.json b/src/BootstrapBlazor.Server/Locales/zh-CN.json index d0eec1b3271..71dc686ecec 100644 --- a/src/BootstrapBlazor.Server/Locales/zh-CN.json +++ b/src/BootstrapBlazor.Server/Locales/zh-CN.json @@ -7125,6 +7125,12 @@ "NetworkMonitorTitle": "NetworkMonitor 网络状态", "NetworkMonitorDescription": "使用浏览器原生 api navigator.connection 实时显示当前网络状态", "NormalTitle": "基本用法", - "NormalIntro": "网络变化时，通过 OnNetworkStateChanged 回调获得当前网络状态信息" + "NormalIntro": "网络变化时，通过 OnNetworkStateChanged 回调获得当前网络状态信息", + "IndicatorTitle": "网络状态指示灯", + "IndicatorIntro": "使用组件 NetworkMonitorIndicator 当网络状态变化时，显示不同颜色的指示灯，鼠标移动到上面时显示网络状态明细", + "IndicatorLi1": "绿色：网络非常好 (4G)", + "IndicatorLi2": "黄色：网络一般 (3G)", + "IndicatorLi3": "红色：网络差 (2G)", + "IndicatorLi4": "灰色：离线状态" } } From 4d58915299b071c6ef6f5b7f6d7604639b6166d1 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sun, 13 Jul 2025 15:19:31 +0800 Subject: [PATCH 06/12] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20INetworkMoni?= =?UTF-8?q?torService=20=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/DefaultNetworkMonitorService.cs | 26 +++++++++++++++++++ .../Services/INetworkMonitorService.cs | 14 ++++++++++ .../wwwroot/modules/utility.js | 12 +++++++++ 3 files changed, 52 insertions(+) create mode 100644 src/BootstrapBlazor/Services/DefaultNetworkMonitorService.cs create mode 100644 src/BootstrapBlazor/Services/INetworkMonitorService.cs diff --git a/src/BootstrapBlazor/Services/DefaultNetworkMonitorService.cs b/src/BootstrapBlazor/Services/DefaultNetworkMonitorService.cs new file mode 100644 index 00000000000..a61d644793d --- /dev/null +++ b/src/BootstrapBlazor/Services/DefaultNetworkMonitorService.cs @@ -0,0 +1,26 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the Apache 2.0 License +// See the LICENSE file in the project root for more information. +// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone + +namespace BootstrapBlazor.Components; + +/// +/// 网络状态服务 +/// +class DefaultNetowrkMonitorService(IJSRuntime jSRuntime) +{ + [NotNull] + private JSModule? _module = null; + + private Task LoadModule() => jSRuntime.LoadUtility(); + + /// + /// 获取剪切板数据方法 + /// + public async Task GetNetworkMonitorState(CancellationToken token = default) + { + _module ??= await LoadModule(); + return await _module.InvokeAsync("getNetworkInfo", token) ?? new(); + } +} diff --git a/src/BootstrapBlazor/Services/INetworkMonitorService.cs b/src/BootstrapBlazor/Services/INetworkMonitorService.cs new file mode 100644 index 00000000000..d18f7578e40 --- /dev/null +++ b/src/BootstrapBlazor/Services/INetworkMonitorService.cs @@ -0,0 +1,14 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the Apache 2.0 License +// See the LICENSE file in the project root for more information. +// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone + +namespace BootstrapBlazor.Components; + +/// +/// +/// +public interface INetworkMonitorService +{ + +} diff --git a/src/BootstrapBlazor/wwwroot/modules/utility.js b/src/BootstrapBlazor/wwwroot/modules/utility.js index aecd390294d..0d97300e834 100644 --- a/src/BootstrapBlazor/wwwroot/modules/utility.js +++ b/src/BootstrapBlazor/wwwroot/modules/utility.js @@ -907,6 +907,18 @@ export function readFileAsync(file) { }); } +export function getNetworkInfo() { + if (navigator.connection) { + const { downlink, effectiveType, rtt } = navigator.connection; + return { + downlink: downlink, + networkType: effectiveType, + rTT: rtt + }; + } + return null; +} + export { autoAdd, autoRemove, From 65d85ced49163e5948e39061de663873441a966d Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sun, 13 Jul 2025 16:37:30 +0800 Subject: [PATCH 07/12] =?UTF-8?q?refactor:=20=E5=AE=9E=E7=8E=B0=20INetwork?= =?UTF-8?q?MonitorService=20=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NetworkMonitor/NetworkMonitor.cs | 69 -------------- .../NetworkMonitorIndicator.razor | 2 - .../NetworkMonitorIndicator.razor.cs | 31 ++++++- .../NetworkMonitor/NetworkMonitorState.cs | 5 - ...tstrapBlazorServiceCollectionExtensions.cs | 1 + .../Services/DefaultNetworkMonitorService.cs | 92 ++++++++++++++++++- .../Services/INetworkMonitorService.cs | 25 ++++- src/BootstrapBlazor/wwwroot/modules/net.js | 82 ++++++++--------- 8 files changed, 181 insertions(+), 126 deletions(-) delete mode 100644 src/BootstrapBlazor/Components/NetworkMonitor/NetworkMonitor.cs diff --git a/src/BootstrapBlazor/Components/NetworkMonitor/NetworkMonitor.cs b/src/BootstrapBlazor/Components/NetworkMonitor/NetworkMonitor.cs deleted file mode 100644 index 5150d24aa88..00000000000 --- a/src/BootstrapBlazor/Components/NetworkMonitor/NetworkMonitor.cs +++ /dev/null @@ -1,69 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the Apache 2.0 License -// See the LICENSE file in the project root for more information. -// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone - -namespace BootstrapBlazor.Components; - -/// -/// 客户端链接组件 -/// -[BootstrapModuleAutoLoader(ModuleName = "net", JSObjectReference = true)] -public class NetworkMonitor : BootstrapModuleComponentBase -{ - /// - /// Gets or sets the callback function that is invoked when the network state changes. - /// - [Parameter] - public Func? OnNetworkStateChanged { get; set; } - - /// - /// Gets or sets the list of indicators used for display info. - /// - [Parameter] - public List? Indicators { get; set; } - - private NetworkMonitorState _state = new(); - - /// - /// - /// - /// - protected override Task InvokeInitAsync() => InvokeVoidAsync("init", Id, new - { - Invoke = Interop, - OnlineStateChangedCallback = nameof(TriggerOnlineStateChanged), - OnNetworkStateChangedCallback = nameof(TriggerNetworkStateChanged), - Indicators - }); - - /// - /// JSInvoke 回调方法 - /// - /// - [JSInvokable] - public async Task TriggerOnlineStateChanged(bool online) - { - _state.IsOnline = online; - if (OnNetworkStateChanged != null) - { - await OnNetworkStateChanged(_state); - } - } - - /// - /// JSInvoke 回调方法 - /// - /// - [JSInvokable] - public async Task TriggerNetworkStateChanged(NetworkMonitorState state) - { - // 网络状态变化回调方法 - _state = state; - _state.IsOnline = true; - if (OnNetworkStateChanged != null) - { - await OnNetworkStateChanged(_state); - } - } -} diff --git a/src/BootstrapBlazor/Components/NetworkMonitor/NetworkMonitorIndicator.razor b/src/BootstrapBlazor/Components/NetworkMonitor/NetworkMonitorIndicator.razor index 0cf96a79e14..05517bc49a2 100644 --- a/src/BootstrapBlazor/Components/NetworkMonitor/NetworkMonitorIndicator.razor +++ b/src/BootstrapBlazor/Components/NetworkMonitor/NetworkMonitorIndicator.razor @@ -22,5 +22,3 @@
- - diff --git a/src/BootstrapBlazor/Components/NetworkMonitor/NetworkMonitorIndicator.razor.cs b/src/BootstrapBlazor/Components/NetworkMonitor/NetworkMonitorIndicator.razor.cs index 5020815fbc8..4a6ab7776c5 100644 --- a/src/BootstrapBlazor/Components/NetworkMonitor/NetworkMonitorIndicator.razor.cs +++ b/src/BootstrapBlazor/Components/NetworkMonitor/NetworkMonitorIndicator.razor.cs @@ -13,7 +13,7 @@ namespace BootstrapBlazor.Components; /// This component allows you to configure the text, placement, and trigger behavior of a tooltip that /// appears when interacting with the network monitor indicator. The tooltip can be customized to provide additional /// information to users. -public partial class NetworkMonitorIndicator +public partial class NetworkMonitorIndicator : IDisposable { /// /// 获得/设置 Popover 弹窗标题 默认为 null @@ -37,8 +37,10 @@ public partial class NetworkMonitorIndicator [Inject, NotNull] private IStringLocalizer? Localizer { get; set; } + [Inject, NotNull] + private INetworkMonitorService? NetworkMonitorService { get; set; } + private NetworkMonitorState _state = new(); - private readonly List _indicators = []; private string _networkTypeString = ""; private string _downlinkString = ""; private string _rttString = ""; @@ -53,11 +55,11 @@ public partial class NetworkMonitorIndicator /// /// /// - protected override void OnInitialized() + protected override async Task OnInitializedAsync() { - base.OnInitialized(); + await base.OnInitializedAsync(); - _indicators.Add(Id); + await NetworkMonitorService.RegisterStateChangedCallback(this, OnNetworkStateChanged); } /// @@ -69,6 +71,7 @@ protected override void OnParametersSet() Trigger ??= "hover focus"; Title ??= Localizer["Title"]; + _networkTypeString = Localizer["NetworkType"]; _downlinkString = Localizer["Downlink"]; _rttString = Localizer["RTT"]; @@ -80,4 +83,22 @@ private Task OnNetworkStateChanged(NetworkMonitorState state) StateHasChanged(); return Task.CompletedTask; } + + private void Dispose(bool disposing) + { + if (disposing) + { + NetworkMonitorService.UnregisterStateChangedCallback(this); + } + } + + /// + /// + /// + /// + public void Dispose() + { + Dispose(true); + GC.SuppressFinalize(this); + } } diff --git a/src/BootstrapBlazor/Components/NetworkMonitor/NetworkMonitorState.cs b/src/BootstrapBlazor/Components/NetworkMonitor/NetworkMonitorState.cs index f6c4afdcbf9..5ec0f5d3427 100644 --- a/src/BootstrapBlazor/Components/NetworkMonitor/NetworkMonitorState.cs +++ b/src/BootstrapBlazor/Components/NetworkMonitor/NetworkMonitorState.cs @@ -10,11 +10,6 @@ namespace BootstrapBlazor.Components; /// public class NetworkMonitorState { - /// - /// Gets or sets a value indicating whether the network is online - /// - public bool IsOnline { get; set; } - /// /// Gets or sets the current network type /// diff --git a/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs b/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs index 9b49222e130..bf57e690b9f 100644 --- a/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs +++ b/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs @@ -93,6 +93,7 @@ public static IServiceCollection AddBootstrapBlazor(this IServiceCollection serv services.TryAddScoped(); services.TryAddScoped(); services.TryAddScoped(); + services.TryAddScoped(); services.AddScoped(); services.AddScoped(); services.AddScoped(); diff --git a/src/BootstrapBlazor/Services/DefaultNetworkMonitorService.cs b/src/BootstrapBlazor/Services/DefaultNetworkMonitorService.cs index a61d644793d..9d313907a63 100644 --- a/src/BootstrapBlazor/Services/DefaultNetworkMonitorService.cs +++ b/src/BootstrapBlazor/Services/DefaultNetworkMonitorService.cs @@ -3,24 +3,110 @@ // See the LICENSE file in the project root for more information. // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone +using System.Collections.Concurrent; + namespace BootstrapBlazor.Components; /// /// 网络状态服务 /// -class DefaultNetowrkMonitorService(IJSRuntime jSRuntime) +class DefaultNetowrkMonitorService : INetworkMonitorService, IAsyncDisposable { [NotNull] private JSModule? _module = null; + [NotNull] + private JSModule? _networkModule = null; + private readonly IJSRuntime _runtime; + private readonly DotNetObjectReference _interop; + private readonly ConcurrentDictionary> _callbacks = new(); + private bool _init = false; + private readonly SemaphoreSlim _semaphoreSlim = new(1, 1); - private Task LoadModule() => jSRuntime.LoadUtility(); + public DefaultNetowrkMonitorService(IJSRuntime jsRuntime) + { + _runtime = jsRuntime; + _interop = DotNetObjectReference.Create(this); + } + + private Task LoadModule() => _runtime.LoadUtility(); /// - /// 获取剪切板数据方法 + /// /// public async Task GetNetworkMonitorState(CancellationToken token = default) { _module ??= await LoadModule(); return await _module.InvokeAsync("getNetworkInfo", token) ?? new(); } + + /// + /// + /// + /// + /// + public async Task RegisterStateChangedCallback(IComponent component, Func callback) + { + _callbacks.AddOrUpdate(component, key => callback, (k, v) => callback); + + if (!_init) + { + await _semaphoreSlim.WaitAsync(); + if (!_init) + { + _init = true; + + _networkModule ??= await _runtime.LoadModuleByName("net"); + await _networkModule.InvokeVoidAsync("init", new + { + Invoke = _interop, + OnNetworkStateChangedCallback = nameof(TriggerNetworkStateChanged) + }); + } + _semaphoreSlim.Release(); + } + } + + /// + /// + /// + /// + public void UnregisterStateChangedCallback(IComponent component) + { + _callbacks.TryRemove(component, out _); + } + + /// + /// JSInvoke 回调方法 + /// + /// + [JSInvokable] + public async Task TriggerNetworkStateChanged(NetworkMonitorState state) + { + foreach (var callback in _callbacks.Values) + { + if (callback != null) + { + await callback(state); + } + } + } + + /// + /// + /// + /// + public async ValueTask DisposeAsync() + { + if (_module != null) + { + await _module.DisposeAsync(); + _module = null; + } + if (_networkModule != null) + { + await _networkModule.DisposeAsync(); + _networkModule = null; + } + _interop?.Dispose(); + } } diff --git a/src/BootstrapBlazor/Services/INetworkMonitorService.cs b/src/BootstrapBlazor/Services/INetworkMonitorService.cs index d18f7578e40..ad214bb5cc9 100644 --- a/src/BootstrapBlazor/Services/INetworkMonitorService.cs +++ b/src/BootstrapBlazor/Services/INetworkMonitorService.cs @@ -6,9 +6,32 @@ namespace BootstrapBlazor.Components; /// -/// +/// Defines a service for monitoring network state and retrieving the current network monitor status. /// public interface INetworkMonitorService { + /// + /// Retrieves the current state of the network monitor. + /// + /// A cancellation token that can be used to cancel the operation. + /// A task representing the asynchronous operation. The task result contains the current . + Task GetNetworkMonitorState(CancellationToken token = default); + /// + /// Registers a callback to be invoked when the network monitor state changes. + /// + /// The callback is executed asynchronously whenever the network monitor detects a change in + /// state. Ensure that the callback function is thread-safe and handles any exceptions that may occur during + /// execution. + /// The component that will be associated with the callback. Cannot be null. + /// A function to be called when the network monitor state changes. The function receives the new state and returns + /// a task. Cannot be null. + Task RegisterStateChangedCallback(IComponent component, Func callback); + + /// + /// Unregisters a previously registered callback for state changes on the specified component. + /// + /// The component for which the state change callback should be unregistered. Cannot be null. + void UnregisterStateChangedCallback(IComponent component); } diff --git a/src/BootstrapBlazor/wwwroot/modules/net.js b/src/BootstrapBlazor/wwwroot/modules/net.js index a7748f7c1ae..a60bdb56d08 100644 --- a/src/BootstrapBlazor/wwwroot/modules/net.js +++ b/src/BootstrapBlazor/wwwroot/modules/net.js @@ -1,8 +1,8 @@ -import Data from "./data.js" -import EventHandler from "./event-handler.js"; +//import Data from "./data.js" +//import EventHandler from "./event-handler.js"; -export function init(id, options) { - const { invoke, onlineStateChangedCallback, onNetworkStateChangedCallback, indicators } = options; +export function init(options) { + const { invoke, onNetworkStateChangedCallback } = options; const updateState = nt => { const { downlink, effectiveType, rtt } = nt; invoke.invokeMethodAsync(onNetworkStateChangedCallback, { @@ -13,46 +13,46 @@ export function init(id, options) { updateState(e.target); } - const onlineStateChanged = () => { - if (Array.isArray(indicators)) { - indicators.forEach(indicator => { - const el = document.getElementById(indicator); - if (el) { - el.classList.remove('offline'); - } - }); - } - invoke.invokeMethodAsync(onlineStateChangedCallback, true); - } - const offlineStateChanged = () => { - if (Array.isArray(indicators)) { - indicators.forEach(indicator => { - const el = document.getElementById(indicator); - if (el) { - el.classList.add('offline'); - } - }); - } - invoke.invokeMethodAsync(onlineStateChangedCallback, false); - } - EventHandler.on(window, 'online', onlineStateChanged); - EventHandler.on(window, 'offline', offlineStateChanged); + //const onlineStateChanged = () => { + // //if (Array.isArray(indicators)) { + // // indicators.forEach(indicator => { + // // const el = document.getElementById(indicator); + // // if (el) { + // // el.classList.remove('offline'); + // // } + // // }); + // //} + // invoke.invokeMethodAsync(onlineStateChangedCallback, true); + //} + //const offlineStateChanged = () => { + // //if (Array.isArray(indicators)) { + // // indicators.forEach(indicator => { + // // const el = document.getElementById(indicator); + // // if (el) { + // // el.classList.add('offline'); + // // } + // // }); + // //} + // invoke.invokeMethodAsync(onlineStateChangedCallback, false); + //} + //EventHandler.on(window, 'online', onlineStateChanged); + //EventHandler.on(window, 'offline', offlineStateChanged); - Data.set(id, { - onlineStateChanged, - offlineStateChanged - }); + //Data.set(id, { + // onlineStateChanged, + // offlineStateChanged + //}); updateState(navigator.connection); } -export async function dispose(id) { - const nt = Data.get(id); - Data.remove(id); +//export async function dispose(id) { +// const nt = Data.get(id); +// Data.remove(id); - if (nt) { - const { onlineStateChanged, offlineStateChanged } = nt; - EventHandler.off(window, 'online', onlineStateChanged); - EventHandler.off(window, 'offline', offlineStateChanged); - } -} +//// if (nt) { +//// const { onlineStateChanged, offlineStateChanged } = nt; +//// EventHandler.off(window, 'online', onlineStateChanged); +//// EventHandler.off(window, 'offline', offlineStateChanged); +//// } +//} From 7287e74c1dadd3b128720b094aea33d489e7f669 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sun, 13 Jul 2025 16:38:04 +0800 Subject: [PATCH 08/12] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Samples/NetworkMonitors.razor | 12 ++----- .../Samples/NetworkMonitors.razor.cs | 34 +++++++++++++++++-- src/BootstrapBlazor.Server/Locales/en-US.json | 16 ++++----- src/BootstrapBlazor.Server/Locales/zh-CN.json | 4 +-- 4 files changed, 43 insertions(+), 23 deletions(-) diff --git a/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor b/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor index 35f02fc3b22..470b3aa5cd9 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor @@ -8,15 +8,6 @@ - -
- -
- - -
  • @Localizer["IndicatorLi1"]
    • @@ -26,4 +17,7 @@
+
+ +
diff --git a/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor.cs index d29556f3713..c1d2c7c6fd6 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor.cs +++ b/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor.cs @@ -8,13 +8,43 @@ namespace BootstrapBlazor.Server.Components.Samples; /// /// NetworkMonitor Sample code /// -public partial class NetworkMonitors +public partial class NetworkMonitors : IDisposable { + [Inject, NotNull] + private INetworkMonitorService? NetworkMonitorService { get; set; } + private ConsoleLogger _logger = null!; + /// + /// + /// + protected override async Task OnInitializedAsync() + { + await base.OnInitializedAsync(); + + await NetworkMonitorService.RegisterStateChangedCallback(this, OnNetworkStateChanged); + } + private Task OnNetworkStateChanged(NetworkMonitorState state) { - _logger.Log($"Online: {state.IsOnline} NetworkType: {state.NetworkType} Downlink: {state.Downlink} RTT: {state.RTT}"); + _logger.Log($"Online: NetworkType: {state.NetworkType} Downlink: {state.Downlink} RTT: {state.RTT}"); return Task.CompletedTask; } + + private void Dispose(bool disposing) + { + if (disposing) + { + NetworkMonitorService.UnregisterStateChangedCallback(this); + } + } + + /// + /// + /// + public void Dispose() + { + Dispose(true); + GC.SuppressFinalize(this); + } } diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json index 54bc853d0c5..5eb8bce193d 100644 --- a/src/BootstrapBlazor.Server/Locales/en-US.json +++ b/src/BootstrapBlazor.Server/Locales/en-US.json @@ -7123,14 +7123,12 @@ }, "BootstrapBlazor.Server.Components.Samples.NetworkMonitors": { "NetworkMonitorTitle": "NetworkMonitor", - "NetworkMonitorDescription": "链路断开后自动重连示例", - "NormalTitle": "基本用法", - "NormalIntro": "通过设置 IsAutoReconnect 开启自动重连机制", - "IndicatorTitle": "网络状态指示灯", - "IndicatorIntro": "使用组件 NetworkMonitorIndicator 当网络状态变化时，显示不同颜色的指示灯，鼠标移动到上面时显示网络状态明细", - "IndicatorLi1": "绿色：网络非常好 (4G)", - "IndicatorLi2": "黄色：网络一般 (3G)", - "IndicatorLi3": "红色：网络差 (2G)", - "IndicatorLi4": "灰色：离线状态" + "NetworkMonitorDescription": "Use the browser native API navigator.connection to display the current network status in real time", + "NormalTitle": "Basic usage", + "NormalIntro": "Use the component NetworkMonitorIndicator to display indicator lights of different colors when the network status changes, and display the network status details when the mouse moves over it", + "IndicatorLi1": "Green: Very good network (4G)", + "IndicatorLi2": "Yellow: Average network (3G)", + "IndicatorLi3": "Red: Poor network (2G)", + "IndicatorLi4": "Gray: Offline" } } diff --git a/src/BootstrapBlazor.Server/Locales/zh-CN.json b/src/BootstrapBlazor.Server/Locales/zh-CN.json index 71dc686ecec..dfdd1d92a79 100644 --- a/src/BootstrapBlazor.Server/Locales/zh-CN.json +++ b/src/BootstrapBlazor.Server/Locales/zh-CN.json @@ -7125,9 +7125,7 @@ "NetworkMonitorTitle": "NetworkMonitor 网络状态", "NetworkMonitorDescription": "使用浏览器原生 api navigator.connection 实时显示当前网络状态", "NormalTitle": "基本用法", - "NormalIntro": "网络变化时，通过 OnNetworkStateChanged 回调获得当前网络状态信息", - "IndicatorTitle": "网络状态指示灯", - "IndicatorIntro": "使用组件 NetworkMonitorIndicator 当网络状态变化时，显示不同颜色的指示灯，鼠标移动到上面时显示网络状态明细", + "NormalIntro": "使用组件 NetworkMonitorIndicator 当网络状态变化时，显示不同颜色的指示灯，鼠标移动到上面时显示网络状态明细", "IndicatorLi1": "绿色：网络非常好 (4G)", "IndicatorLi2": "黄色：网络一般 (3G)", "IndicatorLi3": "红色：网络差 (2G)", From 4c7c660e3725117283cc0c4f218a0b328024b523 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sun, 13 Jul 2025 16:52:43 +0800 Subject: [PATCH 09/12] =?UTF-8?q?refactor:=20=E6=94=AF=E6=8C=81=E7=A6=BB?= =?UTF-8?q?=E7=BA=BF=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/wwwroot/modules/net.js | 60 +++++++--------------- 1 file changed, 19 insertions(+), 41 deletions(-) diff --git a/src/BootstrapBlazor/wwwroot/modules/net.js b/src/BootstrapBlazor/wwwroot/modules/net.js index a60bdb56d08..492ea614818 100644 --- a/src/BootstrapBlazor/wwwroot/modules/net.js +++ b/src/BootstrapBlazor/wwwroot/modules/net.js @@ -1,5 +1,6 @@ -//import Data from "./data.js" -//import EventHandler from "./event-handler.js"; +import Data from "./data.js" +import EventHandler from "./event-handler.js"; +import { registerBootstrapBlazorModule } from './utility.js' export function init(options) { const { invoke, onNetworkStateChangedCallback } = options; @@ -13,46 +14,23 @@ export function init(options) { updateState(e.target); } - //const onlineStateChanged = () => { - // //if (Array.isArray(indicators)) { - // // indicators.forEach(indicator => { - // // const el = document.getElementById(indicator); - // // if (el) { - // // el.classList.remove('offline'); - // // } - // // }); - // //} - // invoke.invokeMethodAsync(onlineStateChangedCallback, true); - //} - //const offlineStateChanged = () => { - // //if (Array.isArray(indicators)) { - // // indicators.forEach(indicator => { - // // const el = document.getElementById(indicator); - // // if (el) { - // // el.classList.add('offline'); - // // } - // // }); - // //} - // invoke.invokeMethodAsync(onlineStateChangedCallback, false); - //} - //EventHandler.on(window, 'online', onlineStateChanged); - //EventHandler.on(window, 'offline', offlineStateChanged); + const onlineStateChanged = () => { + const indicators = [...document.querySelectorAll('.bb-nt-indicator')]; + indicators.forEach(indicator => { + indicator.classList.remove('offline'); + }); + } + const offlineStateChanged = () => { + const indicators = [...document.querySelectorAll('.bb-nt-indicator')]; + indicators.forEach(indicator => { + indicator.classList.add('offline'); + }); + } - //Data.set(id, { - // onlineStateChanged, - // offlineStateChanged - //}); + registerBootstrapBlazorModule("NetworkMonitor", null, () => { + EventHandler.on(window, 'online', onlineStateChanged); + EventHandler.on(window, 'offline', offlineStateChanged); + }); updateState(navigator.connection); } - -//export async function dispose(id) { -// const nt = Data.get(id); -// Data.remove(id); - -//// if (nt) { -//// const { onlineStateChanged, offlineStateChanged } = nt; -//// EventHandler.off(window, 'online', onlineStateChanged); -//// EventHandler.off(window, 'offline', offlineStateChanged); -//// } -//} From 655ce8e0842c273268212eb9bec168abe78f19d9 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sun, 13 Jul 2025 17:00:47 +0800 Subject: [PATCH 10/12] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Samples/NetworkMonitors.razor | 8 ++--- .../Samples/NetworkMonitors.razor.css | 29 +++++++++++++++++++ src/BootstrapBlazor/wwwroot/modules/net.js | 3 +- 3 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor.css diff --git a/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor b/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor index 470b3aa5cd9..2ab1fb92aec 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor @@ -10,10 +10,10 @@ Name="Normal">
    -
  • @Localizer["IndicatorLi1"]
    • -
  • @Localizer["IndicatorLi2"]
    • -
  • @Localizer["IndicatorLi3"]
    • -
  • @Localizer["IndicatorLi4"]
    • +
  • @Localizer["IndicatorLi1"]
    • +
  • @Localizer["IndicatorLi2"]
    • +
  • @Localizer["IndicatorLi3"]
    • +
  • @Localizer["IndicatorLi4"]
diff --git a/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor.css b/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor.css new file mode 100644 index 00000000000..85842e4f0e1 --- /dev/null +++ b/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor.css @@ -0,0 +1,29 @@ +.ul-demo { + list-style: none; + padding-left: 0; +} + +.demo-indicator { + cursor: pointer; + width: 0.5rem; + height: 0.5rem; + border-radius: 50%; + display: inline-block; + margin-inline-end: .5rem; +} + +.demo-indicator-4g { + background-color: var(--bs-primary); +} + +.demo-indicator-3g { + background-color: var(--bs-warning); +} + +.demo-indicator-2g { + background-color: var(--bs-danger); +} + +.demo-indicator-offline { + background-color: var(--bs-secondary); +} diff --git a/src/BootstrapBlazor/wwwroot/modules/net.js b/src/BootstrapBlazor/wwwroot/modules/net.js index 492ea614818..21b53f71c2a 100644 --- a/src/BootstrapBlazor/wwwroot/modules/net.js +++ b/src/BootstrapBlazor/wwwroot/modules/net.js @@ -1,5 +1,4 @@ -import Data from "./data.js" -import EventHandler from "./event-handler.js"; +import EventHandler from "./event-handler.js"; import { registerBootstrapBlazorModule } from './utility.js' export function init(options) { From ab14b1919b935c442a077c7fb0f9f12d98eae9aa Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sun, 13 Jul 2025 17:37:18 +0800 Subject: [PATCH 11/12] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E7=BB=86?= =?UTF-8?q?=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NetworkMonitor/NetworkMonitorIndicator.razor.cs | 5 ++--- src/BootstrapBlazor/Services/DefaultNetworkMonitorService.cs | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/BootstrapBlazor/Components/NetworkMonitor/NetworkMonitorIndicator.razor.cs b/src/BootstrapBlazor/Components/NetworkMonitor/NetworkMonitorIndicator.razor.cs index 4a6ab7776c5..c94c56ba802 100644 --- a/src/BootstrapBlazor/Components/NetworkMonitor/NetworkMonitorIndicator.razor.cs +++ b/src/BootstrapBlazor/Components/NetworkMonitor/NetworkMonitorIndicator.razor.cs @@ -77,11 +77,10 @@ protected override void OnParametersSet() _rttString = Localizer["RTT"]; } - private Task OnNetworkStateChanged(NetworkMonitorState state) + private async Task OnNetworkStateChanged(NetworkMonitorState state) { _state = state; - StateHasChanged(); - return Task.CompletedTask; + await InvokeAsync(StateHasChanged); } private void Dispose(bool disposing) diff --git a/src/BootstrapBlazor/Services/DefaultNetworkMonitorService.cs b/src/BootstrapBlazor/Services/DefaultNetworkMonitorService.cs index 9d313907a63..d86d7f184ed 100644 --- a/src/BootstrapBlazor/Services/DefaultNetworkMonitorService.cs +++ b/src/BootstrapBlazor/Services/DefaultNetworkMonitorService.cs @@ -107,6 +107,6 @@ public async ValueTask DisposeAsync() await _networkModule.DisposeAsync(); _networkModule = null; } - _interop?.Dispose(); + _interop.Dispose(); } } From a03b0d7ae632f26e699d8ae4b130f656b44412bd Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sun, 13 Jul 2025 17:37:24 +0800 Subject: [PATCH 12/12] =?UTF-8?q?test:=20=E6=9B=B4=E6=96=B0=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/NetworkMonitorIndicatorTest.cs | 51 ++++++++++--------- .../DefaultNetworkMonitorServiceTest.cs | 25 +++++++++ 2 files changed, 53 insertions(+), 23 deletions(-) create mode 100644 test/UnitTest/Services/DefaultNetworkMonitorServiceTest.cs diff --git a/test/UnitTest/Components/NetworkMonitorIndicatorTest.cs b/test/UnitTest/Components/NetworkMonitorIndicatorTest.cs index ece9ca562eb..69dc016f68e 100644 --- a/test/UnitTest/Components/NetworkMonitorIndicatorTest.cs +++ b/test/UnitTest/Components/NetworkMonitorIndicatorTest.cs @@ -8,42 +8,47 @@ namespace UnitTest.Components; public class NetworkMonitorIndicatorTest : BootstrapBlazorTestBase { [Fact] - public async Task NetworkMonitorIndicator_Ok() + public void NetworkMonitorIndicator_Ok() { var cut = Context.RenderComponent(pb => { pb.Add(a => a.PopoverPlacement, Placement.Top); }); - var com = cut.FindComponent(); - await cut.InvokeAsync(() => com.Instance.TriggerNetworkStateChanged(new NetworkMonitorState - { - IsOnline = false, - NetworkType = "4g", - Downlink = 10.0, - RTT = 50 - })); - Assert.DoesNotContain("offline", cut.Markup); - - await cut.InvokeAsync(() => com.Instance.TriggerOnlineStateChanged(true)); Assert.DoesNotContain("offline", cut.Markup); } [Fact] - public async Task NetworkMonitor_Ok() + public async Task RegisterStateChangedCallback_Ok() { - NetworkMonitorState? state = null; - var cut = Context.RenderComponent(pb => + var service = Context.Services.GetRequiredService(); + var cut = Context.RenderComponent(pb => { - pb.Add(a => a.OnNetworkStateChanged, v => - { - state = v; - return Task.CompletedTask; - }); + pb.Add(a => a.PopoverPlacement, Placement.Top); }); - await cut.InvokeAsync(() => cut.Instance.TriggerOnlineStateChanged(false)); - Assert.NotNull(state); - Assert.False(state.IsOnline); + // 测试 TriggerNetworkStateChanged 方法 + var innerServicePropertyInfo = cut.Instance.GetType().GetProperty("NetworkMonitorService", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic); + Assert.NotNull(innerServicePropertyInfo); + + var innerService = innerServicePropertyInfo.GetValue(cut.Instance); + Assert.NotNull(innerService); + + var methodInfo = innerService.GetType().GetMethod("TriggerNetworkStateChanged"); + Assert.NotNull(methodInfo); + + var result = methodInfo.Invoke(service, [new NetworkMonitorState() { Downlink = 10, RTT = 100, NetworkType = "4g" }]); + if (result is Task task) + { + await task; + } + + // 测试重复注册回调 + var callback = new Func(state => + { + return Task.CompletedTask; + }); + await service.RegisterStateChangedCallback(cut.Instance, callback); + await service.RegisterStateChangedCallback(cut.Instance, callback); } } diff --git a/test/UnitTest/Services/DefaultNetworkMonitorServiceTest.cs b/test/UnitTest/Services/DefaultNetworkMonitorServiceTest.cs new file mode 100644 index 00000000000..065bbbb676f --- /dev/null +++ b/test/UnitTest/Services/DefaultNetworkMonitorServiceTest.cs @@ -0,0 +1,25 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the Apache 2.0 License +// See the LICENSE file in the project root for more information. +// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone + +namespace UnitTest.Services; + +public class DefaultNetworkMonitorServiceTest : BootstrapBlazorTestBase +{ + [Fact] + public async Task GetNetworkMonitorState_Ok() + { + Context.JSInterop.Setup("getNetworkInfo", matcher => true).SetResult(new NetworkMonitorState + { + NetworkType = "4g", + Downlink = 10, + RTT = 100 + }); + var service = Context.Services.GetRequiredService(); + var state = await service.GetNetworkMonitorState(CancellationToken.None); + Assert.Equal("4g", state.NetworkType); + Assert.Equal(10, state.Downlink); + Assert.Equal(100, state.RTT); + } +}