Wire IScenarioStateStore into middleware options, settings, and consumers

Replace direct ConcurrentDictionary<string, ScenarioState> usage with
IScenarioStateStore across all consumer files. The store is injectable
via WireMockServerSettings.ScenarioStateStore, defaulting to the
InMemoryScenarioStateStore for backward compatibility.

Author: m4tchl0ck

src/WireMock.Net.Minimal/Owin/IWireMockMiddlewareOptions.cs

@@ -33,7 +33,7 @@ internal interface IWireMockMiddlewareOptions
 
     ConcurrentDictionary<Guid, IMapping> Mappings { get; }
 
-    ConcurrentDictionary<string, ScenarioState> Scenarios { get; }
+    IScenarioStateStore ScenarioStateStore { get; set; }
 
     ConcurrentObservableCollection<LogEntry> LogEntries { get; }
 

src/WireMock.Net.Minimal/Owin/MappingMatcher.cs

@@ -91,14 +91,13 @@ private void LogException(IMapping mapping, Exception ex)
 
     private string? GetNextState(IMapping mapping)
     {
-        // If the mapping does not have a scenario or _options.Scenarios does not contain this scenario from the mapping,
+        // If the mapping does not have a scenario or the store does not contain this scenario,
         // just return null to indicate that there is no next state.
-        if (mapping.Scenario == null || !_options.Scenarios.ContainsKey(mapping.Scenario))
+        if (mapping.Scenario == null)
         {
             return null;
         }
 
-        // Else just return the next state
-        return _options.Scenarios[mapping.Scenario].NextState;
+        return _options.ScenarioStateStore.Get(mapping.Scenario)?.NextState;
     }
 }

src/WireMock.Net.Minimal/Owin/WireMockMiddleware.cs

@@ -149,9 +149,9 @@ private async Task InvokeInternalCoreAsync(IContext ctx, RequestMessage request)
                     }
 
                     // Set scenario start
