Improved local config

smapiot · May 1, 2024 · 7ab676e · 7ab676e
1 parent a834b39
commit 7ab676e
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 37 deletions.
diff --git a/src/Piral.Blazor.Orchestrator/Connector/MfEmulatorConnector.cs b/src/Piral.Blazor.Orchestrator/Connector/MfEmulatorConnector.cs
@@ -1,10 +1,9 @@
+using Microsoft.AspNetCore.Http;
 using System.IO.Pipelines;
 using System.Runtime.Loader;
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Microsoft.AspNetCore.Http;
-using NuGet.Versioning;
 
 namespace Piral.Blazor.Orchestrator.Connector;
 

diff --git a/src/Piral.Blazor.Orchestrator/FsNugetSnapshotService.cs b/src/Piral.Blazor.Orchestrator/FsNugetSnapshotService.cs
@@ -27,15 +27,10 @@ public FsNugetSnapshotService(INugetService nuget, IConfiguration configuration)
         _initialized = false;
     }
 
-    public Task UpdateMicrofrontends(IEnumerable<string> ids)
+    public Task UpdateMicrofrontends(IEnumerable<NugetEntryWithConfig> entries)
     {
         return EnqueueJob(() =>
         {
-            var entries = ids.Select(m =>
-            {
-                var (name, version) = m.GetIdentity();
-                return new NugetEntryWithConfig { Name = name, Version = version };
-            });
             _mfs.Clear();
             _mfs.AddRange(entries);
             return StoreMicrofrontendsSnapshot(entries);

diff --git a/src/Piral.Blazor.Orchestrator/ISnapshotService.cs b/src/Piral.Blazor.Orchestrator/ISnapshotService.cs
@@ -7,7 +7,7 @@ public interface ISnapshotService
 {
     Task<IEnumerable<string>> AvailableMicrofrontends();
 
-    Task UpdateMicrofrontends(IEnumerable<string> ids);
+    Task UpdateMicrofrontends(IEnumerable<NugetEntryWithConfig> entries);
 
     Task<JsonObject?> GetConfig(string id);
 

diff --git a/src/Piral.Blazor.Orchestrator/Loader/MfDiscoveryLoaderService.cs b/src/Piral.Blazor.Orchestrator/Loader/MfDiscoveryLoaderService.cs
@@ -29,11 +29,10 @@ public MfDiscoveryLoaderService(IHttpClientFactory client, IMfRepository reposit
 
     private void OnPackagesChanged(object? sender, EventArgs e)
     {
-        var ids = _repository.Packages
-            .Select(m => new NugetEntry { Name = m.Name, Version = m.Version })
-            .Select(m => m.MakePackageId());
+        var entries = _repository.Packages
+            .Select(m => new NugetEntryWithConfig { Name = m.Name, Version = m.Version, Config = m.Config });
 
-        _snapshot.UpdateMicrofrontends(ids);
+        _snapshot.UpdateMicrofrontends(entries);
     }
 
     public async Task LoadMicrofrontends(CancellationToken cancellationToken)

diff --git a/src/Piral.Blazor.Orchestrator/Loader/MfLocalLoaderService.cs b/src/Piral.Blazor.Orchestrator/Loader/MfLocalLoaderService.cs
@@ -1,4 +1,5 @@
-using System.Reflection;
+using System.Text;
+using System.Text.Json;
 using System.Text.Json.Nodes;
 
 namespace Piral.Blazor.Orchestrator.Loader;
@@ -19,21 +20,26 @@ public void ConnectMicrofrontends(CancellationToken cancellationToken)
 
     public async Task LoadMicrofrontends(CancellationToken cancellationToken)
     {
-        var ass = Assembly.GetEntryAssembly()!;
         var all = (Environment.GetEnvironmentVariable("PIRAL_BLAZOR_ALL_DEBUG_ASSEMBLIES") ?? "").Split(',');
-        var cfg = new JsonObject();
-
-        // set primary
-        await _repository.SetPackage(new LocalMicrofrontendPackage(ass, cfg, _container, _events, _data));
 
         foreach (var path in all)
         {
-            if (path != ass.Location)
-            {
-                // set other
-                var other = Assembly.LoadFrom(path);
-                await _repository.SetPackage(new LocalMicrofrontendPackage(other, cfg, _container, _events, _data));
-            }
+            var cfg = GetMicrofrontendConfig(path);
+            await _repository.SetPackage(new LocalMicrofrontendPackage(path, cfg, _container, _events, _data));
+        }
+    }
+
+    private static JsonObject? GetMicrofrontendConfig(string path)
+    {
+        var dir = Path.GetDirectoryName(path)!;
+        var cfgPath = Path.Combine(dir, "config.json");
+
+        if (File.Exists(cfgPath))
+        {
+            var text = File.ReadAllText(cfgPath, Encoding.UTF8);
+            return JsonSerializer.Deserialize<JsonObject?>(text);
         }
+
+        return null;
     }
 }
diff --git a/src/Piral.Blazor.Orchestrator/LocalMicrofrontendPackage.cs b/src/Piral.Blazor.Orchestrator/LocalMicrofrontendPackage.cs
@@ -7,18 +7,13 @@ namespace Piral.Blazor.Orchestrator;
 
 internal class LocalMicrofrontendPackage : MicrofrontendPackage
 {
-    private readonly Assembly _assembly;
+    private readonly string _path;
     private readonly List<string> _contentRoots = [];
 
-    public LocalMicrofrontendPackage(Assembly assembly, JsonObject? config, IModuleContainerService container, IEvents events, IData data)
-        : this(assembly, assembly.GetName(), config, container, events, data)
+    public LocalMicrofrontendPackage(string path, JsonObject? config, IModuleContainerService container, IEvents events, IData data)
+        : base(Path.GetFileNameWithoutExtension(path), "0.0.0", config, container, events, data)
     {
-    }
-
-    private LocalMicrofrontendPackage(Assembly assembly, AssemblyName assemblyName, JsonObject? config, IModuleContainerService container, IEvents events, IData data)
-        : base(assemblyName.Name!, assemblyName.Version!.ToString(), config, container, events, data)
-    {
-        _assembly = assembly;
+        _path = path;
     }
 
     protected override Assembly? LoadMissingAssembly(AssemblyLoadContext _, AssemblyName assemblyName)
@@ -29,13 +24,13 @@ private LocalMicrofrontendPackage(Assembly assembly, AssemblyName assemblyName,
 
     protected override async Task OnInitialized()
     {
-        var infos = Path.ChangeExtension(_assembly.Location, ".staticwebassets.runtime.json");
+        var infos = Path.ChangeExtension(_path, ".staticwebassets.runtime.json");
         using var fs = File.OpenRead(infos);
         var assets = await JsonSerializer.DeserializeAsync<StaticWebAssets>(fs);
         _contentRoots.AddRange(assets?.ContentRoots ?? Enumerable.Empty<string>());
     }
 
-    protected override Assembly? GetAssembly() => Context.LoadFromAssemblyPath(_assembly.Location);
+    protected override Assembly? GetAssembly() => Context.LoadFromAssemblyPath(_path);
 
     public override Task<Stream?> GetFile(string path)
     {

diff --git a/src/Piral.Blazor.Orchestrator/MicrofrontendLoadContext.cs b/src/Piral.Blazor.Orchestrator/MicrofrontendLoadContext.cs
@@ -0,0 +1,18 @@
+using System.Reflection;
+using System.Runtime.Loader;
+
+namespace Piral.Blazor.Orchestrator;
+
+internal class MicrofrontendLoadContext(string name) : AssemblyLoadContext(name, true)
+{
+    protected override Assembly? Load(AssemblyName assemblyName)
+    {
+        //string assemblyPath = _resolver.ResolveAssemblyToPath(assemblyName);
+        //if (assemblyPath != null)
+        //{
+        //    return LoadFromAssemblyPath(assemblyPath);
+        //}
+        //return null;
+        return base.Load(assemblyName);
+    }
+}
diff --git a/src/Piral.Blazor.Orchestrator/MicrofrontendPackage.cs b/src/Piral.Blazor.Orchestrator/MicrofrontendPackage.cs
@@ -10,7 +10,7 @@ public abstract class MicrofrontendPackage(string name, string version, JsonObje
 {
     private readonly RelatedMfAppService _app = new(name, version, config, events, data);
     private readonly IModuleContainerService _container = container;
-    private readonly AssemblyLoadContext _context = new ($"{name}@{version}", true);
+    private readonly AssemblyLoadContext _context = new MicrofrontendLoadContext($"{name}@{version}");
     public event EventHandler? PackageChanged;
 
     private IMfModule? _module;