Do not add custom types into global EncodeableFactory

src/PlcServer.cs

@@ -18,7 +18,6 @@ namespace OpcPlc;
 using System.IO;
 using System.Reflection;
 using System.Threading;
-
 using Meters = OpcPlc.MetricsConfig;
 
 public partial class PlcServer : StandardServer
@@ -260,11 +259,18 @@ public override ResponseHeader Write(RequestHeader requestHeader, WriteValueColl
     /// </remarks>
     protected override MasterNodeManager CreateMasterNodeManager(IServerInternal server, ApplicationConfiguration configuration)
     {
-        var nodeManagers = new List<INodeManager>();
+        var nodeManagers = new List<INodeManager>();
+
+        // When used via NuGet package in-memory, the server needs to use it's own encodeable factory.
+        // Otherwise the client will not load the type definitions for decoding correctly. There is currently no public
+        // API to set the encodeable factory and it is not possible to provide own implementation, because other classes
+        // require the StandardServer or ServerInternalData as objects, so we need to use reflection to set it. 
+        var serverInternalDataField = typeof(StandardServer).GetField("m_serverInternal", BindingFlags.Instance | BindingFlags.NonPublic);
+        var encodeableFactoryField = serverInternalDataField.FieldType.GetField("m_factory", BindingFlags.Instance | BindingFlags.NonPublic);
+        encodeableFactoryField.SetValue(server, new EncodeableFactory(false));
 
         // Add encodable complex types.
         server.Factory.AddEncodeableTypes(Assembly.GetExecutingAssembly());
-        EncodeableFactory.GlobalFactory.AddEncodeableTypes(Assembly.GetExecutingAssembly());
 
         // Add DI node manager first so that it gets the namespace index 2.
         var diNodeManager = new DiNodeManager(server, configuration);
@@ -423,9 +429,9 @@ protected override void OnServerStopping()
             IList<Session> currentSessions = ServerInternal.SessionManager.GetSessions();
 
             if (currentSessions.Count > 0)
-            {
-                // provide some time for the connected clients to detect the shutdown state.
-                ServerInternal.Status.Value.ShutdownReason = new LocalizedText(string.Empty, "Application closed."); // Invariant.
+            {
+                // provide some time for the connected clients to detect the shutdown state.
+                ServerInternal.Status.Value.ShutdownReason = new LocalizedText(string.Empty, "Application closed."); // Invariant.
                 ServerInternal.Status.Variable.ShutdownReason.Value = new LocalizedText(string.Empty, "Application closed."); // Invariant.
                 ServerInternal.Status.Value.State = ServerState.Shutdown;
                 ServerInternal.Status.Variable.State.Value = ServerState.Shutdown;

src/PluginNodes/ComplexTypeBoilerPluginNode.cs

@@ -58,7 +58,13 @@ private void AddNodes(FolderState methodsFolder)
 
         // Convert to node that can be manipulated within the server.
         _node = new Boiler1State(null);
-        _node.Create(_plcNodeManager.SystemContext, passiveBoiler1Node);
+        _node.Create(_plcNodeManager.SystemContext, passiveBoiler1Node);
+        _node.BoilerStatus.Value = new BoilerDataType {
+            Pressure = 99_000,
+            Temperature = new BoilerTemperatureType { Bottom = 100, Top = 95 },
+            HeaterState = BoilerHeaterStateType.On,
+        };
+        _node.BoilerStatus.ClearChangeMasks(_plcNodeManager.SystemContext, includeChildren: true);
 
         // Put Boiler #2 into Boilers folder.
         // TODO: Find a better solution to avoid this dependency between boilers.

tests/BoilerTests.cs

@@ -1,20 +1,32 @@
-namespace OpcPlc.Tests;
-
+namespace OpcPlc.Tests;
+
 using BoilerModel1;
 using FluentAssertions;
 using NUnit.Framework;
 using Opc.Ua;
+using Opc.Ua.Client.ComplexTypes;
+using System.Dynamic;
+using System.Text.Json;
 using static System.TimeSpan;
 
 /// <summary>
 /// Tests for the Boiler, which is a complex type.
 /// </summary>
 [TestFixture]
 public class BoilerTests : SimulatorTestsBase
-{
+{
+    private ComplexTypeSystem _complexTypeSystem;
     public BoilerTests() : base(new[] { "--ctb" })
     {
     }
+
+    [OneTimeSetUp]
+    public void OneTimeSetUp()
+    {
+        _complexTypeSystem = new ComplexTypeSystem(Session);
+        var loaded =  _complexTypeSystem.LoadNamespace(OpcPlc.Namespaces.OpcPlcBoiler).ConfigureAwait(false).GetAwaiter().GetResult();
+        loaded.Should().BeTrue("BoilerDataType should be loaded");
+    }
 
     [TearDown]
     public new virtual void TearDown()
@@ -120,7 +132,13 @@ private void TurnHeaterOff()
     private BoilerDataType GetBoilerModel()
     {
         var nodeId = NodeId.Create(BoilerModel1.Variables.Boiler1_BoilerStatus, OpcPlc.Namespaces.OpcPlcBoiler, Session.NamespaceUris);
-        var value = Session.ReadValue(nodeId).Value;
-        return value.Should().BeOfType<ExtensionObject>().Which.Body.Should().BeOfType<BoilerDataType>().Subject;
+        var value = Session.ReadValue(nodeId).Value;
+
+        // change dynamic in-memory created Boiler type to expected BoilerDataType by serializing and deserializing it.
+        var inmemoryBoilerDataType = (value as ExtensionObject).Body;
+        var json = JsonSerializer.Serialize(inmemoryBoilerDataType);
+
+        var boilerDataTypeFromGeneratedSourceCode = JsonSerializer.Deserialize<BoilerDataType>(json);
+        return boilerDataTypeFromGeneratedSourceCode;
     }
 }

tests/DeterministicAlarmsTests.cs

@@ -4,7 +4,7 @@ namespace OpcPlc.Tests;
 using NUnit.Framework;
 using Opc.Ua;
 using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 using static System.TimeSpan;
 
 [TestFixture]
@@ -26,14 +26,14 @@ public DeterministicAlarmsTests() : base(new[]
     [SetUp]
     public void CreateMonitoredItem()
     {
-        SetUpMonitoredItem(Objects.Server, NodeClass.Object, Attributes.EventNotifier);
+        SetUpMonitoredItem(AlarmNodeId("VendingMachines"), NodeClass.Object, Attributes.EventNotifier);
 
         AddMonitoredItem();
     }
 
     [Test]
     public void FiresEventSequence()
-    {
+    {
         var machine1 = AlarmNodeId("VendingMachine1");
         var machine2 = AlarmNodeId("VendingMachine2");
 

tests/DeterministicAlarmsTests2.cs

@@ -26,7 +26,7 @@ public DeterministicAlarmsTests2() : base(new[]
     [SetUp]
     public void CreateMonitoredItem()
     {
-        SetUpMonitoredItem(Objects.Server, NodeClass.Object, Attributes.EventNotifier);
+        SetUpMonitoredItem(AlarmNodeId("VendingMachines"), NodeClass.Object, Attributes.EventNotifier);
 
         AddMonitoredItem();
     }