refactor: fix DI lifetime

Author: doghappy

src/SocketIOClient.Serializer/BaseJsonSerializer.cs

@@ -16,9 +16,15 @@ protected BaseJsonSerializer(IDecapsulable decapsulator)
     }
 
     protected IDecapsulable Decapsulator { get; }
+    protected IEngineIOMessageAdapter EngineIOMessageAdapter { get; private set; }
     public string Namespace { get; set; }
     protected abstract SerializationResult SerializeCore(object[] data);
 
+    public void SetEngineIOMessageAdapter(IEngineIOMessageAdapter adapter)
+    {
+        EngineIOMessageAdapter = adapter;
+    }
+
     private static void ThrowIfDataIsInvalid(object[] data)
     {
         if (data is null)

src/SocketIOClient.Serializer/ISerializer.cs

@@ -10,5 +10,6 @@ public interface ISerializer
         List<ProtocolMessage> Serialize(object[] data, int packetId);
         List<ProtocolMessage> SerializeAckData(object[] data, int packetId);
         IMessage Deserialize(string text);
+        void SetEngineIOMessageAdapter(IEngineIOMessageAdapter adapter);
     }
 }

src/SocketIOClient/SocketIOClient.csproj

@@ -14,7 +14,7 @@
 		<RepositoryType>github</RepositoryType>
 		<Version>3.1.2</Version>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
-		<LangVersion>default</LangVersion>
+		<LangVersion>latest</LangVersion>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

src/SocketIOClient/V2/Protocol/Http/IHttpAdapter.cs

@@ -4,7 +4,7 @@
 
 namespace SocketIOClient.V2.Protocol.Http;
 
