Some Optimizations and revert JSON-Lib update, cassues Issues with JSON Validation

Author: patrick-dmxc

RDMSharp/Metadata/MetadataFactory.cs

@@ -9,6 +9,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Text.Json;
+using System.Threading;
 using System.Threading.Tasks;
 
 [assembly: InternalsVisibleTo("RDMSharpTests")]
@@ -24,6 +25,8 @@ public static class MetadataFactory
     private static ConcurrentDictionary<MetadataVersion, List<MetadataJSONObjectDefine>> metadataVersionDefinesBagDictionary;
     private static ConcurrentDictionary<ParameterBag, MetadataJSONObjectDefine> parameterBagDefineCache;
     private static List<Assembly> resourceProvider = new List<Assembly>() { typeof(MetadataFactory).Assembly };
+    public static bool IsInitialized = false;
+    private static readonly SemaphoreSlim fillDefaultMetadataVersionListSemaphoreSlim = new SemaphoreSlim(1, 1);
 
     public static void AddResourceProvider(Assembly assembly)
     {
@@ -58,8 +61,11 @@ public static IReadOnlyCollection<string> GetResources(Assembly assembly)
     {
         return assembly.GetManifestResourceNames().Where(p => p.EndsWith(JSON_ENDING)).ToList().AsReadOnly();
     }
-    private static void fillDefaultMetadataVersionList()
+    private static async Task fillDefaultMetadataVersionList()
     {
+        if (fillDefaultMetadataVersionListSemaphoreSlim.CurrentCount == 0)
+            return;
+        await fillDefaultMetadataVersionListSemaphoreSlim.WaitAsync();
         if (metadataVersionDefinesBagDictionary != null)
             return;
 
@@ -87,7 +93,7 @@ private static void fillDefaultMetadataVersionList()
         {
             MaxDegreeOfParallelism = Environment.ProcessorCount, // Optional: Set the maximum degree of parallelism
         };
-        Parallel.ForEach(nonSchemaVersions, parallelOptions, mv =>
+        await Parallel.ForEachAsync(nonSchemaVersions, parallelOptions, async (mv, token) =>
         {
             try
             {
@@ -98,7 +104,8 @@ private static void fillDefaultMetadataVersionList()
                     versionSchemas.TryAdd(schema.Version, jsonSchema);
                 }
                 MetadataBag metadataBag = new MetadataBag(mv);
-                var result = jsonSchema.Evaluate(System.Text.Json.JsonElement.Parse(metadataBag.Content));
+                var doc = JsonDocument.Parse(metadataBag.Content);
+                var result = jsonSchema.Evaluate(doc.RootElement);
                 if (result.IsValid)
                 {
                     MetadataJSONObjectDefine jsonDefine = JsonSerializer.Deserialize<MetadataJSONObjectDefine>(metadataBag.Content);
@@ -121,6 +128,8 @@ private static void fillDefaultMetadataVersionList()
                 Logger?.LogError($"Exception while Deserialize {mv.Name}", e);
             }
         });
+        IsInitialized = true;
+        fillDefaultMetadataVersionListSemaphoreSlim.Release();
     }
 
     public static IReadOnlyCollection<MetadataVersion> GetMetadataSchemaVersions()
@@ -466,4 +475,13 @@ public static Type GetDefinedDataTreeObjectType(ERDM_Parameter parameter, Comman
             return false;
         }).FirstOrDefault();
     }
+
+    public static async Task AwaitInitialize()
+    {
+        while (!IsInitialized)
+        {
+            GetMetadataDefineVersions();
+            await Task.Delay(100);
+        }
+    }
 }

RDMSharp/RDMSharp.cs

@@ -1,4 +1,5 @@
-using System;
+using RDMSharp.Metadata;
+using System;
 using System.Collections.Concurrent;
 using System.Threading;
 using System.Threading.Tasks;
@@ -71,13 +72,14 @@ public bool RequestReceived(RDMMessage request, out RDMMessage response)
         return response is not null;
     }
 
-    public static void Initialize(UID controllerUID, Func<RDMMessage, Task> sendMethode)
+    public static async Task Initialize(UID controllerUID, Func<RDMMessage, Task> sendMethode)
     {
         if (_instance != null)
         {
             throw new InvalidOperationException("RDMSharp instance already exists. Use Instance property to access it.");
         }
         _instance = new RDMSharp(controllerUID, sendMethode);
+        await MetadataFactory.AwaitInitialize();
     }
 
     public class RequestReceivedEventArgs : EventArgs

RDMSharp/RDMSharp.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
 		<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
@@ -35,7 +35,7 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="DMXControlProjects.WellKnownDataTypes" Version="0.0.5" />
-		<PackageReference Include="JsonSchema.Net" Version="8.0.3" />
+		<PackageReference Include="JsonSchema.Net" Version="7.4.0" />
 	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'Or '$(TargetFramework)' == 'net10.0'">
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.1" />