Added FromNumber and ToNumber

CHANGELOG.md

@@ -7,7 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-_no changes yet_
+### Added
+
+- `FromNumber` and `ToNumber` properties to `CallMonitorEventArgs` to use when available
+
+### Changed
+
+- Removed support for .NET 6.0 (EOL: 2024-11-12)
 
 
 ## [v0.1.3] - 2026-01-12
@@ -42,7 +48,7 @@ _Inital release_
 ### Added
 
 - `CallMonitorClient` as client to connect to the call monitor endpoint
-- `CallMonitorEventArgs` are the custom arugments, when `OnEvent` is raised.
+- `CallMonitorEventArgs` are the custom arugments, when `OnEvent` is raised
 - Notifying about
   - `Ring`: An incoming call
   - `Call`: An outgoing call

Directory.Build.props

@@ -3,6 +3,7 @@
     <LangVersion>14.0</LangVersion>
 
     <PublicKey>0024000004800000940000000602000000240000525341310004000001000100d9b40f5db1670c563c2e8be5dfd24ed66ad811b3ebba8a0ca0df9cbad3a115ca361b3de4b4d4ed990bf9874d2651e62565f56adb33af33819687021e263b02d6bf5b3cdacde4f09650cafe97467de4b9e4e9cc1d6c2d500a08759697bbe80940916c05533d172ca7e55e10434f9cc46fd189f26cefc100781a20e57f1bad65d5</PublicKey>
+    <MoqPublicKey>0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7</MoqPublicKey>
 
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(SolutionDir)/FritzCallMonitor.snk</AssemblyOriginatorKeyFile>

src/Directory.Build.props

@@ -41,7 +41,7 @@
 
   <ItemGroup>
     <InternalsVisibleTo Include="FritzCallMonitor.Tests" PublicKey="$(PublicKey)"/>
-    <InternalsVisibleTo Include="DynamicProxyGenAssembly2" PublicKey="0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7"/>
+    <InternalsVisibleTo Include="DynamicProxyGenAssembly2" PublicKey="$(MoqPublicKey)"/>
   </ItemGroup>
 
   <ItemGroup>

src/FritzCallMonitor/EventArgs/CallMonitorEventArgs.cs

@@ -29,15 +29,47 @@ namespace AMWD.Net.Api.Fritz.CallMonitor
 		public int? LinePort { get; private set; }
 
 		/// <summary>
-		/// Gets the external number displayed in the FRITZ!Box.
+		/// Gets the external phone number displayed in the FRITZ!Box.
 		/// </summary>
 		public string? ExternalNumber { get; private set; }
 
 		/// <summary>
-		/// Gets the internal number registered in the FRITZ!Box.
+		/// Gets the internal phone number (part) registered in the FRITZ!Box.
 		/// </summary>
 		public string? InternalNumber { get; private set; }
 
+		/// <summary>
+		/// Gets the phone number from which the call was initiated.
+		/// </summary>
+		public string? FromNumber
+		{
+			get
+			{
+				return Event switch
+				{
+					EventType.Ring => ExternalNumber,
+					EventType.Call => InternalNumber,
+					_ => null
+				};
+			}
+		}
+
+		/// <summary>
+		/// Gets the phone number to which the call was directed.
+		/// </summary>
+		public string? ToNumber
+		{
+			get
+			{
+				return Event switch
+				{
+					EventType.Ring => InternalNumber,
+					EventType.Call => ExternalNumber,
+					_ => null
+				};
+			}
+		}
+
 		/// <summary>
 		/// Gets the duration of the call (only on <see cref="EventType.Disconnect"/> event).
 		/// </summary>

src/FritzCallMonitor/FritzCallMonitor.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
     <NrtTagMatch>v[0-9]*</NrtTagMatch>
 
     <PackageId>AMWD.Net.Api.Fritz.CallMonitor</PackageId>
@@ -22,11 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <InternalsVisibleTo Include="FritzCallMonitor.Tests" PublicKey="$(PublicKey)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.4" />
   </ItemGroup>
 
 </Project>

src/FritzCallMonitor/Utils/ReconnectTcpClient.cs

