1.05.04 final release fixes

Applications/ConsoleReferenceSubscriber/Program.cs

@@ -34,7 +34,7 @@
 using Opc.Ua;
 using Opc.Ua.PubSub;
 using Opc.Ua.PubSub.Configuration;
-using Opc.Ua.PubSub.Encoding;
+using Encoding = Opc.Ua.PubSub.Encoding;
 using Opc.Ua.PubSub.PublishedData;
 using Opc.Ua.PubSub.Transport;
 
@@ -212,15 +212,15 @@ private static void UaPubSubApplication_DataReceived(object sender, SubscribedDa
             {
                 Console.WriteLine("DataReceived event:");
 
-                if (e.NetworkMessage is UadpNetworkMessage)
+                if (e.NetworkMessage is Encoding.UadpNetworkMessage)
                 {
                     Console.WriteLine("UADP Network DataSetMessage ({0} DataSets): Source={1}, SequenceNumber={2}",
-                            e.NetworkMessage.DataSetMessages.Count, e.Source, ((UadpNetworkMessage)e.NetworkMessage).SequenceNumber);
+                            e.NetworkMessage.DataSetMessages.Count, e.Source, ((Encoding.UadpNetworkMessage)e.NetworkMessage).SequenceNumber);
                 }
-                else if (e.NetworkMessage is JsonNetworkMessage)
+                else if (e.NetworkMessage is Encoding.JsonNetworkMessage)
                 {
                     Console.WriteLine("JSON Network DataSetMessage ({0} DataSets): Source={1}, MessageId={2}",
-                            e.NetworkMessage.DataSetMessages.Count, e.Source, ((JsonNetworkMessage)e.NetworkMessage).MessageId);
+                            e.NetworkMessage.DataSetMessages.Count, e.Source, ((Encoding.JsonNetworkMessage)e.NetworkMessage).MessageId);
                 }
 
                 foreach (UaDataSetMessage dataSetMessage in e.NetworkMessage.DataSetMessages)
