davidfowl · adamradocz · Nov 6, 2021 · Nov 6, 2021 · Nov 8, 2021 · Dec 17, 2021
diff --git a/samples/ClientApplication/ClientApplication.csproj b/samples/ClientApplication/ClientApplication.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,8 +14,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.0.0" />
-    <PackageReference Include="MQTTnet.AspNetCore" Version="3.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.0" />
+    <PackageReference Include="MQTTnet.AspNetCore" Version="3.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/ServerApplication/MqttApplication.cs b/samples/ServerApplication/MqttApplication.cs
@@ -19,7 +19,7 @@ private async Task OnClientConnectedAsync(IMqttChannelAdapter adapter)
         {
             while (true)
             {
-                var packet = await adapter.ReceivePacketAsync(Timeout.InfiniteTimeSpan, default);
+                var packet = await adapter.ReceivePacketAsync(default);
 
                 switch (packet)
                 {
@@ -29,8 +29,7 @@ await adapter.SendPacketAsync(new MqttConnAckPacket
                             ReturnCode = MqttConnectReturnCode.ConnectionAccepted,
                             ReasonCode = MqttConnectReasonCode.Success,
                             IsSessionPresent = false
-                        }, Timeout.InfiniteTimeSpan,
-                        default);
+                        }, default);
                         break;
                     case MqttDisconnectPacket disconnectPacket:
                         break;
@@ -48,7 +47,7 @@ await adapter.SendPacketAsync(new MqttConnAckPacket
                         };
                         ack.ReasonCodes.Add(MqttSubscribeReasonCode.GrantedQoS0);
 
-                        await adapter.SendPacketAsync(ack, Timeout.InfiniteTimeSpan, default);
+                        await adapter.SendPacketAsync(ack, default);
                         break;
                     default:
                         break;

diff --git a/samples/ServerApplication/Program.cs b/samples/ServerApplication/Program.cs
@@ -1,12 +1,15 @@
 using System;
 using System.Net;
 using System.Security.Cryptography.X509Certificates;
+using System.Text;
 using System.Threading.Tasks;
 using Bedrock.Framework;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.ObjectPool;
 
 namespace ServerApplication
 {
@@ -24,26 +27,36 @@ public static async Task Main(string[] args)
 
             services.AddSignalR();
 
+            services.TryAddSingleton<ObjectPoolProvider, DefaultObjectPoolProvider>();
+            services.TryAddSingleton<ObjectPool<StringBuilder>>(serviceProvider =>
+            {
+                var objectPoolProvider = serviceProvider.GetRequiredService<ObjectPoolProvider>();
+                var policy = new StringBuilderPooledObjectPolicy();
+                return objectPoolProvider.Create(policy);
+            });
+
             var serviceProvider = services.BuildServiceProvider();
 
             var server = new ServerBuilder(serviceProvider)
                         .UseSockets(sockets =>
                         {
+                            var stringBuilderPool = serviceProvider.GetRequiredService<ObjectPool<StringBuilder>>();
+
                             // Echo server
                             sockets.ListenLocalhost(5000,
-                                builder => builder.UseConnectionLogging().UseConnectionHandler<EchoServerApplication>());
+                                builder => builder.UseConnectionLogging(stringBuilderPool: stringBuilderPool).UseConnectionHandler<EchoServerApplication>());
 
                             // HTTP/1.1 server
                             sockets.Listen(IPAddress.Loopback, 5001,
-                                builder => builder.UseConnectionLogging().UseConnectionHandler<HttpApplication>());
+                                builder => builder.UseConnectionLogging(stringBuilderPool: stringBuilderPool).UseConnectionHandler<HttpApplication>());
 
                             // SignalR Hub
                             sockets.Listen(IPAddress.Loopback, 5002,
-                                builder => builder.UseConnectionLogging().UseHub<Chat>());
+                                builder => builder.UseConnectionLogging(stringBuilderPool: stringBuilderPool).UseHub<Chat>());
 
                             // MQTT application
                             sockets.Listen(IPAddress.Loopback, 5003,
-                                builder => builder.UseConnectionLogging().UseConnectionHandler<MqttApplication>());
+                                builder => builder.UseConnectionLogging(stringBuilderPool: stringBuilderPool).UseConnectionHandler<MqttApplication>());
 
                             // Echo Server with TLS
                             sockets.Listen(IPAddress.Loopback, 5004,
@@ -54,7 +67,7 @@ public static async Task Main(string[] args)
                                     // NOTE: Do not do this in a production environment
                                     options.AllowAnyRemoteCertificate();
                                 })
-                                .UseConnectionLogging().UseConnectionHandler<EchoServerApplication>());
+                                .UseConnectionLogging(stringBuilderPool: stringBuilderPool).UseConnectionHandler<EchoServerApplication>());
 
                             sockets.Listen(IPAddress.Loopback, 5005,
                                 builder => builder.UseConnectionLogging().UseConnectionHandler<MyCustomProtocol>());

diff --git a/samples/ServerApplication/ServerApplication.csproj b/samples/ServerApplication/ServerApplication.csproj
@@ -2,15 +2,15 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <Content Include="..\Certs\testcert.pfx" Link="testcert.pfx" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MQTTnet.AspNetCore" Version="3.0.8" />
+    <PackageReference Include="MQTTnet.AspNetCore" Version="3.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Bedrock.Framework.Experimental/Bedrock.Framework.Experimental.csproj b/src/Bedrock.Framework.Experimental/Bedrock.Framework.Experimental.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PackageDescription>Experimental protocols and transports for Bedrock.Framework.</PackageDescription>
     <Authors>David Fowler</Authors>
@@ -18,6 +18,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Connections.Client" Version="6.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.4.244" />
   </ItemGroup>
 </Project>
diff --git a/src/Bedrock.Framework.Experimental/Protocols/Http1RequestMessageReader.cs b/src/Bedrock.Framework.Experimental/Protocols/Http1RequestMessageReader.cs
@@ -54,7 +54,7 @@ public bool TryParseMessage(in ReadOnlySequence<byte> input, ref SequencePositio
                     goto case State.Headers;
 
                 case State.Headers:
-                    while (sequenceReader.TryReadTo(out var headerLine, NewLine))
+                    while (sequenceReader.TryReadTo(out ReadOnlySequence<byte> headerLine, NewLine))
                     {
                         if (headerLine.Length == 0)
                         {

diff --git a/src/Bedrock.Framework.Experimental/Protocols/Http1ResponseMessageReader.cs b/src/Bedrock.Framework.Experimental/Protocols/Http1ResponseMessageReader.cs
@@ -59,7 +59,7 @@ public bool TryParseMessage(in ReadOnlySequence<byte> input, ref SequencePositio
                     goto case State.Headers;
 
                 case State.Headers:
-                    while (sequenceReader.TryReadTo(out var headerLine, NewLine))
+                    while (sequenceReader.TryReadTo(out ReadOnlySequence<byte> headerLine, NewLine))
                     {
                         if (headerLine.Length == 0)
                         {

diff --git a/src/Bedrock.Framework/Bedrock.Framework.csproj b/src/Bedrock.Framework/Bedrock.Framework.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <PackageDescription>High performance, low level networking APIs for building custom severs and clients.</PackageDescription>
     <Authors>David Fowler</Authors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -12,6 +12,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.IO.Pipelines" Version="4.7.2" />
+    <PackageReference Include="System.IO.Pipelines" Version="6.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.4.244" />
   </ItemGroup>
 </Project>
diff --git a/src/Bedrock.Framework/Middleware/ConnectionBuilderExtensions.cs b/src/Bedrock.Framework/Middleware/ConnectionBuilderExtensions.cs
@@ -1,12 +1,11 @@
 using System;
-using System.Collections.Generic;
 using System.Text;
-using Bedrock.Framework.Infrastructure;
 using Bedrock.Framework.Middleware.Tls;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.ObjectPool;
 
 namespace Bedrock.Framework
 {
@@ -17,11 +16,16 @@ public static class ConnectionBuilderExtensions
         /// <summary>
         /// Emits verbose logs for bytes read from and written to the connection.
         /// </summary>
-        public static TBuilder UseConnectionLogging<TBuilder>(this TBuilder builder, string loggerName = null, ILoggerFactory loggerFactory = null, LoggingFormatter loggingFormatter = null) where TBuilder : IConnectionBuilder
+        public static TBuilder UseConnectionLogging<TBuilder>(this TBuilder builder, string loggerName = null, ILoggerFactory loggerFactory = null, ObjectPool<StringBuilder> stringBuilderPool = null, LoggingFormatter loggingFormatter = null) where TBuilder : IConnectionBuilder
         {
             loggerFactory ??= builder.ApplicationServices.GetRequiredService<ILoggerFactory>();
             var logger = loggerName == null ? loggerFactory.CreateLogger<LoggingConnectionMiddleware>() : loggerFactory.CreateLogger(loggerName);
-            builder.Use(next => new LoggingConnectionMiddleware(next, logger, loggingFormatter).OnConnectionAsync);
+            if (stringBuilderPool == null)
+            {
+                var objectPoolProvider = new DefaultObjectPoolProvider();
+                stringBuilderPool = objectPoolProvider.CreateStringBuilderPool();
+            }
+            builder.Use(next => new LoggingConnectionMiddleware(next, logger, stringBuilderPool, loggingFormatter).OnConnectionAsync);
             return builder;
         }