TEMP

Author: st0o0

src/TurboHTTP.MicroBenchmarks/Http10/Http10DecoderBenchmark.cs

@@ -1,6 +1,9 @@
 using BenchmarkDotNet.Attributes;
 using TurboHTTP.MicroBenchmarks.Internal;
-using TurboHTTP.Protocol.Http10;
+using TurboHTTP.Protocol.Syntax;
+using TurboHTTP.Protocol.Syntax.Http10;
+using TurboHTTP.Protocol.Syntax.Http10.Client;
+using TurboHTTP.Protocol.Syntax.Http10.Options;
 
 namespace TurboHTTP.MicroBenchmarks.Http10;
 
@@ -9,12 +12,12 @@ public class Http10DecoderBenchmark
 {
     private byte[] _smallResponse = null!;
     private byte[] _largeResponse = null!;
-    private Decoder _decoder = null!;
+    private Http10ClientDecoder _decoder = null!;
 
     [GlobalSetup]
     public void Setup()
     {
-        _decoder = new Decoder();
+        _decoder = new Http10ClientDecoder(Http10ClientDecoderOptions.Default, Http10Profile.Default);
 
         _smallResponse = "HTTP/1.0 200 OK\r\nContent-Length: 5\r\n\r\nHello"u8.ToArray();
 
@@ -24,16 +27,16 @@ public void Setup()
     }
 
     [Benchmark(Baseline = true)]
-    public bool DecodeSmallResponse()
+    public object DecodeSmallResponse()
     {
         _decoder.Reset();
-        return _decoder.TryDecode(_smallResponse, out _);
+        return _decoder.Feed(_smallResponse, requestMethodWasHead: false, out _);
     }
 
     [Benchmark]
-    public bool DecodeLargeResponse()
+    public object DecodeLargeResponse()
     {
         _decoder.Reset();
-        return _decoder.TryDecode(_largeResponse, out _);
+        return _decoder.Feed(_largeResponse, requestMethodWasHead: false, out _);
     }
 }

src/TurboHTTP.MicroBenchmarks/Http10/Http10EncoderBenchmark.cs

@@ -1,6 +1,9 @@
+using Akka.Actor;
 using BenchmarkDotNet.Attributes;
 using TurboHTTP.MicroBenchmarks.Internal;
-using TurboHTTP.Protocol.Http10;
+using TurboHTTP.Protocol.Syntax.Http10;
+using TurboHTTP.Protocol.Syntax.Http10.Client;
+using TurboHTTP.Protocol.Syntax.Http10.Options;
 
 namespace TurboHTTP.MicroBenchmarks.Http10;
 
@@ -10,6 +13,7 @@ public class Http10EncoderBenchmark
     private HttpRequestMessage _simpleGet = null!;
     private HttpRequestMessage _requestWithHeaders = null!;
     private byte[] _buffer = null!;
+    private Http10ClientEncoder _encoder = null!;
 
     [GlobalSetup]
     public void Setup()
@@ -24,19 +28,21 @@ public void Setup()
         _requestWithHeaders.Headers.TryAddWithoutValidation("X-Request-Id", "bench-001");
         _requestWithHeaders.Headers.TryAddWithoutValidation("Cache-Control", "no-cache");
         _requestWithHeaders.Content = new ByteArrayContent(new byte[256]);
+
+        _encoder = new Http10ClientEncoder(Http10ClientEncoderOptions.Default, Http10Profile.Default);
     }
 
     [Benchmark(Baseline = true)]
     public int EncodeSimpleGet()
     {
         var span = _buffer.AsSpan();
-        return Encoder.Encode(_simpleGet, ref span);
+        return _encoder.Encode(span, _simpleGet, ActorRefs.Nobody);
     }
 
     [Benchmark]
     public int EncodeWithHeaders()
     {
         var span = _buffer.AsSpan();
-        return Encoder.Encode(_requestWithHeaders, ref span);
+        return _encoder.Encode(span, _requestWithHeaders, ActorRefs.Nobody);
     }
 }

src/TurboHTTP.Server/Streams/Stages/Http10ConnectionStage.cs

