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
diff --git a/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor b/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor new file mode 100644 index 00000000000..2ab1fb92aec --- /dev/null +++ b/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor @@ -0,0 +1,23 @@ +@page "/network-monitor" +@inject IStringLocalizer Localizer + +

@Localizer["NetworkMonitorTitle"]

+ +

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

+ + +
+
    +
  • @Localizer["IndicatorLi1"]
    • +
  • @Localizer["IndicatorLi2"]
    • +
  • @Localizer["IndicatorLi3"]
    • +
  • @Localizer["IndicatorLi4"]
    • +
+
+ +
+ +
+ 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..c1d2c7c6fd6 --- /dev/null +++ b/src/BootstrapBlazor.Server/Components/Samples/NetworkMonitors.razor.cs @@ -0,0 +1,50 @@ +// 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 : 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: 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/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.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..5eb8bce193d 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,15 @@ "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": "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 bb25e0b8d19..dfdd1d92a79 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,15 @@ "AutoReconnectsDescription": "链路断开后自动重连示例", "NormalTitle": "基本用法", "NormalIntro": "通过设置 IsAutoReconnect 开启自动重连机制" + }, + "BootstrapBlazor.Server.Components.Samples.NetworkMonitors": { + "NetworkMonitorTitle": "NetworkMonitor 网络状态", + "NetworkMonitorDescription": "使用浏览器原生 api navigator.connection 实时显示当前网络状态", + "NormalTitle": "基本用法", + "NormalIntro": "使用组件 NetworkMonitorIndicator 当网络状态变化时，显示不同颜色的指示灯，鼠标移动到上面时显示网络状态明细", + "IndicatorLi1": "绿色：网络非常好 (4G)", + "IndicatorLi2": "黄色：网络一般 (3G)", + "IndicatorLi3": "红色：网络差 (2G)", + "IndicatorLi4": "灰色：离线状态" } } 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", 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..c94c56ba802 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,15 +71,33 @@ protected override void OnParametersSet() Trigger ??= "hover focus"; Title ??= Localizer["Title"]; + _networkTypeString = Localizer["NetworkType"]; _downlinkString = Localizer["Downlink"]; _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) + { + 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 new file mode 100644 index 00000000000..d86d7f184ed --- /dev/null +++ b/src/BootstrapBlazor/Services/DefaultNetworkMonitorService.cs @@ -0,0 +1,112 @@ +// 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 + +using System.Collections.Concurrent; + +namespace BootstrapBlazor.Components; + +/// +/// 网络状态服务 +/// +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); + + 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 new file mode 100644 index 00000000000..ad214bb5cc9 --- /dev/null +++ b/src/BootstrapBlazor/Services/INetworkMonitorService.cs @@ -0,0 +1,37 @@ +// 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; + +/// +/// 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..21b53f71c2a 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 EventHandler from "./event-handler.js"; +import { registerBootstrapBlazorModule } from './utility.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, { @@ -14,45 +14,22 @@ export function init(id, options) { } 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 indicators = [...document.querySelectorAll('.bb-nt-indicator')]; + indicators.forEach(indicator => { + indicator.classList.remove('offline'); + }); } const offlineStateChanged = () => { - if (Array.isArray(indicators)) { - indicators.forEach(indicator => { - const el = document.getElementById(indicator); - if (el) { - el.classList.add('offline'); - } - }); - } - invoke.invokeMethodAsync(onlineStateChangedCallback, false); + const indicators = [...document.querySelectorAll('.bb-nt-indicator')]; + indicators.forEach(indicator => { + indicator.classList.add('offline'); + }); } - EventHandler.on(window, 'online', onlineStateChanged); - EventHandler.on(window, 'offline', offlineStateChanged); - 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); - } -} 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, 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); + } +}