69e0d02c72
Catch-all commit for pending work on the task-galaxy-e2e branch that
wasn't part of the FOCAS migration. Grouping by topic so future per-topic
commits can be cherry-picked if needed.
TwinCAT
- src/.../Driver.TwinCAT/AdsTwinCATClient.cs + TwinCATDriverFactoryExtensions.cs:
factory-registration extensions + ADS client refinements.
- src/.../Driver.TwinCAT.Cli/Commands/BrowseCommand.cs: new browse command
for the TwinCAT test-client CLI.
- tests/.../Driver.TwinCAT.IntegrationTests/TwinCAT3SmokeTests.cs + TwinCatProject/:
fixture scaffold with a minimal POU + README pointing at the TCBSD/ESXi
VM for e2e.
- docs/Driver.TwinCAT.Cli.md + docs/drivers/TwinCAT-Test-Fixture.md:
documentation for the above.
- docs/v3/twincat-backlog.md: forward-looking backlog seed.
Admin UI + fleet status
- src/.../Admin/Components/Pages/Clusters/DriversTab.razor + Hosts.razor:
UI refresh for fleet-status rendering.
- src/.../Admin/Hubs/FleetStatusHub.cs + FleetStatusPoller.cs +
Admin/Program.cs: SignalR hub + poller plumbing for live fleet data.
- tests/.../Admin.Tests/FleetStatusPollerTests.cs: poller coverage.
Server + redundancy runtime (Phase 6.3 follow-ups)
- src/.../Server/Hosting/RedundancyPublisherHostedService.cs: HostedService
that owns the RedundancyStatePublisher lifecycle + wires peer reachability.
- src/.../Server/Redundancy/ServerRedundancyNodeWriter.cs: OPC UA
variable-node writer binding ServiceLevel + ServerUriArray to the
publisher's events.
- src/.../Server/Program.cs + Server.csproj: hosted-service registration.
- tests/.../Server.Tests/ServerRedundancyNodeWriterTests.cs +
Server.Tests.csproj: coverage for the above.
Configuration
- src/.../Configuration/Validation/DraftValidator.cs +
tests/.../Configuration.Tests/DraftValidatorTests.cs: draft-validation
refinements.
E2E scripts (shared infrastructure)
- scripts/e2e/README.md + _common.ps1 + test-all.ps1: shared helpers + the
all-drivers test-all runner.
- scripts/e2e/test-opcuaclient.ps1: OPC UA Client e2e runner.
Docs
- docs/v2/implementation/phase-6-{1,2,3,4}*.md + exit-gate-phase-{3,7}.md:
phase-gate + implementation doc updates.
- docs/v2/plan.md: top-level plan refresh.
- docs/v2/redundancy-interop-playbook.md: client interop playbook for the
Phase 6.3 redundancy-runtime work.
Two orphan FOCAS docs remain on disk but deliberately unstaged —
docs/v2/focas-deployment.md and docs/v2/implementation/focas-simulator-plan.md
describe the now-retired Tier-C topology and should either be rewritten
or deleted in a follow-up.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
55 lines
2.1 KiB
C#
55 lines
2.1 KiB
C#
using Microsoft.AspNetCore.SignalR;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.Admin.Hubs;
|
|
|
|
/// <summary>
|
|
/// Pushes per-node generation-apply state changes (<c>ClusterNodeGenerationState</c>) to
|
|
/// subscribed browser clients. Clients call <c>SubscribeCluster(clusterId)</c> on connect to
|
|
/// scope notifications; the server sends <c>NodeStateChanged</c> messages whenever the poller
|
|
/// observes a delta.
|
|
/// </summary>
|
|
public sealed class FleetStatusHub : Hub
|
|
{
|
|
public Task SubscribeCluster(string clusterId)
|
|
{
|
|
if (string.IsNullOrWhiteSpace(clusterId)) return Task.CompletedTask;
|
|
return Groups.AddToGroupAsync(Context.ConnectionId, GroupName(clusterId));
|
|
}
|
|
|
|
public Task UnsubscribeCluster(string clusterId)
|
|
{
|
|
if (string.IsNullOrWhiteSpace(clusterId)) return Task.CompletedTask;
|
|
return Groups.RemoveFromGroupAsync(Context.ConnectionId, GroupName(clusterId));
|
|
}
|
|
|
|
/// <summary>Clients call this once to also receive fleet-wide status — used by the dashboard.</summary>
|
|
public Task SubscribeFleet() => Groups.AddToGroupAsync(Context.ConnectionId, FleetGroup);
|
|
|
|
public const string FleetGroup = "__fleet__";
|
|
public static string GroupName(string clusterId) => $"cluster:{clusterId}";
|
|
}
|
|
|
|
public sealed record NodeStateChangedMessage(
|
|
string NodeId,
|
|
string ClusterId,
|
|
long? CurrentGenerationId,
|
|
string? LastAppliedStatus,
|
|
string? LastAppliedError,
|
|
DateTime? LastAppliedAt,
|
|
DateTime? LastSeenAt);
|
|
|
|
/// <summary>
|
|
/// Pushed by <c>FleetStatusPoller</c> when it observes a change in a
|
|
/// <c>DriverInstanceResilienceStatus</c> row. Closes the last Phase 6.1 Stream E.2/E.3
|
|
/// deferral — lets the Admin <c>/hosts</c> page upsert the matching row without the
|
|
/// 10-second polling round-trip. Keyed on (DriverInstanceId, HostName); the client
|
|
/// fan-outs to the matching row by matching both.
|
|
/// </summary>
|
|
public sealed record ResilienceStatusChangedMessage(
|
|
string DriverInstanceId,
|
|
string HostName,
|
|
int ConsecutiveFailures,
|
|
DateTime? LastCircuitBreakerOpenUtc,
|
|
int CurrentBulkheadDepth,
|
|
DateTime? LastRecycleUtc);
|