@@ -248,20 +248,20 @@ private static void UaPubSubApplication_MetaDataDataReceived(object sender, Subs
             lock (m_lock)
             {
                 Console.WriteLine("MetaDataDataReceived event:");
-                if (e.NetworkMessage is JsonNetworkMessage)
+                if (e.NetworkMessage is Encoding.JsonNetworkMessage)
                 {
                     Console.WriteLine("JSON Network MetaData Message: Source={0}, PublisherId={1}, DataSetWriterId={2} Fields count={3}\n",
                          e.Source,
-                         ((JsonNetworkMessage)e.NetworkMessage).PublisherId,
-                         ((JsonNetworkMessage)e.NetworkMessage).DataSetWriterId,
+                         ((Encoding.JsonNetworkMessage)e.NetworkMessage).PublisherId,
+                         ((Encoding.JsonNetworkMessage)e.NetworkMessage).DataSetWriterId,
                          e.NetworkMessage.DataSetMetaData.Fields.Count);
                 }
-                if (e.NetworkMessage is UadpNetworkMessage)
+                if (e.NetworkMessage is Encoding.UadpNetworkMessage)
                 {
                     Console.WriteLine("UADP Network MetaData Message: Source={0}, PublisherId={1}, DataSetWriterId={2} Fields count={3}\n",
                          e.Source,
-                         ((UadpNetworkMessage)e.NetworkMessage).PublisherId,
-                         ((UadpNetworkMessage)e.NetworkMessage).DataSetWriterId,
+                         ((Encoding.UadpNetworkMessage)e.NetworkMessage).PublisherId,
+                         ((Encoding.UadpNetworkMessage)e.NetworkMessage).DataSetWriterId,
                          e.NetworkMessage.DataSetMetaData.Fields.Count);
                 }
 
@@ -326,8 +326,6 @@ private static PubSubConfigurationDataType CreateSubscriberConfiguration_UdpUadp
             readerGroup1.Name = "ReaderGroup 1";
             readerGroup1.Enabled = true;
             readerGroup1.MaxNetworkMessageSize = 1500;
-            readerGroup1.MessageSettings = new ExtensionObject(new ReaderGroupMessageDataType());
-            readerGroup1.TransportSettings = new ExtensionObject(new ReaderGroupTransportDataType());
 
             #region Define DataSetReader 'Simple' for PublisherId = (UInt16)1, DataSetWriterId = 1
             DataSetReaderDataType dataSetReaderSimple = new DataSetReaderDataType();
@@ -338,7 +336,6 @@ private static PubSubConfigurationDataType CreateSubscriberConfiguration_UdpUadp
             dataSetReaderSimple.Enabled = true;
             dataSetReaderSimple.DataSetFieldContentMask = (uint)DataSetFieldContentMask.RawData;
             dataSetReaderSimple.KeyFrameCount = 1;
-            dataSetReaderSimple.TransportSettings = new ExtensionObject(new DataSetReaderTransportDataType());
 
             UadpDataSetReaderMessageDataType uadpDataSetReaderMessage = new UadpDataSetReaderMessageDataType() {
                 GroupVersion = 0,
@@ -385,7 +382,6 @@ private static PubSubConfigurationDataType CreateSubscriberConfiguration_UdpUadp
             dataSetReaderAllTypes.Enabled = true;
             dataSetReaderAllTypes.DataSetFieldContentMask = (uint)DataSetFieldContentMask.RawData;
             dataSetReaderAllTypes.KeyFrameCount = 1;
-            dataSetReaderAllTypes.TransportSettings = new ExtensionObject(new DataSetReaderTransportDataType());
 
             uadpDataSetReaderMessage = new UadpDataSetReaderMessageDataType() {
                 GroupVersion = 0,
@@ -468,8 +464,6 @@ private static PubSubConfigurationDataType CreateSubscriberConfiguration_MqttJso
             readerGroup1.Name = "ReaderGroup 1";
             readerGroup1.Enabled = true;
             readerGroup1.MaxNetworkMessageSize = 1500;
-            readerGroup1.MessageSettings = new ExtensionObject(new ReaderGroupMessageDataType());
-            readerGroup1.TransportSettings = new ExtensionObject(new ReaderGroupTransportDataType());
 
             #region Define DataSetReader1 'Simple' for PublisherId = (UInt16)2, DataSetWriterId = 1
 
@@ -625,8 +619,6 @@ private static PubSubConfigurationDataType CreateSubscriberConfiguration_MqttUad
             readerGroup1.Name = "ReaderGroup 1";
             readerGroup1.Enabled = true;
             readerGroup1.MaxNetworkMessageSize = 1500;
-            readerGroup1.MessageSettings = new ExtensionObject(new ReaderGroupMessageDataType());
-            readerGroup1.TransportSettings = new ExtensionObject(new ReaderGroupTransportDataType());
 
             #region Define DataSetReader 'Simple' for PublisherId = (UInt16)1, DataSetWriterId = 1
             DataSetReaderDataType dataSetReaderSimple = new DataSetReaderDataType();

Applications/Quickstarts.Servers/Alarms/AlarmNodeManager.cs

@@ -29,6 +29,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Threading;
 using Opc.Ua;
 using Opc.Ua.Server;
@@ -143,7 +144,7 @@ public override void CreateAddressSpace(IDictionary<NodeId, IList<IReference>> e
 
                     Type alarmControllerType = Type.GetType("Alarms.AlarmController");
                     int interval = 1000;
-                    string intervalString = interval.ToString();
+                    string intervalString = interval.ToString(CultureInfo.InvariantCulture);
 
                     int conditionTypeIndex = 0;
                     #endregion

Applications/Quickstarts.Servers/ReferenceServer/ReferenceNodeManager.cs

@@ -669,7 +669,7 @@ public override void CreateAddressSpace(IDictionary<NodeId, IList<IReference>> e
                         string referenceString = "Has3ForwardReferences";
                         if (i > 1)
                         {
-                            referenceString += i.ToString();
+                            referenceString += i.ToString(CultureInfo.InvariantCulture);
                         }
                         BaseDataVariableState has3ForwardReferences = CreateMeshVariable(referencesFolder, referencesPrefix + referenceString, referenceString);
                         has3ForwardReferences.AddReference(ReferenceTypes.HasCause, false, variables[0].NodeId);

Fuzzing/Encoders/Fuzz.Tools/Encoders.Fuzz.Tools.csproj

@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SharpFuzz" Version="2.1.1" />
+    <PackageReference Include="SharpFuzz" Version="2.2.0" />
     <PackageReference Include="Mono.Options" Version="6.12.0.148" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
     <PackageReference Include="Serilog" Version="4.1.0" />

Fuzzing/Encoders/Fuzz/Encoders.Fuzz.csproj

@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SharpFuzz" Version="2.1.1" />
+    <PackageReference Include="SharpFuzz" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>

Libraries/Opc.Ua.Client.ComplexTypes/ComplexTypeSystem.cs

@@ -1158,7 +1158,7 @@ private async Task<NodeId> GetBuiltInSuperTypeAsync(NodeId dataType, bool allowS
                     {
                         // enumerations of namespace 0 in a structure
                         // which are not in the type system are encoded as UInt32
-                        return new NodeId((uint)BuiltInType.UInt32);
+                        return DataTypeIds.UInt32;
                     }
                     if (superType == DataTypeIds.Enumeration)
                     {

Libraries/Opc.Ua.Client.ComplexTypes/Types/OptionalFieldsComplexType.cs

@@ -93,10 +93,7 @@ public override void Encode(IEncoder encoder)
         {
             encoder.PushNamespace(XmlNamespace);
 
-            if (encoder.UseReversibleEncoding)
-            {
-                encoder.WriteUInt32("EncodingMask", m_encodingMask);
-            }
+            encoder.WriteEncodingMask(m_encodingMask);
 
             foreach (var property in GetPropertyEnumerator())
             {
@@ -118,7 +115,22 @@ public override void Decode(IDecoder decoder)
         {
             decoder.PushNamespace(XmlNamespace);
 
-            m_encodingMask = decoder.ReadUInt32("EncodingMask");
+            m_encodingMask = decoder.ReadEncodingMask(null);
+
+            // try again if the mask is implicitly defined by the JSON keys
+            if (m_encodingMask == 0 && decoder is IJsonDecoder)
+            {
+                var masks = new StringCollection();
+                foreach (var property in GetPropertyEnumerator())
+                {
+                    if (property.IsOptional)
+                    {
+                        masks.Add(property.Name);
+                    }
+                }
+
+                m_encodingMask = decoder.ReadEncodingMask(masks);
+            }
 
             foreach (var property in GetPropertyEnumerator())
             {
@@ -132,6 +144,7 @@ public override void Decode(IDecoder decoder)
 
                 DecodeProperty(decoder, property);
             }
+
             decoder.PopNamespace();
         }
 

Libraries/Opc.Ua.Client.ComplexTypes/Types/UnionComplexType.cs

@@ -94,12 +94,9 @@ public override void Encode(IEncoder encoder)
         {
             encoder.PushNamespace(XmlNamespace);
 
-            string fieldName = null;
-            if (encoder.UseReversibleEncoding)
-            {
-                encoder.WriteUInt32("SwitchField", m_switchField);
-                fieldName = "Value";
-            }
+            // the encoder may return an override for the field name
+            // e.g. to support reversible JSON encoding
+            encoder.WriteSwitchField(m_switchField, out string fieldName);
 
             if (m_switchField != 0)
             {
@@ -114,11 +111,17 @@ public override void Encode(IEncoder encoder)
                     }
                     unionSelector++;
                 }
+
+                if (encoder.UseReversibleEncoding)
+                {
+                    fieldName = fieldName ?? unionProperty.Name;
+                }
+
                 EncodeProperty(encoder, fieldName, unionProperty);
             }
             else if (!encoder.UseReversibleEncoding)
             {
-                encoder.WriteString(null, "null");
+                encoder.WriteString(null, null);
             }
 
             encoder.PopNamespace();
@@ -129,20 +132,51 @@ public override void Decode(IDecoder decoder)
         {
             decoder.PushNamespace(XmlNamespace);
 
-            m_switchField = decoder.ReadUInt32("SwitchField");
+            string fieldName = "Value";
+            UInt32 unionSelector = 0;
+
+            unionSelector = decoder.ReadSwitchField(null);
+
+            // maybe the switch field is implicitly defined by the JSON keys
+            bool isJsonDecoder = decoder.EncodingType == EncodingType.Json;
+            if (unionSelector == 0 && isJsonDecoder)
+            {
+                var fields = new StringCollection();
+                foreach (var property in GetPropertyEnumerator())
+                {
+                    if (property.IsOptional)
+                    {
+                        fields.Add(property.Name);
+                    }
+                }
+
+                unionSelector = decoder.ReadSwitchField(fields);
+            }
 
-            UInt32 unionSelector = m_switchField;
+            m_switchField = unionSelector;
             if (unionSelector > 0)
             {
                 foreach (var property in GetPropertyEnumerator())
                 {
                     if (--unionSelector == 0)
                     {
-                        DecodeProperty(decoder, "Value", property);
+                        fieldName = property.Name;
+
+                        if (isJsonDecoder &&
+                            decoder is IJsonDecoder jsonDecoder &&
+                            jsonDecoder.ReadField("Value", out _))
+                        {
+                            DecodeProperty(jsonDecoder, "Value", property);
+                        }
+                        else
+                        {
+                            DecodeProperty(decoder, fieldName, property);
+                        }
                         break;
                     }
                 }
             }
+
             decoder.PopNamespace();
         }
 

Libraries/Opc.Ua.Gds.Server.Common/ApplicationsDatabase/ApplicationsDatabaseBase.cs

@@ -121,7 +121,7 @@ ApplicationRecordDataType application
                 }
             }
 
-            NodeId nodeId = new NodeId();
+            NodeId nodeId = NodeId.Null;
             if (!NodeId.IsNull(application.ApplicationId))
             {
                 // verify node integrity