Revert "Clean up NetLeaf.Bridge."

This reverts commit 7dd6d29.

Author: Tweety-Lab

NetLeaf.Bridge/Assemblies.cs

@@ -4,35 +4,23 @@ namespace NetLeaf.Bridge;
 
 public static class Assemblies
 {
-    /// <summary>
-    /// Represents a loaded plugin/assembly.
-    /// </summary>
     private class LoadedPlugin
     {
         public PluginLoadContext Context;
         public Assembly Assembly;
         public string Path;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LoadedPlugin"/> class.
-        /// </summary>
-        public LoadedPlugin(PluginLoadContext context, Assembly assembly, string path) => (Context, Assembly, Path) = (context, assembly, path);
     }
 
     private static readonly List<LoadedPlugin> _loadedPlugins = new();
 
-    /// <summary>
-    /// All currently loaded assemblies.
-    /// </summary>
-    public static IEnumerable<Assembly> LoadedAssemblies => _loadedPlugins.Select(p => p.Assembly);
+    public static IEnumerable<Assembly> LoadedAssemblies
+        => _loadedPlugins.Select(p => p.Assembly);
 
-    /// <summary>
-    /// Load an assembly.
-    /// </summary>
-    /// <param name="path">Path to the assembly.</param>
     public static void LoadAssembly(string path)
     {
-        string fullPath = Path.IsPathRooted(path) ? path : System.IO.Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? "", path);
+        string fullPath = Path.IsPathRooted(path)
+            ? path
+            : System.IO.Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? "", path);
 
         if (!File.Exists(fullPath))
         {
@@ -43,15 +31,16 @@ public static void LoadAssembly(string path)
         var context = new PluginLoadContext(fullPath);
         var assembly = context.LoadFromAssemblyPath(fullPath);
 
-        _loadedPlugins.Add(new LoadedPlugin(context, assembly, fullPath));
+        _loadedPlugins.Add(new LoadedPlugin
+        {
+            Context = context,
+            Assembly = assembly,
+            Path = fullPath
+        });
 
         Console.WriteLine($"[NetLeaf] Assembly loaded: {fullPath}");
     }
 
-    /// <summary>
-    /// Unload an assembly.
-    /// </summary>
-    /// <param name="path">Path to the assembly.</param>
     public static void UnloadAssembly(string path)
     {
         var plugin = _loadedPlugins.Find(p => p.Path == path);

NetLeaf.Bridge/InstanceFactory.cs

@@ -25,14 +25,14 @@ public static uint CreateInstance(string typeNamespace)
 
         try
         {
-            Type type = Assemblies.FindTypeInLoadedAssemblies(typeNamespace)!;
+            Type type = Assemblies.FindTypeInLoadedAssemblies(typeNamespace);
             if (type == null)
             {
                 Console.WriteLine($"[CreateInstance Error] Type '{typeNamespace}' not found in loaded assemblies.");
                 return 0;
             }
 
-            object instance = Activator.CreateInstance(type) ?? throw new Exception("Failed to create instance.");
+            object instance = Activator.CreateInstance(type);
             instanceMap[id] = instance;
             return id;
         }
@@ -78,7 +78,7 @@ public static void RunInstanceMethod(uint id, string methodCall)
         method.Invoke(instance, args);
     }
 
-    private static string? ParseMethodName(string methodCall, out string[]? args)
+    private static string ParseMethodName(string methodCall, out string[] args)
     {
         int parenStart = methodCall.IndexOf('(');
         int parenEnd = methodCall.LastIndexOf(')');

NetLeaf.Bridge/MethodReturnValue.cs

@@ -2,18 +2,16 @@
 
 namespace NetLeaf.Bridge;
 
-/// <summary>
-/// Struct used for safetly passing a methods return value to unmanaged code.
-/// </summary>
+// Struct for passing a methods return value back to C++
 [StructLayout(LayoutKind.Sequential)]
 public struct MethodReturnValue
 {
-    public IntPtr StringResult;
+    public IntPtr StringResult; // Pointer to marshaled string
     public float FloatResult;
     public uint UIntResult;
     public int IntResult;
 
-    public ReturnType Type;
+    public ReturnType Type; // Indicate the type of the return value
 }
 
 public enum ReturnType : int

NetLeaf.Bridge/Methods.cs

@@ -28,15 +28,9 @@ public static void RunMethod(IntPtr methodNamespace, IntPtr resultPtr)
                 return;
             }
 
-            string? methodNamespaceStr = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? Marshal.PtrToStringUni(methodNamespace) : Marshal.PtrToStringUTF8(methodNamespace);
-
-            if (methodNamespaceStr == null)
-            {
-                Console.Error.WriteLine("[RunMethod] methodNamespaceStr was null.");
-                WriteResult(resultPtr, result);
-                return;
-            }
-
+            string methodNamespaceStr = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
+                ? Marshal.PtrToStringUni(methodNamespace)
+                : Marshal.PtrToStringUTF8(methodNamespace);
 
             if (!TryParseMethodNamespace(methodNamespaceStr, out string fullMethodPath, out string[] argStrings))
             {

NetLeaf.Bridge/PluginLoadContext.cs

@@ -12,11 +12,13 @@ public PluginLoadContext(string pluginPath) : base(isCollectible: true)
         _resolver = new AssemblyDependencyResolver(pluginPath);
     }
 
-    protected override Assembly? Load(AssemblyName assemblyName)
+    protected override Assembly Load(AssemblyName assemblyName)
     {
-        string assemblyPath = _resolver.ResolveAssemblyToPath(assemblyName) ?? throw new Exception("Failed to create instance.");
+        string assemblyPath = _resolver.ResolveAssemblyToPath(assemblyName);
         if (assemblyPath != null)
+        {
             return LoadFromAssemblyPath(assemblyPath);
+        }
 
         return null;
     }