-                    if (!_options.Scenarios.ContainsKey(mapping.Scenario) && mapping.IsStartState)
+                    if (!_options.ScenarioStateStore.ContainsKey(mapping.Scenario) && mapping.IsStartState)
                     {
-                        _options.Scenarios.TryAdd(mapping.Scenario, new ScenarioState
+                        _options.ScenarioStateStore.TryAdd(mapping.Scenario, new ScenarioState
                         {
                             Name = mapping.Scenario
                         });
@@ -340,21 +340,22 @@ await Task.Run(() =>
 
         private void UpdateScenarioState(IMapping mapping)
         {
-            var scenario = _options.Scenarios[mapping.Scenario!];
-
-            // Increase the number of times this state has been executed
-            scenario.Counter++;
-
-            // Only if the number of times this state is executed equals the required StateTimes, proceed to next state and reset the counter to 0
-            if (scenario.Counter == (mapping.TimesInSameState ?? 1))
+            _options.ScenarioStateStore.Update(mapping.Scenario!, scenario =>
             {
-                scenario.NextState = mapping.NextState;
-                scenario.Counter = 0;
-            }
+                // Increase the number of times this state has been executed
+                scenario.Counter++;
+
+                // Only if the number of times this state is executed equals the required StateTimes, proceed to next state and reset the counter to 0
+                if (scenario.Counter == (mapping.TimesInSameState ?? 1))
+                {
+                    scenario.NextState = mapping.NextState;
+                    scenario.Counter = 0;
+                }
 
-            // Else just update Started and Finished
-            scenario.Started = true;
-            scenario.Finished = mapping.NextState == null;
+                // Else just update Started and Finished
+                scenario.Started = true;
+                scenario.Finished = mapping.NextState == null;
+            });
         }
 
         private void LogRequest(LogEntry entry, bool addRequest)

src/WireMock.Net.Minimal/Owin/WireMockMiddlewareOptions.cs

@@ -31,7 +31,7 @@ internal class WireMockMiddlewareOptions : IWireMockMiddlewareOptions
 
     public ConcurrentDictionary<Guid, IMapping> Mappings { get; } = new ConcurrentDictionary<Guid, IMapping>();
 
-    public ConcurrentDictionary<string, ScenarioState> Scenarios { get; } = new(StringComparer.OrdinalIgnoreCase);
+    public IScenarioStateStore ScenarioStateStore { get; set; } = new InMemoryScenarioStateStore();
 
     public ConcurrentObservableCollection<LogEntry> LogEntries { get; } = new();
 

src/WireMock.Net.Minimal/Owin/WireMockMiddlewareOptionsHelper.cs

@@ -28,6 +28,7 @@ public static IWireMockMiddlewareOptions InitFromSettings(
         options.FileSystemHandler = settings.FileSystemHandler;
         options.HandleRequestsSynchronously = settings.HandleRequestsSynchronously;
         options.Logger = settings.Logger;
+        options.ScenarioStateStore = settings.ScenarioStateStore ?? options.ScenarioStateStore;
         options.MaxRequestLogCount = settings.MaxRequestLogCount;
         options.PostWireMockMiddlewareInit = settings.PostWireMockMiddlewareInit;
         options.PreWireMockMiddlewareInit = settings.PreWireMockMiddlewareInit;

src/WireMock.Net.Minimal/Server/WireMockServer.Admin.cs

@@ -713,7 +713,7 @@ private IResponseMessage ScenarioReset(IRequestMessage requestMessage)
     private IResponseMessage ScenariosSetState(IRequestMessage requestMessage)
     {
         var name = requestMessage.Path.Split('/').Reverse().Skip(1).First();
-        if (!_options.Scenarios.ContainsKey(name))
+        if (!_options.ScenarioStateStore.ContainsKey(name))
         {
             ResponseMessageBuilder.Create(HttpStatusCode.NotFound, $"No scenario found by name '{name}'.");
         }

src/WireMock.Net.Minimal/Server/WireMockServer.cs

@@ -96,7 +96,8 @@ public partial class WireMockServer : IWireMockServer
     /// Gets the scenarios.
     /// </summary>
     [PublicAPI]
-    public ConcurrentDictionary<string, ScenarioState> Scenarios => new(_options.Scenarios);
+    public ConcurrentDictionary<string, ScenarioState> Scenarios =>
+        new(_options.ScenarioStateStore.GetAll().ToDictionary(s => s.Name, s => s), StringComparer.OrdinalIgnoreCase);
 
     #region IDisposable Members
     /// <summary>
@@ -586,14 +587,14 @@ public void SetRequestLogExpirationDuration(int? requestLogExpirationDuration)
     [PublicAPI]
     public void ResetScenarios()
     {
-        _options.Scenarios.Clear();
+        _options.ScenarioStateStore.Clear();
     }
 
     /// <inheritdoc />
     [PublicAPI]
     public bool ResetScenario(string name)
     {
-        return _options.Scenarios.ContainsKey(name) && _options.Scenarios.TryRemove(name, out _);
+        return _options.ScenarioStateStore.TryRemove(name);
     }
 
     /// <inheritdoc />
@@ -605,7 +606,7 @@ public bool SetScenarioState(string name, string? state)
             return ResetScenario(name);
         }
 
-        _options.Scenarios.AddOrUpdate(
+        _options.ScenarioStateStore.AddOrUpdate(
             name,
             _ => new ScenarioState
             {

src/WireMock.Net.Shared/Settings/WireMockServerSettings.cs

@@ -182,6 +182,10 @@ public class WireMockServerSettings
     [JsonIgnore]
     public IFileSystemHandler FileSystemHandler { get; set; } = null!;
 
+    [PublicAPI]
+    [JsonIgnore]
+    public IScenarioStateStore? ScenarioStateStore { get; set; }
+
     /// <summary>
     /// Action which can be used to add additional Handlebars registrations. [Optional]
     /// </summary>