diff --git a/example.env b/example.env index 284a1f4..06924f8 100644 --- a/example.env +++ b/example.env @@ -31,6 +31,9 @@ ConnectivityCheckIntervalMinutes=15 # The time (hh:mm:ss) without contact from an aircraft before its connection times out (default: 3 times ConnectivityCheckIntervalMinutes) # Use a value of more than 2 times ConnectivityCheckIntervalMinutes. If not, one failed check will cause connections to time out. AircraftConnectionTimeout=00:45:00 +# The time (hh:mm:ss) that an aircraft is not connected to the ACARS network or VATSIM, and sends no ADS-C messages, before its ADS-C contracts are cancelled (default: 02:00:00) +# Use a value of more than 2 times ConnectivityCheckIntervalMinutes. If not, one failed check will cause contracts to be cancelled. +AdscContractTimeout=02:00:00 # Handoff Configuration # How many minutes before the expected transfer time to send the NEXT DATA AUTHORITY message (default: 20) diff --git a/source/CPDLCServer.Tests/Handlers/AdscMessageReceivedNotificationHandlerTests.cs b/source/CPDLCServer.Tests/Handlers/AdscMessageReceivedNotificationHandlerTests.cs index ae7e833..160074b 100644 --- a/source/CPDLCServer.Tests/Handlers/AdscMessageReceivedNotificationHandlerTests.cs +++ b/source/CPDLCServer.Tests/Handlers/AdscMessageReceivedNotificationHandlerTests.cs @@ -252,7 +252,7 @@ public async Task Handle_Rejection_LogsActivity() static async Task AddContract(TestAdscContractRepository contractRepository, string stationId) { - var contract = new AdscContract("UAL123", stationId); + var contract = new AdscContract("UAL123", stationId, DateTimeOffset.UtcNow); await contractRepository.Add(new AdscContractKey("UAL123", stationId), contract, CancellationToken.None); return contract; } diff --git a/source/CPDLCServer.Tests/Handlers/CancelAdscContractCommandHandlerTests.cs b/source/CPDLCServer.Tests/Handlers/CancelAdscContractCommandHandlerTests.cs index 0be85e6..06415b2 100644 --- a/source/CPDLCServer.Tests/Handlers/CancelAdscContractCommandHandlerTests.cs +++ b/source/CPDLCServer.Tests/Handlers/CancelAdscContractCommandHandlerTests.cs @@ -17,7 +17,7 @@ public async Task Handle_WhenContractExists_SendsCancelAndRemovesContract() // Arrange var clientManager = new TestClientManager(); var contractRepository = new TestAdscContractRepository(); - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow); await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None); var mediator = Substitute.For(); @@ -62,8 +62,8 @@ public async Task Handle_OnlyRemovesContractForStation() { // Arrange var contractRepository = new TestAdscContractRepository(); - var ybbbContract = new AdscContract("UAL123", "YBBB"); - var ymmmContract = new AdscContract("UAL123", "YMMM"); + var ybbbContract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow); + var ymmmContract = new AdscContract("UAL123", "YMMM", DateTimeOffset.UtcNow); await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), ybbbContract, CancellationToken.None); await contractRepository.Add(new AdscContractKey("UAL123", "YMMM"), ymmmContract, CancellationToken.None); diff --git a/source/CPDLCServer.Tests/Handlers/CancelAdscContractOnConnectionEndedHandlerTests.cs b/source/CPDLCServer.Tests/Handlers/CancelAdscContractOnConnectionEndedHandlerTests.cs index ba35c58..fb5ea52 100644 --- a/source/CPDLCServer.Tests/Handlers/CancelAdscContractOnConnectionEndedHandlerTests.cs +++ b/source/CPDLCServer.Tests/Handlers/CancelAdscContractOnConnectionEndedHandlerTests.cs @@ -16,7 +16,7 @@ public async Task Handle_ConnectionTerminated_CancelsContract() { // Arrange var contractRepository = new TestAdscContractRepository(); - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow); await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None); var mediator = Substitute.For(); @@ -39,7 +39,7 @@ public async Task Handle_ConnectionLost_CancelsContractForStationOfAcarsClient() { // Arrange var contractRepository = new TestAdscContractRepository(); - var contract = new AdscContract("UAL123", "YMMM"); + var contract = new AdscContract("UAL123", "YMMM", DateTimeOffset.UtcNow); await contractRepository.Add(new AdscContractKey("UAL123", "YMMM"), contract, CancellationToken.None); var mediator = Substitute.For(); @@ -79,7 +79,7 @@ public async Task Handle_WhenContractIsWithOtherStation_DoesNotCancel() { // Arrange var contractRepository = new TestAdscContractRepository(); - var contract = new AdscContract("UAL123", "YMMM"); + var contract = new AdscContract("UAL123", "YMMM", DateTimeOffset.UtcNow); await contractRepository.Add(new AdscContractKey("UAL123", "YMMM"), contract, CancellationToken.None); var mediator = Substitute.For(); @@ -100,7 +100,7 @@ public async Task Handle_WhenCancelFails_DoesNotThrow() { // Arrange var contractRepository = new TestAdscContractRepository(); - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow); await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None); var mediator = Substitute.For(); diff --git a/source/CPDLCServer.Tests/Handlers/EndExpiredAdscContractsRequestHandlerTests.cs b/source/CPDLCServer.Tests/Handlers/EndExpiredAdscContractsRequestHandlerTests.cs index 0c619cb..e5010e6 100644 --- a/source/CPDLCServer.Tests/Handlers/EndExpiredAdscContractsRequestHandlerTests.cs +++ b/source/CPDLCServer.Tests/Handlers/EndExpiredAdscContractsRequestHandlerTests.cs @@ -19,9 +19,8 @@ public async Task Handle_WhenSelectedContractHasEnded_RequestsDefaultContract() // Arrange var clock = new TestClock(); var contractRepository = new TestAdscContractRepository(); - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", clock.UtcNow()); contract.RequestSelectedContract(TimeSpan.FromMinutes(2), clock.UtcNow()); - contract.LogActivity(clock.UtcNow()); await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None); var mediator = Substitute.For(); @@ -43,9 +42,8 @@ public async Task Handle_WhenSelectedContractHasNotEnded_DoesNothing() // Arrange var clock = new TestClock(); var contractRepository = new TestAdscContractRepository(); - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", clock.UtcNow()); contract.RequestSelectedContract(TimeSpan.FromMinutes(2), clock.UtcNow().AddSeconds(1)); - contract.LogActivity(clock.UtcNow()); await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None); var mediator = Substitute.For(); @@ -65,9 +63,8 @@ public async Task Handle_WhenNoSelectedContract_DoesNothing() // Arrange var clock = new TestClock(); var contractRepository = new TestAdscContractRepository(); - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", clock.UtcNow()); contract.RequestDefaultContract(TimeSpan.FromMinutes(10)); - contract.LogActivity(clock.UtcNow()); await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None); var mediator = Substitute.For(); @@ -89,9 +86,8 @@ public async Task Handle_WhenRequestFails_ContinuesWithOtherContracts() var contractRepository = new TestAdscContractRepository(); foreach (var callsign in new[] { "UAL123", "QFA1" }) { - var contract = new AdscContract(callsign, "YBBB"); + var contract = new AdscContract(callsign, "YBBB", clock.UtcNow()); contract.RequestSelectedContract(TimeSpan.FromMinutes(2), clock.UtcNow()); - contract.LogActivity(clock.UtcNow()); await contractRepository.Add(new AdscContractKey(callsign, "YBBB"), contract, CancellationToken.None); } @@ -118,9 +114,8 @@ public async Task Handle_WhenContractIsInactive_CancelsAndRemovesContract() // Arrange var clock = new TestClock(); var contractRepository = new TestAdscContractRepository(); - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", clock.UtcNow()); contract.RequestDefaultContract(TimeSpan.FromMinutes(10)); - contract.LogActivity(clock.UtcNow()); await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None); var clientManager = new TestClientManager(); @@ -147,9 +142,8 @@ public async Task Handle_WhenContractIsInactiveAndAcarsCancelFails_RemovesContra // Arrange - TestClientManager has no ACARS client for YSSY, so the cancel fails var clock = new TestClock(); var contractRepository = new TestAdscContractRepository(); - var contract = new AdscContract("UAL123", "YSSY"); + var contract = new AdscContract("UAL123", "YSSY", clock.UtcNow()); contract.RequestDefaultContract(TimeSpan.FromMinutes(10)); - contract.LogActivity(clock.UtcNow()); await contractRepository.Add(new AdscContractKey("UAL123", "YSSY"), contract, CancellationToken.None); var mediator = Substitute.For(); @@ -173,9 +167,8 @@ public async Task Handle_WhenContractHasRecentActivity_KeepsContract() // Arrange var clock = new TestClock(); var contractRepository = new TestAdscContractRepository(); - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", clock.UtcNow()); contract.RequestDefaultContract(TimeSpan.FromMinutes(10)); - contract.LogActivity(clock.UtcNow()); await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None); var mediator = Substitute.For(); @@ -197,9 +190,8 @@ public async Task Handle_WhenSelectedContractIsInactive_CancelsInsteadOfRequesti // Arrange var clock = new TestClock(); var contractRepository = new TestAdscContractRepository(); - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", clock.UtcNow()); contract.RequestSelectedContract(TimeSpan.FromMinutes(2), clock.UtcNow().AddMinutes(60)); - contract.LogActivity(clock.UtcNow()); await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None); var mediator = Substitute.For(); diff --git a/source/CPDLCServer.Tests/Handlers/ProduceVatsimAdscReportsRequestHandlerTests.cs b/source/CPDLCServer.Tests/Handlers/ProduceVatsimAdscReportsRequestHandlerTests.cs index ce04325..ce60e2a 100644 --- a/source/CPDLCServer.Tests/Handlers/ProduceVatsimAdscReportsRequestHandlerTests.cs +++ b/source/CPDLCServer.Tests/Handlers/ProduceVatsimAdscReportsRequestHandlerTests.cs @@ -240,7 +240,7 @@ public async Task Handle_WhenPilotIsNotInVatsimData_PublishesNothing() { // Arrange var contractRepository = new TestAdscContractRepository(); - var contract = new AdscContract("QFA1", "YBBB"); + var contract = new AdscContract("QFA1", "YBBB", DateTimeOffset.UtcNow); await contractRepository.Add(new AdscContractKey("QFA1", "YBBB"), contract, CancellationToken.None); contract.RequestDefaultContract(DefaultInterval); @@ -254,6 +254,44 @@ public async Task Handle_WhenPilotIsNotInVatsimData_PublishesNothing() await mediator.DidNotReceive().Publish(Arg.Any(), Arg.Any()); } + [Fact] + public async Task Handle_WhenAircraftIsInVatsimData_LogsActivity() + { + // Arrange - a rejected contract gets no VATSIM report, but the aircraft is still connected to VATSIM + var contractRepository = new TestAdscContractRepository(); + var contract = new AdscContract("UAL123", "YBBB", Now.AddHours(-1)); + contract.RequestDefaultContract(DefaultInterval); + contract.Reject(); + await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None); + + var handler = await CreateHandler(contractRepository, new TestAdscReportRepository(), Substitute.For()); + + // Act + await handler.Handle(new ProduceVatsimAdscReportsRequest(), CancellationToken.None); + + // Assert + Assert.Equal(Now, contract.LastActivity); + } + + [Fact] + public async Task Handle_WhenAircraftIsNotInVatsimData_DoesNotLogActivity() + { + // Arrange - CreateHandler adds only UAL123 to the VATSIM data + var created = Now.AddHours(-1); + var contractRepository = new TestAdscContractRepository(); + var contract = new AdscContract("QFA1", "YBBB", created); + contract.RequestDefaultContract(DefaultInterval); + await contractRepository.Add(new AdscContractKey("QFA1", "YBBB"), contract, CancellationToken.None); + + var handler = await CreateHandler(contractRepository, new TestAdscReportRepository(), Substitute.For()); + + // Act + await handler.Handle(new ProduceVatsimAdscReportsRequest(), CancellationToken.None); + + // Assert + Assert.Equal(created, contract.LastActivity); + } + static async Task CreateHandler( IAdscContractRepository contractRepository, IAdscReportRepository reportRepository, @@ -281,7 +319,7 @@ [new VatsimPilot("UAL123", -33.9461, 151.1772, 37000, LastUpdated, isAdscEquippe static async Task AddContract(IAdscContractRepository contractRepository) { - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow); await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None); return contract; } diff --git a/source/CPDLCServer.Tests/Handlers/RefreshAcarsCallsignsRequestHandlerTests.cs b/source/CPDLCServer.Tests/Handlers/RefreshAcarsCallsignsRequestHandlerTests.cs index a390738..ad967e2 100644 --- a/source/CPDLCServer.Tests/Handlers/RefreshAcarsCallsignsRequestHandlerTests.cs +++ b/source/CPDLCServer.Tests/Handlers/RefreshAcarsCallsignsRequestHandlerTests.cs @@ -39,6 +39,7 @@ public async Task Handle_UpdatesLastSeenForConnectedAircraft() clientManager, aircraftRepository, acarsConnectedCallsignsRepository, + new TestAdscContractRepository(), mediator, clock, Logger.None); @@ -86,6 +87,7 @@ public async Task Handle_DoesNotUpdateLastSeenForDisconnectedAircraft() clientManager, aircraftRepository, acarsConnectedCallsignsRepository, + new TestAdscContractRepository(), mediator, clock, Logger.None); @@ -143,6 +145,7 @@ public async Task Handle_OnlyUpdatesAircraftForMatchingAcarsClient() clientManager, aircraftRepository, acarsConnectedCallsignsRepository, + new TestAdscContractRepository(), mediator, clock, Logger.None); @@ -191,6 +194,7 @@ public async Task Handle_UpdatesRepositoryWithConnectedCallsigns() clientManager, aircraftRepository, acarsConnectedCallsignsRepository, + new TestAdscContractRepository(), mediator, clock, Logger.None); @@ -230,6 +234,7 @@ public async Task Handle_PublishesNotificationWhenCallsignsChange() clientManager, aircraftRepository, acarsConnectedCallsignsRepository, + new TestAdscContractRepository(), mediator, clock, Logger.None); @@ -272,6 +277,7 @@ public async Task Handle_DoesNotPublishNotificationWhenCallsignsUnchanged() clientManager, aircraftRepository, acarsConnectedCallsignsRepository, + new TestAdscContractRepository(), mediator, clock, Logger.None); @@ -314,6 +320,7 @@ public async Task Handle_PublishesNotificationWhenCallsignAdded() clientManager, aircraftRepository, acarsConnectedCallsignsRepository, + new TestAdscContractRepository(), mediator, clock, Logger.None); @@ -359,6 +366,7 @@ public async Task Handle_PublishesNotificationWhenCallsignRemoved() clientManager, aircraftRepository, acarsConnectedCallsignsRepository, + new TestAdscContractRepository(), mediator, clock, Logger.None); @@ -374,4 +382,48 @@ await mediator.Received(1).Publish( n.Callsigns.Length == 1 && n.Callsigns.Contains("UAL123")), Arg.Any()); } + + [Fact] + public async Task Handle_LogsActivityForContractsWithConnectedAircraftAtStation() + { + // Arrange + var clientManager = new TestClientManager(); + var acarsClient = new TestAcarsClient("YBBB"); + clientManager.AddClient("hoppies-ybbb", acarsClient); + + var clock = new TestClock(); + var initialTime = new DateTimeOffset(2026, 1, 1, 0, 0, 0, TimeSpan.Zero); + clock.SetUtcNow(initialTime); + + var contractRepository = new TestAdscContractRepository(); + var connectedContract = new AdscContract("UAL123", "YBBB", initialTime); + var disconnectedContract = new AdscContract("QFA1", "YBBB", initialTime); + var otherStationContract = new AdscContract("UAL123", "YMMM", initialTime); + await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), connectedContract, CancellationToken.None); + await contractRepository.Add(new AdscContractKey("QFA1", "YBBB"), disconnectedContract, CancellationToken.None); + await contractRepository.Add(new AdscContractKey("UAL123", "YMMM"), otherStationContract, CancellationToken.None); + + // Only UAL123 is connected to the ACARS network + acarsClient.Connections.Add("UAL123"); + + var handler = new RefreshAcarsCallsignsRequestHandler( + clientManager, + new TestAircraftRepository(), + new InMemoryAcarsStationRepository(), + contractRepository, + Substitute.For(), + clock, + Logger.None); + + var now = initialTime.AddMinutes(10); + clock.SetUtcNow(now); + + // Act + await handler.Handle(new RefreshAcarsCallsignsRequest("hoppies-ybbb"), CancellationToken.None); + + // Assert + Assert.Equal(now, connectedContract.LastActivity); + Assert.Equal(initialTime, disconnectedContract.LastActivity); + Assert.Equal(initialTime, otherStationContract.LastActivity); + } } diff --git a/source/CPDLCServer.Tests/Handlers/RequestAdscContractOnConnectionEstablishedHandlerTests.cs b/source/CPDLCServer.Tests/Handlers/RequestAdscContractOnConnectionEstablishedHandlerTests.cs index 11faa3c..6da3ee5 100644 --- a/source/CPDLCServer.Tests/Handlers/RequestAdscContractOnConnectionEstablishedHandlerTests.cs +++ b/source/CPDLCServer.Tests/Handlers/RequestAdscContractOnConnectionEstablishedHandlerTests.cs @@ -36,7 +36,7 @@ public async Task Handle_WhenSelectedContractExists_DoesNotRequestContract() { // Arrange var contractRepository = new TestAdscContractRepository(); - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow); contract.RequestSelectedContract(TimeSpan.FromMinutes(5), DateTimeOffset.UtcNow.AddHours(1)); await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None); @@ -58,7 +58,7 @@ public async Task Handle_WhenOnlyDemandReportExists_RequestsDefaultContract() { // Arrange var contractRepository = new TestAdscContractRepository(); - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow); contract.RequestDemandReport(); await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None); @@ -82,7 +82,7 @@ public async Task Handle_WhenDefaultContractIsRejected_RequestsDefaultContract() { // Arrange var contractRepository = new TestAdscContractRepository(); - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow); contract.RequestDefaultContract(TimeSpan.FromMinutes(10)); contract.Reject(); await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None); diff --git a/source/CPDLCServer.Tests/Handlers/RequestAdscDemandReportCommandHandlerTests.cs b/source/CPDLCServer.Tests/Handlers/RequestAdscDemandReportCommandHandlerTests.cs index 42b02c8..42ddcf3 100644 --- a/source/CPDLCServer.Tests/Handlers/RequestAdscDemandReportCommandHandlerTests.cs +++ b/source/CPDLCServer.Tests/Handlers/RequestAdscDemandReportCommandHandlerTests.cs @@ -58,7 +58,7 @@ public async Task Handle_WhenPeriodicContractExists_KeepsPeriodicContractAndSend { // Arrange var contractRepository = new TestAdscContractRepository(); - var existingContract = new AdscContract("UAL123", "YBBB"); + var existingContract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow); existingContract.RequestDefaultContract(TimeSpan.FromMinutes(10)); existingContract.ReportReceived(); await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), existingContract, CancellationToken.None); diff --git a/source/CPDLCServer.Tests/Handlers/RequestDefaultAdscContractCommandHandlerTests.cs b/source/CPDLCServer.Tests/Handlers/RequestDefaultAdscContractCommandHandlerTests.cs index ac4bd03..247ae63 100644 --- a/source/CPDLCServer.Tests/Handlers/RequestDefaultAdscContractCommandHandlerTests.cs +++ b/source/CPDLCServer.Tests/Handlers/RequestDefaultAdscContractCommandHandlerTests.cs @@ -53,7 +53,7 @@ await mediator.Received(1).Publish( } [Fact] - public async Task Handle_LogsActivity() + public async Task Handle_WhenNoContractExists_SetsLastActivityToCreationTime() { // Arrange var clock = new TestClock(); @@ -70,12 +70,33 @@ public async Task Handle_LogsActivity() Assert.Equal(clock.UtcNow(), contract.LastActivity); } + [Fact] + public async Task Handle_WhenContractExists_DoesNotChangeLastActivity() + { + // Arrange + var clock = new TestClock(); + var created = clock.UtcNow(); + var contractRepository = new TestAdscContractRepository(); + var existingContract = new AdscContract("UAL123", "YBBB", created); + await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), existingContract, CancellationToken.None); + + var handler = new RequestDefaultAdscContractCommandHandler( + new TestClientManager(), contractRepository, Substitute.For(), clock, Logger.None); + + // Act - a request does not show that the aircraft is still connected + clock.SetUtcNow(created.AddMinutes(30)); + await handler.Handle(new RequestDefaultAdscContractCommand("YBBB", "UAL123"), CancellationToken.None); + + // Assert + Assert.Equal(created, existingContract.LastActivity); + } + [Fact] public async Task Handle_WhenSelectedContractIsInUse_EndsSelectedContract() { // Arrange var contractRepository = new TestAdscContractRepository(); - var existingContract = new AdscContract("UAL123", "YBBB"); + var existingContract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow); existingContract.RequestSelectedContract(TimeSpan.FromMinutes(2), DateTimeOffset.UtcNow.AddHours(1)); existingContract.ReportReceived(); await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), existingContract, CancellationToken.None); diff --git a/source/CPDLCServer.Tests/Handlers/RequestSelectedAdscContractCommandHandlerTests.cs b/source/CPDLCServer.Tests/Handlers/RequestSelectedAdscContractCommandHandlerTests.cs index cb871af..cf580e2 100644 --- a/source/CPDLCServer.Tests/Handlers/RequestSelectedAdscContractCommandHandlerTests.cs +++ b/source/CPDLCServer.Tests/Handlers/RequestSelectedAdscContractCommandHandlerTests.cs @@ -87,7 +87,7 @@ public async Task Handle_WhenDefaultContractExists_KeepsDefaultContractUntilAcce { // Arrange var contractRepository = new TestAdscContractRepository(); - var existingContract = new AdscContract("UAL123", "YBBB"); + var existingContract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow); existingContract.RequestDefaultContract(TimeSpan.FromMinutes(10)); existingContract.ReportReceived(); await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), existingContract, CancellationToken.None); diff --git a/source/CPDLCServer.Tests/Model/AdscContractTests.cs b/source/CPDLCServer.Tests/Model/AdscContractTests.cs index c09483b..c535793 100644 --- a/source/CPDLCServer.Tests/Model/AdscContractTests.cs +++ b/source/CPDLCServer.Tests/Model/AdscContractTests.cs @@ -12,7 +12,7 @@ public class AdscContractTests public void RequestDefaultContract_SendsDefaultContract() { // Arrange - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow); // Act contract.RequestDefaultContract(DefaultInterval); @@ -28,7 +28,7 @@ public void RequestDefaultContract_SendsDefaultContract() public void RequestDefaultContract_WhenSelectedContractIsAccepted_EndsSelectedContract() { // Arrange - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow); contract.RequestSelectedContract(SelectedInterval, Ends); contract.ReportReceived(); @@ -47,7 +47,7 @@ public void RequestDefaultContract_WhenSelectedContractIsAccepted_EndsSelectedCo public void RequestDefaultContract_WhenSelectedContractIsRejected_KeepsRejection() { // Arrange - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow); contract.RequestSelectedContract(SelectedInterval, Ends); contract.Reject(); @@ -64,7 +64,7 @@ public void RequestDefaultContract_WhenSelectedContractIsRejected_KeepsRejection public void RequestSelectedContract_SendsSelectedContractAndKeepsDefaultContract() { // Arrange - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow); contract.RequestDefaultContract(DefaultInterval); contract.ReportReceived(); @@ -83,7 +83,7 @@ public void RequestSelectedContract_SendsSelectedContractAndKeepsDefaultContract public void ReportReceived_WhenDefaultContractIsSent_AcceptsDefaultContract() { // Arrange - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow); contract.RequestDefaultContract(DefaultInterval); // Act @@ -98,7 +98,7 @@ public void ReportReceived_WhenDefaultContractIsSent_AcceptsDefaultContract() public void ReportReceived_WhenSelectedContractIsSent_AcceptsSelectedContractAndEndsDefaultContract() { // Arrange - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow); contract.RequestDefaultContract(DefaultInterval); contract.RequestSelectedContract(SelectedInterval, Ends); @@ -115,7 +115,7 @@ public void ReportReceived_WhenSelectedContractIsSent_AcceptsSelectedContractAnd public void ReportReceived_WhenDemandReportIsSent_AcceptsDemandReport() { // Arrange - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow); contract.RequestDemandReport(); // Act @@ -132,7 +132,7 @@ public void ReportReceived_WhenDemandReportIsSent_AcceptsDemandReport() public void ReportReceived_WhenNothingIsSent_ReturnsFalse() { // Arrange - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow); contract.RequestDefaultContract(DefaultInterval); contract.ReportReceived(); @@ -148,7 +148,7 @@ public void ReportReceived_WhenNothingIsSent_ReturnsFalse() public void Reject_WhenSelectedContractIsSent_RejectsSelectedContract() { // Arrange - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow); contract.RequestDefaultContract(DefaultInterval); contract.ReportReceived(); contract.RequestSelectedContract(SelectedInterval, Ends); @@ -167,7 +167,7 @@ public void Reject_WhenSelectedContractIsSent_RejectsSelectedContract() public void Reject_WhenSelectedContractIsAccepted_RejectsSelectedContract() { // Arrange - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow); contract.RequestSelectedContract(SelectedInterval, Ends); contract.ReportReceived(); @@ -184,7 +184,7 @@ public void Reject_WhenSelectedContractIsAccepted_RejectsSelectedContract() public void Reject_WhenDefaultContractIsSent_RejectsDefaultContract() { // Arrange - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow); contract.RequestDefaultContract(DefaultInterval); // Act @@ -200,7 +200,7 @@ public void Reject_WhenDefaultContractIsSent_RejectsDefaultContract() public void Reject_WhenDemandReportIsSent_RejectsDemandReport() { // Arrange - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow); contract.RequestDefaultContract(DefaultInterval); contract.ReportReceived(); contract.RequestDemandReport(); @@ -217,7 +217,7 @@ public void Reject_WhenDemandReportIsSent_RejectsDemandReport() public void Reject_WhenDemandReportIsAccepted_KeepsDemandReport() { // Arrange - var contract = new AdscContract("UAL123", "YBBB"); + var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow); contract.RequestDemandReport(); contract.ReportReceived(); contract.RequestDefaultContract(DefaultInterval); diff --git a/source/CPDLCServer/Handlers/ProduceVatsimAdscReportsRequestHandler.cs b/source/CPDLCServer/Handlers/ProduceVatsimAdscReportsRequestHandler.cs index 1c09b7a..fdd319e 100644 --- a/source/CPDLCServer/Handlers/ProduceVatsimAdscReportsRequestHandler.cs +++ b/source/CPDLCServer/Handlers/ProduceVatsimAdscReportsRequestHandler.cs @@ -35,6 +35,7 @@ public async Task Handle(ProduceVatsimAdscReportsRequest request, CancellationTo // A failure for one aircraft must not stop the other aircraft try { + await LogActivityIfConnectedToVatsim(contract, now, cancellationToken); await ProduceReport(contract, now, cancellationToken); } catch (Exception ex) when (!cancellationToken.IsCancellationRequested) @@ -48,6 +49,14 @@ public async Task Handle(ProduceVatsimAdscReportsRequest request, CancellationTo } } + // An aircraft that is connected to VATSIM keeps its ADS-C contracts, even if it is not connected to the ACARS network + async Task LogActivityIfConnectedToVatsim(AdscContract contract, DateTimeOffset now, CancellationToken cancellationToken) + { + var pilot = await vatsimPilotRepository.Find(contract.Callsign, cancellationToken); + if (pilot is not null) + contract.LogActivity(now); + } + async Task ProduceReport(AdscContract contract, DateTimeOffset now, CancellationToken cancellationToken) { if (!contract.IsActive) @@ -75,8 +84,6 @@ async Task ProduceReport(AdscContract contract, DateTimeOffset now, Cancellation contract.Callsign, contract.StationId); - contract.LogActivity(now); - if (contract.ReportReceived()) { logger.Information( diff --git a/source/CPDLCServer/Handlers/RefreshAcarsCallsignsRequestHandler.cs b/source/CPDLCServer/Handlers/RefreshAcarsCallsignsRequestHandler.cs index 0738375..64c40ba 100644 --- a/source/CPDLCServer/Handlers/RefreshAcarsCallsignsRequestHandler.cs +++ b/source/CPDLCServer/Handlers/RefreshAcarsCallsignsRequestHandler.cs @@ -10,6 +10,7 @@ public class RefreshAcarsCallsignsRequestHandler( IClientManager clientManager, IAircraftRepository aircraftRepository, IAcarsStationRepository acarsConnectedCallsignsRepository, + IAdscContractRepository adscContractRepository, IMediator mediator, IClock clock, ILogger logger) : IRequestHandler @@ -41,5 +42,17 @@ await mediator.Publish( connection.LogLastSeen(now); logger.Debug("Updated last seen for {Callsign}", connection.Callsign); } + + // An aircraft that is connected to the ACARS network keeps its ADS-C contracts with this station + var contracts = await adscContractRepository.All(cancellationToken); + var matchingContracts = contracts + .Where(c => c.StationId == client.StationId) + .Where(c => activeConnections.Contains(c.Callsign)); + + foreach (var contract in matchingContracts) + { + contract.LogActivity(now); + logger.Debug("Updated ADS-C contract activity for {Callsign}", contract.Callsign); + } } } diff --git a/source/CPDLCServer/Handlers/RequestAdscDemandReportCommandHandler.cs b/source/CPDLCServer/Handlers/RequestAdscDemandReportCommandHandler.cs index 9cb51c8..c4fdcf7 100644 --- a/source/CPDLCServer/Handlers/RequestAdscDemandReportCommandHandler.cs +++ b/source/CPDLCServer/Handlers/RequestAdscDemandReportCommandHandler.cs @@ -31,12 +31,11 @@ public async Task Handle(RequestAdscDemandReportCommand request, CancellationTok var contract = await adscContractRepository.Find(contractKey, cancellationToken); if (contract is null) { - contract = new AdscContract(request.Callsign, request.StationId); + contract = new AdscContract(request.Callsign, request.StationId, clock.UtcNow()); await adscContractRepository.Add(contractKey, contract, cancellationToken); } contract.RequestDemandReport(); - contract.LogActivity(clock.UtcNow()); await mediator.Publish(new AdscContractChangedNotification(contract), cancellationToken); } diff --git a/source/CPDLCServer/Handlers/RequestDefaultAdscContractCommandHandler.cs b/source/CPDLCServer/Handlers/RequestDefaultAdscContractCommandHandler.cs index ecc4f8f..7d861af 100644 --- a/source/CPDLCServer/Handlers/RequestDefaultAdscContractCommandHandler.cs +++ b/source/CPDLCServer/Handlers/RequestDefaultAdscContractCommandHandler.cs @@ -33,12 +33,11 @@ public async Task Handle(RequestDefaultAdscContractCommand request, Cancellation var contract = await adscContractRepository.Find(contractKey, cancellationToken); if (contract is null) { - contract = new AdscContract(request.Callsign, request.StationId); + contract = new AdscContract(request.Callsign, request.StationId, clock.UtcNow()); await adscContractRepository.Add(contractKey, contract, cancellationToken); } contract.RequestDefaultContract(reportingInterval); - contract.LogActivity(clock.UtcNow()); await mediator.Publish(new AdscContractChangedNotification(contract), cancellationToken); } diff --git a/source/CPDLCServer/Handlers/RequestSelectedAdscContractCommandHandler.cs b/source/CPDLCServer/Handlers/RequestSelectedAdscContractCommandHandler.cs index 94ce6c4..c8dbdfa 100644 --- a/source/CPDLCServer/Handlers/RequestSelectedAdscContractCommandHandler.cs +++ b/source/CPDLCServer/Handlers/RequestSelectedAdscContractCommandHandler.cs @@ -40,12 +40,11 @@ public async Task Handle(RequestSelectedAdscContractCommand request, Cancellatio var contract = await adscContractRepository.Find(contractKey, cancellationToken); if (contract is null) { - contract = new AdscContract(request.Callsign, request.StationId); + contract = new AdscContract(request.Callsign, request.StationId, clock.UtcNow()); await adscContractRepository.Add(contractKey, contract, cancellationToken); } contract.RequestSelectedContract(request.ReportingInterval, ends); - contract.LogActivity(clock.UtcNow()); await mediator.Publish(new AdscContractChangedNotification(contract), cancellationToken); } diff --git a/source/CPDLCServer/Model/AdscContract.cs b/source/CPDLCServer/Model/AdscContract.cs index 401193e..b6d0da0 100644 --- a/source/CPDLCServer/Model/AdscContract.cs +++ b/source/CPDLCServer/Model/AdscContract.cs @@ -9,7 +9,7 @@ namespace CPDLCServer.Model; /// A demand request asks for one report. /// /// -public class AdscContract(string callsign, string stationId) +public class AdscContract(string callsign, string stationId, DateTimeOffset created) { // The ACARS clients poll for messages every 20 to 75 seconds. A shorter interval gives no more data. public static readonly TimeSpan MinimumReportingInterval = TimeSpan.FromSeconds(60); @@ -30,8 +30,9 @@ public class AdscContract(string callsign, string stationId) public AdscContractState? DemandContractState { get; private set; } - // The latest time that a request was sent, or that a message was received from the aircraft - public DateTimeOffset LastActivity { get; private set; } + // The latest time that the aircraft was seen on the ACARS network or in the VATSIM data, or sent an ADS-C message. + // A request from a controller does not change it, because a request does not show that the aircraft is still connected. + public DateTimeOffset LastActivity { get; private set; } = created; public bool HasPeriodicContract => DefaultContractState is AdscContractState.Sent or AdscContractState.Accepted || diff --git a/source/CPDLCServer/Services/AdscContractExpiryService.cs b/source/CPDLCServer/Services/AdscContractExpiryService.cs index d03f0e9..2717221 100644 --- a/source/CPDLCServer/Services/AdscContractExpiryService.cs +++ b/source/CPDLCServer/Services/AdscContractExpiryService.cs @@ -20,6 +20,17 @@ public AdscContractExpiryService(IConfiguration configuration, IMediator mediato _logger = logger.ForContext(); _contractTimeout = configuration.GetValue("AdscContractTimeout", TimeSpan.FromMinutes(120)); + + // The connectivity check updates the activity of each ADS-C contract at this interval. + // If one refresh fails, the time between two updates is two refresh intervals. + var refreshInterval = TimeSpan.FromMinutes(configuration.GetValue("ConnectivityCheckIntervalMinutes", 15)); + if (_contractTimeout <= refreshInterval * 2) + { + _logger.Warning( + "AdscContractTimeout ({ContractTimeout}) is not more than two times the connectivity check interval ({RefreshInterval}). One failed refresh will cause ADS-C contracts to be cancelled.", + _contractTimeout, + refreshInterval); + } } public Task StartAsync(CancellationToken cancellationToken)