From 34fd12469fac121c2bdd859a579a96d7ab90d3cf Mon Sep 17 00:00:00 2001
From: Andres Gutierrez <gutierrezandresfelipe@gmail.com>
Date: Fri, 26 Jul 2024 10:09:25 -0500
Subject: [PATCH] Added missing ScheduleOnceStruct/GracefulShutdownStruct
 flavors

---
 Nixie/ActorRepositoryStruct.cs | 21 ++++++++++++++
 Nixie/ActorScheduler.cs        | 49 ++++++++++++++++++++++++++++++++
 Nixie/ActorSystem.cs           | 52 ++++++++++++++++++++++++++++++++--
 Nixie/Nixie.csproj             |  2 +-
 README.md                      |  4 +--
 5 files changed, 122 insertions(+), 6 deletions(-)

diff --git a/Nixie/ActorRepositoryStruct.cs b/Nixie/ActorRepositoryStruct.cs
index 0ba5872..f3a9d37 100644
--- a/Nixie/ActorRepositoryStruct.cs
+++ b/Nixie/ActorRepositoryStruct.cs
@@ -239,4 +239,25 @@ public async Task<bool> GracefulShutdown(string name, TimeSpan maxWait)
 
         return true;
     }
+
+    /// <summary>
+    /// Tries to shutdown an actor by its name and returns a task whose result confirms shutdown within the specified timespan
+    /// </summary>
+    /// <param name="actorRef"></param>
+    /// <param name="maxWait"></param>
+    /// <returns></returns>
+    public async Task<bool> GracefulShutdown(IActorRefStruct<TActor, TRequest> actorRef, TimeSpan maxWait)
+    {
+        string name = actorRef.Runner.Name;
+
+        if (actors.TryGetValue(name, out Lazy<(ActorRunnerStruct<TActor, TRequest> runner, ActorRefStruct<TActor, TRequest> actorRef)>? actor))
+        {
+            bool success = await actor.Value.runner.GracefulShutdown(maxWait);
+            actors.TryRemove(name, out _);
+            actorSystem.StopAllTimers(actor.Value.actorRef);
+            return success;
+        }
+
+        return true;
+    }
 }
diff --git a/Nixie/ActorScheduler.cs b/Nixie/ActorScheduler.cs
index 8d2f126..70c64ab 100644
--- a/Nixie/ActorScheduler.cs
+++ b/Nixie/ActorScheduler.cs
@@ -149,6 +149,43 @@ public Timer ScheduleOnce<TActor, TRequest>(IActorRef<TActor, TRequest> actorRef
         return timer.Value;
     }
 
+    /// <summary>
+    /// Schedules a message to be sent to an actor once after a specified delay.
+    /// </summary>
+    /// <typeparam name="TActor"></typeparam>
+    /// <typeparam name="TRequest"></typeparam>
+    /// <typeparam name="TResponse"></typeparam>
+    /// <param name="actorRef"></param>
+    /// <param name="request"></param>
+    /// <param name="delay"></param>
+    /// <returns></returns>
+    public Timer ScheduleOnceStruct<TActor, TRequest, TResponse>(IActorRefStruct<TActor, TRequest, TResponse> actorRef, TRequest request, TimeSpan delay)
+        where TActor : IActorStruct<TRequest, TResponse> where TRequest : struct where TResponse : struct
+    {
+        long seq = Interlocked.Increment(ref sequence);
+        Lazy<ConcurrentDictionary<long, Lazy<Timer>>> timers = onceTimers.GetOrAdd(actorRef, (object _) => new());
+        Lazy<Timer> timer = timers.Value.GetOrAdd(seq, (long key) => new(() => ScheduleOnceTimerStruct(actorRef, request, delay, seq)));
+        return timer.Value;
+    }
+
+    /// <summary>
+    /// Schedules a message to be sent to an actor once after a specified delay.
+    /// </summary>
+    /// <typeparam name="TActor"></typeparam>
+    /// <typeparam name="TRequest"></typeparam>
+    /// <param name="actorRef"></param>
+    /// <param name="request"></param>
+    /// <param name="delay"></param>
+    /// <returns></returns>
+    public Timer ScheduleOnceStruct<TActor, TRequest>(IActorRefStruct<TActor, TRequest> actorRef, TRequest request, TimeSpan delay)
+        where TActor : IActorStruct<TRequest> where TRequest : struct
+    {
+        long seq = Interlocked.Increment(ref sequence);
+        Lazy<ConcurrentDictionary<long, Lazy<Timer>>> timers = onceTimers.GetOrAdd(actorRef, (object _) => new());
+        Lazy<Timer> timer = timers.Value.GetOrAdd(seq, (long key) => new(() => ScheduleOnceTimerStruct(actorRef, request, delay, seq)));
+        return timer.Value;
+    }
+
     /// <summary>
     /// Stops a periodic timer
     /// </summary>
@@ -275,6 +312,18 @@ private Timer ScheduleOnceTimer<TActor, TRequest, TResponse>(IActorRef<TActor, T
         return new((state) => SendScheduledMessage(actorRef, request, random), null, delay, TimeSpan.Zero);
     }
 
