Possible fix for .NET 8 Blazor Web App breakage

Source/Lib/Fluxor.Blazor.Web/Components/FluxorComponent.cs

@@ -1,6 +1,8 @@
 using Fluxor.UnsupportedClasses;
 using Microsoft.AspNetCore.Components;
+using System.Threading;
 using System;
+using System.Threading.Tasks;
 
 namespace Fluxor.Blazor.Web.Components
 {
@@ -13,14 +15,17 @@ public abstract class FluxorComponent : ComponentBase, IDisposable
 		[Inject]
 		private IActionSubscriber ActionSubscriber { get; set; }
 
+		[Inject]
+		private IStore Store { get; set; }
+
 		private bool Disposed;
 		private IDisposable StateSubscription;
 		private readonly ThrottledInvoker StateHasChangedThrottler;
 
 		/// <summary>
 		/// Creates a new instance
 		/// </summary>
-		public FluxorComponent()
+		protected FluxorComponent()
 		{
 			StateHasChangedThrottler = new ThrottledInvoker(() =>
 			{
@@ -63,17 +68,25 @@ public void Dispose()
 				Disposed = true;
 			}
 		}
-
+		
 		/// <summary>
 		/// Subscribes to state properties
 		/// </summary>
 		protected override void OnInitialized()
 		{
-			base.OnInitialized();
 			StateSubscription = StateSubscriber.Subscribe(this, _ =>
 			{
 				StateHasChangedThrottler.Invoke(MaximumStateChangedNotificationsPerSecond);
 			});
+
+			base.OnInitialized();
+		}
+
+		protected override async Task OnInitializedAsync()
+		{
+			//Attempt to initialize the store knowing that if it's already been initialized, this won't do anything.
+			await Store.InitializeAsync();
+			await base.OnInitializedAsync();
 		}
 
 		protected virtual void Dispose(bool disposing)

Source/Lib/Fluxor.Blazor.Web/Fluxor.Blazor.Web.csproj

@@ -12,9 +12,11 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.0" Condition="'$(TargetFramework)' == 'net7.0'" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.0" Condition="'$(TargetFramework)' == 'net6.0'" />
 
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" Condition="'$(TargetFramework)' == 'net7.0'" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" Condition="'$(TargetFramework)' == 'net6.0'" />
 	</ItemGroup>

Source/Lib/Fluxor.Blazor.Web/Persistence/PersistenceEffects.cs

@@ -0,0 +1,59 @@
+using Fluxor.Persistence;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Fluxor.Blazor.Web.Persistence
+{
+#if NET6_0_OR_GREATER
+	public sealed class PersistenceEffects
+	{
+		private readonly IPersistenceManager _persistenceManager;
+		private readonly IServiceProvider _serviceProvider;
+
+		public PersistenceEffects(IPersistenceManager persistenceManager, IServiceProvider serviceProvider)
+		{
+			_persistenceManager = persistenceManager;
+			_serviceProvider = serviceProvider;
+		}
+
+		/// <summary>
+		/// Maintains a reference to IStore - injected this way to avoid a circular dependency during the effect method registration
+		/// </summary>
+		private readonly Lazy<IStore> _store = new(_serviceProvider.GetRequiredService<IStore>);
+
+		[EffectMethod(typeof(StorePersistingAction))]
+		public async Task PersistStoreData(IDispatcher dispatcher)
+		{
+			//Serialize the store
+			var json = _store.Value.SerializeToJson();
+
+			//Save to the persistence manager
+			await _persistenceManager.PersistStoreToStateAsync(json);
+
+			//Completed
+			dispatcher.Dispatch(new StorePersistedAction());
+		}
+
+		[EffectMethod(typeof(StoreRehydratingAction))]
+		public async Task RehydrateStoreData(IDispatcher dispatcher)
+		{
+			//Read from the persistence manager
+			var serializedStore = await _persistenceManager.RehydrateStoreFromStateAsync();
+			if (serializedStore is null)
+			{
+				//Nothing to rehydrate - leave as-is
+				dispatcher.Dispatch(new StoreRehydratedAction());
+				return;
+			}
+
+			_store.Value.RehydrateFromJson(serializedStore);
+
+			//Completed
+			dispatcher.Dispatch(new StoreRehydratedAction());
+		}
+	}
+#endif
+}

Source/Lib/Fluxor.Blazor.Web/StoreInitializer.cs

@@ -49,6 +49,14 @@ protected override void OnInitialized()
 			base.OnInitialized();
 		}
 
+#if NET8
+		protected override async Task OnInitializedAsync()
+		{
+			await Store.InitializeAsync();
+			await base.OnInitializedAsync();
+		}
+#endif
+
 		protected override void OnAfterRender(bool firstRender)
 		{
 			base.OnAfterRender(firstRender);
@@ -73,7 +81,9 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
 					if (!string.IsNullOrWhiteSpace(MiddlewareInitializationScripts))
 						await JSRuntime.InvokeVoidAsync("eval", MiddlewareInitializationScripts);
 
+#if !NET8
 					await Store.InitializeAsync();
+#endif
 				}
 				catch (JSException err)
 				{

Source/Lib/Fluxor/DependencyInjection/FluxorOptions.cs

@@ -1,4 +1,5 @@
 using Fluxor.Extensions;
+using Fluxor.Persistence;
 using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Collections.Generic;
@@ -138,5 +139,32 @@ public FluxorOptions AddMiddleware<TMiddleware>()
 			.ToArray();
 			return this;
 		}
+
+#if NET6_0_OR_GREATER
+
+		/// <summary>
+		/// Enables automatic store persistence between location state changes.
+		/// </summary>
+		/// <typeparam name="T">The type of persistence implementation to use.</typeparam>
+		/// <returns>Options</returns>
+		public FluxorOptions WithPersistence<T>() where T : IPersistenceManager
+		{
+			Services.AddScoped(typeof(IPersistenceManager), typeof(T));
+			return this;
+		}
+
+		/// <summary>
+		/// Enables automatic store persistence between location state changes.
+		/// </summary>
+		/// <typeparam name="T">The type of persistence implementation to use.</typeparam>
+		/// <returns>Options</returns>
+		public FluxorOptions WithPersistence<T>(IServiceCollection serviceCollection) where T : IPersistenceManager
+		{
+			WithPersistence<T>();
+			foreach (var serviceDescriptor in serviceCollection) Services.Add(serviceDescriptor);
+			return this;
+		}
+
+#endif
 	}
 }

