Joseph Doherty
2e0743ad25
H1 (HIGH): write-routing key now (AddressSpaceRealm, bareId), not bare-only. A raw s=<RawPath> and a UNS s=<Area/Line/Equip/Eff> can collide as bare strings; the bare-only key let a colliding raw+UNS pair route to the WRONG driver ref (last-writer-wins). The realm the node manager resolves (RealmOf) is now threaded through IOpcUaNodeWriteGateway.WriteAsync -> RouteNodeWrite -> _driverRefByNodeId keyed by (realm, bareId). New regression test: Colliding_raw_and_uns_bare_ids_route_to_their_own_driver_by_realm. M1 (MEDIUM): discovered-node injection made coherently DORMANT. HandleDiscoveredNodes hard-short-circuits (single enforcement point; _discoveredByDriver never populates so the re-inject tail is inert too), with a clear log pointing at the /raw browse-commit flow. New pin: Discovered_nodes_are_ignored_dormant_in_v3; the 16+2 v2 injection scenarios re-pointed to an accurate skip reason (DiscoveryInjectionDormantV3). M2 (MEDIUM): realm-qualified dual-node self-correction tests — Failed_uns_write_reverts_uns_node_and_leaves_raw_node_untouched + Raw_realm_revert_reverts_raw_node_only (the second fails if the realm is dropped). L1: removed the = AddressSpaceRealm.Uns defaults from the consequential node-manager mutation methods (WriteValue/WriteAlarmCondition/MaterialiseAlarmCondition/ EnsureFolder/EnsureVariable/UpdateFolderDisplayName/UpdateTagAttributes/ RaiseNodesAddedModelChange/Remove*/RevertOptimisticWriteIfNeeded) + the AttributeValueUpdate/AlarmStateUpdate records, so the compiler forces explicit realm; read-only accessors + internal builders retain their defaults. L3: fixed the stale VirtualTagHostActor class comment (V3NodeIds.Uns, not the retired EquipmentNodeIds.Variable). Also: DeploymentArtifactRawUnsParityTests — Raw/UNS node-set byte-parity round-trip between AddressSpaceComposer.Compose and DeploymentArtifact.ParseComposition. Claude-Session: https://claude.ai/code/session_01LVneM3eh1UtJxEisFXgmox
43 lines
2.7 KiB
C#
43 lines
2.7 KiB
C#
namespace ZB.MOM.WW.OtOpcUa.Commons.OpcUa;
|
|
|
|
/// <summary>
|
|
/// Reverse-path gateway for an inbound OPC UA operator write to a writable equipment-tag node.
|
|
/// The node manager calls <see cref="WriteAsync"/> fire-and-forget from its OnWriteValue handler
|
|
/// (which runs under the node-manager Lock, so the call MUST return promptly — it kicks off an
|
|
/// asynchronous route and the Task completes later) and uses the resolved
|
|
/// <see cref="NodeWriteOutcome"/> to self-correct the node on failure.
|
|
/// </summary>
|
|
public interface IOpcUaNodeWriteGateway
|
|
{
|
|
/// <summary>Route a write of <paramref name="value"/> to the driver backing node
|
|
/// <paramref name="nodeId"/>; the returned task resolves with the device-write outcome.</summary>
|
|
/// <param name="nodeId">The full ns-qualified node id being written (<c>node.NodeId.ToString()</c>).</param>
|
|
/// <param name="value">The value the client wrote.</param>
|
|
/// <param name="realm">Which of the two v3 namespaces (<see cref="AddressSpaceRealm.Raw"/> device tree or
|
|
/// <see cref="AddressSpaceRealm.Uns"/> equipment tree) <paramref name="nodeId"/> lives in — the node
|
|
/// manager resolves it from the node's namespace index (<c>RealmOf</c>). It is REQUIRED for correct
|
|
/// routing: a raw <c>s=<RawPath></c> and a UNS <c>s=<Area/Line/Equip/Eff></c> can collide as bare
|
|
/// strings, so the routing map is keyed by <c>(realm, bareId)</c> — dropping the realm would let an
|
|
/// operator write route to the WRONG driver ref.</param>
|
|
/// <param name="ct">Cancellation token.</param>
|
|
/// <returns>A task resolving to the device-write outcome.</returns>
|
|
Task<NodeWriteOutcome> WriteAsync(string nodeId, object? value, AddressSpaceRealm realm, CancellationToken ct);
|
|
}
|
|
|
|
/// <summary>Outcome of routing an inbound node write to the backing driver.</summary>
|
|
/// <param name="Success">True when the driver accepted the write.</param>
|
|
/// <param name="Reason">Failure detail when <paramref name="Success"/> is false; null on success.</param>
|
|
public readonly record struct NodeWriteOutcome(bool Success, string? Reason);
|
|
|
|
/// <summary>No-op gateway: every write resolves to "writes unavailable" (matches the legacy
|
|
/// no-router-wired <c>BadNotWritable</c>). The default before the host wires the real gateway.</summary>
|
|
public sealed class NullOpcUaNodeWriteGateway : IOpcUaNodeWriteGateway
|
|
{
|
|
/// <summary>The shared singleton instance.</summary>
|
|
public static readonly NullOpcUaNodeWriteGateway Instance = new();
|
|
private NullOpcUaNodeWriteGateway() { }
|
|
/// <inheritdoc />
|
|
public Task<NodeWriteOutcome> WriteAsync(string nodeId, object? value, AddressSpaceRealm realm, CancellationToken ct) =>
|
|
Task.FromResult(new NodeWriteOutcome(false, "writes unavailable"));
|
|
}
|