fix(dcl): dispose+detach previous OPC UA client on reconnect (S1) — stops session leak and stale ConnectionLost flapping

2026-07-08 23:16:27 -04:00
parent 5d5c747517
commit 11eb5157e6
2 changed files with 70 additions and 0 deletions
@@ -559,4 +559,56 @@ public class OpcUaDataConnectionTests
            Arg.Is<OpcUaConnectionOptions?>(o => o != null && o.AutoAcceptUntrustedCerts == false),
            Arg.Any<CancellationToken>());
    }
+
+    // DataConnectionLayer-S1: the adapter instance is reused across reconnects
+    // (DataConnectionActor calls ConnectAsync again on auto-reconnect). Before the
+    // fix, ConnectAsync overwrote _client without disposing/detaching the previous
+    // one, leaking its session/keep-alive/socket per flap AND leaving its stale
+    // ConnectionLost handler wired — so a late keep-alive death on the OLD client
+    // flapped the NEW healthy session (after _disconnectFired was reset).
+    [Fact]
+    public async Task Reconnect_DisposesAndDetachesPreviousClient()
+    {
+        var clients = new List<IOpcUaClient>();
+        _mockFactory.Create().Returns(_ =>
+        {
+            var c = Substitute.For<IOpcUaClient>();
+            clients.Add(c);
+            return c;
+        });
+        var details = new Dictionary<string, string> { ["EndpointUrl"] = "opc.tcp://x:4840" };
+
+        await _adapter.ConnectAsync(details);   // client[0]
+        await _adapter.ConnectAsync(details);   // reconnect -> client[1]
+
+        Assert.Equal(2, clients.Count);
+        await clients[0].Received(1).DisposeAsync();
+        await clients[1].DidNotReceive().DisposeAsync();
+    }
+
+    [Fact]
+    public async Task StaleClientConnectionLost_DoesNotRaiseDisconnected_AfterReconnect()
+    {
+        var clients = new List<IOpcUaClient>();
+        _mockFactory.Create().Returns(_ =>
+        {
+            var c = Substitute.For<IOpcUaClient>();
+            clients.Add(c);
+            return c;
+        });
+        var details = new Dictionary<string, string> { ["EndpointUrl"] = "opc.tcp://x:4840" };
+        var disconnects = 0;
+        _adapter.Disconnected += () => Interlocked.Increment(ref disconnects);
+
+        await _adapter.ConnectAsync(details);
+        await _adapter.ConnectAsync(details);   // reconnect resets _disconnectFired
+
+        // The OLD client's keep-alive dies later — must be a no-op now.
+        clients[0].ConnectionLost += Raise.Event<Action>();
+        Assert.Equal(0, disconnects);
+
+        // The CURRENT client's loss must still signal.
+        clients[1].ConnectionLost += Raise.Event<Action>();
+        Assert.Equal(1, disconnects);
+    }
 }