@@ -1,7 +1,8 @@
 using Akka.Streams;
 using Akka.Streams.Stage;
 using Servus.Akka.Transport;
-using TurboHTTP.Protocol.Http10;
+using TurboHTTP.Protocol.Syntax.Http10;
+using TurboHTTP.Protocol.Syntax.Http10.Server;
 
 namespace TurboHTTP.Server.Streams.Stages;
 
@@ -15,6 +16,6 @@ internal sealed class Http10ConnectionStage : GraphStage<ConnectionShape>
     public override ConnectionShape Shape => new(_inNetwork, _outRequest, _inResponse, _outNetwork);
 
     protected override GraphStageLogic CreateLogic(Attributes inheritedAttributes)
-        => new HttpConnectionServerStageLogic<ServerStateMachine>(this,
-            ops => new ServerStateMachine(ops));
+        => new HttpConnectionServerStageLogic<Http10ServerStateMachine>(this,
+            ops => new Http10ServerStateMachine(ops));
 }

src/TurboHTTP.Server/Streams/Stages/HttpConnectionServerStageLogic.cs

@@ -1,3 +1,4 @@
+using Akka.Actor;
 using Akka.Event;
 using Akka.Streams;
 using Akka.Streams.Stage;
@@ -19,6 +20,7 @@ internal sealed class HttpConnectionServerStageLogic<TSM> : TimerGraphStageLogic
     private readonly TSM _sm;
     private readonly Queue<HttpRequestMessage> _requestQueue = new();
     private readonly Queue<ITransportOutbound> _outboundQueue = new();
+    private IActorRef _stageActor = ActorRefs.Nobody;
 
     public HttpConnectionServerStageLogic(
         GraphStage<ConnectionShape> stage,
@@ -98,10 +100,16 @@ public HttpConnectionServerStageLogic(
 
     public override void PreStart()
     {
+        _stageActor = GetStageActor(OnStageActorMessage).Ref;
         _sm.PreStart();
         Pull(_inNetwork);
     }
 
+    private void OnStageActorMessage((IActorRef sender, object message) args)
+    {
+        _sm.OnBodyMessage(args.message);
+    }
+
     private void OnNetworkPush()
     {
         var item = Grab(_inNetwork);
@@ -166,6 +174,8 @@ void IServerStageOperations.OnCancelTimer(string name)
 
     ILoggingAdapter IServerStageOperations.Log => Log;
 
+    IActorRef IServerStageOperations.StageActor => _stageActor;
+
     private void TryPushRequest()
     {
         if (_requestQueue.Count > 0 && IsAvailable(_outRequest))

src/TurboHTTP.Tests.Shared/FakeOps.cs

@@ -1,3 +1,4 @@
+using Akka.Actor;
 using Akka.Event;
 using Servus.Akka.Transport;
 using TurboHTTP.Streams.Stages;
@@ -14,4 +15,5 @@ internal sealed class FakeOps : IStageOperations
     public void OnScheduleTimer(string name, TimeSpan duration) { }
     public void OnCancelTimer(string name) { }
     public ILoggingAdapter Log => NoLogger.Instance;
+    public IActorRef StageActor { get; set; } = ActorRefs.Nobody;
 }

src/TurboHTTP.Tests.Shared/FakeServerOps.cs

@@ -0,0 +1,19 @@
+using Akka.Actor;
+using Akka.Event;
+using Servus.Akka.Transport;
+using TurboHTTP.Streams;
+
+namespace TurboHTTP.Tests.Shared;
+
+internal sealed class FakeServerOps : IServerStageOperations
+{
+    public List<HttpRequestMessage> Requests { get; } = [];
+    public List<ITransportOutbound> Outbound { get; } = [];
+
+    public void OnRequest(HttpRequestMessage request) => Requests.Add(request);
+    public void OnOutbound(ITransportOutbound item) => Outbound.Add(item);
+    public void OnScheduleTimer(string name, TimeSpan delay) { }
+    public void OnCancelTimer(string name) { }
+    public ILoggingAdapter Log => NoLogger.Instance;
+    public IActorRef StageActor { get; set; } = ActorRefs.Nobody;
+}