@@ -158,7 +158,7 @@ namespace AMWD.Net.Api.Fritz.CallMonitor.Utils
 						if (delay > 60 * 1000)
 							delay = 60 * 1000;
 
-						Logger?.LogWarning(ex, $"Failed to connect to {_host}:{_port}. Retrying in {delay}ms...");
+						Logger?.LogWarning(ex, "Failed to connect to {Hostname}:{RemotePort}. Retrying in {DelayMS}ms...", _host, _port, delay);
 						try
 						{
 							await Task.Delay(delay, cancellationToken).ConfigureAwait(false);

test/Directory.Build.props

@@ -11,14 +11,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="6.0.4">
+    <PackageReference Include="coverlet.msbuild" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageReference Include="Moq" Version="4.20.72" />
-    <PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
+    <PackageReference Include="MSTest" Version="4.1.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
   </ItemGroup>
 
   <ItemGroup>

test/FritzCallMonitor.Tests/CallMonitorEventArgsTest.cs

@@ -32,6 +32,8 @@ namespace FritzCallMonitor.Tests
 			Assert.IsNull(result.LinePort);
 			Assert.AreEqual("012345678901", result.ExternalNumber);
 			Assert.AreEqual("9876543", result.InternalNumber);
+			Assert.AreEqual(result.ExternalNumber, result.FromNumber);
+			Assert.AreEqual(result.InternalNumber, result.ToNumber);
 			Assert.IsNull(result.Duration);
 		}
 
@@ -48,6 +50,8 @@ namespace FritzCallMonitor.Tests
 			Assert.AreEqual(3, result.LinePort);
 			Assert.AreEqual("012345678901", result.ExternalNumber);
 			Assert.IsNull(result.InternalNumber);
+			Assert.IsNull(result.FromNumber);
+			Assert.IsNull(result.ToNumber);
 			Assert.IsNull(result.Duration);
 		}
 
@@ -64,6 +68,8 @@ namespace FritzCallMonitor.Tests
 			Assert.IsNull(result.LinePort);
 			Assert.IsNull(result.ExternalNumber);
 			Assert.IsNull(result.InternalNumber);
+			Assert.IsNull(result.FromNumber);
+			Assert.IsNull(result.ToNumber);
 			Assert.AreEqual(TimeSpan.FromSeconds(42), result.Duration);
 		}
 
@@ -80,6 +86,8 @@ namespace FritzCallMonitor.Tests
 			Assert.AreEqual(7, result.LinePort);
 			Assert.AreEqual("012345678901", result.ExternalNumber);
 			Assert.AreEqual("9876543", result.InternalNumber);
+			Assert.AreEqual(result.InternalNumber, result.FromNumber);
+			Assert.AreEqual(result.ExternalNumber, result.ToNumber);
 			Assert.IsNull(result.Duration);
 		}
 
@@ -114,6 +122,9 @@ namespace FritzCallMonitor.Tests
 			var result = CallMonitorEventArgs.Parse(line);
 			Assert.IsNotNull(result);
 			Assert.IsNull(result.LinePort);
+			Assert.AreEqual("012345678901", result.ExternalNumber);
+			Assert.IsNull(result.FromNumber);
+			Assert.IsNull(result.ToNumber);
 		}
 
 		[TestMethod]
@@ -123,6 +134,10 @@ namespace FritzCallMonitor.Tests
 			var result = CallMonitorEventArgs.Parse(line);
 			Assert.IsNotNull(result);
 			Assert.IsNull(result.LinePort);
+			Assert.AreEqual("012345678901", result.ExternalNumber);
+			Assert.AreEqual("9876543", result.InternalNumber);
+			Assert.AreEqual(result.InternalNumber, result.FromNumber);
+			Assert.AreEqual(result.ExternalNumber, result.ToNumber);
 		}
 
 		[TestMethod]
@@ -150,6 +165,8 @@ namespace FritzCallMonitor.Tests
 			Assert.IsNotNull(result);
 			Assert.AreEqual("012345678901", result.ExternalNumber);
 			Assert.AreEqual("9876543", result.InternalNumber);
+			Assert.AreEqual(result.ExternalNumber, result.FromNumber);
+			Assert.AreEqual(result.InternalNumber, result.ToNumber);
 		}
 	}
 }