Feedback

Author: javiercn

src/Components/Components/src/IPersistentComponentStateStore.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNetCore.Components.Lifetime
+namespace Microsoft.AspNetCore.Components
 {
     /// <summary>
     /// Manages the storage for components and services that are part of a Blazor application.

src/Components/Components/src/Infrastructure/ComponentStatePersistenceManager.cs

@@ -4,11 +4,7 @@
 using System;
 using System.Buffers;
 using System.Collections.Generic;
-using System.IO.Pipelines;
-using System.Text.Json;
-using System.Text.Json.Serialization;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components.Lifetime;
 using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.Extensions.Logging;
 
@@ -17,11 +13,11 @@ namespace Microsoft.AspNetCore.Components.Infrastructure
     /// <summary>
     /// Manages the persistent state of components in an application.
     /// </summary>
-    public class ComponentStatePersistenceManager
+    public class ComponentStatePersistenceManager : IDisposable
     {
         private bool _stateIsPersisted;
-        private List<Func<Task>> _pauseCallbacks = new();
-        private readonly Dictionary<string, PooledByteBufferWriter> _currentState = new();
+        private readonly List<Func<Task>> _pauseCallbacks = new();
+        private readonly Dictionary<string, PooledByteBufferWriter> _currentState = new(StringComparer.Ordinal);
         private readonly ILogger<ComponentStatePersistenceManager> _logger;
 
         /// <summary>
@@ -70,17 +66,19 @@ async Task PauseAndPersistState()
             {
                 await PauseAsync();
 
-                var data = new Dictionary<string, ReadOnlySequence<byte>>();
+                var data = new Dictionary<string, ReadOnlySequence<byte>>(StringComparer.Ordinal);
                 foreach (var (key, value) in _currentState)
                 {
                     data[key] = new ReadOnlySequence<byte>(value.WrittenMemory);
                 }
 
                 await store.PersistStateAsync(data);
-                foreach (var (key, value) in _currentState)
+
+                foreach (var value in _currentState.Values)
                 {
                     value.Dispose();
                 }
+                _currentState.Clear();
             }
         }
 
@@ -142,5 +140,14 @@ static async Task Awaited(Task task, ILogger<ComponentStatePersistenceManager> l
                 }
             }
         }
+
+        void IDisposable.Dispose()
+        {
+            foreach (var value in _currentState.Values)
+            {
+                value.Dispose();
+            }
+            _currentState.Clear();
+        }
     }
 }

src/Components/Components/src/PersistentComponentState.cs

