Update to .Net9.0, update NuGets and bug fixes.

Author: barnstee

Controllers/DashboardController.cs

@@ -108,7 +108,7 @@ public IActionResult Display()
 
                     if (key.Contains("OPC Foundation"))
                     {
-                        Environment.SetEnvironmentVariable("TOPIC", "starterkit/#");
+                        Environment.SetEnvironmentVariable("TOPIC", "#");
                         break;
                     }
 

Dockerfile

@@ -1,11 +1,11 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
 WORKDIR /app
-EXPOSE 80
+EXPOSE 8080
 EXPOSE 443
 
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
 WORKDIR /src
 COPY ["UACloudDashboard.csproj", "."]
 RUN dotnet restore "./UACloudDashboard.csproj"

Encoding/JsonDataSetMessage.cs

@@ -497,7 +497,13 @@ private DataSet DecodePayloadContent(JsonDecoder jsonDecoder, DataSetReaderDataT
             for (int i = 0; i < dataValues.Count; i++)
             {
                 Field dataField = new Field();
-                dataField.FieldMetaData = dataSetMetaData?.Fields[(int)dataSetMetaData?.Fields.Count - dataValues.Count + i];
+
+                int metadataIndex = dataSetMetaData.Fields.Count - dataValues.Count + i;
+                if ((dataSetMetaData != null) && (metadataIndex > 0) && (metadataIndex < dataSetMetaData.Fields.Count))
+                {
+                    dataField.FieldMetaData = dataSetMetaData.Fields[metadataIndex];
+                }
+
                 dataField.Value = dataValues[i];
 
                 dataFields.Add(dataField);
@@ -601,7 +607,7 @@ private void EncodeField(JsonEncoder encoder, Field field)
                     // the field value is encoded as a Variant encoded using the reversible OPC UA JSON Data Encoding
                     // defined in OPC 10000-6.
                     encoder.ForceNamespaceUri = false;
-                    encoder.WriteVariant(fieldName, valueToEncode, true);
+                    encoder.WriteVariant(fieldName, valueToEncode);
                     break;
 
                 case FieldTypeEncodingMask.RawData:
@@ -610,7 +616,7 @@ private void EncodeField(JsonEncoder encoder, Field field)
                     // defined in OPC 10000-6
                     encoder.ForceNamespaceUri = true;
 
-                    encoder.WriteVariant(fieldName, valueToEncode, false);
+                    encoder.WriteVariant(fieldName, valueToEncode);
                     break;
 
                 case FieldTypeEncodingMask.DataValue:
@@ -646,7 +652,7 @@ private void EncodeField(JsonEncoder encoder, Field field)
                     // If the DataSetFieldContentMask results in a DataValue representation,
                     // the field value is a DataValue encoded using the non-reversible OPC UA JSON Data Encoding
                     encoder.ForceNamespaceUri = true;
-                    encoder.WriteDataValue(fieldName, dataValue, false);
+                    encoder.WriteDataValue(fieldName, dataValue);
                     break;
             }
         }

Encoding/JsonNetworkMessage.cs

