Implemented IScopedEvents and IGlobalEvents for DI #9

src/Piral.Blazor.Orchestrator/Connector/MfEmulatorConnector.cs

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Http;
+using Piral.Blazor.Shared;
 using System.IO.Pipelines;
 using System.Runtime.Loader;
 using System.Text;
@@ -7,12 +8,12 @@
 
 namespace Piral.Blazor.Orchestrator.Connector;
 
-internal class MfEmulatorConnector(IMfRepository repository, IEvents events) : IMfDebugConnector
+internal class MfEmulatorConnector(IMfRepository repository, IGlobalEvents events) : IMfDebugConnector
 {
     private readonly IEnumerable<string> _styles = [];
     private readonly IEnumerable<string> _scripts = ["_content/Piral.Blazor.Orchestrator/debug.js"];
     private readonly IMfRepository _repository = repository;
-    private readonly IEvents _events = events;
+    private readonly IGlobalEvents _events = events;
 
     public IEnumerable<string> Styles => _styles;
 

src/Piral.Blazor.Orchestrator/GlobalEvents.cs → src/Piral.Blazor.Orchestrator/EventBus.cs

@@ -1,9 +1,10 @@
 using System.Collections.Concurrent;
 using System.Text.Json;
+using Piral.Blazor.Shared;
 
 namespace Piral.Blazor.Orchestrator;
 
-internal class GlobalEvents : IEvents
+internal class EventBus : IGlobalEvents, IScopedEvents
 {
     private ConcurrentDictionary<string, List<Delegate>> _eventMap = new();
 

src/Piral.Blazor.Orchestrator/Loader/MfLocalLoaderService.cs

@@ -1,13 +1,15 @@
-namespace Piral.Blazor.Orchestrator.Loader;
+using Piral.Blazor.Shared;
 
-internal class MfLocalLoaderService<T>(T originalLoader, IMfRepository repository, IPiralConfig config, IModuleContainerService container, IEvents events, IData data) : IMfLoaderService
+namespace Piral.Blazor.Orchestrator.Loader;
+
+internal class MfLocalLoaderService<T>(T originalLoader, IMfRepository repository, IPiralConfig config, IModuleContainerService container, IGlobalEvents events, IData data) : IMfLoaderService
     where T : class, IMfLoaderService
 {
     private readonly T _originalLoader = originalLoader;
     private readonly IMfRepository _repository = repository;
     private readonly IModuleContainerService _container = container;
     private readonly IPiralConfig _config = config;
-    private readonly IEvents _events = events;
+    private readonly IGlobalEvents _events = events;
     private readonly IData _data = data;
 
     public void ConnectMicrofrontends(CancellationToken cancellationToken)

src/Piral.Blazor.Orchestrator/LocalMicrofrontendPackage.cs

@@ -1,4 +1,5 @@
 using NuGet.Packaging;
+using Piral.Blazor.Shared;
 using System.Reflection;
 using System.Text;
 using System.Text.Json;
@@ -7,7 +8,7 @@
 
 namespace Piral.Blazor.Orchestrator;
 
-internal class LocalMicrofrontendPackage(string path, IPiralConfig config, IModuleContainerService container, IEvents events, IData data) :
+internal class LocalMicrofrontendPackage(string path, IPiralConfig config, IModuleContainerService container, IGlobalEvents events, IData data) :
     MicrofrontendPackage(MakePackage(path), config, container, events, data)
 {
     private readonly string _path = path;

src/Piral.Blazor.Orchestrator/MfPackageService.cs

@@ -1,14 +1,14 @@
 using NuGet.Packaging;
-using System.Text.Json.Nodes;
+using Piral.Blazor.Shared;
 
 namespace Piral.Blazor.Orchestrator;
 
-internal class MfPackageService(IPiralConfig config, IModuleContainerService container, ISnapshotService snapshot, IEvents events, IData data) : IMfPackageService
+internal class MfPackageService(IPiralConfig config, IModuleContainerService container, ISnapshotService snapshot, IGlobalEvents events, IData data) : IMfPackageService
 {
     private readonly IPiralConfig _config = config;
     private readonly IModuleContainerService _container = container;
     private readonly ISnapshotService _snapshot = snapshot;
-    private readonly IEvents _events = events;
+    private readonly IGlobalEvents _events = events;
     private readonly IData _data = data;
 
     public async Task<MicrofrontendPackage> LoadMicrofrontend(MfPackageMetadata entry)

src/Piral.Blazor.Orchestrator/MicrofrontendPackage.cs

@@ -15,7 +15,7 @@ public abstract class MicrofrontendPackage : IDisposable
     private readonly MicrofrontendLoadContext _context;
     public event EventHandler? PackageChanged;
 
-    public MicrofrontendPackage(MfPackageMetadata entry, IPiralConfig config, IModuleContainerService container, IEvents events, IData data)
+    public MicrofrontendPackage(MfPackageMetadata entry, IPiralConfig config, IModuleContainerService container, IGlobalEvents events, IData data)
     {
         _app = new (entry, events, data);
         _config = config;
@@ -127,9 +127,9 @@ public async Task Destroy()
 
     public abstract Task<Stream?> GetFile(string path);
 
-    sealed class RelatedMfAppService(MfPackageMetadata entry, IEvents events, IData data) : IMfAppService
+    sealed class RelatedMfAppService(MfPackageMetadata entry, IGlobalEvents events, IData data) : IMfAppService
     {
-        private readonly IEvents _events = events;
+        private readonly IGlobalEvents _events = events;
         private readonly IData _data = data;
         private readonly MfDetails _meta = new () { Name = entry.Name, Version = entry.Version, Config = entry.Config ?? [] };
 

src/Piral.Blazor.Orchestrator/RemoteMicrofrontendPackage.cs

@@ -1,9 +1,10 @@
 using NuGet.Packaging;
+using Piral.Blazor.Shared;
 using System.Reflection;
 
 namespace Piral.Blazor.Orchestrator;
 
-internal class RemoteMicrofrontendPackage(MfPackageMetadata entry, List<PackageArchiveReader> packages, IPiralConfig config, IModuleContainerService container, IEvents events, IData data) :
+internal class RemoteMicrofrontendPackage(MfPackageMetadata entry, List<PackageArchiveReader> packages, IPiralConfig config, IModuleContainerService container, IGlobalEvents events, IData data) :
     MicrofrontendPackage(entry, config, container, events, data)
 {
     private readonly List<PackageArchiveReader> _packages = packages;

src/Piral.Blazor.Orchestrator/ServiceCollectionExtensions.cs

@@ -18,8 +18,9 @@ public static IServiceCollection AddMicrofrontends<TLoader>(this IServiceCollect
         services.AddSingleton<IMfRepository, MfRepository>();
         services.AddSingleton<INugetService, NugetService>();
         services.AddSingleton<IMfPackageService, MfPackageService>();
-        services.AddSingleton<IEvents, GlobalEvents>();
+        services.AddSingleton<IGlobalEvents, EventBus>();
         services.AddSingleton<IData, GlobalData>();
+        services.AddScoped<IScopedEvents, EventBus>();
 
         if (config.IsEmulator)
         {

src/Piral.Blazor.Shared/IGlobalEvents.cs

@@ -0,0 +1,22 @@
+namespace Piral.Blazor.Shared;
+
+/// <summary>
+/// Represents an event bus that works globally - i.e., beyond the session scope.
+/// </summary>
+public interface IGlobalEvents
+{
+    /// <summary>
+    /// Dispatches an event using the given type.
+    /// </summary>
+    void DispatchEvent<T>(string type, T args);
+
+    /// <summary>
+    /// Adds the provided event listener.
+    /// </summary>
+    void AddEventListener<T>(string type, Action<T> handler);
+
+    /// <summary>
+    /// Removes the provided event listener.
+    /// </summary>
+    void RemoveEventListener<T>(string type, Action<T> handler);
+}

src/Piral.Blazor.Shared/IMfComponentService.cs

@@ -2,9 +2,9 @@
 
 public interface IMfComponentService
 {
-	event EventHandler ComponentsChanged;
+    event EventHandler ComponentsChanged;
 
-	IEnumerable<string> Styles { get; }
+    IEnumerable<string> Styles { get; }
 
     IEnumerable<string> Scripts { get; }
 

src/Piral.Blazor.Shared/IMfService.cs

@@ -3,36 +3,21 @@
 /// <summary>
 /// Represents a set of helper functions to be used in micro frontend components.
 /// </summary>
-public interface IMfService
+public interface IMfService : IGlobalEvents
 {
-	/// <summary>
-	/// Dispatches an event using the given type.
-	/// </summary>
-	void DispatchEvent<T>(string type, T args);
-
-	/// <summary>
-	/// Adds the provided event listener.
-	/// </summary>
-	void AddEventListener<T>(string type, Action<T> handler);
-
-	/// <summary>
-	/// Removes the provided event listener.
-	/// </summary>
-	void RemoveEventListener<T>(string type, Action<T> handler);
-
-	/// <summary>
-	/// Gets the details for the current micro frontend.
-	/// </summary>
-	MfDetails Meta { get; }
+    /// <summary>
+    /// Gets the details for the current micro frontend.
+    /// </summary>
+    MfDetails Meta { get; }
 
-	/// <summary>
-	/// Tries to set some data available across the micro frontends.
-	/// </summary>
-	/// <typeparam name="T">The type of the data to set.</typeparam>
-	/// <param name="name">The name of the data entry.</param>
-	/// <param name="value">The data value to store.</param>
-	/// <returns>True if the data was set, otherwise false.</returns>
-	bool TrySetData<T>(string name, T value);
+    /// <summary>
+    /// Tries to set some data available across the micro frontends.
+    /// </summary>
+    /// <typeparam name="T">The type of the data to set.</typeparam>
+    /// <param name="name">The name of the data entry.</param>
+    /// <param name="value">The data value to store.</param>
+    /// <returns>True if the data was set, otherwise false.</returns>
+    bool TrySetData<T>(string name, T value);
 
     /// <summary>
     /// Tries to get some data available for all micro frontends.

src/Piral.Blazor.Orchestrator/IEvents.cs → src/Piral.Blazor.Shared/IScopedEvents.cs

@@ -1,9 +1,9 @@
-namespace Piral.Blazor.Orchestrator;
+namespace Piral.Blazor.Shared;
 
 /// <summary>
-/// Represents the micro frontend shared event basis.
+/// Represents an event bus that works within the current scope only.
 /// </summary>
-public interface IEvents
+public interface IScopedEvents
 {
     /// <summary>
     /// Dispatches an event using the given type.