@@ -65,7 +65,7 @@ public PersistingComponentStateSubscription RegisterOnPersisting(Func<Task> call
         /// <param name="key">The key used to persist the state.</param>
         /// <param name="value">The persisted state.</param>
         /// <returns><c>true</c> if the state was found; <c>false</c> otherwise.</returns>
-        public bool TryTake(string key, [MaybeNullWhen(false)] out ReadOnlySequence<byte> value)
+        public bool TryTake(string key, out ReadOnlySequence<byte> value)
         {
             if (key is null)
             {

src/Components/Components/src/PersistingComponentStateSubscription.cs

@@ -9,13 +9,13 @@
 namespace Microsoft.AspNetCore.Components
 {
     /// <summary>
-    /// Represents a subscription to the OnPersisting callback that <see cref="ComponentStatePersistenceManager"/> will trigger
+    /// Represents a subscription to the <c>OnPersisting</c> callback that <see cref="ComponentStatePersistenceManager"/> callback will trigger
     /// when the application is being persisted.
     /// </summary>
-    public struct PersistingComponentStateSubscription : IDisposable
+    public readonly struct PersistingComponentStateSubscription : IDisposable
     {
-        private readonly List<Func<Task>> _callbacks;
-        private Func<Task> _callback;
+        private readonly List<Func<Task>>? _callbacks;
+        private readonly Func<Task>? _callback;
 
         internal PersistingComponentStateSubscription(List<Func<Task>> callbacks, Func<Task> callback)
         {
@@ -26,7 +26,10 @@ internal PersistingComponentStateSubscription(List<Func<Task>> callbacks, Func<T
         /// <inheritdoc />
         public void Dispose()
         {
-            _callbacks?.Remove(_callback);
+            if (_callback != null)
+            {
+                _callbacks?.Remove(_callback);
+            }
         }
     }
 }

src/Components/Components/src/PublicAPI.Unshipped.txt

@@ -12,14 +12,14 @@ Microsoft.AspNetCore.Components.ErrorBoundaryBase.ErrorContent.set -> void
 Microsoft.AspNetCore.Components.ErrorBoundaryBase.MaximumErrorCount.get -> int
 Microsoft.AspNetCore.Components.ErrorBoundaryBase.MaximumErrorCount.set -> void
 Microsoft.AspNetCore.Components.ErrorBoundaryBase.Recover() -> void
+Microsoft.AspNetCore.Components.IPersistentComponentStateStore
+Microsoft.AspNetCore.Components.IPersistentComponentStateStore.GetPersistedStateAsync() -> System.Threading.Tasks.Task<System.Collections.Generic.IDictionary<string!, System.Buffers.ReadOnlySequence<byte>>!>!
+Microsoft.AspNetCore.Components.IPersistentComponentStateStore.PersistStateAsync(System.Collections.Generic.IReadOnlyDictionary<string!, System.Buffers.ReadOnlySequence<byte>>! state) -> System.Threading.Tasks.Task!
 Microsoft.AspNetCore.Components.Infrastructure.ComponentStatePersistenceManager
 Microsoft.AspNetCore.Components.Infrastructure.ComponentStatePersistenceManager.ComponentStatePersistenceManager(Microsoft.Extensions.Logging.ILogger<Microsoft.AspNetCore.Components.Infrastructure.ComponentStatePersistenceManager!>! logger) -> void
-Microsoft.AspNetCore.Components.Infrastructure.ComponentStatePersistenceManager.PersistStateAsync(Microsoft.AspNetCore.Components.Lifetime.IPersistentComponentStateStore! store, Microsoft.AspNetCore.Components.RenderTree.Renderer! renderer) -> System.Threading.Tasks.Task!
-Microsoft.AspNetCore.Components.Infrastructure.ComponentStatePersistenceManager.RestoreStateAsync(Microsoft.AspNetCore.Components.Lifetime.IPersistentComponentStateStore! store) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.Components.Infrastructure.ComponentStatePersistenceManager.PersistStateAsync(Microsoft.AspNetCore.Components.IPersistentComponentStateStore! store, Microsoft.AspNetCore.Components.RenderTree.Renderer! renderer) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.Components.Infrastructure.ComponentStatePersistenceManager.RestoreStateAsync(Microsoft.AspNetCore.Components.IPersistentComponentStateStore! store) -> System.Threading.Tasks.Task!
 Microsoft.AspNetCore.Components.Infrastructure.ComponentStatePersistenceManager.State.get -> Microsoft.AspNetCore.Components.PersistentComponentState!
-Microsoft.AspNetCore.Components.Lifetime.IPersistentComponentStateStore
-Microsoft.AspNetCore.Components.Lifetime.IPersistentComponentStateStore.GetPersistedStateAsync() -> System.Threading.Tasks.Task<System.Collections.Generic.IDictionary<string!, System.Buffers.ReadOnlySequence<byte>>!>!
-Microsoft.AspNetCore.Components.Lifetime.IPersistentComponentStateStore.PersistStateAsync(System.Collections.Generic.IReadOnlyDictionary<string!, System.Buffers.ReadOnlySequence<byte>>! state) -> System.Threading.Tasks.Task!
 Microsoft.AspNetCore.Components.PersistentComponentState
 Microsoft.AspNetCore.Components.PersistentComponentState.Persist(string! key, System.Action<System.Buffers.IBufferWriter<byte>!>! valueWriter) -> void
 Microsoft.AspNetCore.Components.PersistentComponentState.PersistAsJson<TValue>(string! key, TValue instance) -> void

src/Components/Components/test/Lifetime/ComponentApplicationLifetimeTest.cs

@@ -7,7 +7,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components.Infrastructure;
-using Microsoft.AspNetCore.Components.Lifetime;
 using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;

src/Components/Server/src/Circuits/CircuitFactory.cs

@@ -7,7 +7,6 @@
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components.Infrastructure;
-using Microsoft.AspNetCore.Components.Lifetime;
 using Microsoft.AspNetCore.Components.Routing;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.Extensions.DependencyInjection;

src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj

@@ -86,7 +86,6 @@
     <Compile Include="$(RepoRoot)src\Shared\Components\PrerenderComponentApplicationStore.cs" />
     <Compile Include="$(RepoRoot)src\Shared\Components\ProtectedPrerenderComponentApplicationStore.cs" />
     <Compile Include="$(RepoRoot)src\Shared\Components\PooledByteBufferWritter.cs" />
-    
   </ItemGroup>
 
   <PropertyGroup>

src/Mvc/Mvc.TagHelpers/test/PersistComponentStateTagHelperTest.cs

@@ -5,9 +5,7 @@
 using System.Collections.Generic;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Infrastructure;
-using Microsoft.AspNetCore.Components.Lifetime;
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Html;

src/Shared/Components/PooledByteBufferWritter.cs

@@ -136,8 +136,7 @@ private void CheckAndResizeBuffer(int sizeHint)
 
                 var previousBuffer = oldBuffer.AsSpan(0, _index);
                 previousBuffer.CopyTo(_currentBuffer);
-                previousBuffer.Clear();
-                ArrayPool<byte>.Shared.Return(oldBuffer);
+                ArrayPool<byte>.Shared.Return(oldBuffer, clearArray: true);
             }
         }
     }

src/Shared/Components/PrerenderComponentApplicationStore.cs

@@ -8,7 +8,6 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components.Infrastructure;
-using Microsoft.AspNetCore.Components.Lifetime;
 
 namespace Microsoft.AspNetCore.Components
 {
@@ -89,11 +88,11 @@ protected virtual PooledByteBufferWriter SerializeState(IReadOnlyDictionary<stri
             static void WriteMultipleSegments(Utf8JsonWriter jsonWriter, string key, ReadOnlySequence<byte> value)
             {
                 byte[] unescapedArray = null;
-                var valueLenght = (int)value.Length;
+                var valueLength = (int)value.Length;
 
                 Span<byte> valueSegment = value.Length <= 256 ?
-                    stackalloc byte[valueLenght] :
-                    (unescapedArray = ArrayPool<byte>.Shared.Rent(valueLenght)).AsSpan().Slice(0, valueLenght);
+                    stackalloc byte[valueLength] :
+                    (unescapedArray = ArrayPool<byte>.Shared.Rent(valueLength)).AsSpan().Slice(0, valueLength);
 
                 value.CopyTo(valueSegment);
                 jsonWriter.WriteBase64String(key, valueSegment);