From 1ad9e2e7c66c34ba639273518b9e802982322544 Mon Sep 17 00:00:00 2001 From: Eoin Motherway <25342760+YuKitsune@users.noreply.github.com> Date: Sat, 24 Oct 2026 14:37:34 +1000 Subject: [PATCH 1/4] feat: Cancel ADS Contracts after last controller disconnects --- ...nAllControllersDisconnectedHandlerTests.cs | 106 ++++++++++++++++++ .../Mocks/TestAdscMessageLogRepository.cs | 5 + .../InMemoryAdscMessageLogRepositoryTests.cs | 19 ++++ .../Services/MessageMonitorServiceTests.cs | 64 +++++++++-- ...actsOnAllControllersDisconnectedHandler.cs | 48 ++++++++ .../Persistence/IAdscMessageLogRepository.cs | 2 + .../InMemoryAdscMessageLogRepository.cs | 10 ++ .../Services/MessageMonitorService.cs | 18 ++- 8 files changed, 258 insertions(+), 14 deletions(-) create mode 100644 source/CPDLCServer.Tests/Handlers/CancelAdscContractsOnAllControllersDisconnectedHandlerTests.cs create mode 100644 source/CPDLCServer/Handlers/CancelAdscContractsOnAllControllersDisconnectedHandler.cs diff --git a/source/CPDLCServer.Tests/Handlers/CancelAdscContractsOnAllControllersDisconnectedHandlerTests.cs b/source/CPDLCServer.Tests/Handlers/CancelAdscContractsOnAllControllersDisconnectedHandlerTests.cs new file mode 100644 index 0000000..c241ff4 --- /dev/null +++ b/source/CPDLCServer.Tests/Handlers/CancelAdscContractsOnAllControllersDisconnectedHandlerTests.cs @@ -0,0 +1,106 @@ +using CPDLCServer.Handlers; +using CPDLCServer.Messages; +using CPDLCServer.Model; +using CPDLCServer.Persistence; +using CPDLCServer.Tests.Mocks; +using MediatR; +using NSubstitute; +using Serilog.Core; + +namespace CPDLCServer.Tests.Handlers; + +public class CancelAdscContractsOnAllControllersDisconnectedHandlerTests +{ + [Fact] + public async Task Handle_WhenNoControllersRemain_CancelsAllContracts() + { + // Arrange + var contractRepository = new TestAdscContractRepository(); + await contractRepository.Add( + new AdscContractKey("UAL123", "YBBB"), + new AdscContract("UAL123", "YBBB"), + CancellationToken.None); + await contractRepository.Add( + new AdscContractKey("QFA1", "YMMM"), + new AdscContract("QFA1", "YMMM"), + CancellationToken.None); + + var mediator = Substitute.For(); + var handler = new CancelAdscContractsOnAllControllersDisconnectedHandler( + new TestControllerRepository(), contractRepository, mediator, Logger.None); + + // Act + await handler.Handle( + new ControllerDisconnectedNotification(Guid.NewGuid(), "BN-TSN_CTR"), + CancellationToken.None); + + // Assert + await mediator.Received(1).Send( + Arg.Is(c => c.StationId == "YBBB" && c.Callsign == "UAL123"), + Arg.Any()); + await mediator.Received(1).Send( + Arg.Is(c => c.StationId == "YMMM" && c.Callsign == "QFA1"), + Arg.Any()); + } + + [Fact] + public async Task Handle_WhenControllersRemain_DoesNotCancel() + { + // Arrange + var controllerRepository = new TestControllerRepository(); + await controllerRepository.Add( + new ControllerInfo(Guid.NewGuid(), "connection-1", "YBBB", "ML-ASP_CTR", "1234567"), + CancellationToken.None); + + var contractRepository = new TestAdscContractRepository(); + await contractRepository.Add( + new AdscContractKey("UAL123", "YBBB"), + new AdscContract("UAL123", "YBBB"), + CancellationToken.None); + + var mediator = Substitute.For(); + var handler = new CancelAdscContractsOnAllControllersDisconnectedHandler( + controllerRepository, contractRepository, mediator, Logger.None); + + // Act + await handler.Handle( + new ControllerDisconnectedNotification(Guid.NewGuid(), "BN-TSN_CTR"), + CancellationToken.None); + + // Assert + Assert.Empty(mediator.ReceivedCalls()); + } + + [Fact] + public async Task Handle_WhenCancelFails_CancelsOtherContracts() + { + // Arrange + var contractRepository = new TestAdscContractRepository(); + await contractRepository.Add( + new AdscContractKey("UAL123", "YBBB"), + new AdscContract("UAL123", "YBBB"), + CancellationToken.None); + await contractRepository.Add( + new AdscContractKey("QFA1", "YMMM"), + new AdscContract("QFA1", "YMMM"), + CancellationToken.None); + + var mediator = Substitute.For(); + mediator + .Send(Arg.Is(c => c.Callsign == "UAL123"), Arg.Any()) + .Returns(Task.FromException(new HttpRequestException("Hoppie is down"))); + + var handler = new CancelAdscContractsOnAllControllersDisconnectedHandler( + new TestControllerRepository(), contractRepository, mediator, Logger.None); + + // Act + await handler.Handle( + new ControllerDisconnectedNotification(Guid.NewGuid(), "BN-TSN_CTR"), + CancellationToken.None); + + // Assert + await mediator.Received(1).Send( + Arg.Is(c => c.StationId == "YMMM" && c.Callsign == "QFA1"), + Arg.Any()); + } +} diff --git a/source/CPDLCServer.Tests/Mocks/TestAdscMessageLogRepository.cs b/source/CPDLCServer.Tests/Mocks/TestAdscMessageLogRepository.cs index 5286fe9..093e5b4 100644 --- a/source/CPDLCServer.Tests/Mocks/TestAdscMessageLogRepository.cs +++ b/source/CPDLCServer.Tests/Mocks/TestAdscMessageLogRepository.cs @@ -16,4 +16,9 @@ public Task All(CancellationToken cancellationToken) { return _inner.All(cancellationToken); } + + public Task RemoveOlderThan(DateTimeOffset cutoff, CancellationToken cancellationToken) + { + return _inner.RemoveOlderThan(cutoff, cancellationToken); + } } diff --git a/source/CPDLCServer.Tests/Persistence/InMemoryAdscMessageLogRepositoryTests.cs b/source/CPDLCServer.Tests/Persistence/InMemoryAdscMessageLogRepositoryTests.cs index 7547aaf..0cf7622 100644 --- a/source/CPDLCServer.Tests/Persistence/InMemoryAdscMessageLogRepositoryTests.cs +++ b/source/CPDLCServer.Tests/Persistence/InMemoryAdscMessageLogRepositoryTests.cs @@ -43,6 +43,25 @@ public async Task Add_WhenFull_RemovesOldestEntry() Assert.Equal(CreateEntry(1), entries.Last()); } + [Fact] + public async Task RemoveOlderThan_RemovesOnlyOlderEntries() + { + // Arrange + var repository = new InMemoryAdscMessageLogRepository(); + var oldest = CreateEntry(0); + var atCutoff = CreateEntry(1); + var newest = CreateEntry(2); + await repository.Add(oldest, CancellationToken.None); + await repository.Add(atCutoff, CancellationToken.None); + await repository.Add(newest, CancellationToken.None); + + // Act + await repository.RemoveOlderThan(atCutoff.Time, CancellationToken.None); + + // Assert + Assert.Equal([newest, atCutoff], await repository.All(CancellationToken.None)); + } + static AdscMessageLogEntry CreateEntry(int index) { return new AdscMessageLogEntry( diff --git a/source/CPDLCServer.Tests/Services/MessageMonitorServiceTests.cs b/source/CPDLCServer.Tests/Services/MessageMonitorServiceTests.cs index 6688e8e..4d9a231 100644 --- a/source/CPDLCServer.Tests/Services/MessageMonitorServiceTests.cs +++ b/source/CPDLCServer.Tests/Services/MessageMonitorServiceTests.cs @@ -32,7 +32,7 @@ public async Task CheckForTimeouts_MarksPilotLate_WhenUplinkTimesOut() startTime); await repository.Add(dialogue, CancellationToken.None); - var service = new MessageMonitorService(repository, clock, publisher, Logger.None); + var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), clock, publisher, Logger.None); // Act - advance time beyond pilot late timeout (2 minutes) clock.SetUtcNow(startTime.AddMinutes(3)); @@ -68,7 +68,7 @@ public async Task CheckForTimeouts_DoesNotMarkPilotLate_WhenTimeoutNotReached() startTime); await repository.Add(dialogue, CancellationToken.None); - var service = new MessageMonitorService(repository, clock, publisher, Logger.None); + var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), clock, publisher, Logger.None); // Act - advance time but not beyond timeout (1 minute < 2 minute timeout) clock.SetUtcNow(startTime.AddMinutes(1)); @@ -103,7 +103,7 @@ public async Task CheckForTimeouts_IgnoresNoResponseUplinks() startTime); await repository.Add(dialogue, CancellationToken.None); - var service = new MessageMonitorService(repository, clock, publisher, Logger.None); + var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), clock, publisher, Logger.None); // Act - advance time beyond timeout clock.SetUtcNow(startTime.AddMinutes(3)); @@ -137,7 +137,7 @@ public async Task CheckForTimeouts_MarksControllerLate_WhenDownlinkTimesOut() startTime); await repository.Add(dialogue, CancellationToken.None); - var service = new MessageMonitorService(repository, clock, publisher, Logger.None); + var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), clock, publisher, Logger.None); // Act - advance time beyond controller late timeout (2 minutes) clock.SetUtcNow(startTime.AddMinutes(3)); @@ -177,7 +177,7 @@ public async Task CheckForTimeouts_IgnoresClosedMessages() await repository.Add(dialogue, CancellationToken.None); - var service = new MessageMonitorService(repository, clock, publisher, Logger.None); + var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), clock, publisher, Logger.None); // Act - advance time beyond timeout clock.SetUtcNow(startTime.AddMinutes(3)); @@ -212,7 +212,7 @@ public async Task CheckForTimeouts_IgnoresClosedDialogues() startTime); await repository.Add(dialogue, CancellationToken.None); - var service = new MessageMonitorService(repository, clock, publisher, Logger.None); + var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), clock, publisher, Logger.None); // Act - advance time beyond timeout clock.SetUtcNow(startTime.AddMinutes(3)); @@ -247,7 +247,7 @@ public async Task ArchiveCompletedDialogues_ArchivesDialogue_WhenAllMessagesAckn startTime); // NoResponse uplinks are self-closing and auto-acknowledged await repository.Add(dialogue, CancellationToken.None); - var service = new MessageMonitorService(repository, clock, publisher, Logger.None); + var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), clock, publisher, Logger.None); // Act - advance time beyond archive delay (10 seconds) clock.SetUtcNow(startTime.AddSeconds(15)); @@ -283,7 +283,7 @@ public async Task ArchiveCompletedDialogues_DoesNotArchive_WhenDelayNotPassed() startTime); await repository.Add(dialogue, CancellationToken.None); - var service = new MessageMonitorService(repository, clock, publisher, Logger.None); + var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), clock, publisher, Logger.None); // Act - advance time but not enough (5 seconds < 10 second delay) clock.SetUtcNow(startTime.AddSeconds(5)); @@ -318,7 +318,7 @@ public async Task ArchiveCompletedDialogues_IgnoresOpenDialogues() startTime); await repository.Add(dialogue, CancellationToken.None); - var service = new MessageMonitorService(repository, clock, publisher, Logger.None); + var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), clock, publisher, Logger.None); // Act - advance time beyond archive delay clock.SetUtcNow(startTime.AddSeconds(15)); @@ -353,7 +353,7 @@ public async Task ArchiveCompletedDialogues_IgnoresDialoguesWithoutAcknowledgeme startTime); await repository.Add(dialogue, CancellationToken.None); - var service = new MessageMonitorService(repository, clock, publisher, Logger.None); + var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), clock, publisher, Logger.None); // Act - advance time beyond archive delay clock.SetUtcNow(startTime.AddSeconds(15)); @@ -386,7 +386,7 @@ public async Task CheckForTimeouts_HandlesMultipleDialogues() await repository.Add(dialogue1, CancellationToken.None); await repository.Add(dialogue2, CancellationToken.None); - var service = new MessageMonitorService(repository, clock, publisher, Logger.None); + var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), clock, publisher, Logger.None); // Act - advance time beyond timeout clock.SetUtcNow(startTime.AddMinutes(3)); @@ -397,4 +397,46 @@ public async Task CheckForTimeouts_HandlesMultipleDialogues() Assert.True(uplink2.IsPilotLate); Assert.Equal(2, publisher.PublishedNotifications.Count); } + + [Fact] + public async Task PurgeOldAdscMessages_RemovesMessagesOlderThan24Hours() + { + // Arrange + var clock = new TestClock(); + var adscMessageLogRepository = new TestAdscMessageLogRepository(); + + var startTime = DateTimeOffset.UtcNow; + clock.SetUtcNow(startTime); + + var oldEntry = new AdscMessageLogEntry( + startTime, + "Hoppies/YBBB", + "YBBB", + "UAL123", + AdscMessageDirection.Uplink, + "REQUEST PERIODIC 1"); + var newEntry = new AdscMessageLogEntry( + startTime.AddHours(2), + "Hoppies/YBBB", + "YBBB", + "UAL123", + AdscMessageDirection.Uplink, + "REQUEST PERIODIC 2"); + await adscMessageLogRepository.Add(oldEntry, CancellationToken.None); + await adscMessageLogRepository.Add(newEntry, CancellationToken.None); + + var service = new MessageMonitorService( + new TestDialogueRepository(), + adscMessageLogRepository, + clock, + new TestPublisher(), + Logger.None); + + // Act - advance time beyond the purge timeout (24 hours) for the old entry only + clock.SetUtcNow(startTime.AddHours(25)); + await service.PurgeOldAdscMessages(CancellationToken.None); + + // Assert + Assert.Equal([newEntry], await adscMessageLogRepository.All(CancellationToken.None)); + } } diff --git a/source/CPDLCServer/Handlers/CancelAdscContractsOnAllControllersDisconnectedHandler.cs b/source/CPDLCServer/Handlers/CancelAdscContractsOnAllControllersDisconnectedHandler.cs new file mode 100644 index 0000000..4c9c7eb --- /dev/null +++ b/source/CPDLCServer/Handlers/CancelAdscContractsOnAllControllersDisconnectedHandler.cs @@ -0,0 +1,48 @@ +using CPDLCServer.Messages; +using CPDLCServer.Persistence; +using MediatR; + +namespace CPDLCServer.Handlers; + +public class CancelAdscContractsOnAllControllersDisconnectedHandler( + IControllerRepository controllerRepository, + IAdscContractRepository adscContractRepository, + IMediator mediator, + ILogger logger) + : INotificationHandler +{ + public async Task Handle(ControllerDisconnectedNotification notification, CancellationToken cancellationToken) + { + // Note: The disconnected controller is already removed from the repository + var controllers = await controllerRepository.All(cancellationToken); + if (controllers.Length > 0) + return; + + var contracts = await adscContractRepository.All(cancellationToken); + if (contracts.Length == 0) + return; + + logger.Information( + "No controllers are connected. Cancelling {ContractCount} ADS-C contract(s)", + contracts.Length); + + foreach (var contract in contracts) + { + // A failure for one aircraft must not stop the other aircraft + try + { + await mediator.Send( + new CancelAdscContractCommand(contract.StationId, contract.Callsign), + cancellationToken); + } + catch (Exception ex) when (!cancellationToken.IsCancellationRequested) + { + logger.Error( + ex, + "Failed to cancel ADS-C contract with {Callsign} for {StationId}", + contract.Callsign, + contract.StationId); + } + } + } +} diff --git a/source/CPDLCServer/Persistence/IAdscMessageLogRepository.cs b/source/CPDLCServer/Persistence/IAdscMessageLogRepository.cs index 28b57b8..e7848d3 100644 --- a/source/CPDLCServer/Persistence/IAdscMessageLogRepository.cs +++ b/source/CPDLCServer/Persistence/IAdscMessageLogRepository.cs @@ -8,4 +8,6 @@ public interface IAdscMessageLogRepository // Newest entries first Task All(CancellationToken cancellationToken); + + Task RemoveOlderThan(DateTimeOffset cutoff, CancellationToken cancellationToken); } diff --git a/source/CPDLCServer/Persistence/InMemoryAdscMessageLogRepository.cs b/source/CPDLCServer/Persistence/InMemoryAdscMessageLogRepository.cs index 0610566..dd749a2 100644 --- a/source/CPDLCServer/Persistence/InMemoryAdscMessageLogRepository.cs +++ b/source/CPDLCServer/Persistence/InMemoryAdscMessageLogRepository.cs @@ -29,4 +29,14 @@ public async Task All(CancellationToken cancellationToken return _entries.Reverse().ToArray(); } } + + public async Task RemoveOlderThan(DateTimeOffset cutoff, CancellationToken cancellationToken) + { + using (await _semaphore.LockAsync(cancellationToken)) + { + // The entries are added in time order, so the oldest entries are at the front + while (_entries.Count > 0 && _entries.Peek().Time < cutoff) + _entries.Dequeue(); + } + } } diff --git a/source/CPDLCServer/Services/MessageMonitorService.cs b/source/CPDLCServer/Services/MessageMonitorService.cs index bf43160..282f461 100644 --- a/source/CPDLCServer/Services/MessageMonitorService.cs +++ b/source/CPDLCServer/Services/MessageMonitorService.cs @@ -7,7 +7,12 @@ namespace CPDLCServer.Services; -public class MessageMonitorService(IDialogueRepository repository, IClock clock, IPublisher publisher, ILogger logger) +public class MessageMonitorService( + IDialogueRepository repository, + IAdscMessageLogRepository adscMessageLogRepository, + IClock clock, + IPublisher publisher, + ILogger logger) : BackgroundService { readonly TimeSpan _timeoutCheckInterval = TimeSpan.FromSeconds(5); @@ -15,6 +20,7 @@ public class MessageMonitorService(IDialogueRepository repository, IClock clock, readonly TimeSpan _pilotLateTimeout = TimeSpan.FromMinutes(2); readonly TimeSpan _controllerLateTimeout = TimeSpan.FromMinutes(2); private readonly TimeSpan _archiveDelay = TimeSpan.FromSeconds(10); + readonly TimeSpan _purgeTimeout = TimeSpan.FromHours(24); protected override async Task ExecuteAsync(CancellationToken stoppingToken) { @@ -29,6 +35,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) logger.Verbose("Running message monitor iteration"); await PurgeOldDialogues(stoppingToken); + await PurgeOldAdscMessages(stoppingToken); await CheckForTimeouts(stoppingToken); await ArchiveCompletedDialogues(stoppingToken); } @@ -61,11 +68,10 @@ internal async Task PurgeOldDialogues(CancellationToken cancellationToken) var now = clock.UtcNow(); var dialogues = await repository.All(cancellationToken); - var purgeTimeout = TimeSpan.FromHours(24); foreach (var dialogue in dialogues) { var timeSinceOpened = now - dialogue.Opened; - if (timeSinceOpened < purgeTimeout) + if (timeSinceOpened < _purgeTimeout) continue; // I don't care if it's closed or not. It's been long enough. @@ -74,6 +80,12 @@ internal async Task PurgeOldDialogues(CancellationToken cancellationToken) } } + internal async Task PurgeOldAdscMessages(CancellationToken cancellationToken) + { + var cutoff = clock.UtcNow() - _purgeTimeout; + await adscMessageLogRepository.RemoveOlderThan(cutoff, cancellationToken); + } + internal async Task CheckForTimeouts(CancellationToken cancellationToken) { // TODO: Verify if this is supposed to apply to message closures or acknowledgements. From 4639173667d1e9f03ce45e958a5d051e279a263b Mon Sep 17 00:00:00 2001 From: Eoin Motherway <25342760+YuKitsune@users.noreply.github.com> Date: Sat, 24 Oct 2026 14:43:40 +1000 Subject: [PATCH 2/4] Remove ADS-C reports after 24 hours Co-Authored-By: Claude Opus 5.5 --- .../Mocks/TestAdscReportRepository.cs | 5 ++ .../InMemoryAdscReportRepositoryTests.cs | 22 +++++++ .../Services/MessageMonitorServiceTests.cs | 62 +++++++++++++++---- .../Persistence/IAdscReportRepository.cs | 2 + .../InMemoryAdscReportRepository.cs | 9 +++ .../Services/MessageMonitorService.cs | 8 +++ 6 files changed, 97 insertions(+), 11 deletions(-) diff --git a/source/CPDLCServer.Tests/Mocks/TestAdscReportRepository.cs b/source/CPDLCServer.Tests/Mocks/TestAdscReportRepository.cs index 824f2ca..da963b2 100644 --- a/source/CPDLCServer.Tests/Mocks/TestAdscReportRepository.cs +++ b/source/CPDLCServer.Tests/Mocks/TestAdscReportRepository.cs @@ -21,4 +21,9 @@ public Task All(CancellationToken cancellationToken) { return _inner.All(cancellationToken); } + + public Task RemoveOlderThan(DateTimeOffset cutoff, CancellationToken cancellationToken) + { + return _inner.RemoveOlderThan(cutoff, cancellationToken); + } } diff --git a/source/CPDLCServer.Tests/Persistence/InMemoryAdscReportRepositoryTests.cs b/source/CPDLCServer.Tests/Persistence/InMemoryAdscReportRepositoryTests.cs index 3671199..0379004 100644 --- a/source/CPDLCServer.Tests/Persistence/InMemoryAdscReportRepositoryTests.cs +++ b/source/CPDLCServer.Tests/Persistence/InMemoryAdscReportRepositoryTests.cs @@ -89,6 +89,28 @@ public async Task Find_ReturnsLatestReportForAircraft() Assert.Null(await repository.Find("QFA1", CancellationToken.None)); } + [Fact] + public async Task RemoveOlderThan_RemovesOnlyOlderReports() + { + // Arrange + var repository = new InMemoryAdscReportRepository(); + var older = CreateReport("UAL123", "YBBB", 0); + var atCutoff = CreateReport("QFA1", "YBBB", 5); + var newer = CreateReport("VOZ1", "YBBB", 10); + await repository.Add(older, CancellationToken.None); + await repository.Add(atCutoff, CancellationToken.None); + await repository.Add(newer, CancellationToken.None); + + // Act + await repository.RemoveOlderThan(atCutoff.Received, CancellationToken.None); + + // Assert + var reports = await repository.All(CancellationToken.None); + Assert.Equal(2, reports.Length); + Assert.Contains(atCutoff, reports); + Assert.Contains(newer, reports); + } + static AircraftAdscReport CreateReport( string callsign, string stationId, diff --git a/source/CPDLCServer.Tests/Services/MessageMonitorServiceTests.cs b/source/CPDLCServer.Tests/Services/MessageMonitorServiceTests.cs index 4d9a231..b207adc 100644 --- a/source/CPDLCServer.Tests/Services/MessageMonitorServiceTests.cs +++ b/source/CPDLCServer.Tests/Services/MessageMonitorServiceTests.cs @@ -32,7 +32,7 @@ public async Task CheckForTimeouts_MarksPilotLate_WhenUplinkTimesOut() startTime); await repository.Add(dialogue, CancellationToken.None); - var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), clock, publisher, Logger.None); + var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), new TestAdscReportRepository(), clock, publisher, Logger.None); // Act - advance time beyond pilot late timeout (2 minutes) clock.SetUtcNow(startTime.AddMinutes(3)); @@ -68,7 +68,7 @@ public async Task CheckForTimeouts_DoesNotMarkPilotLate_WhenTimeoutNotReached() startTime); await repository.Add(dialogue, CancellationToken.None); - var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), clock, publisher, Logger.None); + var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), new TestAdscReportRepository(), clock, publisher, Logger.None); // Act - advance time but not beyond timeout (1 minute < 2 minute timeout) clock.SetUtcNow(startTime.AddMinutes(1)); @@ -103,7 +103,7 @@ public async Task CheckForTimeouts_IgnoresNoResponseUplinks() startTime); await repository.Add(dialogue, CancellationToken.None); - var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), clock, publisher, Logger.None); + var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), new TestAdscReportRepository(), clock, publisher, Logger.None); // Act - advance time beyond timeout clock.SetUtcNow(startTime.AddMinutes(3)); @@ -137,7 +137,7 @@ public async Task CheckForTimeouts_MarksControllerLate_WhenDownlinkTimesOut() startTime); await repository.Add(dialogue, CancellationToken.None); - var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), clock, publisher, Logger.None); + var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), new TestAdscReportRepository(), clock, publisher, Logger.None); // Act - advance time beyond controller late timeout (2 minutes) clock.SetUtcNow(startTime.AddMinutes(3)); @@ -177,7 +177,7 @@ public async Task CheckForTimeouts_IgnoresClosedMessages() await repository.Add(dialogue, CancellationToken.None); - var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), clock, publisher, Logger.None); + var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), new TestAdscReportRepository(), clock, publisher, Logger.None); // Act - advance time beyond timeout clock.SetUtcNow(startTime.AddMinutes(3)); @@ -212,7 +212,7 @@ public async Task CheckForTimeouts_IgnoresClosedDialogues() startTime); await repository.Add(dialogue, CancellationToken.None); - var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), clock, publisher, Logger.None); + var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), new TestAdscReportRepository(), clock, publisher, Logger.None); // Act - advance time beyond timeout clock.SetUtcNow(startTime.AddMinutes(3)); @@ -247,7 +247,7 @@ public async Task ArchiveCompletedDialogues_ArchivesDialogue_WhenAllMessagesAckn startTime); // NoResponse uplinks are self-closing and auto-acknowledged await repository.Add(dialogue, CancellationToken.None); - var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), clock, publisher, Logger.None); + var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), new TestAdscReportRepository(), clock, publisher, Logger.None); // Act - advance time beyond archive delay (10 seconds) clock.SetUtcNow(startTime.AddSeconds(15)); @@ -283,7 +283,7 @@ public async Task ArchiveCompletedDialogues_DoesNotArchive_WhenDelayNotPassed() startTime); await repository.Add(dialogue, CancellationToken.None); - var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), clock, publisher, Logger.None); + var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), new TestAdscReportRepository(), clock, publisher, Logger.None); // Act - advance time but not enough (5 seconds < 10 second delay) clock.SetUtcNow(startTime.AddSeconds(5)); @@ -318,7 +318,7 @@ public async Task ArchiveCompletedDialogues_IgnoresOpenDialogues() startTime); await repository.Add(dialogue, CancellationToken.None); - var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), clock, publisher, Logger.None); + var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), new TestAdscReportRepository(), clock, publisher, Logger.None); // Act - advance time beyond archive delay clock.SetUtcNow(startTime.AddSeconds(15)); @@ -353,7 +353,7 @@ public async Task ArchiveCompletedDialogues_IgnoresDialoguesWithoutAcknowledgeme startTime); await repository.Add(dialogue, CancellationToken.None); - var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), clock, publisher, Logger.None); + var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), new TestAdscReportRepository(), clock, publisher, Logger.None); // Act - advance time beyond archive delay clock.SetUtcNow(startTime.AddSeconds(15)); @@ -386,7 +386,7 @@ public async Task CheckForTimeouts_HandlesMultipleDialogues() await repository.Add(dialogue1, CancellationToken.None); await repository.Add(dialogue2, CancellationToken.None); - var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), clock, publisher, Logger.None); + var service = new MessageMonitorService(repository, new TestAdscMessageLogRepository(), new TestAdscReportRepository(), clock, publisher, Logger.None); // Act - advance time beyond timeout clock.SetUtcNow(startTime.AddMinutes(3)); @@ -428,6 +428,7 @@ public async Task PurgeOldAdscMessages_RemovesMessagesOlderThan24Hours() var service = new MessageMonitorService( new TestDialogueRepository(), adscMessageLogRepository, + new TestAdscReportRepository(), clock, new TestPublisher(), Logger.None); @@ -439,4 +440,43 @@ public async Task PurgeOldAdscMessages_RemovesMessagesOlderThan24Hours() // Assert Assert.Equal([newEntry], await adscMessageLogRepository.All(CancellationToken.None)); } + + [Fact] + public async Task PurgeOldAdscReports_RemovesReportsOlderThan24Hours() + { + // Arrange + var clock = new TestClock(); + var adscReportRepository = new TestAdscReportRepository(); + + var startTime = DateTimeOffset.UtcNow; + clock.SetUtcNow(startTime); + + var oldReport = new AircraftAdscReport( + "UAL123", + "YBBB", + new AdscReport(startTime, -33.9461, 151.1772, 37000, AdscReportSource.Hoppie), + startTime); + var newReport = new AircraftAdscReport( + "QFA1", + "YBBB", + new AdscReport(startTime.AddHours(2), -33.9461, 151.1772, 37000, AdscReportSource.Hoppie), + startTime.AddHours(2)); + await adscReportRepository.Add(oldReport, CancellationToken.None); + await adscReportRepository.Add(newReport, CancellationToken.None); + + var service = new MessageMonitorService( + new TestDialogueRepository(), + new TestAdscMessageLogRepository(), + adscReportRepository, + clock, + new TestPublisher(), + Logger.None); + + // Act - advance time beyond the purge timeout (24 hours) for the old report only + clock.SetUtcNow(startTime.AddHours(25)); + await service.PurgeOldAdscReports(CancellationToken.None); + + // Assert + Assert.Equal([newReport], await adscReportRepository.All(CancellationToken.None)); + } } diff --git a/source/CPDLCServer/Persistence/IAdscReportRepository.cs b/source/CPDLCServer/Persistence/IAdscReportRepository.cs index 22953e7..d747265 100644 --- a/source/CPDLCServer/Persistence/IAdscReportRepository.cs +++ b/source/CPDLCServer/Persistence/IAdscReportRepository.cs @@ -10,4 +10,6 @@ public interface IAdscReportRepository Task Add(AircraftAdscReport report, CancellationToken cancellationToken); Task Find(string callsign, CancellationToken cancellationToken); Task All(CancellationToken cancellationToken); + + Task RemoveOlderThan(DateTimeOffset cutoff, CancellationToken cancellationToken); } diff --git a/source/CPDLCServer/Persistence/InMemoryAdscReportRepository.cs b/source/CPDLCServer/Persistence/InMemoryAdscReportRepository.cs index adabb71..996ff90 100644 --- a/source/CPDLCServer/Persistence/InMemoryAdscReportRepository.cs +++ b/source/CPDLCServer/Persistence/InMemoryAdscReportRepository.cs @@ -43,4 +43,13 @@ public async Task All(CancellationToken cancellationToken) return _reports.Values.ToArray(); } } + + public async Task RemoveOlderThan(DateTimeOffset cutoff, CancellationToken cancellationToken) + { + using (await _semaphore.LockAsync(cancellationToken)) + { + foreach (var report in _reports.Values.Where(r => r.Received < cutoff).ToArray()) + _reports.Remove(report.Callsign); + } + } } diff --git a/source/CPDLCServer/Services/MessageMonitorService.cs b/source/CPDLCServer/Services/MessageMonitorService.cs index 282f461..a877082 100644 --- a/source/CPDLCServer/Services/MessageMonitorService.cs +++ b/source/CPDLCServer/Services/MessageMonitorService.cs @@ -10,6 +10,7 @@ namespace CPDLCServer.Services; public class MessageMonitorService( IDialogueRepository repository, IAdscMessageLogRepository adscMessageLogRepository, + IAdscReportRepository adscReportRepository, IClock clock, IPublisher publisher, ILogger logger) @@ -36,6 +37,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) logger.Verbose("Running message monitor iteration"); await PurgeOldDialogues(stoppingToken); await PurgeOldAdscMessages(stoppingToken); + await PurgeOldAdscReports(stoppingToken); await CheckForTimeouts(stoppingToken); await ArchiveCompletedDialogues(stoppingToken); } @@ -86,6 +88,12 @@ internal async Task PurgeOldAdscMessages(CancellationToken cancellationToken) await adscMessageLogRepository.RemoveOlderThan(cutoff, cancellationToken); } + internal async Task PurgeOldAdscReports(CancellationToken cancellationToken) + { + var cutoff = clock.UtcNow() - _purgeTimeout; + await adscReportRepository.RemoveOlderThan(cutoff, cancellationToken); + } + internal async Task CheckForTimeouts(CancellationToken cancellationToken) { // TODO: Verify if this is supposed to apply to message closures or acknowledgements. From c5ae3f30d47ecb8dc9a29e3554e78be154322185 Mon Sep 17 00:00:00 2001 From: Eoin Motherway <25342760+YuKitsune@users.noreply.github.com> Date: Sat, 24 Oct 2026 15:24:18 +1000 Subject: [PATCH 3/4] Cancel ADS-C contracts after 120 minutes with no activity Do not cancel ADS-C contracts when all controllers disconnect. Co-Authored-By: Claude Opus 5.5 --- ...MessageReceivedNotificationHandlerTests.cs | 38 +++++ ...nAllControllersDisconnectedHandlerTests.cs | 106 -------------- ...ExpiredAdscContractsRequestHandlerTests.cs | 131 ++++++++++++++++-- ...uestAdscDemandReportCommandHandlerTests.cs | 6 +- ...tDefaultAdscContractCommandHandlerTests.cs | 24 +++- .../AdscMessageReceivedNotificationHandler.cs | 2 + ...actsOnAllControllersDisconnectedHandler.cs | 48 ------- .../EndExpiredAdscContractsRequestHandler.cs | 53 +++++++ .../ProduceVatsimAdscReportsRequestHandler.cs | 2 + .../RequestAdscDemandReportCommandHandler.cs | 3 + ...equestDefaultAdscContractCommandHandler.cs | 3 + ...questSelectedAdscContractCommandHandler.cs | 1 + .../EndExpiredAdscContractsRequest.cs | 2 +- source/CPDLCServer/Model/AdscContract.cs | 8 ++ .../Services/AdscContractExpiryService.cs | 7 +- 15 files changed, 263 insertions(+), 171 deletions(-) delete mode 100644 source/CPDLCServer.Tests/Handlers/CancelAdscContractsOnAllControllersDisconnectedHandlerTests.cs delete mode 100644 source/CPDLCServer/Handlers/CancelAdscContractsOnAllControllersDisconnectedHandler.cs diff --git a/source/CPDLCServer.Tests/Handlers/AdscMessageReceivedNotificationHandlerTests.cs b/source/CPDLCServer.Tests/Handlers/AdscMessageReceivedNotificationHandlerTests.cs index 83794c9..ae7e833 100644 --- a/source/CPDLCServer.Tests/Handlers/AdscMessageReceivedNotificationHandlerTests.cs +++ b/source/CPDLCServer.Tests/Handlers/AdscMessageReceivedNotificationHandlerTests.cs @@ -212,6 +212,44 @@ public async Task Handle_Rejection_WhenNoContract_IsIgnored() Assert.Empty(mediator.ReceivedCalls()); } + [Fact] + public async Task Handle_Report_LogsActivity() + { + // Arrange + var contractRepository = new TestAdscContractRepository(); + var contract = await AddContract(contractRepository, "YBBB"); + contract.RequestDefaultContract(DefaultInterval); + + var handler = new AdscMessageReceivedNotificationHandler( + contractRepository, Substitute.For(), Logger.None); + var notification = CreateReport("YBBB"); + + // Act + await handler.Handle(notification, CancellationToken.None); + + // Assert + Assert.Equal(notification.Message.Received, contract.LastActivity); + } + + [Fact] + public async Task Handle_Rejection_LogsActivity() + { + // Arrange + var contractRepository = new TestAdscContractRepository(); + var contract = await AddContract(contractRepository, "YBBB"); + contract.RequestDefaultContract(DefaultInterval); + + var handler = new AdscMessageReceivedNotificationHandler( + contractRepository, Substitute.For(), Logger.None); + var notification = CreateRejection("YBBB"); + + // Act + await handler.Handle(notification, CancellationToken.None); + + // Assert + Assert.Equal(notification.Message.Received, contract.LastActivity); + } + static async Task AddContract(TestAdscContractRepository contractRepository, string stationId) { var contract = new AdscContract("UAL123", stationId); diff --git a/source/CPDLCServer.Tests/Handlers/CancelAdscContractsOnAllControllersDisconnectedHandlerTests.cs b/source/CPDLCServer.Tests/Handlers/CancelAdscContractsOnAllControllersDisconnectedHandlerTests.cs deleted file mode 100644 index c241ff4..0000000 --- a/source/CPDLCServer.Tests/Handlers/CancelAdscContractsOnAllControllersDisconnectedHandlerTests.cs +++ /dev/null @@ -1,106 +0,0 @@ -using CPDLCServer.Handlers; -using CPDLCServer.Messages; -using CPDLCServer.Model; -using CPDLCServer.Persistence; -using CPDLCServer.Tests.Mocks; -using MediatR; -using NSubstitute; -using Serilog.Core; - -namespace CPDLCServer.Tests.Handlers; - -public class CancelAdscContractsOnAllControllersDisconnectedHandlerTests -{ - [Fact] - public async Task Handle_WhenNoControllersRemain_CancelsAllContracts() - { - // Arrange - var contractRepository = new TestAdscContractRepository(); - await contractRepository.Add( - new AdscContractKey("UAL123", "YBBB"), - new AdscContract("UAL123", "YBBB"), - CancellationToken.None); - await contractRepository.Add( - new AdscContractKey("QFA1", "YMMM"), - new AdscContract("QFA1", "YMMM"), - CancellationToken.None); - - var mediator = Substitute.For(); - var handler = new CancelAdscContractsOnAllControllersDisconnectedHandler( - new TestControllerRepository(), contractRepository, mediator, Logger.None); - - // Act - await handler.Handle( - new ControllerDisconnectedNotification(Guid.NewGuid(), "BN-TSN_CTR"), - CancellationToken.None); - - // Assert - await mediator.Received(1).Send( - Arg.Is(c => c.StationId == "YBBB" && c.Callsign == "UAL123"), - Arg.Any()); - await mediator.Received(1).Send( - Arg.Is(c => c.StationId == "YMMM" && c.Callsign == "QFA1"), - Arg.Any()); - } - - [Fact] - public async Task Handle_WhenControllersRemain_DoesNotCancel() - { - // Arrange - var controllerRepository = new TestControllerRepository(); - await controllerRepository.Add( - new ControllerInfo(Guid.NewGuid(), "connection-1", "YBBB", "ML-ASP_CTR", "1234567"), - CancellationToken.None); - - var contractRepository = new TestAdscContractRepository(); - await contractRepository.Add( - new AdscContractKey("UAL123", "YBBB"), - new AdscContract("UAL123", "YBBB"), - CancellationToken.None); - - var mediator = Substitute.For(); - var handler = new CancelAdscContractsOnAllControllersDisconnectedHandler( - controllerRepository, contractRepository, mediator, Logger.None); - - // Act - await handler.Handle( - new ControllerDisconnectedNotification(Guid.NewGuid(), "BN-TSN_CTR"), - CancellationToken.None); - - // Assert - Assert.Empty(mediator.ReceivedCalls()); - } - - [Fact] - public async Task Handle_WhenCancelFails_CancelsOtherContracts() - { - // Arrange - var contractRepository = new TestAdscContractRepository(); - await contractRepository.Add( - new AdscContractKey("UAL123", "YBBB"), - new AdscContract("UAL123", "YBBB"), - CancellationToken.None); - await contractRepository.Add( - new AdscContractKey("QFA1", "YMMM"), - new AdscContract("QFA1", "YMMM"), - CancellationToken.None); - - var mediator = Substitute.For(); - mediator - .Send(Arg.Is(c => c.Callsign == "UAL123"), Arg.Any()) - .Returns(Task.FromException(new HttpRequestException("Hoppie is down"))); - - var handler = new CancelAdscContractsOnAllControllersDisconnectedHandler( - new TestControllerRepository(), contractRepository, mediator, Logger.None); - - // Act - await handler.Handle( - new ControllerDisconnectedNotification(Guid.NewGuid(), "BN-TSN_CTR"), - CancellationToken.None); - - // Assert - await mediator.Received(1).Send( - Arg.Is(c => c.StationId == "YMMM" && c.Callsign == "QFA1"), - Arg.Any()); - } -} diff --git a/source/CPDLCServer.Tests/Handlers/EndExpiredAdscContractsRequestHandlerTests.cs b/source/CPDLCServer.Tests/Handlers/EndExpiredAdscContractsRequestHandlerTests.cs index b7afceb..0c619cb 100644 --- a/source/CPDLCServer.Tests/Handlers/EndExpiredAdscContractsRequestHandlerTests.cs +++ b/source/CPDLCServer.Tests/Handlers/EndExpiredAdscContractsRequestHandlerTests.cs @@ -11,6 +11,8 @@ namespace CPDLCServer.Tests.Handlers; public class EndExpiredAdscContractsRequestHandlerTests { + static readonly TimeSpan ContractTimeout = TimeSpan.FromMinutes(120); + [Fact] public async Task Handle_WhenSelectedContractHasEnded_RequestsDefaultContract() { @@ -19,13 +21,15 @@ public async Task Handle_WhenSelectedContractHasEnded_RequestsDefaultContract() var contractRepository = new TestAdscContractRepository(); var contract = new AdscContract("UAL123", "YBBB"); 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(); - var handler = new EndExpiredAdscContractsRequestHandler(contractRepository, clock, mediator, Logger.None); + var handler = new EndExpiredAdscContractsRequestHandler( + new TestClientManager(), contractRepository, clock, mediator, Logger.None); // Act - await handler.Handle(new EndExpiredAdscContractsRequest(), CancellationToken.None); + await handler.Handle(new EndExpiredAdscContractsRequest(ContractTimeout), CancellationToken.None); // Assert await mediator.Received(1).Send( @@ -41,13 +45,15 @@ public async Task Handle_WhenSelectedContractHasNotEnded_DoesNothing() var contractRepository = new TestAdscContractRepository(); var contract = new AdscContract("UAL123", "YBBB"); 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(); - var handler = new EndExpiredAdscContractsRequestHandler(contractRepository, clock, mediator, Logger.None); + var handler = new EndExpiredAdscContractsRequestHandler( + new TestClientManager(), contractRepository, clock, mediator, Logger.None); // Act - await handler.Handle(new EndExpiredAdscContractsRequest(), CancellationToken.None); + await handler.Handle(new EndExpiredAdscContractsRequest(ContractTimeout), CancellationToken.None); // Assert Assert.Empty(mediator.ReceivedCalls()); @@ -61,13 +67,15 @@ public async Task Handle_WhenNoSelectedContract_DoesNothing() var contractRepository = new TestAdscContractRepository(); var contract = new AdscContract("UAL123", "YBBB"); contract.RequestDefaultContract(TimeSpan.FromMinutes(10)); + contract.LogActivity(clock.UtcNow()); await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None); var mediator = Substitute.For(); - var handler = new EndExpiredAdscContractsRequestHandler(contractRepository, clock, mediator, Logger.None); + var handler = new EndExpiredAdscContractsRequestHandler( + new TestClientManager(), contractRepository, clock, mediator, Logger.None); // Act - await handler.Handle(new EndExpiredAdscContractsRequest(), CancellationToken.None); + await handler.Handle(new EndExpiredAdscContractsRequest(ContractTimeout), CancellationToken.None); // Assert Assert.Empty(mediator.ReceivedCalls()); @@ -83,6 +91,7 @@ public async Task Handle_WhenRequestFails_ContinuesWithOtherContracts() { var contract = new AdscContract(callsign, "YBBB"); contract.RequestSelectedContract(TimeSpan.FromMinutes(2), clock.UtcNow()); + contract.LogActivity(clock.UtcNow()); await contractRepository.Add(new AdscContractKey(callsign, "YBBB"), contract, CancellationToken.None); } @@ -91,14 +100,120 @@ public async Task Handle_WhenRequestFails_ContinuesWithOtherContracts() .Send(Arg.Is(c => c.Callsign == "UAL123"), Arg.Any()) .Returns(Task.FromException(new HttpRequestException("Hoppie is down"))); - var handler = new EndExpiredAdscContractsRequestHandler(contractRepository, clock, mediator, Logger.None); + var handler = new EndExpiredAdscContractsRequestHandler( + new TestClientManager(), contractRepository, clock, mediator, Logger.None); // Act - await handler.Handle(new EndExpiredAdscContractsRequest(), CancellationToken.None); + await handler.Handle(new EndExpiredAdscContractsRequest(ContractTimeout), CancellationToken.None); // Assert await mediator.Received(1).Send( Arg.Is(c => c.Callsign == "QFA1"), Arg.Any()); } + + [Fact] + public async Task Handle_WhenContractIsInactive_CancelsAndRemovesContract() + { + // Arrange + var clock = new TestClock(); + var contractRepository = new TestAdscContractRepository(); + var contract = new AdscContract("UAL123", "YBBB"); + contract.RequestDefaultContract(TimeSpan.FromMinutes(10)); + contract.LogActivity(clock.UtcNow()); + await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None); + + var clientManager = new TestClientManager(); + var mediator = Substitute.For(); + var handler = new EndExpiredAdscContractsRequestHandler( + clientManager, contractRepository, clock, mediator, Logger.None); + + // Act + clock.SetUtcNow(clock.UtcNow() + ContractTimeout + TimeSpan.FromMinutes(1)); + await handler.Handle(new EndExpiredAdscContractsRequest(ContractTimeout), CancellationToken.None); + + // Assert + var client = (TestAcarsClient) await clientManager.GetAcarsClient("hoppies-ybbb", CancellationToken.None); + Assert.Equal(["UAL123"], client.CancelledAdscContracts); + Assert.Empty(await contractRepository.All(CancellationToken.None)); + await mediator.Received(1).Publish( + Arg.Is(n => n.Callsign == "UAL123" && n.StationId == "YBBB"), + Arg.Any()); + } + + [Fact] + public async Task Handle_WhenContractIsInactiveAndAcarsCancelFails_RemovesContract() + { + // 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"); + contract.RequestDefaultContract(TimeSpan.FromMinutes(10)); + contract.LogActivity(clock.UtcNow()); + await contractRepository.Add(new AdscContractKey("UAL123", "YSSY"), contract, CancellationToken.None); + + var mediator = Substitute.For(); + var handler = new EndExpiredAdscContractsRequestHandler( + new TestClientManager(), contractRepository, clock, mediator, Logger.None); + + // Act + clock.SetUtcNow(clock.UtcNow() + ContractTimeout + TimeSpan.FromMinutes(1)); + await handler.Handle(new EndExpiredAdscContractsRequest(ContractTimeout), CancellationToken.None); + + // Assert + Assert.Empty(await contractRepository.All(CancellationToken.None)); + await mediator.Received(1).Publish( + Arg.Is(n => n.Callsign == "UAL123" && n.StationId == "YSSY"), + Arg.Any()); + } + + [Fact] + public async Task Handle_WhenContractHasRecentActivity_KeepsContract() + { + // Arrange + var clock = new TestClock(); + var contractRepository = new TestAdscContractRepository(); + var contract = new AdscContract("UAL123", "YBBB"); + contract.RequestDefaultContract(TimeSpan.FromMinutes(10)); + contract.LogActivity(clock.UtcNow()); + await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None); + + var mediator = Substitute.For(); + var handler = new EndExpiredAdscContractsRequestHandler( + new TestClientManager(), contractRepository, clock, mediator, Logger.None); + + // Act + clock.SetUtcNow(clock.UtcNow() + ContractTimeout - TimeSpan.FromMinutes(1)); + await handler.Handle(new EndExpiredAdscContractsRequest(ContractTimeout), CancellationToken.None); + + // Assert + Assert.Same(contract, Assert.Single(await contractRepository.All(CancellationToken.None))); + Assert.Empty(mediator.ReceivedCalls()); + } + + [Fact] + public async Task Handle_WhenSelectedContractIsInactive_CancelsInsteadOfRequestingDefault() + { + // Arrange + var clock = new TestClock(); + var contractRepository = new TestAdscContractRepository(); + var contract = new AdscContract("UAL123", "YBBB"); + 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(); + var handler = new EndExpiredAdscContractsRequestHandler( + new TestClientManager(), contractRepository, clock, mediator, Logger.None); + + // Act + clock.SetUtcNow(clock.UtcNow() + ContractTimeout + TimeSpan.FromMinutes(1)); + await handler.Handle(new EndExpiredAdscContractsRequest(ContractTimeout), CancellationToken.None); + + // Assert + Assert.Empty(await contractRepository.All(CancellationToken.None)); + await mediator.DidNotReceive().Send( + Arg.Any(), + Arg.Any()); + } } diff --git a/source/CPDLCServer.Tests/Handlers/RequestAdscDemandReportCommandHandlerTests.cs b/source/CPDLCServer.Tests/Handlers/RequestAdscDemandReportCommandHandlerTests.cs index 428830f..42b02c8 100644 --- a/source/CPDLCServer.Tests/Handlers/RequestAdscDemandReportCommandHandlerTests.cs +++ b/source/CPDLCServer.Tests/Handlers/RequestAdscDemandReportCommandHandlerTests.cs @@ -17,7 +17,7 @@ public async Task Handle_SendsRequestViaAcarsClientForStation() // Arrange var clientManager = new TestClientManager(); var handler = new RequestAdscDemandReportCommandHandler( - clientManager, new TestAdscContractRepository(), Substitute.For(), Logger.None); + clientManager, new TestAdscContractRepository(), Substitute.For(), new TestClock(), Logger.None); // Act await handler.Handle(new RequestAdscDemandReportCommand("YBBB", "UAL123"), CancellationToken.None); @@ -35,7 +35,7 @@ public async Task Handle_WhenNoContractExists_AddsContractWithOnlyDemandReport() var contractRepository = new TestAdscContractRepository(); var mediator = Substitute.For(); var handler = new RequestAdscDemandReportCommandHandler( - new TestClientManager(), contractRepository, mediator, Logger.None); + new TestClientManager(), contractRepository, mediator, new TestClock(), Logger.None); // Act await handler.Handle(new RequestAdscDemandReportCommand("YBBB", "UAL123"), CancellationToken.None); @@ -65,7 +65,7 @@ public async Task Handle_WhenPeriodicContractExists_KeepsPeriodicContractAndSend var mediator = Substitute.For(); var handler = new RequestAdscDemandReportCommandHandler( - new TestClientManager(), contractRepository, mediator, Logger.None); + new TestClientManager(), contractRepository, mediator, new TestClock(), Logger.None); // Act await handler.Handle(new RequestAdscDemandReportCommand("YBBB", "UAL123"), CancellationToken.None); diff --git a/source/CPDLCServer.Tests/Handlers/RequestDefaultAdscContractCommandHandlerTests.cs b/source/CPDLCServer.Tests/Handlers/RequestDefaultAdscContractCommandHandlerTests.cs index ccda83c..ac4bd03 100644 --- a/source/CPDLCServer.Tests/Handlers/RequestDefaultAdscContractCommandHandlerTests.cs +++ b/source/CPDLCServer.Tests/Handlers/RequestDefaultAdscContractCommandHandlerTests.cs @@ -17,7 +17,7 @@ public async Task Handle_SendsDefaultIntervalViaAcarsClientForStation() // Arrange var clientManager = new TestClientManager(); var handler = new RequestDefaultAdscContractCommandHandler( - clientManager, new TestAdscContractRepository(), Substitute.For(), Logger.None); + clientManager, new TestAdscContractRepository(), Substitute.For(), new TestClock(), Logger.None); // Act await handler.Handle(new RequestDefaultAdscContractCommand("YMMM", "UAL123"), CancellationToken.None); @@ -36,7 +36,7 @@ public async Task Handle_WhenNoContractExists_AddsDefaultContract() var contractRepository = new TestAdscContractRepository(); var mediator = Substitute.For(); var handler = new RequestDefaultAdscContractCommandHandler( - new TestClientManager(), contractRepository, mediator, Logger.None); + new TestClientManager(), contractRepository, mediator, new TestClock(), Logger.None); // Act await handler.Handle(new RequestDefaultAdscContractCommand("YBBB", "UAL123"), CancellationToken.None); @@ -52,6 +52,24 @@ await mediator.Received(1).Publish( Arg.Any()); } + [Fact] + public async Task Handle_LogsActivity() + { + // Arrange + var clock = new TestClock(); + var contractRepository = new TestAdscContractRepository(); + var handler = new RequestDefaultAdscContractCommandHandler( + new TestClientManager(), contractRepository, Substitute.For(), clock, Logger.None); + + // Act + await handler.Handle(new RequestDefaultAdscContractCommand("YBBB", "UAL123"), CancellationToken.None); + + // Assert + var contract = await contractRepository.Find(new AdscContractKey("UAL123", "YBBB"), CancellationToken.None); + Assert.NotNull(contract); + Assert.Equal(clock.UtcNow(), contract.LastActivity); + } + [Fact] public async Task Handle_WhenSelectedContractIsInUse_EndsSelectedContract() { @@ -63,7 +81,7 @@ public async Task Handle_WhenSelectedContractIsInUse_EndsSelectedContract() await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), existingContract, CancellationToken.None); var handler = new RequestDefaultAdscContractCommandHandler( - new TestClientManager(), contractRepository, Substitute.For(), Logger.None); + new TestClientManager(), contractRepository, Substitute.For(), new TestClock(), Logger.None); // Act await handler.Handle(new RequestDefaultAdscContractCommand("YBBB", "UAL123"), CancellationToken.None); diff --git a/source/CPDLCServer/Handlers/AdscMessageReceivedNotificationHandler.cs b/source/CPDLCServer/Handlers/AdscMessageReceivedNotificationHandler.cs index 9501b56..d315bbb 100644 --- a/source/CPDLCServer/Handlers/AdscMessageReceivedNotificationHandler.cs +++ b/source/CPDLCServer/Handlers/AdscMessageReceivedNotificationHandler.cs @@ -26,6 +26,8 @@ public async Task Handle(AdscMessageReceivedNotification notification, Cancellat return; } + contract.LogActivity(message.Received); + switch (message) { case ReceivedAdscReport reportMessage: diff --git a/source/CPDLCServer/Handlers/CancelAdscContractsOnAllControllersDisconnectedHandler.cs b/source/CPDLCServer/Handlers/CancelAdscContractsOnAllControllersDisconnectedHandler.cs deleted file mode 100644 index 4c9c7eb..0000000 --- a/source/CPDLCServer/Handlers/CancelAdscContractsOnAllControllersDisconnectedHandler.cs +++ /dev/null @@ -1,48 +0,0 @@ -using CPDLCServer.Messages; -using CPDLCServer.Persistence; -using MediatR; - -namespace CPDLCServer.Handlers; - -public class CancelAdscContractsOnAllControllersDisconnectedHandler( - IControllerRepository controllerRepository, - IAdscContractRepository adscContractRepository, - IMediator mediator, - ILogger logger) - : INotificationHandler -{ - public async Task Handle(ControllerDisconnectedNotification notification, CancellationToken cancellationToken) - { - // Note: The disconnected controller is already removed from the repository - var controllers = await controllerRepository.All(cancellationToken); - if (controllers.Length > 0) - return; - - var contracts = await adscContractRepository.All(cancellationToken); - if (contracts.Length == 0) - return; - - logger.Information( - "No controllers are connected. Cancelling {ContractCount} ADS-C contract(s)", - contracts.Length); - - foreach (var contract in contracts) - { - // A failure for one aircraft must not stop the other aircraft - try - { - await mediator.Send( - new CancelAdscContractCommand(contract.StationId, contract.Callsign), - cancellationToken); - } - catch (Exception ex) when (!cancellationToken.IsCancellationRequested) - { - logger.Error( - ex, - "Failed to cancel ADS-C contract with {Callsign} for {StationId}", - contract.Callsign, - contract.StationId); - } - } - } -} diff --git a/source/CPDLCServer/Handlers/EndExpiredAdscContractsRequestHandler.cs b/source/CPDLCServer/Handlers/EndExpiredAdscContractsRequestHandler.cs index 7b8f9fa..dc8f76c 100644 --- a/source/CPDLCServer/Handlers/EndExpiredAdscContractsRequestHandler.cs +++ b/source/CPDLCServer/Handlers/EndExpiredAdscContractsRequestHandler.cs @@ -1,11 +1,14 @@ +using CPDLCServer.Clients; using CPDLCServer.Infrastructure; using CPDLCServer.Messages; +using CPDLCServer.Model; using CPDLCServer.Persistence; using MediatR; namespace CPDLCServer.Handlers; public class EndExpiredAdscContractsRequestHandler( + IClientManager clientManager, IAdscContractRepository adscContractRepository, IClock clock, IMediator mediator, @@ -19,6 +22,25 @@ public async Task Handle(EndExpiredAdscContractsRequest request, CancellationTok foreach (var contract in contracts) { + if (now - contract.LastActivity > request.ContractTimeout) + { + // A failure for one aircraft must not stop the other aircraft + try + { + await CancelInactiveContract(contract, cancellationToken); + } + catch (Exception ex) when (!cancellationToken.IsCancellationRequested) + { + logger.Error( + ex, + "Failed to remove inactive ADS-C contract with {Callsign} for {StationId}", + contract.Callsign, + contract.StationId); + } + + continue; + } + if (contract.SelectedContractEnds is null || contract.SelectedContractEnds > now) continue; @@ -44,4 +66,35 @@ await mediator.Send( } } } + + async Task CancelInactiveContract(AdscContract contract, CancellationToken cancellationToken) + { + logger.Information( + "ADS-C contract with {Callsign} from {StationId} has no activity since {LastActivity}, cancelling", + contract.Callsign, + contract.StationId, + contract.LastActivity); + + // The aircraft is possibly not on the ACARS network any more. + // Remove the contract, even if the ACARS network cannot cancel it. + try + { + var client = await clientManager.GetAcarsClientForStation(contract.StationId, cancellationToken); + await client.CancelAdscContract(contract.Callsign, cancellationToken); + } + catch (Exception ex) when (!cancellationToken.IsCancellationRequested) + { + logger.Warning( + ex, + "Failed to cancel ADS-C contract with {Callsign} for {StationId} on the ACARS network", + contract.Callsign, + contract.StationId); + } + + await adscContractRepository.Remove(new AdscContractKey(contract.Callsign, contract.StationId), cancellationToken); + + await mediator.Publish( + new AdscContractRemovedNotification(contract.Callsign, contract.StationId), + cancellationToken); + } } diff --git a/source/CPDLCServer/Handlers/ProduceVatsimAdscReportsRequestHandler.cs b/source/CPDLCServer/Handlers/ProduceVatsimAdscReportsRequestHandler.cs index 845feef..1c09b7a 100644 --- a/source/CPDLCServer/Handlers/ProduceVatsimAdscReportsRequestHandler.cs +++ b/source/CPDLCServer/Handlers/ProduceVatsimAdscReportsRequestHandler.cs @@ -75,6 +75,8 @@ 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/RequestAdscDemandReportCommandHandler.cs b/source/CPDLCServer/Handlers/RequestAdscDemandReportCommandHandler.cs index 4870c28..9cb51c8 100644 --- a/source/CPDLCServer/Handlers/RequestAdscDemandReportCommandHandler.cs +++ b/source/CPDLCServer/Handlers/RequestAdscDemandReportCommandHandler.cs @@ -1,4 +1,5 @@ using CPDLCServer.Clients; +using CPDLCServer.Infrastructure; using CPDLCServer.Messages; using CPDLCServer.Model; using CPDLCServer.Persistence; @@ -10,6 +11,7 @@ public class RequestAdscDemandReportCommandHandler( IClientManager clientManager, IAdscContractRepository adscContractRepository, IMediator mediator, + IClock clock, ILogger logger) : IRequestHandler { @@ -34,6 +36,7 @@ public async Task Handle(RequestAdscDemandReportCommand request, CancellationTok } 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 6f36c82..ecc4f8f 100644 --- a/source/CPDLCServer/Handlers/RequestDefaultAdscContractCommandHandler.cs +++ b/source/CPDLCServer/Handlers/RequestDefaultAdscContractCommandHandler.cs @@ -1,4 +1,5 @@ using CPDLCServer.Clients; +using CPDLCServer.Infrastructure; using CPDLCServer.Messages; using CPDLCServer.Model; using CPDLCServer.Persistence; @@ -10,6 +11,7 @@ public class RequestDefaultAdscContractCommandHandler( IClientManager clientManager, IAdscContractRepository adscContractRepository, IMediator mediator, + IClock clock, ILogger logger) : IRequestHandler { @@ -36,6 +38,7 @@ public async Task Handle(RequestDefaultAdscContractCommand request, Cancellation } 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 38984e2..94ce6c4 100644 --- a/source/CPDLCServer/Handlers/RequestSelectedAdscContractCommandHandler.cs +++ b/source/CPDLCServer/Handlers/RequestSelectedAdscContractCommandHandler.cs @@ -45,6 +45,7 @@ public async Task Handle(RequestSelectedAdscContractCommand request, Cancellatio } contract.RequestSelectedContract(request.ReportingInterval, ends); + contract.LogActivity(clock.UtcNow()); await mediator.Publish(new AdscContractChangedNotification(contract), cancellationToken); } diff --git a/source/CPDLCServer/Messages/EndExpiredAdscContractsRequest.cs b/source/CPDLCServer/Messages/EndExpiredAdscContractsRequest.cs index 73683c2..4f4eada 100644 --- a/source/CPDLCServer/Messages/EndExpiredAdscContractsRequest.cs +++ b/source/CPDLCServer/Messages/EndExpiredAdscContractsRequest.cs @@ -2,4 +2,4 @@ namespace CPDLCServer.Messages; -public record EndExpiredAdscContractsRequest : IRequest; +public record EndExpiredAdscContractsRequest(TimeSpan ContractTimeout) : IRequest; diff --git a/source/CPDLCServer/Model/AdscContract.cs b/source/CPDLCServer/Model/AdscContract.cs index c737499..401193e 100644 --- a/source/CPDLCServer/Model/AdscContract.cs +++ b/source/CPDLCServer/Model/AdscContract.cs @@ -30,6 +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; } + public bool HasPeriodicContract => DefaultContractState is AdscContractState.Sent or AdscContractState.Accepted || SelectedContractState is AdscContractState.Sent or AdscContractState.Accepted; @@ -39,6 +42,11 @@ DefaultContractState is AdscContractState.Sent or AdscContractState.Accepted || HasPeriodicContract || DemandContractState is AdscContractState.Sent or AdscContractState.Accepted; + public void LogActivity(DateTimeOffset now) + { + LastActivity = now; + } + /// /// The default contract replaces a selected contract that is in use. /// A rejected selected contract stays, so that the controller can see the rejection. diff --git a/source/CPDLCServer/Services/AdscContractExpiryService.cs b/source/CPDLCServer/Services/AdscContractExpiryService.cs index 2db4acb..d03f0e9 100644 --- a/source/CPDLCServer/Services/AdscContractExpiryService.cs +++ b/source/CPDLCServer/Services/AdscContractExpiryService.cs @@ -6,6 +6,7 @@ namespace CPDLCServer.Services; public class AdscContractExpiryService : IHostedService, IDisposable { readonly TimeSpan _checkInterval = TimeSpan.FromMinutes(1); + readonly TimeSpan _contractTimeout; readonly IMediator _mediator; readonly ILogger _logger; @@ -13,10 +14,12 @@ public class AdscContractExpiryService : IHostedService, IDisposable CancellationTokenSource? _cancellationTokenSource; Task? _task; - public AdscContractExpiryService(IMediator mediator, ILogger logger) + public AdscContractExpiryService(IConfiguration configuration, IMediator mediator, ILogger logger) { _mediator = mediator; _logger = logger.ForContext(); + + _contractTimeout = configuration.GetValue("AdscContractTimeout", TimeSpan.FromMinutes(120)); } public Task StartAsync(CancellationToken cancellationToken) @@ -57,7 +60,7 @@ async Task DoWork(CancellationToken stoppingToken) using var timeoutCts = CancellationTokenSource.CreateLinkedTokenSource(stoppingToken); timeoutCts.CancelAfter(TimeSpan.FromMinutes(1)); - await _mediator.Send(new EndExpiredAdscContractsRequest(), timeoutCts.Token); + await _mediator.Send(new EndExpiredAdscContractsRequest(_contractTimeout), timeoutCts.Token); await Task.Delay(_checkInterval, stoppingToken); } From 44d983e0df900bb4783f96cef0626bb70e52152c Mon Sep 17 00:00:00 2001 From: Eoin Motherway <25342760+YuKitsune@users.noreply.github.com> Date: Sun, 1 Nov 2026 13:54:04 +1000 Subject: [PATCH 4/4] Time out ADS-C contracts when the aircraft leaves Hoppie and VATSIM Only the aircraft keeps a contract alive: presence on the ACARS network or in the VATSIM data, or an ADS-C message. Controller requests do not. Add AdscContractTimeout to example.env. Co-Authored-By: Claude Opus 5.5 --- example.env | 3 ++ ...MessageReceivedNotificationHandlerTests.cs | 2 +- .../CancelAdscContractCommandHandlerTests.cs | 6 +-- ...scContractOnConnectionEndedHandlerTests.cs | 8 +-- ...ExpiredAdscContractsRequestHandlerTests.cs | 24 +++------ ...uceVatsimAdscReportsRequestHandlerTests.cs | 42 ++++++++++++++- ...efreshAcarsCallsignsRequestHandlerTests.cs | 52 +++++++++++++++++++ ...ractOnConnectionEstablishedHandlerTests.cs | 6 +-- ...uestAdscDemandReportCommandHandlerTests.cs | 2 +- ...tDefaultAdscContractCommandHandlerTests.cs | 25 ++++++++- ...SelectedAdscContractCommandHandlerTests.cs | 2 +- .../Model/AdscContractTests.cs | 26 +++++----- .../ProduceVatsimAdscReportsRequestHandler.cs | 11 +++- .../RefreshAcarsCallsignsRequestHandler.cs | 13 +++++ .../RequestAdscDemandReportCommandHandler.cs | 3 +- ...equestDefaultAdscContractCommandHandler.cs | 3 +- ...questSelectedAdscContractCommandHandler.cs | 3 +- source/CPDLCServer/Model/AdscContract.cs | 7 +-- .../Services/AdscContractExpiryService.cs | 11 ++++ 19 files changed, 192 insertions(+), 57 deletions(-) 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)