Added support for dependency injection when creating actors

andresgutierrez · Oct 16, 2023 · 81e4e1e · 81e4e1e
1 parent 740a3da
commit 81e4e1e
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 9 deletions.
diff --git a/Nixie/Actors/ActorMessage.cs → Nixie/ActorMessage.cs b/Nixie/Actors/ActorMessage.cs → Nixie/ActorMessage.cs
diff --git a/Nixie/ActorRepository.cs b/Nixie/ActorRepository.cs
@@ -1,4 +1,5 @@
 
+using Microsoft.Extensions.DependencyInjection;
 using System.Collections.Concurrent;
 
 namespace Nixie;
@@ -13,15 +14,19 @@ public sealed class ActorRepository<TActor, TRequest> : IActorRepositoryRunnable
 {
     private readonly ActorSystem actorSystem;
 
+    private readonly IServiceProvider? serviceProvider;
+
     private readonly ConcurrentDictionary<string, Lazy<(ActorRunner<TActor, TRequest>, ActorRef<TActor, TRequest>)>> actors = new();
 
     /// <summary>
     /// Constructor
     /// </summary>
     /// <param name="actorSystem"></param>
-    public ActorRepository(ActorSystem actorSystem)
+    /// <param name="serviceProvider"></param>
+    public ActorRepository(ActorSystem actorSystem, IServiceProvider? serviceProvider)
     {
         this.actorSystem = actorSystem;
+        this.serviceProvider = serviceProvider;
     }
 
     /// <summary>
@@ -119,10 +124,18 @@ public bool IsProcessing()
             for (int i = 0; i < args.Length; i++)
                 arguments[i + 1] = args[i];
 
-            actor = (TActor?)Activator.CreateInstance(typeof(TActor), arguments);
+            if (serviceProvider is not null)
+                actor = (TActor?)ActivatorUtilities.CreateInstance(serviceProvider, typeof(TActor), arguments);
+            else
+                actor = (TActor?)Activator.CreateInstance(typeof(TActor), arguments);
         }
         else
-            actor = (TActor?)Activator.CreateInstance(typeof(TActor), actorContext);
+        {
+            if (serviceProvider is not null)
+                actor = (TActor?)ActivatorUtilities.CreateInstance(serviceProvider, typeof(TActor), actorContext);
+            else
+                actor = (TActor?)Activator.CreateInstance(typeof(TActor), actorContext);
+        }
 
         if (actor is null)
             throw new NixieException("Invalid actor");

diff --git a/Nixie/ActorRepositoryReply.cs b/Nixie/ActorRepositoryReply.cs
@@ -1,5 +1,6 @@
 
 using System.Collections.Concurrent;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Nixie;
 
@@ -13,15 +14,19 @@ public sealed class ActorRepository<TActor, TRequest, TResponse> : IActorReposit
 {
     private readonly ActorSystem actorSystem;
 
+    private readonly IServiceProvider? serviceProvider;
+
     private readonly ConcurrentDictionary<string, Lazy<(ActorRunner<TActor, TRequest, TResponse>, ActorRef<TActor, TRequest, TResponse>)>> actors = new();
 
     /// <summary>
     /// Constructor
     /// </summary>
     /// <param name="actorSystem"></param>
-    public ActorRepository(ActorSystem actorSystem)
+    /// <param name="serviceProvider"></param>
+    public ActorRepository(ActorSystem actorSystem, IServiceProvider? serviceProvider)
     {
         this.actorSystem = actorSystem;
+        this.serviceProvider = serviceProvider;
     }
 
     /// <summary>
@@ -119,10 +124,18 @@ public bool IsProcessing()
             for (int i = 0; i < args.Length; i++)
                 arguments[i + 1] = args[i];
 
-            actor = (TActor?)Activator.CreateInstance(typeof(TActor), arguments);
+            if (serviceProvider is not null)
+                actor = (TActor?)ActivatorUtilities.CreateInstance(serviceProvider, typeof(TActor), arguments);
+            else
+                actor = (TActor?)Activator.CreateInstance(typeof(TActor), arguments);
         }
         else
-            actor = (TActor?)Activator.CreateInstance(typeof(TActor), actorContext);
+        {
+            if (serviceProvider is not null)
+                actor = (TActor?)ActivatorUtilities.CreateInstance(serviceProvider, typeof(TActor), actorContext);
+            else
+                actor = (TActor?)Activator.CreateInstance(typeof(TActor), actorContext);
+        }
 
         if (actor is null)
             throw new NixieException("Invalid actor");

diff --git a/Nixie/ActorSystem.cs b/Nixie/ActorSystem.cs
@@ -11,6 +11,8 @@ public sealed class ActorSystem : IDisposable
 {
     private readonly ActorScheduler scheduler = new();
 
+    private readonly IServiceProvider? serviceProvider;
+
     private readonly ConcurrentDictionary<Type, Lazy<IActorRepositoryRunnable>> repositories = new();
 
     private readonly IActorRef<NobodyActor, object> nobody;
@@ -25,8 +27,13 @@ public sealed class ActorSystem : IDisposable
     /// </summary>
     public ActorScheduler Scheduler => scheduler;
 
-    public ActorSystem()
+    /// <summary>
+    /// Constructor
+    /// </summary>
+    public ActorSystem(IServiceProvider? serviceProvider = null)
     {
+        this.serviceProvider = serviceProvider;
+
         nobody = Spawn<NobodyActor, object>();
     }
 
@@ -172,7 +179,7 @@ public ActorSystem()
     private ActorRepository<TActor, TRequest, TResponse> CreateRepository<TActor, TRequest, TResponse>()
         where TActor : IActor<TRequest, TResponse> where TRequest : class where TResponse : class
     {
-        ActorRepository<TActor, TRequest, TResponse> repository = new(this);
+        ActorRepository<TActor, TRequest, TResponse> repository = new(this, serviceProvider);
         return repository;
     }
 
@@ -196,7 +203,7 @@ public ActorSystem()
     private ActorRepository<TActor, TRequest> CreateRepository<TActor, TRequest>()
         where TActor : IActor<TRequest> where TRequest : class
     {
-        ActorRepository<TActor, TRequest> repository = new(this);
+        ActorRepository<TActor, TRequest> repository = new(this, serviceProvider);
         return repository;
     }
 

diff --git a/Nixie/IActorReply.cs b/Nixie/IActorReply.cs
@@ -8,5 +8,10 @@ namespace Nixie;
 /// <typeparam name="TResponse"></typeparam>
 public interface IActor<TRequest, TResponse> where TRequest : class where TResponse : class
 {
+    /// <summary>
+    /// Passes a message to the actor and returns a response.
+    /// </summary>
+    /// <param name="message"></param>
+    /// <returns></returns>
     public Task<TResponse> Receive(TRequest message);
 }
diff --git a/Nixie/IGenericActorRef.cs b/Nixie/IGenericActorRef.cs
@@ -1,6 +1,9 @@
 
 namespace Nixie;
 
+/// <summary>
+/// Generic interface for actor references.
+/// </summary>
 public interface IGenericActorRef
 {
 

diff --git a/Nixie/Nixie.csproj b/Nixie/Nixie.csproj
@@ -33,4 +33,8 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+  </ItemGroup>
+
 </Project>