+    private Timer ScheduleOnceTimerStruct<TActor, TRequest>(IActorRefStruct<TActor, TRequest> actorRef, TRequest request, TimeSpan delay, long random)
+       where TActor : IActorStruct<TRequest> where TRequest : struct
+    {
+        return new((state) => SendScheduledMessage(actorRef, request, random), null, delay, TimeSpan.Zero);
+    }
+
+    private Timer ScheduleOnceTimerStruct<TActor, TRequest, TResponse>(IActorRefStruct<TActor, TRequest, TResponse> actorRef, TRequest request, TimeSpan delay, long random)
+        where TActor : IActorStruct<TRequest, TResponse> where TRequest : struct where TResponse : struct
+    {
+        return new((state) => SendScheduledMessage(actorRef, request, random), null, delay, TimeSpan.Zero);
+    }
+
     private void SendScheduledMessage<TActor, TRequest>(IActorRef<TActor, TRequest> actorRef, TRequest request, long random)
         where TActor : IActor<TRequest> where TRequest : class
     {
diff --git a/Nixie/ActorSystem.cs b/Nixie/ActorSystem.cs
index 1ff6583..fb25efa 100644
--- a/Nixie/ActorSystem.cs
+++ b/Nixie/ActorSystem.cs
@@ -1,9 +1,8 @@
 
-using Microsoft.Extensions.Logging;
 using Nixie.Actors;
 using Nixie.Utils;
+using Microsoft.Extensions.Logging;
 using System.Collections.Concurrent;
-using System.Diagnostics;
 
 namespace Nixie;
 
@@ -351,7 +350,7 @@ public async Task<bool> GracefulShutdownStruct<TActor, TRequest>(string name, Ti
     /// <typeparam name="TActor"></typeparam>
     /// <typeparam name="TRequest"></typeparam>
     /// <typeparam name="TResponse"></typeparam>
-    /// <param name="name"></param>
+    /// <param name="actorRef"></param>
     /// <param name="maxWait"></param>
     /// <returns></returns>
     public async Task<bool> GracefulShutdownStruct<TActor, TRequest, TResponse>(IActorRefStruct<TActor, TRequest, TResponse> actorRef, TimeSpan maxWait)
@@ -362,6 +361,22 @@ public async Task<bool> GracefulShutdownStruct<TActor, TRequest, TResponse>(IAct
         return await repository.GracefulShutdown(actorRef, maxWait);
     }
 
+    /// <summary>
+    /// Shutdowns an actor by its reference
+    /// </summary>
+    /// <typeparam name="TActor"></typeparam>
+    /// <typeparam name="TRequest"></typeparam>    
+    /// <param name="actorRef"></param>
+    /// <param name="maxWait"></param>
+    /// <returns></returns>
+    public async Task<bool> GracefulShutdownStruct<TActor, TRequest>(IActorRefStruct<TActor, TRequest> actorRef, TimeSpan maxWait)
+        where TActor : IActorStruct<TRequest> where TRequest : struct 
+    {
+        ActorRepositoryStruct<TActor, TRequest> repository = GetRepositoryStruct<TActor, TRequest>();
+
+        return await repository.GracefulShutdown(actorRef, maxWait);
+    }
+
     /// <summary>
     /// Returns the repository where the current references to request/response actors are stored.
     /// </summary>
@@ -569,6 +584,37 @@ public void ScheduleOnce<TActor, TRequest>(IActorRef<TActor, TRequest> actorRef,
         scheduler.ScheduleOnce(actorRef, request, delay);
     }
 
+    /// <summary>
+    /// Schedules a message to be sent to an actor once after a specified delay.
+    /// </summary>
+    /// <typeparam name="TActor"></typeparam>
+    /// <typeparam name="TRequest"></typeparam>
+    /// <typeparam name="TResponse"></typeparam>
+    /// <param name="actorRef"></param>
+    /// <param name="request"></param>
+    /// <param name="delay"></param>
+    /// <returns></returns>
+    public void ScheduleOnceStruct<TActor, TRequest, TResponse>(IActorRefStruct<TActor, TRequest, TResponse> actorRef, TRequest request, TimeSpan delay)
+        where TActor : IActorStruct<TRequest, TResponse> where TRequest : struct where TResponse : struct
+    {
+        scheduler.ScheduleOnceStruct(actorRef, request, delay);
+    }
+
+    /// <summary>
+    /// Schedules a message to be sent to an actor once after a specified delay.
+    /// </summary>
+    /// <typeparam name="TActor"></typeparam>
+    /// <typeparam name="TRequest"></typeparam>
+    /// <param name="actorRef"></param>
+    /// <param name="request"></param>
+    /// <param name="delay"></param>
+    /// <returns></returns>
+    public void ScheduleOnceStruct<TActor, TRequest>(IActorRefStruct<TActor, TRequest> actorRef, TRequest request, TimeSpan delay)
+        where TActor : IActorStruct<TRequest> where TRequest : struct
+    {
+        scheduler.ScheduleOnceStruct(actorRef, request, delay);
+    }
+
     /// <summary>
     /// Stops a periodic timer
     /// </summary>
diff --git a/Nixie/Nixie.csproj b/Nixie/Nixie.csproj
index 40cab64..0c3b7b7 100644
--- a/Nixie/Nixie.csproj
+++ b/Nixie/Nixie.csproj
@@ -9,7 +9,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <PackageId>Nixie</PackageId>
-    <Version>1.0.2</Version>
+    <Version>1.0.3</Version>
     <Description>A Lightweight Actor Model Implementation for C#/.NET</Description>
     <Authors>Andres Gutierrez</Authors>
     <Company>Andres Gutierrez</Company>    
diff --git a/README.md b/README.md
index bf8eb0e..a6242eb 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ To install Nixie into your C#/.NET project, you can use the .NET CLI or the NuGe
 #### Using .NET CLI
 
 ```shell
-dotnet add package Nixie --version 1.0.2
+dotnet add package Nixie --version 1.0.3
 ```
 
 ### Using NuGet Package Manager
@@ -39,7 +39,7 @@ dotnet add package Nixie --version 1.0.2
 Search for Nixie and install it from the NuGet package manager UI, or use the Package Manager Console:
 
 ```shell
-Install-Package Nixie -Version 1.0.2
+Install-Package Nixie -Version 1.0.3
 ```
 
 ## Usage