diff --git a/SuperSocket.sln b/SuperSocket.sln index 834eed086..bc58ba436 100644 --- a/SuperSocket.sln +++ b/SuperSocket.sln @@ -39,6 +39,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SuperSocket.Connection", "s EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SuperSocket.Kestrel", "src\SuperSocket.Kestrel\SuperSocket.Kestrel.csproj", "{8C8507D6-903F-4786-8F18-ACA54257454B}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SuperSocket.Quic", "src\SuperSocket.Quic\SuperSocket.Quic.csproj", "{F5FDE719-657B-43A8-9F08-E65C7987D357}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SuperSocket.Quic.Connection", "src\SuperSocket.Quic.Connection\SuperSocket.Quic.Connection.csproj", "{6EFA7A93-3B62-46C1-8816-E1802EBF037A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -241,6 +245,30 @@ Global {8C8507D6-903F-4786-8F18-ACA54257454B}.Release|x64.Build.0 = Release|Any CPU {8C8507D6-903F-4786-8F18-ACA54257454B}.Release|x86.ActiveCfg = Release|Any CPU {8C8507D6-903F-4786-8F18-ACA54257454B}.Release|x86.Build.0 = Release|Any CPU + {F5FDE719-657B-43A8-9F08-E65C7987D357}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F5FDE719-657B-43A8-9F08-E65C7987D357}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F5FDE719-657B-43A8-9F08-E65C7987D357}.Debug|x64.ActiveCfg = Debug|Any CPU + {F5FDE719-657B-43A8-9F08-E65C7987D357}.Debug|x64.Build.0 = Debug|Any CPU + {F5FDE719-657B-43A8-9F08-E65C7987D357}.Debug|x86.ActiveCfg = Debug|Any CPU + {F5FDE719-657B-43A8-9F08-E65C7987D357}.Debug|x86.Build.0 = Debug|Any CPU + {F5FDE719-657B-43A8-9F08-E65C7987D357}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F5FDE719-657B-43A8-9F08-E65C7987D357}.Release|Any CPU.Build.0 = Release|Any CPU + {F5FDE719-657B-43A8-9F08-E65C7987D357}.Release|x64.ActiveCfg = Release|Any CPU + {F5FDE719-657B-43A8-9F08-E65C7987D357}.Release|x64.Build.0 = Release|Any CPU + {F5FDE719-657B-43A8-9F08-E65C7987D357}.Release|x86.ActiveCfg = Release|Any CPU + {F5FDE719-657B-43A8-9F08-E65C7987D357}.Release|x86.Build.0 = Release|Any CPU + {6EFA7A93-3B62-46C1-8816-E1802EBF037A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6EFA7A93-3B62-46C1-8816-E1802EBF037A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6EFA7A93-3B62-46C1-8816-E1802EBF037A}.Debug|x64.ActiveCfg = Debug|Any CPU + {6EFA7A93-3B62-46C1-8816-E1802EBF037A}.Debug|x64.Build.0 = Debug|Any CPU + {6EFA7A93-3B62-46C1-8816-E1802EBF037A}.Debug|x86.ActiveCfg = Debug|Any CPU + {6EFA7A93-3B62-46C1-8816-E1802EBF037A}.Debug|x86.Build.0 = Debug|Any CPU + {6EFA7A93-3B62-46C1-8816-E1802EBF037A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6EFA7A93-3B62-46C1-8816-E1802EBF037A}.Release|Any CPU.Build.0 = Release|Any CPU + {6EFA7A93-3B62-46C1-8816-E1802EBF037A}.Release|x64.ActiveCfg = Release|Any CPU + {6EFA7A93-3B62-46C1-8816-E1802EBF037A}.Release|x64.Build.0 = Release|Any CPU + {6EFA7A93-3B62-46C1-8816-E1802EBF037A}.Release|x86.ActiveCfg = Release|Any CPU + {6EFA7A93-3B62-46C1-8816-E1802EBF037A}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -262,6 +290,8 @@ Global {8454E8D5-777D-46CB-B050-76C5119B624B} = {DDA4741E-097F-40C3-A252-2E1E3476C1A7} {FC2B529F-4AF4-4C39-BC4F-A3836CC7B37C} = {DDA4741E-097F-40C3-A252-2E1E3476C1A7} {8C8507D6-903F-4786-8F18-ACA54257454B} = {DDA4741E-097F-40C3-A252-2E1E3476C1A7} + {F5FDE719-657B-43A8-9F08-E65C7987D357} = {DDA4741E-097F-40C3-A252-2E1E3476C1A7} + {6EFA7A93-3B62-46C1-8816-E1802EBF037A} = {DDA4741E-097F-40C3-A252-2E1E3476C1A7} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {ADB30AA2-A848-4CB3-8A20-488C80F1BA9E} diff --git a/src/SuperSocket.Connection/PipeConnectionBase.cs b/src/SuperSocket.Connection/PipeConnectionBase.cs index 6601420d2..cba380d7a 100644 --- a/src/SuperSocket.Connection/PipeConnectionBase.cs +++ b/src/SuperSocket.Connection/PipeConnectionBase.cs @@ -97,7 +97,8 @@ private async ValueTask HandleClosing() { try { - await _pipeTask.ConfigureAwait(false); + if (_pipeTask != null) + await _pipeTask.ConfigureAwait(false); } catch (OperationCanceledException) { diff --git a/src/SuperSocket.Quic.Connection/QuicPipeConnection.cs b/src/SuperSocket.Quic.Connection/QuicPipeConnection.cs new file mode 100644 index 000000000..ae5169220 --- /dev/null +++ b/src/SuperSocket.Quic.Connection/QuicPipeConnection.cs @@ -0,0 +1,52 @@ +using System; +using System.IO; +using System.Net; +using System.Net.Quic; +using System.Net.Sockets; +using System.Threading; +using System.Threading.Tasks; +using SuperSocket.Connection; + +#pragma warning disable CA2252 + +namespace SuperSocket.Quic.Connection; + +public class QuicPipeConnection : StreamPipeConnection +{ + private readonly Stream _stream; + + public QuicPipeConnection(Stream stream, EndPoint remoteEndPoint, ConnectionOptions options) + : this(stream, remoteEndPoint, null, options) + { + _stream = stream; + } + + public QuicPipeConnection(Stream stream, EndPoint remoteEndPoint, EndPoint localEndPoint, ConnectionOptions options) + : base(stream, remoteEndPoint, localEndPoint, options) + { + _stream = stream; + } + + protected override async Task StartInputPipeTask(IObjectPipe packagePipe, CancellationToken cancellationToken) + { + if (_stream is QuicPipeStream quicPipeStream) + await quicPipeStream.OpenStreamAsync(cancellationToken); + + await base.StartInputPipeTask(packagePipe, cancellationToken); + } + + protected override bool IsIgnorableException(Exception e) + { + if (base.IsIgnorableException(e)) + return true; + + switch (e) + { + case QuicException: + case SocketException se when se.IsIgnorableSocketException(): + return true; + default: + return false; + } + } +} \ No newline at end of file diff --git a/src/SuperSocket.Quic.Connection/QuicPipeStream.cs b/src/SuperSocket.Quic.Connection/QuicPipeStream.cs new file mode 100644 index 000000000..b1bb6ecd5 --- /dev/null +++ b/src/SuperSocket.Quic.Connection/QuicPipeStream.cs @@ -0,0 +1,66 @@ +using System; +using System.IO; +using System.Net.Quic; +using System.Threading; +using System.Threading.Tasks; + +namespace SuperSocket.Quic.Connection; + +#pragma warning disable CA2252 + +public sealed class QuicPipeStream : Stream +{ + private Stream _stream; + + private readonly QuicConnection _connection; + + public QuicPipeStream(QuicConnection connection) + { + _connection = connection; + } + + public override bool CanRead => _stream.CanRead; + public override bool CanSeek => _stream.CanSeek; + public override bool CanWrite => _stream.CanWrite; + public override long Length => _stream.Length; + + public override long Position + { + get => _stream.Position; + set => _stream.Position = value; + } + + public async ValueTask OpenStreamAsync(CancellationToken cancellationToken) + { + _stream = await _connection.AcceptInboundStreamAsync(cancellationToken); + } + + public override void Flush() => _stream.Flush(); + + public override int Read(byte[] buffer, int offset, int count) => _stream.Read(buffer, offset, count); + + public override long Seek(long offset, SeekOrigin origin) => _stream.Seek(offset, origin); + + public override void SetLength(long value) => _stream.Flush(); + + public override void Close() => _stream.Close(); + + public override Task FlushAsync(CancellationToken cancellationToken) => _stream.FlushAsync(cancellationToken); + + public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) => + _stream.ReadAsync(buffer, offset, count, cancellationToken); + + public override ValueTask ReadAsync(Memory buffer, + CancellationToken cancellationToken = default) => _stream.ReadAsync(buffer, cancellationToken); + + public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) => + _stream.WriteAsync(buffer, offset, count, cancellationToken); + + public override ValueTask WriteAsync(ReadOnlyMemory buffer, + CancellationToken cancellationToken = default) => + _stream.WriteAsync(buffer, cancellationToken); + + public override void Write(ReadOnlySpan buffer) => _stream.Flush(); + + public override void Write(byte[] buffer, int offset, int count) => _stream.Flush(); +} \ No newline at end of file diff --git a/src/SuperSocket.Quic.Connection/SuperSocket.Quic.Connection.csproj b/src/SuperSocket.Quic.Connection/SuperSocket.Quic.Connection.csproj new file mode 100644 index 000000000..e1e646928 --- /dev/null +++ b/src/SuperSocket.Quic.Connection/SuperSocket.Quic.Connection.csproj @@ -0,0 +1,12 @@ + + + + SuperSocket quic connection library. + net7.0;net8.0 + + + + + + + diff --git a/src/SuperSocket.Quic/QuicConnectionFactory.cs b/src/SuperSocket.Quic/QuicConnectionFactory.cs new file mode 100644 index 000000000..cea1cefbb --- /dev/null +++ b/src/SuperSocket.Quic/QuicConnectionFactory.cs @@ -0,0 +1,29 @@ +using System.Net.Quic; +using System.Threading; +using System.Threading.Tasks; +using SuperSocket.Connection; +using SuperSocket.Quic.Connection; + +#pragma warning disable CA2252 +namespace SuperSocket.Quic; + +internal class QuicConnectionFactory : IConnectionFactory +{ + private readonly ConnectionOptions _connectionOptions; + + public QuicConnectionFactory(ConnectionOptions connectionOptions) + { + _connectionOptions = connectionOptions; + } + + public Task CreateConnection(object connection, CancellationToken cancellationToken) + { + var quicConnection = (QuicConnection)connection; + + var quicStream = new QuicPipeStream(quicConnection); + + var pipeConnection = new QuicPipeConnection(quicStream, quicConnection.RemoteEndPoint, quicConnection.LocalEndPoint, _connectionOptions); + + return Task.FromResult(pipeConnection); + } +} diff --git a/src/SuperSocket.Quic/QuicConnectionFactoryBuilder.cs b/src/SuperSocket.Quic/QuicConnectionFactoryBuilder.cs new file mode 100644 index 000000000..7ca1e740c --- /dev/null +++ b/src/SuperSocket.Quic/QuicConnectionFactoryBuilder.cs @@ -0,0 +1,13 @@ +using SuperSocket.Connection; +using SuperSocket.Server.Abstractions; +using SuperSocket.Server.Abstractions.Connections; + +namespace SuperSocket.Quic; + +internal class QuicConnectionFactoryBuilder : IConnectionFactoryBuilder +{ + public IConnectionFactory Build(ListenOptions listenOptions, ConnectionOptions connectionOptions) + { + return new QuicConnectionFactory(connectionOptions); + } +} \ No newline at end of file diff --git a/src/SuperSocket.Quic/QuicConnectionListener.cs b/src/SuperSocket.Quic/QuicConnectionListener.cs new file mode 100644 index 000000000..ded0514f2 --- /dev/null +++ b/src/SuperSocket.Quic/QuicConnectionListener.cs @@ -0,0 +1,157 @@ +using System; +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.Extensions.Logging; +using SuperSocket.Connection; +using SuperSocket.Server.Abstractions; +using SuperSocket.Server.Abstractions.Connections; +using System.Net.Quic; +using System.Net.Security; + +#pragma warning disable CA2252 +namespace SuperSocket.Quic; + +internal sealed class QuicConnectionListener : IConnectionListener +{ + private readonly ILogger _logger; + private readonly QuicTransportOptions _quicTransportOptions; + + private QuicListener _listenQuic; + private CancellationTokenSource _cancellationTokenSource; + private TaskCompletionSource _stopTaskCompletionSource; + public IConnectionFactory ConnectionFactory { get; } + public ListenOptions Options { get; } + public bool IsRunning { get; private set; } + + public QuicConnectionListener(ListenOptions options, + QuicTransportOptions quicTransportOptions, + IConnectionFactory connectionFactory, ILogger logger) + { + Options = options; + ConnectionFactory = connectionFactory; + _logger = logger; + _quicTransportOptions = quicTransportOptions; + } + + public bool Start() + { + var options = Options; + + try + { + var listenEndpoint = options.ToEndPoint(); + + if (options.CertificateOptions == null) + throw new ArgumentNullException(nameof(options.CertificateOptions),"Quic requires an ssl certificate"); + + if (options.CertificateOptions.Certificate == null) + options.CertificateOptions.EnsureCertificate(); + + var quicListenerOptions = new QuicListenerOptions + { + ListenBacklog = options.BackLog, + ListenEndPoint = listenEndpoint, + ApplicationProtocols = new List { SslApplicationProtocol.Http3 }, + ConnectionOptionsCallback = (connection, ssl, token) => ValueTask.FromResult( + new QuicServerConnectionOptions + { + DefaultStreamErrorCode = _quicTransportOptions.DefaultStreamErrorCode, + DefaultCloseErrorCode = _quicTransportOptions.DefaultCloseErrorCode, + IdleTimeout = _quicTransportOptions.IdleTimeout.HasValue + ? TimeSpan.FromMicroseconds(_quicTransportOptions.IdleTimeout.Value) + : Timeout.InfiniteTimeSpan, + MaxInboundBidirectionalStreams = _quicTransportOptions.MaxBidirectionalStreamCount, + MaxInboundUnidirectionalStreams = _quicTransportOptions.MaxUnidirectionalStreamCount, + ServerAuthenticationOptions = new SslServerAuthenticationOptions() + { + ApplicationProtocols = + new List { SslApplicationProtocol.Http3 }, + ServerCertificate = options.CertificateOptions.Certificate, + RemoteCertificateValidationCallback = + options.CertificateOptions.RemoteCertificateValidationCallback, + } + }) + }; + + var listenSocket = _listenQuic = QuicListener.ListenAsync(quicListenerOptions).GetAwaiter().GetResult(); + + IsRunning = true; + + _cancellationTokenSource = new CancellationTokenSource(); + + KeepAcceptAsync(listenSocket, _cancellationTokenSource.Token).DoNotAwait(); + return true; + } + catch (Exception e) + { + _logger.LogError(e, $"The listener[{this.ToString()}] failed to start."); + return false; + } + } + + + private async Task KeepAcceptAsync(QuicListener listenSocket, CancellationToken cancellationToken) + { + while (!cancellationToken.IsCancellationRequested) + { + try + { + var quicConnection = + await listenSocket.AcceptConnectionAsync(cancellationToken).ConfigureAwait(false); + OnNewClientAccept(quicConnection, cancellationToken); + } + catch (Exception e) + { + _logger.LogError(e, $"Listener[{this.ToString()}] failed to do AcceptAsync"); + } + } + + _stopTaskCompletionSource.TrySetResult(true); + } + + public event NewConnectionAcceptHandler NewConnectionAccept; + + private async void OnNewClientAccept(QuicConnection quicConnection, CancellationToken cancellationToken) + { + var handler = NewConnectionAccept; + + if (handler == null) + return; + + IConnection connection = null; + + try + { + using var cts = CancellationTokenSourcePool.Shared.Rent(Options.ConnectionAcceptTimeOut); + connection = await ConnectionFactory.CreateConnection(quicConnection, cts.Token); + } + catch (Exception e) + { + _logger.LogError(e, $"Failed to create quicConnection for {quicConnection.RemoteEndPoint}."); + return; + } + + await handler.Invoke(this.Options, connection); + } + + public async Task StopAsync() + { + var listenSocket = _listenQuic; + + if (listenSocket == null) + return; + + _stopTaskCompletionSource = new TaskCompletionSource(); + + _cancellationTokenSource.Cancel(); + await _listenQuic.DisposeAsync(); + + await _stopTaskCompletionSource.Task; + } + + public override string ToString() + { + return Options?.ToString(); + } +} \ No newline at end of file diff --git a/src/SuperSocket.Quic/QuicConnectionListenerFactory.cs b/src/SuperSocket.Quic/QuicConnectionListenerFactory.cs new file mode 100644 index 000000000..98242a9c6 --- /dev/null +++ b/src/SuperSocket.Quic/QuicConnectionListenerFactory.cs @@ -0,0 +1,32 @@ +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; +using SuperSocket.Connection; +using SuperSocket.Server.Abstractions; +using SuperSocket.Server.Abstractions.Connections; + +namespace SuperSocket.Quic; + +internal class QuicConnectionListenerFactory : IConnectionListenerFactory +{ + private readonly QuicTransportOptions _quicTransportOptions; + private readonly IConnectionFactoryBuilder _connectionFactoryBuilder; + + public QuicConnectionListenerFactory(IConnectionFactoryBuilder connectionFactoryBuilder, + IOptions options) + { + _connectionFactoryBuilder = connectionFactoryBuilder; + _quicTransportOptions = options.Value; + } + + public IConnectionListener CreateConnectionListener(ListenOptions options, ConnectionOptions connectionOptions, + ILoggerFactory loggerFactory) + { + connectionOptions.Logger = loggerFactory.CreateLogger(nameof(IConnection)); + var connectionFactoryLogger = loggerFactory.CreateLogger(nameof(QuicConnectionListener)); + + var connectionFactory = _connectionFactoryBuilder.Build(options, connectionOptions); + + return new QuicConnectionListener(options, _quicTransportOptions, connectionFactory, + connectionFactoryLogger); + } +} \ No newline at end of file diff --git a/src/SuperSocket.Quic/QuicServerHostBuilderExtensions.cs b/src/SuperSocket.Quic/QuicServerHostBuilderExtensions.cs new file mode 100644 index 000000000..a931c0a37 --- /dev/null +++ b/src/SuperSocket.Quic/QuicServerHostBuilderExtensions.cs @@ -0,0 +1,44 @@ +using System; +using System.Net.Quic; +using Microsoft.Extensions.DependencyInjection; +using SuperSocket.Server.Abstractions.Connections; +using SuperSocket.Server.Abstractions.Host; +using SuperSocket.Quic; + +#pragma warning disable CA2252 + +namespace SuperSocket.Server; + +public static class QuicServerHostBuilderExtensions +{ + public static ISuperSocketHostBuilder UseQuic(this ISuperSocketHostBuilder hostBuilder) + { + return hostBuilder.UseQuic(o => { }); + } + + public static ISuperSocketHostBuilder UseQuic( + this ISuperSocketHostBuilder hostBuilder) + { + return (hostBuilder as ISuperSocketHostBuilder).UseQuic(o => { }) as + ISuperSocketHostBuilder; + } + + public static ISuperSocketHostBuilder UseQuic(this ISuperSocketHostBuilder hostBuilder, Action globalConfigure) + { + return (hostBuilder as ISuperSocketHostBuilder).UseQuic(globalConfigure) as + ISuperSocketHostBuilder; + } + + public static ISuperSocketHostBuilder UseQuic(this ISuperSocketHostBuilder hostBuilder, Action globalConfigure) + { + if (!QuicListener.IsSupported) + throw new PlatformNotSupportedException("System.Net.Quic is not supported on this platform."); + + return hostBuilder.ConfigureServices((_, services) => + { + services.Configure(globalConfigure); + services.AddSingleton(); + services.AddSingleton(); + }) as ISuperSocketHostBuilder; + } +} \ No newline at end of file diff --git a/src/SuperSocket.Quic/QuicTransportOptions.cs b/src/SuperSocket.Quic/QuicTransportOptions.cs new file mode 100644 index 000000000..6793c8f58 --- /dev/null +++ b/src/SuperSocket.Quic/QuicTransportOptions.cs @@ -0,0 +1,27 @@ +namespace SuperSocket.Quic; + +public sealed class QuicTransportOptions +{ + public int MaxBidirectionalStreamCount { get; set; } = 100; + + /// + /// The maximum number of concurrent inbound uni-directional streams per connection. + /// + public int MaxUnidirectionalStreamCount { get; set; } = 10; + + /// + /// Error code used when the stream needs to abort the read or write side of the stream internally. + /// + public long DefaultStreamErrorCode { get; set; } + + /// + /// Error code used when an open connection is disposed + /// + public long DefaultCloseErrorCode { get; set; } + + /// Gets or sets the idle timeout for connections. The idle timeout is the time after which the connection will be closed. + /// Default means underlying implementation default idle timeout. + /// The idle timeout for connections. The default is , which means that the default idle timeout of the underlying implementation is used. + public int? IdleTimeout { get; set; } + +} \ No newline at end of file diff --git a/src/SuperSocket.Quic/SuperSocket.Quic.csproj b/src/SuperSocket.Quic/SuperSocket.Quic.csproj new file mode 100644 index 000000000..0be6201ae --- /dev/null +++ b/src/SuperSocket.Quic/SuperSocket.Quic.csproj @@ -0,0 +1,15 @@ + + + + SuperSocket quic library. + net7.0;net8.0 + True + + + + + + + + + diff --git a/test/SuperSocket.Tests/ClientTest.cs b/test/SuperSocket.Tests/ClientTest.cs index b36cff6e2..f9707aa0a 100644 --- a/test/SuperSocket.Tests/ClientTest.cs +++ b/test/SuperSocket.Tests/ClientTest.cs @@ -23,13 +23,13 @@ namespace SuperSocket.Tests public class ClientTest : TestClassBase { private static Random _rd = new Random(); - + public ClientTest(ITestOutputHelper outputHelper) : base(outputHelper) { } - + [Theory] [Trait("Category", "Client.TestEcho")] [InlineData(typeof(RegularHostConfigurator), false)] @@ -37,6 +37,7 @@ public ClientTest(ITestOutputHelper outputHelper) [InlineData(typeof(GzipHostConfigurator), false)] [InlineData(typeof(GzipSecureHostConfigurator), false)] [InlineData(typeof(RegularHostConfigurator), true)] + [InlineData(typeof(QuicHostConfigurator), false)] public async Task TestEcho(Type hostConfiguratorType, bool clientReadAsDemand) { var serverSessionEvent = new AutoResetEvent(false); @@ -71,11 +72,11 @@ public async Task TestEcho(Type hostConfiguratorType, bool clientReadAsDemand) Logger = NullLogger.Instance, ReadAsDemand = clientReadAsDemand }; - + var client = hostConfigurator.ConfigureEasyClient(new LinePipelineFilter(), options); var connected = await client.ConnectAsync(new IPEndPoint(IPAddress.Loopback, hostConfigurator.Listener.Port)); - + Assert.True(connected); Assert.True(serverSessionEvent.WaitOne(1000)); @@ -87,7 +88,7 @@ public async Task TestEcho(Type hostConfiguratorType, bool clientReadAsDemand) var package = await client.ReceiveAsync(); Assert.NotNull(package); - Assert.Equal(msg, package.Text); + Assert.Equal(msg, package.Text); } await client.CloseAsync(); @@ -99,11 +100,11 @@ public async Task TestEcho(Type hostConfiguratorType, bool clientReadAsDemand) [Theory] [InlineData(typeof(RegularHostConfigurator))] [InlineData(typeof(GzipHostConfigurator))] + [InlineData(typeof(QuicHostConfigurator))] [Trait("Category", "Client.TestBindLocalEndPoint")] public async Task TestBindLocalEndPoint(Type hostConfiguratorType) { IAppSession session = default; - var hostConfigurator = CreateObject(hostConfiguratorType); using (var server = CreateSocketServerBuilder(hostConfigurator) .UseSessionHandler(async s => @@ -117,7 +118,7 @@ public async Task TestBindLocalEndPoint(Type hostConfiguratorType) Assert.Equal("TestServer", server.Name); Assert.True(await server.StartAsync()); - OutputHelper.WriteLine("Server started."); + OutputHelper.WriteLine("Server started."); var pipelineFilter = new CommandLinePipelineFilter { @@ -128,11 +129,11 @@ public async Task TestBindLocalEndPoint(Type hostConfiguratorType) { Logger = DefaultLoggerFactory.CreateLogger(nameof(TestBindLocalEndPoint)) }; - + var client = hostConfigurator.ConfigureEasyClient(pipelineFilter, options); var connected = false; var localPort = 0; - + for (var i = 0; i < 3; i++) { localPort = _rd.Next(40000, 50000); @@ -146,16 +147,16 @@ public async Task TestBindLocalEndPoint(Type hostConfiguratorType) { if (e.SocketErrorCode == SocketError.AccessDenied || e.SocketErrorCode == SocketError.AddressAlreadyInUse) continue; - + throw e; } - break; - } - + break; + } + Assert.True(connected); - await Task.Delay(500); + await Task.Delay(5000); Assert.NotNull(session); Assert.Equal(localPort, (session.RemoteEndPoint as IPEndPoint).Port); @@ -197,6 +198,7 @@ public void TestCancellationTokenIsBeingUsedWhenConnecting() [InlineData(typeof(SecureHostConfigurator))] [InlineData(typeof(GzipSecureHostConfigurator))] [InlineData(typeof(GzipHostConfigurator))] + [InlineData(typeof(QuicHostConfigurator))] public async Task TestCommandLine(Type hostConfiguratorType) { var packageEvent = new AutoResetEvent(false); @@ -235,7 +237,7 @@ public async Task TestCommandLine(Type hostConfiguratorType) }; var connected = await client.ConnectAsync(new IPEndPoint(IPAddress.Loopback, hostConfigurator.Listener.Port)); - + Assert.True(connected); client.StartReceive(); @@ -322,7 +324,7 @@ async Task TestDetachableChannelInternal(IHostConfigurator hostConfigurator, Fun connection = connectionFactory(server, socket); await TestConnection(connection); - } + } await server.StopAsync(); } diff --git a/test/SuperSocket.Tests/QuicHostConfigurator.cs b/test/SuperSocket.Tests/QuicHostConfigurator.cs new file mode 100644 index 000000000..2da44626d --- /dev/null +++ b/test/SuperSocket.Tests/QuicHostConfigurator.cs @@ -0,0 +1,151 @@ +using System; +using System.Buffers; +using System.Collections.Generic; +using System.IO; +using System.Net; +using System.Net.Quic; +using System.Net.Security; +using System.Net.Sockets; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; +using SuperSocket.Connection; +using SuperSocket.Server; +using SuperSocket.Server.Abstractions; +using SuperSocket.Server.Abstractions.Host; +using SuperSocket.Client; +using SuperSocket.ProtoBase; +using SuperSocket.Quic; +using SuperSocket.Quic.Connection; + +#pragma warning disable CA2252 +#if NET7_0_OR_GREATER +namespace SuperSocket.Tests +{ + public class QuicHostConfigurator : IHostConfigurator + { + private static readonly ArrayPool _bufferPool = ArrayPool.Shared; + + public string WebSocketSchema => "ws"; + + public bool IsSecure => false; + + public ListenOptions Listener { get; private set; } + + public IEasyClient ConfigureEasyClient(IPipelineFilter pipelineFilter, + ConnectionOptions options) where TPackageInfo : class + { + return new QuicClient(pipelineFilter, options); + } + + private static Random _rd = new Random(); + + public void Configure(ISuperSocketHostBuilder hostBuilder) + { + hostBuilder + .UseQuic() + .ConfigureServices((ctx, services) => + { + services.Configure((options) => + { + var listener = options.Listeners[0]; + listener.CertificateOptions = new CertificateOptions + { + FilePath = "supersocket.pfx", + Password = "supersocket" + }; + Listener = listener; + }); + } + ); + } + + public TextReader GetStreamReader(Stream stream, Encoding encoding) + { + throw new NotImplementedException(); + } + + public ValueTask GetClientStream(Socket socket) + { + throw new NotImplementedException(); + } + + private IPipelineFilter GetPipelineFilter() + { + return new TerminatorPipelineFilter(new[] { (byte)'\r', (byte)'\n' }) + { + Decoder = new UdpPackageDecoder() + }; + } + + class UdpPackageDecoder : IPackageDecoder + { + public TextPackageInfo Decode(ref ReadOnlySequence buffer, object context) + { + return new TextPackageInfo { Text = buffer.GetString(Encoding.UTF8) }; + } + } + + class QuicClient : EasyClient + where TReceivePackage : class + { + public QuicClient(IPipelineFilter pipelineFilter, ConnectionOptions options) + : base(pipelineFilter, options) + { + } + + protected override async ValueTask ConnectAsync(EndPoint remoteEndPoint, + CancellationToken cancellationToken) + { + var quicConnection = await QuicConnection.ConnectAsync( + cancellationToken: cancellationToken, + options: new QuicClientConnectionOptions + { + DefaultCloseErrorCode = 0, + DefaultStreamErrorCode = 0, + RemoteEndPoint = remoteEndPoint, + LocalEndPoint = LocalEndPoint, + IdleTimeout = TimeSpan.Zero, + ClientAuthenticationOptions = new SslClientAuthenticationOptions + { + ApplicationProtocols = new List { SslApplicationProtocol.Http3 }, + RemoteCertificateValidationCallback = (sender, certificate, chain, errors) => + { + return true; + } + } + }); + + if (cancellationToken.IsCancellationRequested) + { + OnError($"The connection to {remoteEndPoint} was cancelled."); + return false; + } + + var quicStream = + await quicConnection.OpenOutboundStreamAsync(QuicStreamType.Bidirectional, cancellationToken); + + var connection = new QuicPipeConnection(quicStream, quicConnection.RemoteEndPoint, + quicConnection.LocalEndPoint, Options); + + SetupConnection(connection); + + return true; + } + } + + public async ValueTask KeepSequence() + { + await Task.Delay(200); + } + + public Socket CreateClient() + { + throw new NotImplementedException(); + } + } +} +#endif \ No newline at end of file diff --git a/test/SuperSocket.Tests/SuperSocket.Tests.csproj b/test/SuperSocket.Tests/SuperSocket.Tests.csproj index 2f292b952..084867a20 100755 --- a/test/SuperSocket.Tests/SuperSocket.Tests.csproj +++ b/test/SuperSocket.Tests/SuperSocket.Tests.csproj @@ -13,6 +13,7 @@ +