-public interface IHttpAdapter : IProtocolAdapter
+public interface IHttpAdapter : IProtocolAdapter // TODO: seems no need IProtocolAdapter.SendAsync(pm)
 {
     Task SendAsync(IHttpRequest req, CancellationToken cancellationToken);
     Uri Uri { get; set; }

src/SocketIOClient/V2/Serializer/SystemTextJson/SystemJsonSerializer.cs

@@ -11,14 +11,12 @@ namespace SocketIOClient.V2.Serializer.SystemTextJson;
 
 public class SystemJsonSerializer : BaseJsonSerializer
 {
-    public SystemJsonSerializer(IDecapsulable decapsulator, IEngineIOMessageAdapter engineIOMessageAdapter) : base(decapsulator)
+    public SystemJsonSerializer(IDecapsulable decapsulator) : base(decapsulator)
     {
-        _engineIOMessageAdapter = engineIOMessageAdapter;
         JsonSerializerOptions = new JsonSerializerOptions();
     }
 
     public JsonSerializerOptions JsonSerializerOptions { get; set; }
-    private readonly IEngineIOMessageAdapter _engineIOMessageAdapter;
 
     private JsonSerializerOptions NewOptions(JsonConverter converter)
     {
@@ -46,11 +44,11 @@ protected override IMessage NewMessage(MessageType type, string text)
             MessageType.Opened => NewOpenedMessage(text),
             MessageType.Ping => new PingMessage(),
             MessageType.Pong => new PongMessage(),
-            MessageType.Connected => _engineIOMessageAdapter.DeserializeConnectedMessage(text),
+            MessageType.Connected => EngineIOMessageAdapter.DeserializeConnectedMessage(text),
             MessageType.Disconnected => NewDisconnectedMessage(text),
             MessageType.Event => NewEventMessage(text),
             MessageType.Ack => NewAckMessage(text),
-            MessageType.Error => _engineIOMessageAdapter.DeserializeErrorMessage(text),
+            MessageType.Error => EngineIOMessageAdapter.DeserializeErrorMessage(text),
             MessageType.Binary => NewBinaryEventMessage(text),
             MessageType.BinaryAck => NewBinaryAckMessage(text),
             _ => throw new ArgumentOutOfRangeException(nameof(type), type, null),

src/SocketIOClient/V2/Serializer/SystemTextJson/SystemJsonSerializerFactory.cs

@@ -9,8 +9,7 @@ public class SystemJsonSerializerFactory(IServiceProvider serviceProvider) : ISe
 {
     public ISerializer Create(EngineIO engineIO)
     {
-        var factory = serviceProvider.GetRequiredService<IEngineIOMessageAdapterFactory>();
-        var adapter = factory.Create(engineIO);
+        var adapter = serviceProvider.GetRequiredKeyedService<IEngineIOMessageAdapter>(engineIO);
         return ActivatorUtilities.CreateInstance<SystemJsonSerializer>(serviceProvider, adapter);
     }
 }

src/SocketIOClient/V2/ServicesInitializer.cs

@@ -24,17 +24,22 @@ public static IServiceProvider BuildServiceProvider(IServiceCollection services,
         services.AddSingleton<IDecapsulable, Decapsulator>();
         services.AddSingleton<IHttpClient, SystemHttpClient>();
         services.AddSingleton<IRetriable, RandomDelayRetryPolicy>();
-        services.AddTransient<IHttpAdapter, HttpAdapter>();
+        services.AddScoped<IHttpAdapter, HttpAdapter>();
         services.AddSingleton<IUriConverter>(new DefaultUriConverter());
 
         // SystemTextJson or NewtonsoftJson
         // v3 or V4
         // Polling or WebSocket
         AddSystemTextJson(services);
 
-        services.AddSingleton<IEngineIOAdapterFactory, EngineIOAdapterFactory>();
+        services.AddScoped<IEngineIOAdapterFactory, EngineIOAdapterFactory>();
+        services.AddKeyedScoped<IEngineIOAdapter, EngineIO3Adapter>(EngineIO.V3);
+        services.AddKeyedScoped<IEngineIOAdapter, EngineIO4Adapter>(EngineIO.V4);
+
+        // TODO: Microsoft.Extensions.Http .AddHttpClient()
         services.AddSingleton<HttpMessageInvoker, HttpClient>();
-        services.AddTransient<ISessionFactory, HttpSessionFactory>();
+        // services.AddScoped<ISessionFactory, HttpSessionFactory>();
+        services.AddScoped<ISession, HttpSession>();
 
         configure?.Invoke(services);
 
@@ -46,6 +51,19 @@ private static void AddSystemTextJson(IServiceCollection services)
         services.AddKeyedSingleton<IEngineIOMessageAdapter, SystemJsonEngineIO3MessageAdapter>(EngineIO.V3);
         services.AddKeyedSingleton<IEngineIOMessageAdapter, SystemJsonEngineIO4MessageAdapter>(EngineIO.V4);
         services.AddSingleton<IEngineIOMessageAdapterFactory, EngineIOMessageAdapterFactory>();
-        services.AddSingleton<ISerializerFactory, SystemJsonSerializerFactory>();
+        // TODO: Should be Scoped, need to add test cases to cover it
+        services.AddSingleton<ISerializer, SystemJsonSerializer>();
+    }
+}
+
+public record ProtocolOptions
+{
+    public ProtocolOptions(TransportProtocol protocol, EngineIO engineIO)
+    {
+        Protocol = protocol;
+        EngineIO = engineIO;
     }
+
+    public TransportProtocol Protocol { get; }
+    public EngineIO EngineIO { get; }
 }

src/SocketIOClient/V2/Session/EngineIOHttpAdapter/EngineIO3Adapter.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 using SocketIOClient.Core;
 using SocketIOClient.Core.Messages;
 using SocketIOClient.V2.Infrastructure;
@@ -16,13 +17,13 @@ public sealed class EngineIO3Adapter : IEngineIOAdapter, IDisposable
     public EngineIO3Adapter(
         IStopwatch stopwatch,
         IHttpAdapter httpAdapter,
-        EngineIOAdapterOptions options,
-        IRetriable retryPolicy)
+        IRetriable retryPolicy,
+        ILogger<EngineIO3Adapter> logger)
     {
         _stopwatch = stopwatch;
         _httpAdapter = httpAdapter;
-        _options = options;
         _retryPolicy = retryPolicy;
+        _logger = logger;
     }
 
     private readonly IStopwatch _stopwatch;
@@ -33,8 +34,10 @@ public EngineIO3Adapter(
     private OpenedMessage _openedMessage;
 
     private readonly List<IMyObserver<IMessage>> _observers = [];
-    private readonly EngineIOAdapterOptions _options;
     private readonly IRetriable _retryPolicy;
+    private readonly ILogger<EngineIO3Adapter> _logger;
+
+    public TimeSpan Timeout { get; set; }
 
     public IHttpRequest ToHttpRequest(ICollection<byte[]> bytes)
     {
@@ -201,7 +204,7 @@ private async Task StartPingAsync()
             var request = ToHttpRequest("2");
             await _retryPolicy.RetryAsync(3, async () =>
             {
-                using var cts = new CancellationTokenSource(_options.Timeout);
+                using var cts = new CancellationTokenSource(Timeout);
                 await _httpAdapter.SendAsync(request, cts.Token);
             });
             _stopwatch.Restart();
@@ -236,7 +239,9 @@ private async Task WaitHttpAdapterReady()
             await Task.Delay(delay).ConfigureAwait(false);
             ms += delay;
         }
-        throw new TimeoutException();
+        var ex = new TimeoutException();
+        _logger.LogError(ex, "Wait HttpAdapter ready timeout");
+        throw ex;
     }
 
     private async Task NotifyObserversAsync(IMessage message)

src/SocketIOClient/V2/Session/EngineIOHttpAdapter/EngineIO4Adapter.cs

@@ -18,22 +18,21 @@ public class EngineIO4Adapter : IEngineIOAdapter
     public EngineIO4Adapter(
         IStopwatch stopwatch,
         IHttpAdapter httpAdapter,
-        EngineIOAdapterOptions options,
         IRetriable retryPolicy)
     {
         _stopwatch = stopwatch;
         _httpAdapter = httpAdapter;
-        _options = options;
         _retryPolicy = retryPolicy;
     }
 
     private const string Delimiter = "\u001E";
     private readonly IStopwatch _stopwatch;
     private readonly IHttpAdapter _httpAdapter;
     private readonly List<IMyObserver<IMessage>> _observers = [];
-    private readonly EngineIOAdapterOptions _options;
     private readonly IRetriable _retryPolicy;
 
+    public TimeSpan Timeout { get; set; }
+
     public IHttpRequest ToHttpRequest(ICollection<byte[]> bytes)
     {
         if (!bytes.Any())
@@ -108,7 +107,7 @@ private async Task HandlePingMessageAsync()
         _stopwatch.Restart();
         await _retryPolicy.RetryAsync(3, async () =>
         {
-            using var cts = new CancellationTokenSource(_options.Timeout);
+            using var cts = new CancellationTokenSource(Timeout);
             var pong = ToHttpRequest("3");
             await _httpAdapter.SendAsync(pong, cts.Token);
         });

src/SocketIOClient/V2/Session/EngineIOHttpAdapter/EngineIOAdapterFactory.cs

@@ -6,12 +6,8 @@ namespace SocketIOClient.V2.Session.EngineIOHttpAdapter;
 
 public class EngineIOAdapterFactory(IServiceProvider serviceProvider) : IEngineIOAdapterFactory
 {
-    public IEngineIOAdapter Create(EngineIO engineIO, EngineIOAdapterOptions options)
+    public IEngineIOAdapter Create(EngineIO engineIO)
     {
-        if (engineIO == EngineIO.V3)
-        {
-            return ActivatorUtilities.CreateInstance<EngineIO3Adapter>(serviceProvider, options);
-        }
-        return ActivatorUtilities.CreateInstance<EngineIO4Adapter>(serviceProvider, options);
+        return serviceProvider.GetRequiredKeyedService<IEngineIOAdapter>(engineIO);
     }
 }