fix: wire up timer lifecycle in add/update/remove handlers

Agent-Logs-Url: https://github.com/nhwilly/timewarp-state/sessions/ea1a58a9-fc53-4b4b-a923-9cad99724c7f

Co-authored-by: nhwilly <7560842+nhwilly@users.noreply.github.com>

Author: Copilot

source/timewarp-state-plus/features/timers/timer-state/timer-state.add-timer.cs

@@ -1,7 +1,5 @@
 namespace TimeWarp.State.Plus.Features.Timers;
 
-using System.Timers;
-
 public partial class TimerState
 {
   public static class AddTimerActionSet
@@ -24,7 +22,7 @@ public Handler(IStore store) : base(store) {}
 
       public override Task Handle(Action action, CancellationToken cancellationToken)
       {
-        TimerState.Timers[action.TimerName] = (new Timer(action.TimerConfig.Duration), action.TimerConfig);
+        TimerState.CreateAndStartTimer(action.TimerName, action.TimerConfig);
         return Task.CompletedTask;
       }
     }

source/timewarp-state-plus/features/timers/timer-state/timer-state.cs

@@ -48,25 +48,35 @@ public object Clone()
 
   public override void Initialize()
   {
+    foreach ((_, (Timer timer, TimerConfig _)) in Timers)
+    {
+      timer.Stop();
+      timer.Dispose();
+    }
     Timers.Clear();
     // Load from options
     foreach ((string timerName, TimerConfig timerConfig) in MultiTimerOptions.Timers)
     {
-      var timer = new Timer(timerConfig.Duration);
-      timer.Elapsed += (_, _) => OnTimerElapsed(timerName);
-      timer.AutoReset = false;
-      timer.Start();
-      Timers[timerName] = (timer, timerConfig);
-      Logger.LogDebug
-      (
-        EventIds.MultiTimerPostProcessor_TimerStarted,
-        message: "{TimerName} started with timeout of {TimeoutDuration} ms, ResetOnActivity: {ResetOnActivity}",
-        timerName,
-        timerConfig.Duration,
-        timerConfig.ResetOnActivity
-      );
+      CreateAndStartTimer(timerName, timerConfig);
     }
   }
+
+  private void CreateAndStartTimer(string timerName, TimerConfig timerConfig)
+  {
+    var timer = new Timer(timerConfig.Duration);
+    timer.Elapsed += (_, _) => OnTimerElapsed(timerName);
+    timer.AutoReset = false;
+    timer.Start();
+    Timers[timerName] = (timer, timerConfig);
+    Logger.LogDebug
+    (
+      EventIds.MultiTimerPostProcessor_TimerStarted,
+      message: "{TimerName} started with timeout of {TimeoutDuration} ms, ResetOnActivity: {ResetOnActivity}",
+      timerName,
+      timerConfig.Duration,
+      timerConfig.ResetOnActivity
+    );
+  }
 
   private async void OnTimerElapsed(string timerName)
   {

source/timewarp-state-plus/features/timers/timer-state/timer-state.remove-timer.cs

@@ -26,6 +26,7 @@ public override Task Handle(Action action, CancellationToken cancellationToken)
       {
         if (TimerState.Timers.TryGetValue(action.TimerName, out (Timer Timer, TimerConfig TimerConfig) timerTuple))
         {
+          timerTuple.Timer.Stop();
           timerTuple.Timer.Dispose();
           TimerState.Timers.Remove(action.TimerName);
         }

source/timewarp-state-plus/features/timers/timer-state/timer-state.update-timer.cs

@@ -28,9 +28,9 @@ public override Task Handle(Action action, CancellationToken cancellationToken)
       {
         if (TimerState.Timers.TryGetValue(action.TimerName, out (Timer Timer, TimerConfig TimerConfig) timerTuple))
         {
+          timerTuple.Timer.Stop();
           timerTuple.Timer.Dispose();
-          Timer newTimer = new(action.NewTimerConfig.Duration);
-          TimerState.Timers[action.TimerName] = (newTimer, action.NewTimerConfig);
+          TimerState.CreateAndStartTimer(action.TimerName, action.NewTimerConfig);
         }
         return Task.CompletedTask;
       }