Optimize edge case where the assembly is downloaded but not loaded into context

Author: isc30

src/src/AssemblyLoader.Server/Services/DisposableAssemblyLoadContext.cs

@@ -82,6 +82,25 @@ public DisposableAssemblyLoadContext(
             return null;
         }
 
+        public Assembly? Load(AssemblyName assemblyName)
+        {
+            try
+            {
+                lock (_assemblyLoadContextLock)
+                {
+                    if (_assemblyLoadContext == null)
+                    {
+                        return null;
+                    }
+
+                    return _assemblyLoadContext.LoadFromAssemblyName(assemblyName);
+                }
+            }
+            catch { }
+
+            return null;
+        }
+
         [MethodImpl(MethodImplOptions.NoInlining)]
         public void Dispose()
         {

src/src/AssemblyLoader.Wasm/Services/AppDomainAssemblyLoadContext.cs

@@ -102,5 +102,25 @@ public void Dispose()
                 return null;
             }
         }
+
+        public Assembly? Load(AssemblyName assemblyName)
+        {
+            try
+            {
+                lock (_domainLock)
+                {
+                    if (_domain == null)
+                    {
+                        return null;
+                    }
+
+                    return _domain.Load(assemblyName);
+                }
+            }
+            catch
+            {
+                return null;
+            }
+        }
     }
 }

src/src/AssemblyLoader/Abstractions/IAssemblyLoadContext.cs

@@ -12,5 +12,7 @@ public interface IAssemblyLoadContext : IDisposable
         ICollection<Assembly> OwnAssemblies { get; }
 
         Assembly? Load(AssemblyData assemblyData);
+
+        Assembly? Load(AssemblyName assemblyName);
     }
 }

src/src/AssemblyLoader/Services/AssemblyLoader.cs

@@ -182,6 +182,19 @@ private bool TryGetAlreadyLoadedAssembly(
             IAssemblyComparer comparer,
             AssemblyLoaderContext context)
         {
+            if (_assemblyLoadContext == null)
+            {
+                return null;
+            }
+
+            // Try loading the assembly by name (this works when the assembly is part of the bootloader, but never used explicitly)
+            Assembly? assembly = _assemblyLoadContext.Load(assemblyName);
+
+            if (assembly != null)
+            {
+                return assembly;
+            }
+
             AssemblyData? data = await _assemblyDataProvider.GetAssemblyDataAsync(assemblyName, context).ConfigureAwait(false);
 
             if (data == null)
@@ -197,11 +210,6 @@ private bool TryGetAlreadyLoadedAssembly(
                 return null;
             }
 
-            if (_assemblyLoadContext == null)
-            {
-                return null;
-            }
-
             return _assemblyLoadContext.Load(data);
         }