- tweak: fix resolving think

Nebula.Shared/Services/AssemblyService.cs

@@ -10,20 +10,36 @@ namespace Nebula.Shared.Services;
 [ServiceRegister]
 public class AssemblyService
 {
-    private readonly Dictionary<string,Assembly> _assemblies = new();
+    private readonly List<Assembly> _assemblies = new();
     private readonly DebugService _debugService;
 
     public AssemblyService(DebugService debugService)
     {
         _debugService = debugService;
+        
+        SharpZstd.Interop.ZstdImportResolver.ResolveLibrary += (name, assembly1, path) =>
+        {
+            if (name.Equals("SharpZstd.Native"))
+            {
+                _debugService.Debug("RESOLVING SHARPZSTD THINK: " + name + " " + path);
+                GetRuntimeInfo(out string platform, out string architecture, out string extension);
+                string fileName = GetDllName(platform, architecture, extension);
+
+                if (NativeLibrary.TryLoad(fileName, assembly1, path, out var nativeLibrary))
+                {
+                    return nativeLibrary;
+                }
+            }
+            return IntPtr.Zero;
+        };
     }
 
-    //public IReadOnlyList<Assembly> Assemblies => _assemblies;
+    public IReadOnlyList<Assembly> Assemblies => _assemblies;
 
-    public AssemblyApi Mount(IFileApi fileApi, string apiName = "")
+    public AssemblyApi Mount(IFileApi fileApi)
     {
         var asmApi = new AssemblyApi(fileApi);
-        AssemblyLoadContext.Default.Resolving += (context, name) => OnAssemblyResolving(context, name, asmApi, apiName);
+        AssemblyLoadContext.Default.Resolving += (context, name) => OnAssemblyResolving(context, name, asmApi);
         AssemblyLoadContext.Default.ResolvingUnmanagedDll += LoadContextOnResolvingUnmanaged;
 
         return asmApi;
@@ -53,11 +69,6 @@ public class AssemblyService
 
     public bool TryOpenAssembly(string name, AssemblyApi assemblyApi, [NotNullWhen(true)] out Assembly? assembly)
     {
-        if (_assemblies.TryGetValue(name, out assembly))
-        {
-            return true;
-        }
-        
         if (!TryOpenAssemblyStream(name, assemblyApi, out var asm, out var pdb))
         {
             assembly = null;
@@ -66,8 +77,9 @@ public class AssemblyService
 
         assembly = AssemblyLoadContext.Default.LoadFromStream(asm, pdb);
         _debugService.Log("LOADED ASSEMBLY " + name);
-        
-        _assemblies.Add(name, assembly);
+
+
+        if (!_assemblies.Contains(assembly)) _assemblies.Add(assembly);
 
         asm.Dispose();
         pdb?.Dispose();
@@ -86,13 +98,27 @@ public class AssemblyService
         assemblyApi.TryOpen($"{name}.pdb", out pdb);
         return true;
     }
+    
+    private readonly HashSet<string> _resolvingAssemblies = new HashSet<string>();
 
-    private Assembly? OnAssemblyResolving(AssemblyLoadContext context, AssemblyName name, AssemblyApi assemblyApi,
-        string apiName)
+    private Assembly? OnAssemblyResolving(AssemblyLoadContext context, AssemblyName name, AssemblyApi assemblyApi)
     {
-
-        _debugService.Debug($"Resolving assembly from {apiName}: {name.Name}");
-        return TryOpenAssembly(name.Name!, assemblyApi, out var assembly) ? assembly : null;
+        if (_resolvingAssemblies.Contains(name.FullName))
+        {
+            _debugService.Debug($"Already resolving {name.Name}, skipping.");
+            return null; // Prevent recursive resolution
+        }
+        
+        try
+        {
+            _resolvingAssemblies.Add(name.FullName);
+            _debugService.Debug($"Resolving assembly from FileAPI: {name.Name}");
+            return TryOpenAssembly(name.Name!, assemblyApi, out var assembly) ? assembly : null;
+        }
+        finally
+        {
+            _resolvingAssemblies.Remove(name.FullName);
+        }
     }
 
     private IntPtr LoadContextOnResolvingUnmanaged(Assembly assembly, string unmanaged)
@@ -104,7 +130,66 @@ public class AssemblyService
 
         if (NativeLibrary.TryLoad(a, out var handle))
             return handle;
+        
+        _debugService.Error("Loading dll error! Not found");
 
         return IntPtr.Zero;
     }
+    
+    public static string GetDllName(
+        string platform,
+        string architecture,
+        string extension)
+    {
+        string name = $"SharpZstd.Native.{extension}";
+        return name;
+    }
+
+    public static void GetRuntimeInfo(
+        out string platform,
+        out string architecture,
+        out string extension)
+    {
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            platform = "win";
+            extension = "dll";
+        }
+        else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+        {
+            platform = "linux";
+            extension = "so";
+        }
+        else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+        {
+            platform = "osx";
+            extension = "dylib";
+        }
+        else
+        {
+            platform = "linux";
+            extension = "so";
+        }
+
+        if (RuntimeInformation.ProcessArchitecture == Architecture.X64)
+        {
+            architecture = "x64";
+        }
+        else if (RuntimeInformation.ProcessArchitecture == Architecture.X86)
+        {
+            architecture = "x86";
+        }
+        else if (RuntimeInformation.ProcessArchitecture == Architecture.Arm)
+        {
+            architecture = "arm";
+        }
+        else if (RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
+        {
+            architecture = "arm64";
+        }
+        else
+        {
+            throw new PlatformNotSupportedException("Unsupported process architecture.");
+        }
+    }
 }