diff --git a/SuperSocket.sln b/SuperSocket.sln index 834eed086..d8a55263d 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.Connection", "src\SuperSocket.Quic.Connection\SuperSocket.Quic.Connection.csproj", "{29F5C43A-410D-4922-A5C2-E9DDEBF29F9B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SuperSocket.Quic", "src\SuperSocket.Quic\SuperSocket.Quic.csproj", "{BB428AE4-B9F3-414F-823E-58A905E57AE8}" +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 + {29F5C43A-410D-4922-A5C2-E9DDEBF29F9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {29F5C43A-410D-4922-A5C2-E9DDEBF29F9B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {29F5C43A-410D-4922-A5C2-E9DDEBF29F9B}.Debug|x64.ActiveCfg = Debug|Any CPU + {29F5C43A-410D-4922-A5C2-E9DDEBF29F9B}.Debug|x64.Build.0 = Debug|Any CPU + {29F5C43A-410D-4922-A5C2-E9DDEBF29F9B}.Debug|x86.ActiveCfg = Debug|Any CPU + {29F5C43A-410D-4922-A5C2-E9DDEBF29F9B}.Debug|x86.Build.0 = Debug|Any CPU + {29F5C43A-410D-4922-A5C2-E9DDEBF29F9B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {29F5C43A-410D-4922-A5C2-E9DDEBF29F9B}.Release|Any CPU.Build.0 = Release|Any CPU + {29F5C43A-410D-4922-A5C2-E9DDEBF29F9B}.Release|x64.ActiveCfg = Release|Any CPU + {29F5C43A-410D-4922-A5C2-E9DDEBF29F9B}.Release|x64.Build.0 = Release|Any CPU + {29F5C43A-410D-4922-A5C2-E9DDEBF29F9B}.Release|x86.ActiveCfg = Release|Any CPU + {29F5C43A-410D-4922-A5C2-E9DDEBF29F9B}.Release|x86.Build.0 = Release|Any CPU + {BB428AE4-B9F3-414F-823E-58A905E57AE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BB428AE4-B9F3-414F-823E-58A905E57AE8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BB428AE4-B9F3-414F-823E-58A905E57AE8}.Debug|x64.ActiveCfg = Debug|Any CPU + {BB428AE4-B9F3-414F-823E-58A905E57AE8}.Debug|x64.Build.0 = Debug|Any CPU + {BB428AE4-B9F3-414F-823E-58A905E57AE8}.Debug|x86.ActiveCfg = Debug|Any CPU + {BB428AE4-B9F3-414F-823E-58A905E57AE8}.Debug|x86.Build.0 = Debug|Any CPU + {BB428AE4-B9F3-414F-823E-58A905E57AE8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BB428AE4-B9F3-414F-823E-58A905E57AE8}.Release|Any CPU.Build.0 = Release|Any CPU + {BB428AE4-B9F3-414F-823E-58A905E57AE8}.Release|x64.ActiveCfg = Release|Any CPU + {BB428AE4-B9F3-414F-823E-58A905E57AE8}.Release|x64.Build.0 = Release|Any CPU + {BB428AE4-B9F3-414F-823E-58A905E57AE8}.Release|x86.ActiveCfg = Release|Any CPU + {BB428AE4-B9F3-414F-823E-58A905E57AE8}.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} + {29F5C43A-410D-4922-A5C2-E9DDEBF29F9B} = {DDA4741E-097F-40C3-A252-2E1E3476C1A7} + {BB428AE4-B9F3-414F-823E-58A905E57AE8} = {DDA4741E-097F-40C3-A252-2E1E3476C1A7} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {ADB30AA2-A848-4CB3-8A20-488C80F1BA9E} diff --git a/src/SuperSocket.Quic.Connection/QuicPipeConnection.cs b/src/SuperSocket.Quic.Connection/QuicPipeConnection.cs new file mode 100644 index 000000000..56e3f2772 --- /dev/null +++ b/src/SuperSocket.Quic.Connection/QuicPipeConnection.cs @@ -0,0 +1,52 @@ +using System; +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 QuicPipeStream _stream; + + public QuicPipeConnection(QuicPipeStream stream, EndPoint remoteEndPoint, ConnectionOptions options) + : this(stream, remoteEndPoint, null, options) + { + _stream = stream; + } + + public QuicPipeConnection(QuicPipeStream stream, EndPoint remoteEndPoint, EndPoint localEndPoint, + ConnectionOptions options) + : base(stream, remoteEndPoint, localEndPoint, options) + { + _stream = stream; + } + + protected override async Task StartInputPipeTask(IObjectPipe packagePipe, + CancellationToken cancellationToken) + { + await _stream.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..5acf7a724 --- /dev/null +++ b/src/SuperSocket.Quic.Connection/QuicPipeStream.cs @@ -0,0 +1,75 @@ +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 bool _serverStream; + private readonly QuicConnection _connection; + + public QuicPipeStream(QuicConnection connection, bool serverStream) + { + _connection = connection; + _serverStream = serverStream; + } + + 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) + { + if (_serverStream) + { + _stream = await _connection.AcceptInboundStreamAsync(cancellationToken); + } + else + { + _stream = await _connection.OpenOutboundStreamAsync(QuicStreamType.Bidirectional, 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..9659a1be3 --- /dev/null +++ b/src/SuperSocket.Quic/QuicConnectionFactory.cs @@ -0,0 +1,46 @@ +using System.Collections.Generic; +using System.IO; +using System.Net.Quic; +using System.Threading; +using System.Threading.Tasks; +using SuperSocket.Connection; +using SuperSocket.Quic.Connection; +using SuperSocket.Server.Abstractions; +using SuperSocket.Server.Abstractions.Connections; + +#pragma warning disable CA2252 +namespace SuperSocket.Quic +{ + internal class QuicConnectionFactory : IConnectionFactory + { + private readonly ListenOptions _listenOptions; + private readonly ConnectionOptions _connectionOptions; + private readonly IEnumerable _connectionStreamInitializers; + + public QuicConnectionFactory( + IConnectionStreamInitializersFactory connectionStreamInitializersFactory, + ListenOptions listenOptions, + ConnectionOptions connectionOptions) + { + _listenOptions = listenOptions; + _connectionOptions = connectionOptions; + _connectionStreamInitializers = connectionStreamInitializersFactory.Create(_listenOptions); + } + + public async Task CreateConnection(object connection, CancellationToken cancellationToken) + { + Stream stream = null; + var quicConnection = connection as QuicConnection; + + foreach (var initializer in _connectionStreamInitializers) + { + stream = await initializer.InitializeAsync(quicConnection, cancellationToken); + } + + var quicStream = (QuicPipeStream)stream; + + return new QuicPipeConnection(quicStream, quicConnection.RemoteEndPoint, + quicConnection.LocalEndPoint, _connectionOptions); + } + } +} diff --git a/src/SuperSocket.Quic/QuicConnectionFactoryBuilder.cs b/src/SuperSocket.Quic/QuicConnectionFactoryBuilder.cs new file mode 100644 index 000000000..b4f1dd36d --- /dev/null +++ b/src/SuperSocket.Quic/QuicConnectionFactoryBuilder.cs @@ -0,0 +1,21 @@ +using SuperSocket.Connection; +using SuperSocket.Server.Abstractions; +using SuperSocket.Server.Abstractions.Connections; + +namespace SuperSocket.Quic +{ + internal class QuicConnectionFactoryBuilder : IConnectionFactoryBuilder + { + private readonly IConnectionStreamInitializersFactory _connectionStreamInitializersFactory; + + public QuicConnectionFactoryBuilder(IConnectionStreamInitializersFactory connectionStreamInitializersFactory) + { + _connectionStreamInitializersFactory = connectionStreamInitializersFactory; + } + + public IConnectionFactory Build(ListenOptions listenOptions, ConnectionOptions connectionOptions) + { + return new QuicConnectionFactory(_connectionStreamInitializersFactory,listenOptions, 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..86916c9ee --- /dev/null +++ b/src/SuperSocket.Quic/QuicConnectionListener.cs @@ -0,0 +1,159 @@ +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 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, IConnectionFactory connectionFactory, ILogger logger) + { + Options = options; + ConnectionFactory = connectionFactory; + _logger = logger; + } + + public bool Start() + { + var options = Options; + + try + { + var listenEndpoint = options.ToEndPoint(); + + ArgumentNullException.ThrowIfNull(options.CertificateOptions); + + 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 = 0, + DefaultCloseErrorCode = 0, + IdleTimeout = TimeSpan.FromMicroseconds(10), + //MaxInboundBidirectionalStreams = 0, + //MaxInboundUnidirectionalStreams = 0, + ServerAuthenticationOptions = new SslServerAuthenticationOptions() + { + ApplicationProtocols = + new List { SslApplicationProtocol.Http3 }, + ServerCertificate = options.CertificateOptions.Certificate, + RemoteCertificateValidationCallback = + options.CertificateOptions.RemoteCertificateValidationCallback, + } + }) + }; + + var result = QuicListener.ListenAsync(quicListenerOptions); + + if (result.IsCompleted) + _listenQuic = result.Result; + else + _listenQuic = result.GetAwaiter().GetResult(); + + var listenSocket = _listenQuic; + + 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(); + } + } +} diff --git a/src/SuperSocket.Quic/QuicConnectionListenerFactory.cs b/src/SuperSocket.Quic/QuicConnectionListenerFactory.cs new file mode 100644 index 000000000..2f3326098 --- /dev/null +++ b/src/SuperSocket.Quic/QuicConnectionListenerFactory.cs @@ -0,0 +1,27 @@ +using Microsoft.Extensions.Logging; +using SuperSocket.Connection; +using SuperSocket.Server.Abstractions; +using SuperSocket.Server.Abstractions.Connections; + +namespace SuperSocket.Quic +{ + internal class QuicConnectionListenerFactory : IConnectionListenerFactory + { + private readonly IConnectionFactoryBuilder _connectionFactoryBuilder; + + public QuicConnectionListenerFactory(IConnectionFactoryBuilder connectionFactoryBuilder) + { + _connectionFactoryBuilder = connectionFactoryBuilder; + } + + 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, connectionFactory, connectionFactoryLogger); + } + } +} \ No newline at end of file diff --git a/src/SuperSocket.Quic/QuicConnectionStreamInitializersFactory.cs b/src/SuperSocket.Quic/QuicConnectionStreamInitializersFactory.cs new file mode 100644 index 000000000..a274ac093 --- /dev/null +++ b/src/SuperSocket.Quic/QuicConnectionStreamInitializersFactory.cs @@ -0,0 +1,23 @@ +using System.Collections.Generic; +using SuperSocket.Server.Abstractions; +using SuperSocket.Server.Abstractions.Connections; +using SuperSocket.Server.Connection; + +namespace SuperSocket.Quic; + +internal class QuicConnectionStreamInitializersFactory : DefaultConnectionStreamInitializersFactory +{ + public override IEnumerable Create(ListenOptions listenOptions) + { + var connectionStreamInitializers = new List(); + + if (CompressionLevel != System.IO.Compression.CompressionLevel.NoCompression) + connectionStreamInitializers.Add(new GZipStreamInitializer()); + + connectionStreamInitializers.Add(new QuicPipeStreamInitializer()); + + connectionStreamInitializers.ForEach(initializer => initializer.Setup(listenOptions)); + + return connectionStreamInitializers; + } +} \ No newline at end of file diff --git a/src/SuperSocket.Quic/QuicPipeStreamInitializer.cs b/src/SuperSocket.Quic/QuicPipeStreamInitializer.cs new file mode 100644 index 000000000..1dd2cb57b --- /dev/null +++ b/src/SuperSocket.Quic/QuicPipeStreamInitializer.cs @@ -0,0 +1,24 @@ +using System.IO; +using System.Net.Quic; +using System.Net.Sockets; +using System.Threading; +using System.Threading.Tasks; +using SuperSocket.Quic.Connection; +using SuperSocket.Server.Abstractions; +using SuperSocket.Server.Abstractions.Connections; + +namespace SuperSocket.Quic; + +internal class QuicPipeStreamInitializer : IConnectionStreamInitializer +{ + public void Setup(ListenOptions listenOptions) + { + } + + public Task InitializeAsync(object connection, CancellationToken cancellationToken) + { + var quicConnection = (QuicConnection)connection; + + return Task.FromResult(new QuicPipeStream(quicConnection, true)); + } +} \ 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..c83107345 --- /dev/null +++ b/src/SuperSocket.Quic/QuicServerHostBuilderExtensions.cs @@ -0,0 +1,31 @@ +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) + { + if (!QuicListener.IsSupported) + throw new PlatformNotSupportedException("System.Net.Quic is not supported on this platform."); + + return hostBuilder.ConfigureServices((_, services) => + { + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + }) as ISuperSocketHostBuilder; + } + + public static ISuperSocketHostBuilder UseQuic(this ISuperSocketHostBuilder hostBuilder) + { + return (hostBuilder as ISuperSocketHostBuilder).UseQuic() as ISuperSocketHostBuilder; + } + } +} diff --git a/src/SuperSocket.Quic/QuicTransportOptions.cs b/src/SuperSocket.Quic/QuicTransportOptions.cs new file mode 100644 index 000000000..9857b9378 --- /dev/null +++ b/src/SuperSocket.Quic/QuicTransportOptions.cs @@ -0,0 +1,28 @@ +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; + + /// The maximum read size. + public long MaxReadBufferSize { get; set; } = 1048576L; + + /// The maximum write size. + public long MaxWriteBufferSize { get; set; } = 65536L; + + /// The maximum length of the pending connection queue. + public int Backlog { get; set; } = 512; + + /// + /// 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; } +} \ 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..d2241818c --- /dev/null +++ b/src/SuperSocket.Quic/SuperSocket.Quic.csproj @@ -0,0 +1,14 @@ + + + + SuperSocket quic library. + net7.0;net8.0 + True + + + + + + + + diff --git a/src/SuperSocket.Server.Abstractions/Connections/IConnectionStreamInitializer.cs b/src/SuperSocket.Server.Abstractions/Connections/IConnectionStreamInitializer.cs index 78c7dc2ab..6bb003f25 100644 --- a/src/SuperSocket.Server.Abstractions/Connections/IConnectionStreamInitializer.cs +++ b/src/SuperSocket.Server.Abstractions/Connections/IConnectionStreamInitializer.cs @@ -9,6 +9,6 @@ public interface IConnectionStreamInitializer { void Setup(ListenOptions listenOptions); - Task InitializeAsync(Socket socket, Stream stream, CancellationToken cancellationToken); + Task InitializeAsync(object connection, CancellationToken cancellationToken); } } \ No newline at end of file diff --git a/src/SuperSocket.Server/Connection/GZipStreamInitializer.cs b/src/SuperSocket.Server/Connection/GZipStreamInitializer.cs index 0990bf847..2bbe15920 100644 --- a/src/SuperSocket.Server/Connection/GZipStreamInitializer.cs +++ b/src/SuperSocket.Server/Connection/GZipStreamInitializer.cs @@ -13,8 +13,10 @@ public class GZipStreamInitializer : IConnectionStreamInitializer { public CompressionLevel CompressionLevel { get; private set; } - public Task InitializeAsync(Socket socket, Stream stream, CancellationToken cancellationToken) + public Task InitializeAsync(object connection, CancellationToken cancellationToken) { + var stream = (Stream)connection; + var connectionStream = new ReadWriteDelegateStream( stream, new GZipStream(stream, CompressionMode.Decompress), diff --git a/src/SuperSocket.Server/Connection/NetworkStreamInitializer.cs b/src/SuperSocket.Server/Connection/NetworkStreamInitializer.cs index cfc2531f0..cdf8b2277 100644 --- a/src/SuperSocket.Server/Connection/NetworkStreamInitializer.cs +++ b/src/SuperSocket.Server/Connection/NetworkStreamInitializer.cs @@ -13,8 +13,10 @@ public void Setup(ListenOptions listenOptions) { } - public Task InitializeAsync(Socket socket, Stream stream, CancellationToken cancellationToken) + public Task InitializeAsync(object connection, CancellationToken cancellationToken) { + var socket = (Socket)connection; + return Task.FromResult(new NetworkStream(socket, true)); } } diff --git a/src/SuperSocket.Server/Connection/SslStreamInitializer.cs b/src/SuperSocket.Server/Connection/SslStreamInitializer.cs index 68715f04e..1b18738e3 100644 --- a/src/SuperSocket.Server/Connection/SslStreamInitializer.cs +++ b/src/SuperSocket.Server/Connection/SslStreamInitializer.cs @@ -32,8 +32,10 @@ public void Setup(ListenOptions listenOptions) _authOptions = authOptions; } - public async Task InitializeAsync(Socket socket, Stream stream, CancellationToken cancellationToken) + public async Task InitializeAsync(object connection, CancellationToken cancellationToken) { + var stream = (Stream)connection; + var sslStream = new SslStream(stream, false); await sslStream.AuthenticateAsServerAsync(_authOptions, cancellationToken); return sslStream; diff --git a/src/SuperSocket.Server/Connection/TcpConnectionFactory.cs b/src/SuperSocket.Server/Connection/TcpConnectionFactory.cs index 9c6ff92a9..95bfb6166 100644 --- a/src/SuperSocket.Server/Connection/TcpConnectionFactory.cs +++ b/src/SuperSocket.Server/Connection/TcpConnectionFactory.cs @@ -37,7 +37,7 @@ public override async Task CreateConnection(object connection, Canc foreach (var initializer in connectionStreamInitializers) { - stream = await initializer.InitializeAsync(socket, stream, cancellationToken); + stream = await initializer.InitializeAsync(socket, cancellationToken); } return new StreamPipeConnection(stream, socket.RemoteEndPoint, socket.LocalEndPoint, ConnectionOptions); diff --git a/test/SuperSocket.Tests/ClientTest.cs b/test/SuperSocket.Tests/ClientTest.cs index b36cff6e2..0f1103425 100644 --- a/test/SuperSocket.Tests/ClientTest.cs +++ b/test/SuperSocket.Tests/ClientTest.cs @@ -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); @@ -99,6 +100,7 @@ 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) { @@ -197,6 +199,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); diff --git a/test/SuperSocket.Tests/QuicHostConfigurator.cs b/test/SuperSocket.Tests/QuicHostConfigurator.cs new file mode 100644 index 000000000..80e1444fd --- /dev/null +++ b/test/SuperSocket.Tests/QuicHostConfigurator.cs @@ -0,0 +1,153 @@ +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; + +namespace SuperSocket.Tests +{ +#if NET7_0_OR_GREATER + + 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) + { +#pragma warning disable CA2252 + var quicConnection = await QuicConnection.ConnectAsync( + cancellationToken: cancellationToken, + options: new QuicClientConnectionOptions + { + DefaultCloseErrorCode = 0, + DefaultStreamErrorCode = 0, + RemoteEndPoint = remoteEndPoint, + LocalEndPoint = LocalEndPoint, + 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 = new QuicPipeStream(quicConnection, false); + + var connection = new QuicPipeConnection(quicStream, quicConnection.RemoteEndPoint, + quicConnection.LocalEndPoint, Options); + + SetupConnection(connection); + + return true; + +#pragma warning restore CA2252 + } + } + + 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 @@ +