-
Notifications
You must be signed in to change notification settings - Fork 42
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Migrate to use
Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets
- Loading branch information
1 parent
ca25dca
commit 283244d
Showing
7 changed files
with
209 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| using System.Buffers; | ||
| using System.IO; | ||
| using System.IO.Pipelines; | ||
| using System.Threading; | ||
|
|
||
| namespace Obsidian.Net; | ||
|
|
||
| // https://raw.githubusercontent.com/StarlkYT/BedrockFramework/main/src/Bedrock.Framework/Infrastructure/DuplexPipeStream.cs | ||
| // With some small changes. | ||
| internal sealed class DuplexPipeStream : Stream | ||
| { | ||
| private readonly PipeReader _input; | ||
| private readonly PipeWriter _output; | ||
| private readonly bool _throwOnCancelled; | ||
| private volatile bool _cancelCalled; | ||
|
|
||
| public DuplexPipeStream(IDuplexPipe pipe, bool throwOnCancelled = false) | ||
| { | ||
| _input = pipe.Input; | ||
| _output = pipe.Output; | ||
| _throwOnCancelled = throwOnCancelled; | ||
| } | ||
|
|
||
| public void CancelPendingRead() | ||
| { | ||
| _cancelCalled = true; | ||
| _input.CancelPendingRead(); | ||
| } | ||
|
|
||
| public override bool CanRead => true; | ||
|
|
||
| public override bool CanSeek => false; | ||
|
|
||
| public override bool CanWrite => true; | ||
|
|
||
| public override long Length => throw new NotSupportedException(); | ||
|
|
||
| public override long Position | ||
| { | ||
| get => throw new NotSupportedException(); | ||
| set => throw new NotSupportedException(); | ||
| } | ||
|
|
||
| public override long Seek(long offset, SeekOrigin origin) | ||
| { | ||
| throw new NotSupportedException(); | ||
| } | ||
|
|
||
| public override void SetLength(long value) | ||
| { | ||
| throw new NotSupportedException(); | ||
| } | ||
|
|
||
| public override int Read(byte[] buffer, int offset, int count) | ||
| { | ||
| // ValueTask uses .GetAwaiter().GetResult() if necessary | ||
| // https://github.com/dotnet/corefx/blob/f9da3b4af08214764a51b2331f3595ffaf162abe/src/System.Threading.Tasks.Extensions/src/System/Threading/Tasks/ValueTask.cs#L156 | ||
| return ReadAsyncInternal(new Memory<byte>(buffer, offset, count), default).Result; | ||
| } | ||
|
|
||
| public override Task<int> ReadAsync(byte[] buffer, int offset, int count, | ||
| CancellationToken cancellationToken) | ||
| { | ||
| return ReadAsyncInternal(new Memory<byte>(buffer, offset, count), cancellationToken).AsTask(); | ||
| } | ||
|
|
||
| public override ValueTask<int> ReadAsync(Memory<byte> destination, CancellationToken cancellationToken = default) | ||
| { | ||
| return ReadAsyncInternal(destination, cancellationToken); | ||
| } | ||
|
|
||
| public override void Write(byte[] buffer, int offset, int count) | ||
| { | ||
| WriteAsync(buffer, offset, count).GetAwaiter().GetResult(); | ||
| } | ||
|
|
||
| public async override Task WriteAsync(byte[]? buffer, int offset, int count, CancellationToken cancellationToken) | ||
| { | ||
| if (buffer != null) | ||
| { | ||
| _output.Write(new ReadOnlySpan<byte>(buffer, offset, count)); | ||
| } | ||
|
|
||
| await _output.FlushAsync(cancellationToken).ConfigureAwait(false); | ||
| } | ||
|
|
||
| public async override ValueTask WriteAsync(ReadOnlyMemory<byte> source, | ||
| CancellationToken cancellationToken = default) | ||
| { | ||
| _output.Write(source.Span); | ||
| await _output.FlushAsync(cancellationToken).ConfigureAwait(false); | ||
| } | ||
|
|
||
| public override void Flush() | ||
| { | ||
| FlushAsync(CancellationToken.None).GetAwaiter().GetResult(); | ||
| } | ||
|
|
||
| public override Task FlushAsync(CancellationToken cancellationToken) | ||
| { | ||
| return WriteAsync(null, 0, 0, cancellationToken); | ||
| } | ||
|
|
||
| private async ValueTask<int> ReadAsyncInternal(Memory<byte> destination, CancellationToken cancellationToken) | ||
| { | ||
| while (true) | ||
| { | ||
| var result = await _input.ReadAsync(cancellationToken).ConfigureAwait(false); | ||
| var readableBuffer = result.Buffer; | ||
| try | ||
| { | ||
| if (_throwOnCancelled && result.IsCanceled && _cancelCalled) | ||
| { | ||
| // Reset the bool | ||
| _cancelCalled = false; | ||
| throw new OperationCanceledException(); | ||
| } | ||
|
|
||
| if (!readableBuffer.IsEmpty) | ||
| { | ||
| // buffer.Count is int | ||
| var count = (int)Math.Min(readableBuffer.Length, destination.Length); | ||
| readableBuffer = readableBuffer.Slice(0, count); | ||
| readableBuffer.CopyTo(destination.Span); | ||
| return count; | ||
| } | ||
|
|
||
| if (result.IsCompleted) | ||
| { | ||
| return 0; | ||
| } | ||
| } | ||
| finally | ||
| { | ||
| _input.AdvanceTo(readableBuffer.End, readableBuffer.End); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| using Microsoft.AspNetCore.Connections; | ||
| using Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets; | ||
| using Microsoft.Extensions.Logging; | ||
| using Microsoft.Extensions.Logging.Abstractions; | ||
| using Microsoft.Extensions.Options; | ||
| using System.Net; | ||
| using System.Threading; | ||
|
|
||
| namespace Obsidian.Net; | ||
|
|
||
| internal static class SocketFactory | ||
| { | ||
| public static async Task<IConnectionListener> CreateListenerAsync(IPEndPoint endPoint, SocketTransportOptions? options = null, | ||
| ILoggerFactory? loggerFactory = null, CancellationToken token = default) | ||
| { | ||
| options ??= new SocketTransportOptions(); | ||
| loggerFactory ??= NullLoggerFactory.Instance; | ||
|
|
||
| var factory = new SocketTransportFactory(Options.Create(options), loggerFactory); | ||
| return await factory.BindAsync(endPoint, token); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters