improve LocalNode to use the new APIs

Author: smdn

src/Smdn.Net.MuninNode/Smdn.Net.MuninNode/LocalNode.Create.cs

@@ -3,11 +3,14 @@
 using System;
 using System.Collections.Generic;
 using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
 
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
 using Smdn.Net.MuninNode.AccessRules;
+using Smdn.Net.MuninNode.Transport;
 using Smdn.Net.MuninPlugin;
 
 namespace Smdn.Net.MuninNode;
@@ -39,6 +42,7 @@ public ConcreteLocalNode(
       IServiceProvider? serviceProvider = null
     )
       : base(
+        serverFactory: new ServerFactory(serviceProvider?.GetService<ILoggerFactory>()?.CreateLogger<LocalNode>()),
         accessRule: accessRule ?? serviceProvider?.GetService<IAccessRule>(),
         logger: serviceProvider?.GetService<ILoggerFactory>()?.CreateLogger<LocalNode>()
       )
@@ -53,6 +57,23 @@ protected override EndPoint GetLocalEndPointToBind()
         address: ((IPEndPoint)base.GetLocalEndPointToBind()).Address,
         port: port
       );
+
+    private new sealed class ServerFactory(ILogger? logger) : IMuninNodeServerFactory {
+      public ValueTask<IMuninNodeServer> CreateAsync(
+        EndPoint endPoint,
+        IMuninNode node,
+        CancellationToken cancellationToken
+      )
+#pragma warning disable CA2000
+        => new(
+          new MuninNodeServer(
+            endPoint: endPoint,
+            logger: logger,
+            serviceProvider: null
+          )
+        );
+#pragma warning restore CA2000
+    }
   }
 
   /// <summary>

src/Smdn.Net.MuninNode/Smdn.Net.MuninNode/LocalNode.Obsolete.cs

@@ -5,6 +5,8 @@
 
 using Microsoft.Extensions.Logging;
 
+using Smdn.Net.MuninNode.Transport;
+
 namespace Smdn.Net.MuninNode;
 
 #pragma warning disable IDE0040
@@ -19,7 +21,7 @@ partial class LocalNode {
   /// <param name="logger">
   /// The <see cref="ILogger"/> to report the situation.
   /// </param>
-  [Obsolete("This constructor will be deprecated in the future.")]
+  [Obsolete($"Use a constructor overload that takes {nameof(IMuninNodeServerFactory)} as an argument.")]
   protected LocalNode(
     IAccessRule? accessRule,
     ILogger? logger = null
@@ -31,34 +33,7 @@ protected LocalNode(
   {
   }
 
-  [Obsolete("This method will be deprecated in the future.")]
+  [Obsolete($"Use {nameof(IMuninNodeServerFactory)} and {nameof(StartAsync)} instead.")]
   protected override Socket CreateServerSocket()
-  {
-    const int MaxClients = 1;
-
-    Socket? server = null;
-
-    try {
-      var endPoint = GetLocalEndPointToBind();
-
-      server = new Socket(
-        endPoint.AddressFamily,
-        SocketType.Stream,
-        ProtocolType.Tcp
-      );
-
-      if (endPoint.AddressFamily == AddressFamily.InterNetworkV6 && Socket.OSSupportsIPv4)
-        server.DualMode = true;
-
-      server.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
-      server.Bind(endPoint);
-      server.Listen(MaxClients);
-
-      return server;
-    }
-    catch {
-      server?.Dispose();
-      throw;
-    }
-  }
+    => MuninNodeServer.CreateServerSocket(endPoint: GetLocalEndPointToBind());
 }

src/Smdn.Net.MuninNode/Smdn.Net.MuninNode/LocalNode.cs

@@ -1,5 +1,13 @@
 // SPDX-FileCopyrightText: 2023 smdn <smdn@smdn.jp>
 // SPDX-License-Identifier: MIT
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.Extensions.Logging;
+
+using Smdn.Net.MuninNode.Transport;
+
 namespace Smdn.Net.MuninNode;
 
 /// <summary>
@@ -11,11 +19,45 @@ public abstract partial class LocalNode : NodeBase {
   /// <summary>
   /// Initializes a new instance of the <see cref="LocalNode"/> class.
   /// </summary>
-  private LocalNode()
+  /// <param name="serverFactory">
+  /// The <see cref="IMuninNodeServerFactory"/> factory to create an <see cref="IMuninNodeServer"/> to be used in this instance.
+  /// If <see langword="null"/>, the default <see cref="IMuninNodeServerFactory"/> implementation is used.
+  /// </param>
+  /// <param name="accessRule">
+  /// The <see cref="IAccessRule"/> to determine whether to accept or reject a remote host that connects to <see cref="LocalNode"/>.
+  /// </param>
+  /// <param name="logger">
+  /// The <see cref="ILogger"/> to report the situation.
+  /// </param>
+  protected LocalNode(
+    IMuninNodeServerFactory? serverFactory,
+    IAccessRule? accessRule,
+    ILogger? logger
+  )
     : base(
-      accessRule: null,
-      logger: null
+      serverFactory: serverFactory ?? ServerFactory.Instance,
+      accessRule: accessRule,
+      logger: logger
     )
   {
   }
+
+  private sealed class ServerFactory : IMuninNodeServerFactory {
+    public static readonly ServerFactory Instance = new();
+
+    public ValueTask<IMuninNodeServer> CreateAsync(
+      EndPoint endPoint,
+      IMuninNode node,
+      CancellationToken cancellationToken
+    )
+#pragma warning disable CA2000
+      => new(
+        new MuninNodeServer(
+          endPoint: endPoint,
+          logger: null,
+          serviceProvider: null
+        )
+      );
+#pragma warning restore CA2000
+  }
 }