DYN-9011: Contd. from PR 16255 - Improve Library Loading of many DYFs

src/DynamoApplications/StartupUtils.cs

@@ -194,7 +194,8 @@ private static DynamoModel PrepareModel(
             bool cliMode = true,
             string userDataFolder = "",
             string commonDataFolder = "",
-            bool serviceMode = false)
+            bool serviceMode = false,
+            bool useCustomNodeCache = false)
         {
             var normalizedCLILocale = string.IsNullOrEmpty(cliLocale) ? null : cliLocale;
             IPathResolver pathResolver = CreatePathResolver(false, string.Empty, string.Empty, string.Empty);
@@ -214,7 +215,8 @@ private static DynamoModel PrepareModel(
                 noNetworkMode: noNetworkMode,
                 info: analyticsInfo,
                 isServiceMode: serviceMode,
-                cliLocale: normalizedCLILocale
+                cliLocale: normalizedCLILocale,
+                useCustomNodeCache
             );
             model.IsASMLoaded = isASMloaded;
             return model;
@@ -285,7 +287,8 @@ public static DynamoModel MakeModel(bool CLImode, string asmPath = "", string ho
         /// <param name="asmPath">Path to directory containing geometry library binaries</param>
         /// <param name="info">Host analytics info specifying Dynamo launching host related information.</param>
         /// <returns></returns>
-        public static DynamoModel MakeModel(bool CLImode, string CLIlocale, bool noNetworkMode, string asmPath = "", HostAnalyticsInfo info = new HostAnalyticsInfo())
+        public static DynamoModel MakeModel(bool CLImode, string CLIlocale, bool noNetworkMode, string asmPath = "",
+            HostAnalyticsInfo info = new HostAnalyticsInfo())
         {
             var model = PrepareModel(
                 cliLocale: CLIlocale,
@@ -296,6 +299,22 @@ public static DynamoModel MakeModel(bool CLImode, string asmPath = "", string ho
             return model;
         }
 
+        internal static DynamoModel MakeModel(bool CLImode, string CLIlocale, bool noNetworkMode, bool useCustomNodeCache,
+            string asmPath = "", HostAnalyticsInfo info = new HostAnalyticsInfo())
+        {
+            var model = PrepareModel(
+                cliLocale: CLIlocale,
+                asmPath: asmPath,
+                noNetworkMode: noNetworkMode,
+                analyticsInfo: info,
+                cliMode: CLImode,
+                userDataFolder: "",
+                commonDataFolder: "",
+                serviceMode: false,
+                useCustomNodeCache);
+            return model;
+        }
+
         /// <summary>
         /// It returns an IPathResolver based on the mode and some locations
         /// </summary>
@@ -371,7 +390,8 @@ private static DynamoModel StartDynamoWithDefaultConfig(bool CLImode,
             bool noNetworkMode,
             HostAnalyticsInfo info = new HostAnalyticsInfo(),
             bool isServiceMode = false,
-            string cliLocale = null)
+            string cliLocale = null,
+            bool useCustomNodeCache = false)
         {
 
             var config = new DynamoModel.DefaultStartConfiguration
@@ -387,6 +407,7 @@ private static DynamoModel StartDynamoWithDefaultConfig(bool CLImode,
                 Preferences = PreferenceSettings.Instance,
                 NoNetworkMode = noNetworkMode,
                 CLILocale = cliLocale,
+                UseCustomNodeCache = useCustomNodeCache,
                 //Breaks all Lucene calls. TI enable this would require a lot of refactoring around Lucene usage in Dynamo.
                 //IsHeadless = CLImode
             };

src/DynamoCore/Core/CustomNodeDefinition.cs

@@ -1,12 +1,15 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using Dynamo.Engine;
 using Dynamo.Engine.CodeGeneration;
 using Dynamo.Graph.Nodes;
 using Dynamo.Graph.Nodes.CustomNodes;
 using Dynamo.Graph.Workspaces;
 using Dynamo.Library;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using ProtoCore;
 using ProtoCore.AST.AssociativeAST;
 
@@ -302,6 +305,9 @@ public CustomNodeInfo(Guid functionId, string name, string category, string desc
             if (String.IsNullOrWhiteSpace(Category))
                 Category = Dynamo.Properties.Resources.DefaultCustomNodeCategory;
         }
+
+        [JsonConstructor] public CustomNodeInfo() { }
+
         /// <summary>
         /// Returns custom node unique ID
         /// </summary>
@@ -315,7 +321,7 @@ public CustomNodeInfo(Guid functionId, string name, string category, string desc
         /// <summary>
         /// Returns custom node category
         /// </summary>
-        public string Category { get; set; }
+        public string Category { get; set; } = string.Empty;
 
         /// <summary>
         /// Returns custom node description
@@ -337,13 +343,81 @@ public CustomNodeInfo(Guid functionId, string name, string category, string desc
         /// Indicates if custom node is part of the library search.
         /// If true, then custom node is part of library search.
         /// </summary>
-        public bool IsVisibleInDynamoLibrary { get; private set; }
+        public bool IsVisibleInDynamoLibrary { get; set; }
 
         /// <summary>
         /// Only valid if IsPackageMember is true.
         /// Can be used to identify which package 
         /// requested this CustomNode to load.
         /// </summary>
         public PackageInfo PackageInfo { get;  internal set; }
+
+
+        private static readonly string[] topLevelJsonKeys = { "Uuid", "Category", "Description", "Name" };
+        private static readonly Dictionary<string, object> propertyLookup = new Dictionary<string, object>();
+        private static object isVisibleInDynamoLibraryProp = null;
+        private static DefaultJsonNameTable propertyTable = null;
+
+        internal static bool GetFromJsonDocument(string path, out CustomNodeInfo info, out Exception ex)
+        {
+            if (propertyTable == null)
+            {
+                propertyTable = new DefaultJsonNameTable();
+                foreach (var pn in topLevelJsonKeys)
+                {
+                    propertyLookup[pn] = propertyTable.Add(pn);
+                }
+                isVisibleInDynamoLibraryProp = propertyTable.Add(nameof(IsVisibleInDynamoLibrary));
+            }
+
+            try
+            {
+                var data = new JObject();
+                // JsonTextRead will automatically dispose of the stream reader
+                using (var fs = new FileStream(path, FileMode.Open, FileAccess.Read))
+                using (var jr = new JsonTextReader(new StreamReader(fs)) { PropertyNameTable = propertyTable })
+                {
+                    while (jr.Read())
+                    {
+                        if (data.Count == topLevelJsonKeys.Length + 1)
+                        {
+                            break; // we have all of the 
+                        }
+
+                        if (jr.TokenType == JsonToken.PropertyName)
+                        {
+                            if (jr.Depth == 1)
+                            {
+                                foreach (var prop in propertyLookup)
+                                {
+                                    if (jr.Value == prop.Value)
+                                    {
+                                        data[prop.Key] = jr.ReadAsString() ?? "";
+                                        break;
+                                    }
+                                }
+                            }
+                            else if (jr.Value == isVisibleInDynamoLibraryProp)
+                            {
+                                data[nameof(IsVisibleInDynamoLibrary)] = jr.ReadAsBoolean();
+                            }
+                        }
+                    }
+                }
+
+                ex = null;
+                data["FunctionId"] = data.GetValue("Uuid");
+                data["Path"] = path;
+
+                info = data.ToObject<CustomNodeInfo>();
+                return true;
+            }
+            catch (Exception e)
+            {
+                ex = e;
+                info = null;
+                return false;
+            }
+        }
     }
 }