Rename INetworkManager to INetworkMonitor (#48)

Co-authored-by: Artem Levin <[email protected]>

README.md

@@ -17,8 +17,8 @@ Let's build a better world together!
 ## How to use
 1. Provide your own implementation or use default one for interfaces: INetworkManager, INativeHttpClient, IHttpClientContext:
    ```c#
-   _networkManager = new WindowsNetworkManager();
-   _nativeHttpClient = new WindowsHttpClient(_networkManager);
+   _networkMonitor = new WindowsNetworkMonitor();
+   _nativeHttpClient = new WindowsHttpClient(_networkMonitor);
    _httpClientContext = new HttpClientContext(_nativeHttpClient);
 
 2. Use ApiEndpoint as base class for your API endpoints:

samples/Arbus.Network.Demo/Program.cs

@@ -4,23 +4,16 @@ namespace Arbus.Network.Demo;
 
 public static class Program
 {
-    private static readonly INetworkManager _networkManager;
-    private static readonly INativeHttpClient _nativeHttpClient;
-    private static readonly IHttpClientContext _httpClientContext;
-
-    static Program()
-    {
-        _networkManager = new WindowsNetworkManager();
-        _nativeHttpClient = new WindowsHttpClient(_networkManager);
-        _httpClientContext = new HttpClientContext(_nativeHttpClient);
-    }
-
     public static async Task Main()
     {
+        var networkMonitor = new WindowsNetworkMonitor();
+        var nativeHttpClient = new WindowsHttpClient(networkMonitor);
+        var httpClientContext = new HttpClientContext(nativeHttpClient);
+
         try
         {
             GetAllOrdersApiEndpoint endpoint = new();
-            var orders = await _httpClientContext.RunEndpoint(endpoint).ConfigureAwait(false);
+            await httpClientContext.RunEndpoint(endpoint).ConfigureAwait(false);
         }
         catch (NetworkException e)
         {

src/Arbus.Network.UnitTests/Tests/NativeHttpClientTests.cs

@@ -25,21 +25,21 @@ public void EnsureNoTimeout_CancellationNotRequested_NoException()
     [Test]
     public void EnsureNetworkAvailable_NetworkNotAvailable_ThrowsNoNetworkConnectionAvailableException()
     {
-        var mockNetworkManager = new Mock<INetworkManager>();
-        mockNetworkManager.SetupGet(x => x.IsNetworkAvailable).Returns(false);
+        var mockNetworkMonitor = new Mock<INetworkMonitor>();
+        mockNetworkMonitor.SetupGet(x => x.IsNetworkAvailable).Returns(false);
 
-        NativeHttpClient nativeHttpClient = new(mockNetworkManager.Object);
+        NativeHttpClient nativeHttpClient = new(mockNetworkMonitor.Object);
 
         Assert.Throws<NoNetworkConnectionException>(() => nativeHttpClient.EnsureNetworkAvailable());
     }
 
     [Test]
     public void EnsureNetworkAvailable_NetworkAvailable_NoException()
     {
-        var mockNetworkManager = new Mock<INetworkManager>();
-        mockNetworkManager.SetupGet(x => x.IsNetworkAvailable).Returns(true);
+        var mockNetworkMonitor = new Mock<INetworkMonitor>();
+        mockNetworkMonitor.SetupGet(x => x.IsNetworkAvailable).Returns(true);
 
-        NativeHttpClient nativeHttpClient = new(mockNetworkManager.Object);
+        NativeHttpClient nativeHttpClient = new(mockNetworkMonitor.Object);
 
         Assert.DoesNotThrow(() => nativeHttpClient.EnsureNetworkAvailable());
     }

src/Arbus.Network/INetworkManager.cs → src/Arbus.Network/INetworkMonitor.cs

@@ -1,6 +1,6 @@
 namespace Arbus.Network;
 
-public interface INetworkManager
+public interface INetworkMonitor
 {
     bool IsNetworkAvailable { get; }
     event EventHandler<bool>? NetworkAvailabilityChanged;

src/Arbus.Network/NativeHttpClient.cs

@@ -10,16 +10,16 @@ public class NativeHttpClient : INativeHttpClient
     {
         Timeout = Timeout.InfiniteTimeSpan
     };
-    private readonly INetworkManager _networkManager;
+    private readonly INetworkMonitor _networkMonitor;
 
-    public NativeHttpClient(INetworkManager networkManager, ProductInfoHeaderValue userAgent) : this(networkManager)
+    public NativeHttpClient(INetworkMonitor networkMonitor, ProductInfoHeaderValue userAgent) : this(networkMonitor)
     {
         _httpClient.DefaultRequestHeaders.UserAgent.Add(userAgent);
     }
 
-    public NativeHttpClient(INetworkManager networkManager)
+    public NativeHttpClient(INetworkMonitor networkMonitor)
     {
-        _networkManager = networkManager;
+        _networkMonitor = networkMonitor;
     }
 
     public virtual async Task<HttpResponseMessage> SendRequest(HttpRequestMessage request, CancellationToken cancellationToken, HttpCompletionOption httpCompletionOption = HttpCompletionOption.ResponseHeadersRead)
@@ -60,7 +60,7 @@ public virtual async Task<HttpResponseMessage> SendRequest(HttpRequestMessage re
 
     public void EnsureNetworkAvailable()
     {
-        if (_networkManager.IsNetworkAvailable is false)
+        if (_networkMonitor.IsNetworkAvailable is false)
             throw new NoNetworkConnectionException();
     }
 

src/Arbus.Network/WindowsHttpClient.cs

@@ -16,12 +16,12 @@ static void SetTlsForWindows7()
         }
     }
 
-    public WindowsHttpClient(INetworkManager networkManager) : base(networkManager)
+    public WindowsHttpClient(INetworkMonitor networkMonitor) : base(networkMonitor)
     {
 
     }
 
-    public WindowsHttpClient(INetworkManager networkManager, ProductInfoHeaderValue userAgent) : base(networkManager, userAgent)
+    public WindowsHttpClient(INetworkMonitor networkMonitor, ProductInfoHeaderValue userAgent) : base(networkMonitor, userAgent)
     {
     }
 }

src/Arbus.Network/WindowsNetworkMonitor.cs

@@ -0,0 +1,17 @@
+using System.Net.NetworkInformation;
+
+namespace Arbus.Network;
+
+public class WindowsNetworkMonitor : INetworkMonitor
+{
+    public event EventHandler<bool>? NetworkAvailabilityChanged;
+
+    public bool IsNetworkAvailable => NetworkInterface.GetAllNetworkInterfaces().Any(IsNetworkInterfaceAvailable);
+
+    private static bool IsNetworkInterfaceAvailable(NetworkInterface networkInterface)
+    {
+        return networkInterface.OperationalStatus == OperationalStatus.Up &&
+               networkInterface.NetworkInterfaceType != NetworkInterfaceType.Tunnel &&
+               networkInterface.NetworkInterfaceType != NetworkInterfaceType.Loopback;
+    }
+}