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>
149 lines
5.1 KiB
C#
149 lines
5.1 KiB
C#
using System;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using ZB.MOM.WW.OtOpcUa.Host.Domain;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.Host.MxAccess
|
|
{
|
|
public sealed partial class MxAccessClient
|
|
{
|
|
/// <summary>
|
|
/// Opens the MXAccess runtime connection, replays stored subscriptions, and starts the optional probe subscription.
|
|
/// </summary>
|
|
/// <param name="ct">A token that cancels the connection attempt.</param>
|
|
public async Task ConnectAsync(CancellationToken ct = default)
|
|
{
|
|
if (_state == ConnectionState.Connected) return;
|
|
|
|
SetState(ConnectionState.Connecting);
|
|
try
|
|
{
|
|
_connectionHandle = await _staThread.RunAsync(() =>
|
|
{
|
|
AttachProxyEvents();
|
|
return _proxy.Register(_config.ClientName);
|
|
});
|
|
|
|
Log.Information("MxAccess registered with handle {Handle}", _connectionHandle);
|
|
SetState(ConnectionState.Connected);
|
|
|
|
// Replay stored subscriptions
|
|
await ReplayStoredSubscriptionsAsync();
|
|
|
|
// Start probe if configured
|
|
if (!string.IsNullOrWhiteSpace(_config.ProbeTag))
|
|
{
|
|
_probeTag = _config.ProbeTag;
|
|
_lastProbeValueTime = DateTime.UtcNow;
|
|
await SubscribeInternalAsync(_probeTag!);
|
|
Log.Information("Probe tag subscribed: {ProbeTag}", _probeTag);
|
|
}
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
try
|
|
{
|
|
await _staThread.RunAsync(DetachProxyEvents);
|
|
}
|
|
catch (Exception cleanupEx)
|
|
{
|
|
Log.Warning(cleanupEx, "Failed to detach proxy events after connection failure");
|
|
}
|
|
|
|
Log.Error(ex, "MxAccess connection failed");
|
|
SetState(ConnectionState.Error, ex.Message);
|
|
throw;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Disconnects from the runtime and cleans up active handles, callbacks, and pending operations.
|
|
/// </summary>
|
|
public async Task DisconnectAsync()
|
|
{
|
|
if (_state == ConnectionState.Disconnected) return;
|
|
|
|
SetState(ConnectionState.Disconnecting);
|
|
try
|
|
{
|
|
await _staThread.RunAsync(() =>
|
|
{
|
|
// UnAdvise + RemoveItem for all active subscriptions
|
|
foreach (var kvp in _addressToHandle)
|
|
try
|
|
{
|
|
_proxy.UnAdviseSupervisory(_connectionHandle, kvp.Value);
|
|
_proxy.RemoveItem(_connectionHandle, kvp.Value);
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
Log.Warning(ex, "Error cleaning up subscription for {Address}", kvp.Key);
|
|
}
|
|
|
|
// Unwire events before unregister
|
|
DetachProxyEvents();
|
|
|
|
// Unregister
|
|
try
|
|
{
|
|
_proxy.Unregister(_connectionHandle);
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
Log.Warning(ex, "Error during Unregister");
|
|
}
|
|
});
|
|
|
|
_handleToAddress.Clear();
|
|
_addressToHandle.Clear();
|
|
_pendingReadsByAddress.Clear();
|
|
_pendingWrites.Clear();
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
Log.Warning(ex, "Error during disconnect");
|
|
}
|
|
finally
|
|
{
|
|
SetState(ConnectionState.Disconnected);
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Attempts to recover from a runtime fault by disconnecting and reconnecting the client.
|
|
/// </summary>
|
|
public async Task ReconnectAsync()
|
|
{
|
|
SetState(ConnectionState.Reconnecting);
|
|
Interlocked.Increment(ref _reconnectCount);
|
|
Log.Information("MxAccess reconnect attempt #{Count}", _reconnectCount);
|
|
|
|
try
|
|
{
|
|
await DisconnectAsync();
|
|
await ConnectAsync();
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
Log.Error(ex, "Reconnect failed");
|
|
SetState(ConnectionState.Error, ex.Message);
|
|
}
|
|
}
|
|
|
|
private void AttachProxyEvents()
|
|
{
|
|
if (_proxyEventsAttached) return;
|
|
_proxy.OnDataChange += HandleOnDataChange;
|
|
_proxy.OnWriteComplete += HandleOnWriteComplete;
|
|
_proxyEventsAttached = true;
|
|
}
|
|
|
|
private void DetachProxyEvents()
|
|
{
|
|
if (!_proxyEventsAttached) return;
|
|
_proxy.OnDataChange -= HandleOnDataChange;
|
|
_proxy.OnWriteComplete -= HandleOnWriteComplete;
|
|
_proxyEventsAttached = false;
|
|
}
|
|
}
|
|
} |