Fix browsing nodes

src/Moryx.Drivers.OpcUa/ApplicationConfigurationFactory.cs

@@ -1,6 +1,8 @@
 // Copyright (c) 2025, Phoenix Contact GmbH & Co. KG
+// Licensed under the Apache License, Version 2.0
 
 using Microsoft.Extensions.Logging;
+using Moryx.Drivers.OpcUa.Exceptions;
 using Opc.Ua;
 using Opc.Ua.Configuration;
 
@@ -40,7 +42,7 @@ public virtual async Task<ApplicationConfiguration> Create(ILogger logger, strin
         var haveAppCertificate = await application.CheckApplicationInstanceCertificate(false, 0);
         if (!haveAppCertificate)
         {
-            throw new Exception("Application instance certificate invalid!");
+            throw new InvalidCertificateException("Application instance certificate invalid!");
         }
         else
         {

src/Moryx.Drivers.OpcUa/DataValueResult.cs

@@ -1,7 +1,8 @@
 // Copyright (c) 2025, Phoenix Contact GmbH & Co. KG
+// Licensed under the Apache License, Version 2.0
 
-using Moryx.Tools;
 using Opc.Ua;
+using Moryx.Tools;
 
 namespace Moryx.Drivers.OpcUa;
 

src/Moryx.Drivers.OpcUa/Exceptions/InvalidCertificateException.cs

@@ -0,0 +1,20 @@
+// Copyright (c) 2025, Phoenix Contact GmbH & Co. KG
+// Licensed under the Apache License, Version 2.0
+
+namespace Moryx.Drivers.OpcUa.Exceptions;
+
+[Serializable]
+internal class InvalidCertificateException : Exception
+{
+    public InvalidCertificateException()
+    {
+    }
+
+    public InvalidCertificateException(string message) : base(message)
+    {
+    }
+
+    public InvalidCertificateException(string message, Exception innerException) : base(message, innerException)
+    {
+    }
+}

src/Moryx.Drivers.OpcUa/IOpcUaDriver.cs

@@ -3,7 +3,6 @@
 
 using Moryx.AbstractionLayer.Drivers.InOut;
 using Moryx.AbstractionLayer.Drivers.Message;
-using Moryx.Drivers.OpcUa;
 
 namespace Moryx.Drivers.OpcUa;
 

src/Moryx.Drivers.OpcUa/Nodes/OpcUaDisplayNode.cs

@@ -25,7 +25,7 @@ public OpcUaDisplayNode()
     /// <summary>
     /// Id of the Opc Ua Node
     /// </summary>
-    public string NodeId => _nodeId == null ? string.Empty : _nodeId.Format(CultureInfo.InvariantCulture);
+    public string NodeId => _nodeId == null ? string.Empty : _nodeId.Identifier.ToString();
 
     /// <summary>
     /// Display Name of the Opc Ua Node

src/Moryx.Drivers.OpcUa/Nodes/OpcUaNode.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0
 
 using System.Globalization;
-using System.Text.RegularExpressions;
 using Microsoft.Extensions.Logging;
 using Moryx.AbstractionLayer.Drivers;
 using Moryx.AbstractionLayer.Drivers.Message;
@@ -21,6 +20,7 @@ public class OpcUaNode : IMessageChannel
 {
     private IOpcUaDriver _driver => (IOpcUaDriver)Driver;
 
+    private const int DefaultNamespaceLength = 5;
     private readonly IModuleLogger _logger;
 
     /// <inheritdoc/>
@@ -82,12 +82,34 @@ public event EventHandler<object> Received
         }
     }
 
+    /// <summary>
+    /// Converts a NodeId string into an expanded NodeId string that matches the OPC UA specification;
+    /// </summary>
     public static string CreateExpandedNodeId(string nodeId)
     {
-        var result = Regex.Replace(nodeId, ";ns=\\d+", "");
-        result = result.Trim();
+        var result = nodeId.Trim();
+        result = OpcUaNodeHelpers.NodeIdWithNamespaceIndexRegex().Replace(result, "");
+        result = RemoveNamespaceIndexZero(result);
         return result;
     }
+
+    private static string RemoveNamespaceIndexZero(string nodeId)
+    {
+        if (nodeId.StartsWith("ns=0;"))
+        {
+            return nodeId[DefaultNamespaceLength..];
+        }
+        return nodeId;
+    }
+
+    /// <summary>
+    /// Converts a NodeId into an expanded NodeId string that matches the OPC UA specification;
+    /// </summary>
+    public static string CreateExpandedNodeId(NodeId nodeId)
+    {
+        return CreateExpandedNodeId(nodeId.ToString());
+    }
+
     internal MonitoredItem MonitoredItem { get; set; }
 
     #region Constructors
@@ -98,17 +120,21 @@ private OpcUaNode(IOpcUaDriver driver, IModuleLogger logger)
 
     }
 
+    /// <inheritdoc />
     public OpcUaNode(IOpcUaDriver driver, IModuleLogger logger, string namespaceUri, string nodeIdValue)
         : this(driver, logger)
     {
         NodeId = new ExpandedNodeId(nodeIdValue, namespaceUri);
     }
 
+    /// <inheritdoc />
     public OpcUaNode(IOpcUaDriver driver, IModuleLogger logger, ExpandedNodeId nodeId, NamespaceTable namespaceTable)
         : this(driver, logger)
     {
         NodeId = new ExpandedNodeId(nodeId.Identifier, nodeId.NamespaceIndex, namespaceTable.GetString(nodeId.NamespaceIndex), nodeId.ServerIndex);
     }
+
+    /// <inheritdoc />
     public OpcUaNode(IOpcUaDriver driver, IModuleLogger logger, string identifier)
     {
         Driver = driver;
@@ -134,7 +160,7 @@ public void Send(object payload)
             _logger?.Log(LogLevel.Error, "It is tried to read the value of node {NodeId}, but the node is no variable node", NodeId);
             return;
         }
-        _driver.WriteNode(this.Identifier, payload);
+        _driver.WriteNode(Identifier, payload);
     }
 
     /// <summary>
@@ -153,5 +179,4 @@ internal void ReceivedMessage(object payload)
     {
         _received?.Invoke(this, payload);
     }
-
 }

src/Moryx.Drivers.OpcUa/Nodes/OpcUaNodeHelpers.cs

@@ -0,0 +1,12 @@
+// Copyright (c) 2025, Phoenix Contact GmbH & Co. KG
+// Licensed under the Apache License, Version 2.0
+
+using System.Text.RegularExpressions;
+
+namespace Moryx.Drivers.OpcUa;
+
+internal static partial class OpcUaNodeHelpers
+{
+    [GeneratedRegex(";ns=\\d+")]
+    public static partial Regex NodeIdWithNamespaceIndexRegex();
+}