@@ -265,6 +265,8 @@ public override void Decode(IServiceMessageContext context, byte[] message, ILis
 
             using (JsonDecoder jsonDecoder = new JsonDecoder(json, context))
             {
+                jsonDecoder.UpdateNamespaceTable = true;
+
                 // 1. decode network message header (PublisherId & DataSetClassId)
                 DecodeNetworkMessageHeader(jsonDecoder);
 
@@ -669,12 +671,12 @@ private void DecodeStatus(JsonDecoder jsonDecoder, IList<DataSetReaderDataType>
                     jsonDecoder.ReadField("Status", out object status);
                     PubSubState state = (PubSubState)jsonDecoder.ReadEnumerated("Status", typeof(PubSubState));
                     Field dataField2 = new Field();
-                    dataField2.Value = new DataValue(status.ToString());
+                    dataField2.Value = new DataValue(status?.ToString());
                     dataField2.FieldMetaData = new FieldMetaData();
                     dataField2.FieldMetaData.Name = "Status";
                     dataFields.Add(dataField2);
 
-                    if ((bool)cyclic)
+                    if ((cyclic != null) && (bool)cyclic)
                     {
                         jsonDecoder.ReadField("NextReportTime", out object nextTime);
                         Field dataField3 = new Field();

Encoding/UadpNetworkMessage.cs

@@ -2,7 +2,7 @@
  * Copyright (c) 2005-2021 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -11,7 +11,7 @@
  * copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following
  * conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be
  * included in all copies or substantial portions of the Software.
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
@@ -65,7 +65,7 @@ public class UadpNetworkMessage : UaNetworkMessage
         /// <summary>
         /// Create new instance of UadpNetworkMessage
         /// </summary>
-        /// <param name="writerGroupConfiguration">The <see cref="WriterGroupDataType"/> conflagration object that produced this message.</param> 
+        /// <param name="writerGroupConfiguration">The <see cref="WriterGroupDataType"/> conflagration object that produced this message.</param>
         /// <param name="uadpDataSetMessages"><see cref="UadpDataSetMessage"/> list as input</param>
         public UadpNetworkMessage(WriterGroupDataType writerGroupConfiguration, List<UadpDataSetMessage> uadpDataSetMessages)
             : base(writerGroupConfiguration, uadpDataSetMessages?.ConvertAll<UaDataSetMessage>(x => (UaDataSetMessage)x) ?? new List<UaDataSetMessage>())
@@ -114,7 +114,7 @@ public UadpNetworkMessage(UADPNetworkMessageDiscoveryType discoveryType)
         #region Properties
 
         /// <summary>
-        /// NetworkMessageContentMask contains the mask that will be used to check NetworkMessage options selected for usage  
+        /// NetworkMessageContentMask contains the mask that will be used to check NetworkMessage options selected for usage
         /// </summary>
         public UadpNetworkMessageContentMask NetworkMessageContentMask { get; private set; }
 
@@ -130,7 +130,7 @@ public UADPNetworkMessageType UADPNetworkMessageType
         }
 
         /// <summary>
-        /// Get the UADP network message discovery type 
+        /// Get the UADP network message discovery type
         /// </summary>
         public UADPNetworkMessageDiscoveryType UADPDiscoveryType
         {
@@ -186,7 +186,7 @@ public object PublisherId
             get { return m_publisherId; }
             set
             {
-                // Just in case value is a positive signed Integer 
+                // Just in case value is a positive signed Integer
                 // Try to bring it to an accepted type (will overflow if value doesn't fit)
 
                 object adjustedValue = value;
@@ -371,7 +371,7 @@ public override byte[] Encode(IServiceMessageContext messageContext)
         /// <param name="stream">The stream to use.</param>
         public override void Encode(IServiceMessageContext messageContext, Stream stream)
         {
-            using (BinaryEncoder encoder = new BinaryEncoder(stream, messageContext))
+            using (BinaryEncoder encoder = new BinaryEncoder(stream, messageContext, false))
             {
                 if (m_uadpNetworkMessageType == UADPNetworkMessageType.DataSetMessage)
                 {
@@ -409,7 +409,7 @@ public override void Encode(IServiceMessageContext messageContext, Stream stream
         }
 
         /// <summary>
-        /// Decodes the message 
+        /// Decodes the message
         /// </summary>
         /// <param name="context"></param>
         /// <param name="message"></param>
@@ -482,20 +482,20 @@ private void EncodeDataSetNetworkMessageType(BinaryEncoder binaryEncoder)
         }
 
         /// <summary>
-        /// Encodes the NetworkMessage as a DiscoveryResponse of DataSetMetaData Type 
+        /// Encodes the NetworkMessage as a DiscoveryResponse of DataSetMetaData Type
         /// </summary>
         /// <param name="binaryEncoder"></param>
         private void EncodeDataSetMetaData(BinaryEncoder binaryEncoder)
         {
             binaryEncoder.WriteUInt16("DataSetWriterId", DataSetWriterId);
-            
+
             if (m_metadata == null)
             {
                 Utils.Trace("The UADP DiscoveryResponse DataSetMetaData message cannot be encoded: The MetaData property is missing. Value null will be used.");
             }
             binaryEncoder.WriteEncodeable("MetaData", m_metadata, typeof(DataSetMetaDataType));
 
-            // temporary write StatusCode.Good 
+            // temporary write StatusCode.Good
             binaryEncoder.WriteStatusCode("StatusCode", StatusCodes.Good);
         }
 
@@ -647,12 +647,12 @@ private void SetFlagsDiscoveryResponseMetaData()
             ExtendedFlags1 = ExtendedFlags1EncodingMask.Security | ExtendedFlags1EncodingMask.ExtendedFlags2;
             ExtendedFlags2 = ExtendedFlags2EncodingMask.NetworkMessageWithDiscoveryResponse;
 
-            // enable encoding of PublisherId in message header 
+            // enable encoding of PublisherId in message header
             NetworkMessageContentMask = UadpNetworkMessageContentMask.PublisherId;
         }
 
         /// <summary>
-        /// Set All flags before encode/decode for a NetworkMessage that contains A DiscoveryRequest 
+        /// Set All flags before encode/decode for a NetworkMessage that contains A DiscoveryRequest
         /// </summary>
         private void SetFlagsDiscoveryRequest()
         {
@@ -671,8 +671,8 @@ private void SetFlagsDiscoveryRequest()
 
 
         /// <summary>
-        /// Decode the stream from decoder parameter and produce a Dataset 
-        /// </summary> 
+        /// Decode the stream from decoder parameter and produce a Dataset
+        /// </summary>
         /// <param name="binaryDecoder"></param>
         /// <param name="dataSetReaders"></param>
         /// <returns></returns>
@@ -763,7 +763,7 @@ If the value is 0 (null), the parameter shall be ignored and all received DataSe
                         uadpDataSetMessages.Add(new UadpDataSetMessage());
                     }
 
-                    // 6.2 Decode payload into DataSets 
+                    // 6.2 Decode payload into DataSets
                     // Restore the encoded fields (into dataset for now) for each possible dataset reader
                     foreach (UadpDataSetMessage uadpDataSetMessage in uadpDataSetMessages)
                     {
@@ -807,7 +807,7 @@ If the value is 0 (null), the parameter shall be ignored and all received DataSe
                     m_uaDataSetMessages.Clear();
                     m_uaDataSetMessages.AddRange(dataSetMessages);
                 }
-                
+
             }
             catch (Exception ex)
             {
@@ -825,7 +825,7 @@ private void DecodeMetaDataMessage(BinaryDecoder binaryDecoder)
             DataSetWriterId = binaryDecoder.ReadUInt16("DataSetWriterId");
             m_metadata = binaryDecoder.ReadEncodeable("MetaData", typeof(DataSetMetaDataType)) as DataSetMetaDataType;
 
-            // temporary write StatusCode.Good 
+            // temporary write StatusCode.Good
             StatusCode statusCode = binaryDecoder.ReadStatusCode("StatusCode");
             Utils.Trace("DecodeMetaDataMessage returned: " + statusCode.ToString());
         }
@@ -975,7 +975,7 @@ private void EncodePromotedFields(BinaryEncoder encoder)
         }
 
         /// <summary>
-        /// Encode security header 
+        /// Encode security header
         /// </summary>
         /// <param name="encoder"></param>
         private void EncodeSecurityHeader(BinaryEncoder encoder)
@@ -1006,7 +1006,7 @@ private void EncodePayload(BinaryEncoder encoder)
             if (DataSetMessages.Count > 1
                 && (NetworkMessageContentMask & UadpNetworkMessageContentMask.PayloadHeader) != 0)
             {
-                //skip 2 * dataset count for each dataset payload size 
+                //skip 2 * dataset count for each dataset payload size
                 encoder.Position += 2 * DataSetMessages.Count;
             }
             //encode dataset message payload
@@ -1050,7 +1050,7 @@ private void EncodeSignature(BinaryEncoder encoder)
 
         #endregion
 
-        #region Private Methods - Decoding 
+        #region Private Methods - Decoding
 
         /// <summary>
         /// Encode Network Message Header
@@ -1237,7 +1237,7 @@ private void DecodePayloadSize(BinaryDecoder decoder)
             if (binaryDecoder != null)
             {
                 int offset = 0;
-                // set start position of dataset message in binary stream 
+                // set start position of dataset message in binary stream
                 foreach (UadpDataSetMessage uadpDataSetMessage in DataSetMessages)
                 {
                     uadpDataSetMessage.StartPositionInStream = binaryDecoder.Position + offset;
@@ -1247,7 +1247,7 @@ private void DecodePayloadSize(BinaryDecoder decoder)
         }
 
         /// <summary>
-        /// Decode security header 
+        /// Decode security header
         /// </summary>
         /// <param name="decoder"></param>
         private void DecodeSecurityHeader(BinaryDecoder decoder)

MQTTSubscriber.cs

@@ -3,11 +3,11 @@ namespace Opc.Ua.Cloud.Dashboard
 {
     using Microsoft.Extensions.Logging;
     using MQTTnet;
-    using MQTTnet.Adapter;
-    using MQTTnet.Client;
+    using MQTTnet.Exceptions;
     using MQTTnet.Packets;
     using MQTTnet.Protocol;
     using System;
+    using System.Buffers;
     using System.Collections.Generic;
     using System.Globalization;
     using System.Linq;
@@ -70,13 +70,13 @@ private bool Connect()
                 }
 
                 // create MQTT client
-                _client = new MqttFactory().CreateMqttClient();
+                _client = new MqttClientFactory().CreateMqttClient();
                 _client.ApplicationMessageReceivedAsync += msg => HandleMessageAsync(msg);
                 var clientOptions = new MqttClientOptionsBuilder()
                     .WithTcpServer(opt => opt.NoDelay = true)
                     .WithClientId(Environment.GetEnvironmentVariable("CLIENT_NAME"))
                     .WithTcpServer(Environment.GetEnvironmentVariable("BROKER_NAME"), int.Parse(Environment.GetEnvironmentVariable("BROKER_PORT")))
-                    .WithTls(new MqttClientOptionsBuilderTlsParameters { UseTls = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("USE_TLS")) })
+                    .WithTlsOptions(new MqttClientTlsOptions { UseTls = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("USE_TLS")) })
                     .WithProtocolVersion(MQTTnet.Formatter.MqttProtocolVersion.V311)
                     .WithTimeout(TimeSpan.FromSeconds(10))
                     .WithKeepAlivePeriod(TimeSpan.FromSeconds(100))
@@ -125,14 +125,14 @@ private bool Connect()
 
                     return true;
                 }
-                catch (MqttConnectingFailedException ex)
+                catch (MqttCommunicationException ex)
                 {
-                    _logger.LogError($"Failed to connect with reason {ex.ResultCode} and message: {ex.Message}");
-                    if (ex.Result?.UserProperties != null)
+                    _logger.LogError($"Failed to connect with reason {ex.HResult} and message: {ex.Message}");
+                    if ((ex.Data != null) && (ex.Data.Count > 0))
                     {
-                        foreach (var prop in ex.Result.UserProperties)
+                        foreach (var prop in ex.Data)
                         {
-                            _logger.LogError($"{prop.Name}: {prop.Value}");
+                            _logger.LogError($"{prop.ToString()}");
                         }
                     }
 
@@ -173,7 +173,7 @@ private async Task HandleMessageAsync(MqttApplicationMessageReceivedEventArgs ar
         {
             try
             {
-                _uaMessageProcessor.ProcessMessage(args.ApplicationMessage.PayloadSegment.Array, DateTime.UtcNow, args.ApplicationMessage.ContentType);
+                _uaMessageProcessor.ProcessMessage(args.ApplicationMessage.Payload.ToArray(), DateTime.UtcNow, args.ApplicationMessage.ContentType);
 
                 // send reponse to MQTT broker, if required
                 if (args.ApplicationMessage.ResponseTopic != null)

UACloudDashboard.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <UserSecretsId>b2d0ab73-8f42-4b3f-9415-ab542610a5f8</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerfileContext>.</DockerfileContext>
@@ -16,10 +16,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Confluent.Kafka" Version="2.1.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
-    <PackageReference Include="MQTTnet" Version="4.2.1.781" />
-    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.371.96" />
+    <PackageReference Include="Confluent.Kafka" Version="2.8.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.1" />
+    <PackageReference Include="MQTTnet" Version="5.0.1.1416" />
+    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.5.375.443" />
   </ItemGroup>
 
   <ItemGroup>

UAPubSubMessageProcessor.cs

@@ -242,11 +242,17 @@ private void DecodeMessage(byte[] payload, DateTime receivedTime, UaNetworkMessa
                                         // convert to string
                                         DataValue value = new DataValue(new Variant(field.Value.ToString()), field.Value.StatusCode, field.Value.SourceTimestamp);
 
-                                        flattenedPublishedNodes.Add(telemetryName, value);
+                                        if (!flattenedPublishedNodes.ContainsKey(telemetryName))
+                                        {
+                                            flattenedPublishedNodes.Add(telemetryName, value);
+                                        }
                                     }
                                     else
                                     {
-                                        flattenedPublishedNodes.Add(telemetryName, field.Value);
+                                        if (!flattenedPublishedNodes.ContainsKey(telemetryName))
+                                        {
+                                            flattenedPublishedNodes.Add(telemetryName, field.Value);
+                                        }
                                     }
                                 }
                                 catch (Exception ex)

Views/Dashboard/Graph.cshtml

@@ -129,7 +129,7 @@
 
                 for (var j = 0; j < myChart.data.datasets.length; j++)
                 {
-                    var value = parseFloat(values[j].replace(',', '.'));
+                    var value = parseFloat(values[j]);
                     myChart.data.datasets[j].data.push(value);
                     if (myChart.data.datasets[j].data.length > 100)
                     {