Completes local-dev-master-slave-setup: dual-instance frontend tooling, module-capability gating, and master/slave protocol self-healing fixes
Frontend (Unit 2 completion): dual dev-server tooling (pnpm dev:slave, pnpm dev:all), per-instance browser tab titles, and a backend capability check (SystemController + useSystemCapabilities + ModuleGuard) so a Master-only page is hidden on a slave instance instead of assuming every backend has every module. Master/slave protocol fixes surfaced by actually running master and slave side by side locally: - Deactivating a CMS instance (Inactive) now releases the slave's master gate instead of leaving it stuck on its last pushed status. - The periodic integrity check now also re-pushes status to every reachable slave (previously URL-verification only) and runs once immediately on startup. - Added the originally-specified (but never implemented) slave-pull path: a slave now periodically polls its own status from the master (GET /api/v1/SlaveStatus) and fails open to Available if the master is unreachable for too long, complementing the existing push. - The slave's own Settings page can no longer "successfully" change local availability while the master controls it; it's now locked with an explanatory banner and the backend rejects the write with 409 instead of silently no-op'ing it. - CMS instance status badges now match the dashboard's color/icon styling instead of a plain grey badge. Also corrected the master-cms-module design docs to match this as-built behavior, and flagged (without a full rewrite) a larger, pre-existing divergence between its inception-stage application design and what construction actually built. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
+111
@@ -237,4 +237,115 @@ public class MasterAvailabilityServiceTests : IDisposable
|
||||
status.IsAvailable.Should().BeTrue();
|
||||
status.DisableMessage.Should().BeNull();
|
||||
}
|
||||
|
||||
// --- GetPollTargetAsync ---
|
||||
|
||||
[Fact]
|
||||
public async Task GetPollTargetAsync_ReturnsMasterUrlAndPlainKey_WhenRegistered()
|
||||
{
|
||||
var existing = new MasterRegistration
|
||||
{
|
||||
Id = MasterRegistration.SingletonId,
|
||||
MasterUrl = "https://master.example.com",
|
||||
ApiKey = "enc:key",
|
||||
RegisteredAt = DateTimeOffset.UtcNow
|
||||
};
|
||||
_repo.GetAsync().Returns(existing);
|
||||
_protector.Unprotect("enc:key").Returns("key");
|
||||
|
||||
var target = await _svc.GetPollTargetAsync();
|
||||
|
||||
target.Should().NotBeNull();
|
||||
target!.MasterUrl.Should().Be("https://master.example.com");
|
||||
target.PlainApiKey.Should().Be("key");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetPollTargetAsync_ReturnsNull_WhenNoRegistration()
|
||||
{
|
||||
_repo.GetAsync().Returns((MasterRegistration?)null);
|
||||
|
||||
var target = await _svc.GetPollTargetAsync();
|
||||
|
||||
target.Should().BeNull();
|
||||
}
|
||||
|
||||
// --- ApplyPolledStatusAsync ---
|
||||
|
||||
[Fact]
|
||||
public async Task ApplyPolledStatusAsync_UpdatesGateAndPersistsPollTimestamp()
|
||||
{
|
||||
var existing = new MasterRegistration
|
||||
{
|
||||
Id = MasterRegistration.SingletonId,
|
||||
MasterUrl = "https://master.example.com",
|
||||
ApiKey = "enc:key",
|
||||
RegisteredAt = DateTimeOffset.UtcNow
|
||||
};
|
||||
_repo.GetAsync().Returns(existing);
|
||||
|
||||
await _svc.ApplyPolledStatusAsync(false, "Onderhoud");
|
||||
|
||||
var status = _svc.GetMasterStatus();
|
||||
status.IsAvailable.Should().BeFalse();
|
||||
status.DisableMessage.Should().Be("Onderhoud");
|
||||
existing.LastPolledAt.Should().NotBeNull();
|
||||
_repo.Received(1).Update(existing);
|
||||
await _repo.Received(1).SaveChangesAsync();
|
||||
}
|
||||
|
||||
// --- RecordPollFailureAsync ---
|
||||
|
||||
[Fact]
|
||||
public async Task RecordPollFailureAsync_DoesNotFailOpen_WhenWithinGracePeriod()
|
||||
{
|
||||
var existing = new MasterRegistration
|
||||
{
|
||||
Id = MasterRegistration.SingletonId,
|
||||
MasterUrl = "https://master.example.com",
|
||||
ApiKey = "enc:key",
|
||||
RegisteredAt = DateTimeOffset.UtcNow,
|
||||
LastPolledAt = DateTimeOffset.UtcNow
|
||||
};
|
||||
_repo.GetAsync().Returns(existing);
|
||||
_protector.Unprotect("enc:key").Returns("key");
|
||||
await _svc.PushStatusAsync("key", false, "Down");
|
||||
|
||||
await _svc.RecordPollFailureAsync(TimeSpan.FromMinutes(5));
|
||||
|
||||
var status = _svc.GetMasterStatus();
|
||||
status.IsAvailable.Should().BeFalse();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task RecordPollFailureAsync_FailsOpen_WhenMasterUnreachableTooLong()
|
||||
{
|
||||
var existing = new MasterRegistration
|
||||
{
|
||||
Id = MasterRegistration.SingletonId,
|
||||
MasterUrl = "https://master.example.com",
|
||||
ApiKey = "enc:key",
|
||||
RegisteredAt = DateTimeOffset.UtcNow.AddMinutes(-30),
|
||||
LastPolledAt = DateTimeOffset.UtcNow.AddMinutes(-10)
|
||||
};
|
||||
_repo.GetAsync().Returns(existing);
|
||||
_protector.Unprotect("enc:key").Returns("key");
|
||||
await _svc.PushStatusAsync("key", false, "Down");
|
||||
|
||||
await _svc.RecordPollFailureAsync(TimeSpan.FromMinutes(5));
|
||||
|
||||
var status = _svc.GetMasterStatus();
|
||||
status.IsAvailable.Should().BeTrue();
|
||||
status.DisableMessage.Should().BeNull();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task RecordPollFailureAsync_DoesNothing_WhenNoRegistration()
|
||||
{
|
||||
_repo.GetAsync().Returns((MasterRegistration?)null);
|
||||
|
||||
var act = async () => await _svc.RecordPollFailureAsync(TimeSpan.FromMinutes(5));
|
||||
|
||||
await act.Should().NotThrowAsync();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user