am-wd/FritzCallMonitor
1
0
Fork 0
Code Actions Activity

Added UnitTests

Browse Source
This commit is contained in:
Andreas Müller
2025-08-25 17:23:34 +02:00
parent 56c0fdb742
commit 791d88f069
7 changed files with 636 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/FritzCallMonitor/EventArgs/CallMonitorEventArgs.cs
View File

@@ -90,6 +90,9 @@ namespace AMWD.Net.Api.Fritz.CallMonitor
args.CalleeNumber = columns[4];
args.CallerNumber = columns[5];
break;
default:
return null;
}
return args;

4
src/FritzCallMonitor/FritzCallMonitor.csproj
View File

@@ -21,6 +21,10 @@
<None Include="README.md" Pack="true" PackagePath="/" />
</ItemGroup>
<ItemGroup>
<InternalsVisibleTo Include="FritzCallMonitor.Tests" PublicKey="$(PublicKey)" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.4" />
</ItemGroup>

1
src/FritzCallMonitor/Utils/Extensions.cs
View File

@@ -6,6 +6,7 @@ namespace AMWD.Net.Api.Fritz.CallMonitor.Utils
{
internal static class Extensions
{
[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
public static async void Forget(this Task task, ILogger? logger = null)
{
try

50
src/FritzCallMonitor/Utils/ReconnectTcpClient.cs
View File

@@ -24,10 +24,10 @@ namespace AMWD.Net.Api.Fritz.CallMonitor.Utils
public ReconnectTcpClient(string host, int port)
{
if (string.IsNullOrWhiteSpace(host))
throw new ArgumentNullException(nameof(host), "The host is required.");
throw new ArgumentNullException(nameof(host));
if (port <= ushort.MinValue || ushort.MaxValue < port)
throw new ArgumentOutOfRangeException(nameof(port), $"The port must be between {ushort.MinValue + 1} and {ushort.MaxValue}.");
if (port < 1 || 65535 < port)
throw new ArgumentOutOfRangeException(nameof(port));
_host = host;
_port = port;
@@ -98,7 +98,7 @@ namespace AMWD.Net.Api.Fritz.CallMonitor.Utils
_tcpClient?.Dispose();
_tcpClient = null;
});
}, cancellationToken);
try
{
@@ -127,13 +127,13 @@ namespace AMWD.Net.Api.Fritz.CallMonitor.Utils
_tcpClient.Client.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.KeepAlive, true);
#if NET6_0_OR_GREATER
var connectTask = _tcpClient.ConnectAsync(_host, _port, cancellationToken);
await _tcpClient.ConnectAsync(_host, _port, cancellationToken).ConfigureAwait(false);
#else
var connectTask = _tcpClient.ConnectAsync(_host, _port);
#endif
var completedTask = await Task.WhenAny(connectTask, Task.Delay(1000, cancellationToken)).ConfigureAwait(false);
var completedTask = await Task.WhenAny(connectTask, Task.Delay(Timeout.Infinite, cancellationToken)).ConfigureAwait(false);
if (completedTask != connectTask)
throw new TimeoutException("Connection attempt timed out.");
throw new OperationCanceledException("Connection attempt was canceled.", cancellationToken);
#endif
if (OnConnected != null)
await OnConnected(this).ConfigureAwait(false);
@@ -176,34 +176,26 @@ namespace AMWD.Net.Api.Fritz.CallMonitor.Utils
byte[] buffer = new byte[1];
while (!cancellationToken.IsCancellationRequested && !_isDisposed)
{
if (!IsConnected)
if (_tcpClient == null || !IsConnected)
{
await ConnectWithRetryAsync(cancellationToken).ConfigureAwait(false);
continue;
}
var stream = _tcpClient?.GetStream();
if (stream != null && stream.CanRead)
var stream = _tcpClient.GetStream();
bool disconnected = false;
try
{
bool disconnected = false;
try
{
// Attempt to read zero bytes to check if the connection is still alive.
// Should return immediately if the connection is still active.
// So the timeout of 1sec is more than enough.
var readTask = stream.ReadAsync(buffer, 0, 0, cancellationToken);
var completedTask = await Task.WhenAny(readTask, Task.Delay(1000, cancellationToken)).ConfigureAwait(false);
if (completedTask != readTask)
continue; // Timeout
}
catch
{
disconnected = true;
}
if (disconnected || !IsConnected)
await ConnectWithRetryAsync(cancellationToken).ConfigureAwait(false);
// Attempt to read zero bytes to check if the connection is still alive.
await stream.ReadAsync(buffer, 0, 0, cancellationToken);
}
catch
{
disconnected = true;
}
if (disconnected)
await ConnectWithRetryAsync(cancellationToken).ConfigureAwait(false);
// Check for an active connection every 5 seconds.
await Task.Delay(5000, cancellationToken).ConfigureAwait(false);

4
src/FritzCallMonitor/Wrappers/NetworkStreamWrapper.cs
View File

@@ -21,10 +21,6 @@ namespace AMWD.Net.Api.Fritz.CallMonitor.Wrappers
public virtual void Dispose()
=> _networkStream.Dispose();
/// <inheritdoc cref="NetworkStream.CanRead"/>
public virtual bool CanRead =>
_networkStream.CanRead;
/// <inheritdoc cref="Stream.ReadAsync(byte[], int, int, CancellationToken)"/>
public virtual Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
=> _networkStream.ReadAsync(buffer, offset, count, cancellationToken);