Source/Lib/Fluxor/DependencyInjection/ServiceRegistration/StoreRegistration.cs

@@ -1,5 +1,6 @@
 using Fluxor.DependencyInjection.WrapperFactories;
 using Fluxor.Extensions;
+using Fluxor.Persistence;
 using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Collections.Generic;
@@ -41,7 +42,13 @@ public static void Register(
 			services.Add(typeof(Store), serviceProvider =>
 			{
 				var dispatcher = serviceProvider.GetService<IDispatcher>();
+
+#if NET6_0_OR_GREATER
+				var persistenceManager = serviceProvider.GetService<IPersistenceManager>();
+				var store = new Store(dispatcher, persistenceManager);
+#else
 				var store = new Store(dispatcher);
+#endif
 				foreach (FeatureClassInfo featureClassInfo in featureClassInfos)
 				{
 					var feature = (IFeature)serviceProvider.GetService(featureClassInfo.FeatureInterfaceGenericType);

Source/Lib/Fluxor/Fluxor.csproj

@@ -4,7 +4,7 @@
 		<Description>A zero boilerplate Redux/Flux framework for .NET</Description>
 		<PackageIcon>fluxor-small-logo.png</PackageIcon>
 		<PackageTags>Redux Flux DotNet CSharp</PackageTags>
-		<SignAssembly Condition="'$(Configuration)'=='Release'" >True</SignAssembly>
+		<SignAssembly Condition="'$(Configuration)'=='Release'">True</SignAssembly>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -15,9 +15,11 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<PackageReference Condition="'$(TargetFramework)' == 'net8.0'" Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
 		<PackageReference Condition="'$(TargetFramework)' == 'net7.0'" Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
 		<PackageReference Condition="'$(TargetFramework)' == 'net6.0'" Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
 		<PackageReference Condition="'$(TargetFramework)' == 'net5.0'" Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
 		<PackageReference Condition="'$(TargetFramework)' != 'net7.0' AND '$(TargetFramework)' != 'net6.0' AND '$(TargetFramework)' != 'net5.0'" Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
+		<PackageReference Include="System.Text.Json" Version="4.7.2" />
 	</ItemGroup>
 </Project>

Source/Lib/Fluxor/IStore.cs

@@ -93,5 +93,18 @@ public interface IStore : IActionSubscriber
 		/// Executed when an exception is not handled
 		/// </summary>
 		event EventHandler<Exceptions.UnhandledExceptionEventArgs> UnhandledException;
+
+		/// <summary>
+		/// Persists the features in the store to a serialized string.
+		/// </summary>
+		/// <returns></returns>
+		string SerializeToJson();
+
+		/// <summary>
+		/// Deserializes a previously serialized store and rehydrates each feature using the
+		/// provided values.
+		/// </summary>
+		/// <param name="json">The serialized store.</param>
+		void RehydrateFromJson(string json);
 	}
 }

Source/Lib/Fluxor/Persistence/IPersistenceManager.cs

@@ -0,0 +1,27 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Fluxor.Persistence
+{
+	public interface IPersistenceManager
+	{
+		/// <summary>
+		/// Persists the store to a persisted state.
+		/// </summary>
+		/// <param name="serializedStore">The serialized store data being persisted.</param>
+		public Task PersistStoreToStateAsync(string serializedStore);
+
+		/// <summary>
+		/// Rehydrates the store from a persisted state.
+		/// </summary>
+		public Task<string?> RehydrateStoreFromStateAsync();
+
+		/// <summary>
+		/// Clears the store from the persisted state.
+		/// </summary>
+		public Task ClearStoreFromStateAsync();
+	}
+}

Source/Lib/Fluxor/Persistence/PersistenceEffects.cs

@@ -0,0 +1,56 @@
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Fluxor.Persistence
+{
+	public sealed class PersistenceEffects
+	{
+		private readonly IPersistenceManager _persistenceManager;
+		private readonly IServiceProvider _serviceProvider;
+
+		public PersistenceEffects(IPersistenceManager persistenceManager, IServiceProvider serviceProvider)
+		{
+			_persistenceManager = persistenceManager;
+			_serviceProvider = serviceProvider;
+		}
+
+		/// <summary>
+		/// Maintains a reference to IStore - injected this way to avoid a circular dependency during the effect method registration
+		/// </summary>
+		private readonly Lazy<IStore> _store = new(_serviceProvider.GetRequiredService<IStore>);
+
+		[EffectMethod(typeof(StorePersistingAction))]
+		public async Task PersistStoreData(IDispatcher dispatcher)
+		{
+			//Serialize the store
+			var json = _store.Value.SerializeToJson();
+
+			//Save to the persistence manager
+			await _persistenceManager.PersistStoreToStateAsync(json);
+
+			//Completed
+			dispatcher.Dispatch(new StorePersistedAction());
+		}
+
+		[EffectMethod(typeof(StoreRehydratingAction))]
+		public async Task RehydrateStoreData(IDispatcher dispatcher)
+		{
+			//Read from the persistence manager
+			var serializedStore = await _persistenceManager.RehydrateStoreFromStateAsync();
+			if (serializedStore is null)
+			{
+				//Nothing to rehydrate - leave as-is
+				dispatcher.Dispatch(new StoreRehydratedAction());
+				return;
+			}
+
+			_store.Value.RehydrateFromJson(serializedStore);
+
+			//Completed
+			dispatcher.Dispatch(new StoreRehydratedAction());
+		}
+	}
+}

Source/Lib/Fluxor/Persistence/StorePersistedAction.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Fluxor.Persistence
+{
+	/// <summary>
+	/// Dispatched by the store once it has been successfully persisted to state.
+	/// </summary>
+	public sealed class StorePersistedAction
+	{
+	}
+}

Source/Lib/Fluxor/Persistence/StorePersistingAction.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Fluxor.Persistence
+{
+	/// <summary>
+	/// Dispatched by the store once it has started persisting to state.
+	/// </summary>
+	public sealed class StorePersistingAction
+	{
+	}
+}

Source/Lib/Fluxor/Persistence/StoreRehydratedAction.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Fluxor.Persistence
+{
+	/// <summary>
+	/// Dispatched by the store once it has been successfully rehydrated from state.
+	/// </summary>
+	public sealed class StoreRehydratedAction
+	{
+	}
+}

Source/Lib/Fluxor/Persistence/StoreRehydratingAction.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Fluxor.Persistence
+{
+	/// <summary>
+	/// Dispatched by the store once it has started rehydrating from state.
+	/// </summary>
+	public sealed class StoreRehydratingAction
+	{
+	}
+}