Renames all 11 projects (5 src + 6 tests), the .slnx solution file, all source-file namespaces, all axaml namespace references, and all v1 documentation references in CLAUDE.md and docs/*.md (excluding docs/v2/ which is already in OtOpcUa form). Also updates the TopShelf service registration name from "LmxOpcUa" to "OtOpcUa" per Phase 0 Task 0.6.
Preserves runtime identifiers per Phase 0 Out-of-Scope rules to avoid breaking v1/v2 client trust during coexistence: OPC UA `ApplicationUri` defaults (`urn:{GalaxyName}:LmxOpcUa`), server `EndpointPath` (`/LmxOpcUa`), `ServerName` default (feeds cert subject CN), `MxAccessConfiguration.ClientName` default (defensive — stays "LmxOpcUa" for MxAccess audit-trail consistency), client OPC UA identifiers (`ApplicationName = "LmxOpcUaClient"`, `ApplicationUri = "urn:localhost:LmxOpcUaClient"`, cert directory `%LocalAppData%\LmxOpcUaClient\pki\`), and the `LmxOpcUaServer` class name (class rename out of Phase 0 scope per Task 0.5 sed pattern; happens in Phase 1 alongside `LmxNodeManager → GenericDriverNodeManager` Core extraction). 23 LmxOpcUa references retained, all enumerated and justified in `docs/v2/implementation/exit-gate-phase-0.md`.
Build clean: 0 errors, 30 warnings (lower than baseline 167). Tests at strict improvement over baseline: 821 passing / 1 failing vs baseline 820 / 2 (one flaky pre-existing failure passed this run; the other still fails — both pre-existing and unrelated to the rename). `Client.UI.Tests`, `Historian.Aveva.Tests`, `Client.Shared.Tests`, `IntegrationTests` all match baseline exactly. Exit gate compliance results recorded in `docs/v2/implementation/exit-gate-phase-0.md` with all 7 checks PASS or DEFERRED-to-PR-review (#7 service install verification needs Windows service permissions on the reviewer's box).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
134 lines
4.0 KiB
C#
134 lines
4.0 KiB
C#
using Opc.Ua;
|
|
using Opc.Ua.Client;
|
|
using Serilog;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.Client.Shared.Adapters;
|
|
|
|
/// <summary>
|
|
/// Production subscription adapter wrapping a real OPC UA Subscription.
|
|
/// </summary>
|
|
internal sealed class DefaultSubscriptionAdapter : ISubscriptionAdapter
|
|
{
|
|
private static readonly ILogger Logger = Log.ForContext<DefaultSubscriptionAdapter>();
|
|
private readonly Dictionary<uint, MonitoredItem> _monitoredItems = new();
|
|
private readonly Subscription _subscription;
|
|
|
|
/// <summary>
|
|
/// Wraps a live OPC UA subscription so client code can manage monitored items through a testable abstraction.
|
|
/// </summary>
|
|
/// <param name="subscription">The underlying OPC UA subscription that owns monitored items for this client workflow.</param>
|
|
public DefaultSubscriptionAdapter(Subscription subscription)
|
|
{
|
|
_subscription = subscription;
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public uint SubscriptionId => _subscription.Id;
|
|
|
|
/// <inheritdoc />
|
|
public async Task<uint> AddDataChangeMonitoredItemAsync(
|
|
NodeId nodeId, int samplingIntervalMs, Action<string, DataValue> onDataChange, CancellationToken ct)
|
|
{
|
|
var item = new MonitoredItem(_subscription.DefaultItem)
|
|
{
|
|
StartNodeId = nodeId,
|
|
DisplayName = nodeId.ToString(),
|
|
SamplingInterval = samplingIntervalMs
|
|
};
|
|
|
|
item.Notification += (_, e) =>
|
|
{
|
|
if (e.NotificationValue is MonitoredItemNotification notification)
|
|
onDataChange(nodeId.ToString(), notification.Value);
|
|
};
|
|
|
|
_subscription.AddItem(item);
|
|
await _subscription.ApplyChangesAsync(ct);
|
|
|
|
var handle = item.ClientHandle;
|
|
_monitoredItems[handle] = item;
|
|
|
|
Logger.Debug("Added data change monitored item for {NodeId}, handle={Handle}", nodeId, handle);
|
|
return handle;
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public async Task RemoveMonitoredItemAsync(uint clientHandle, CancellationToken ct)
|
|
{
|
|
if (!_monitoredItems.TryGetValue(clientHandle, out var item))
|
|
return;
|
|
|
|
_subscription.RemoveItem(item);
|
|
await _subscription.ApplyChangesAsync(ct);
|
|
_monitoredItems.Remove(clientHandle);
|
|
|
|
Logger.Debug("Removed monitored item handle={Handle}", clientHandle);
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public async Task<uint> AddEventMonitoredItemAsync(
|
|
NodeId nodeId, int samplingIntervalMs, EventFilter filter, Action<EventFieldList> onEvent, CancellationToken ct)
|
|
{
|
|
var item = new MonitoredItem(_subscription.DefaultItem)
|
|
{
|
|
StartNodeId = nodeId,
|
|
DisplayName = "AlarmMonitor",
|
|
SamplingInterval = samplingIntervalMs,
|
|
NodeClass = NodeClass.Object,
|
|
AttributeId = Attributes.EventNotifier,
|
|
Filter = filter
|
|
};
|
|
|
|
item.Notification += (_, e) =>
|
|
{
|
|
if (e.NotificationValue is EventFieldList eventFields) onEvent(eventFields);
|
|
};
|
|
|
|
_subscription.AddItem(item);
|
|
await _subscription.ApplyChangesAsync(ct);
|
|
|
|
var handle = item.ClientHandle;
|
|
_monitoredItems[handle] = item;
|
|
|
|
Logger.Debug("Added event monitored item for {NodeId}, handle={Handle}", nodeId, handle);
|
|
return handle;
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public async Task ConditionRefreshAsync(CancellationToken ct)
|
|
{
|
|
await _subscription.ConditionRefreshAsync(ct);
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public async Task DeleteAsync(CancellationToken ct)
|
|
{
|
|
try
|
|
{
|
|
await _subscription.DeleteAsync(true);
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
Logger.Warning(ex, "Error deleting subscription");
|
|
}
|
|
|
|
_monitoredItems.Clear();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Releases the wrapped OPC UA subscription and clears tracked monitored items held by the adapter.
|
|
/// </summary>
|
|
public void Dispose()
|
|
{
|
|
try
|
|
{
|
|
_subscription.Delete(true);
|
|
}
|
|
catch
|
|
{
|
|
}
|
|
|
|
_monitoredItems.Clear();
|
|
}
|
|
}
|