Skip to content
This repository was archived by the owner on Sep 3, 2024. It is now read-only.

Commit 1958746

Browse files
thefringeninjathefringeninja
authored
Merge pull request #6 from thefringeninja/optimizations
Several Minor Tweaks
2 parents fe66014 + 8492eda commit 1958746

36 files changed

Lines changed: 777 additions & 204 deletions

‎src/KestrelPureOwin/KestrelOwinServer.cs‎

Lines changed: 40 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33
using System.Linq;
44
using System.Threading;
55
using System.Threading.Tasks;
6-
using Microsoft.AspNetCore.Hosting.Internal;
76
using Microsoft.AspNetCore.Hosting.Server.Features;
8-
using Microsoft.AspNetCore.Server.Kestrel;
97
using Microsoft.Extensions.Logging;
108
using Microsoft.Extensions.Options;
119
using static KestrelPureOwin.Constants;
1210

1311
namespace KestrelPureOwin
1412
{
13+
using Microsoft.AspNetCore.Hosting.Internal;
14+
using Microsoft.AspNetCore.Server.Kestrel.Core;
15+
using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv;
1516
using AppFunc = Func<IDictionary<string, object>, Task>;
1617

1718
using MidFunc = Func<
@@ -48,38 +49,24 @@ public KestrelOwinServer(KestrelServerOptions options)
4849
}
4950

5051
var wrappedOptions = Options.Create(options);
51-
52-
var lifetime = new ApplicationLifetime();
53-
52+
5453
var loggerFactory = new LoggerFactory();
54+
loggerFactory.AddProvider(new ConsoleLogProvider());
5555

56-
Server = new KestrelServer(wrappedOptions, lifetime, loggerFactory);
56+
var transport = new LibuvTransportFactory(
57+
Options.Create(new LibuvTransportOptions()),
58+
new ApplicationLifetime(loggerFactory.CreateLogger<ApplicationLifetime>()),
59+
loggerFactory);
60+
61+
Server = new KestrelServer(wrappedOptions, transport, loggerFactory);
5762
}
5863

5964
private static KestrelServerOptions GetOptions(IDictionary<string, object> properties)
6065
=> new KestrelServerOptions();
6166

6267
public KestrelServer Server { get; }
6368

64-
public void Run(string url, Action<BuildFunc> configure)
65-
{
66-
var done = new ManualResetEventSlim(false);
67-
68-
Console.CancelKeyPress += (s, e) =>
69-
{
70-
Console.WriteLine("Application is shutting down...");
71-
72-
done.Set();
73-
74-
e.Cancel = true;
75-
};
76-
77-
Start(url, configure);
78-
79-
done.Wait();
80-
}
81-
82-
public void Start(string url, Action<BuildFunc> configure)
69+
public Task Start(string url, Action<BuildFunc> configure, CancellationToken cancellationToken)
8370
{
8471
var application = ConfigureApplication(configure);
8572

@@ -97,7 +84,7 @@ public void Start(string url, Action<BuildFunc> configure)
9784
Console.WriteLine($"Now listening on: {address}");
9885
}
9986

100-
Server.Start(application);
87+
return Server.StartAsync(application, cancellationToken);
10188
}
10289

10390
public void Dispose() => Server.Dispose();
@@ -121,5 +108,32 @@ private static OwinApplication BuildApplication(IEnumerable<MidFunc> middleware)
121108

122109
return new OwinApplication(app);
123110
}
111+
112+
private class ConsoleLogger : ILogger
113+
{
114+
public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
115+
=> Console.WriteLine(formatter(state, exception));
116+
117+
public bool IsEnabled(LogLevel logLevel) => true;
118+
119+
public IDisposable BeginScope<TState>(TState state) => new NoOpScope();
120+
121+
private class NoOpScope : IDisposable
122+
{
123+
public void Dispose()
124+
{
125+
}
126+
}
127+
}
128+
129+
private class ConsoleLogProvider : ILoggerProvider
130+
{
131+
public void Dispose()
132+
{
133+
134+
}
135+
136+
public ILogger CreateLogger(string categoryName) => new ConsoleLogger();
137+
}
124138
}
125139
}

‎src/KestrelPureOwin/KestrelPureOwin.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.3</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
55
<AssemblyName>KestrelPureOwin</AssemblyName>
66
<PackageId>KestrelPureOwin</PackageId>
77
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -10,8 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
14-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" />
15-
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="1.1.1" />
13+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="2.0.0" />
1615
</ItemGroup>
1716
</Project>

‎src/KestrelPureOwin/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Reflection;
2-
using System.Runtime.CompilerServices;
32
using System.Runtime.InteropServices;
43

54
// General Information about an assembly is controlled through the following

‎src/KestrelPureOwin/ReverseOwinHeaderDictionary.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ StringValues IHeaderDictionary.this[string key]
3333
set { Inner[key] = value; }
3434
}
3535

36+
public long? ContentLength { get; set; }
37+
3638
StringValues IDictionary<string, StringValues>.this[string key]
3739
{
3840
get { return Inner[key]; }

‎src/SqlStreamStore.HAL.DevServer/Program.cs‎

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,18 @@
22
{
33
using System;
44
using System.Linq;
5+
using System.Threading;
56
using System.Threading.Tasks;
67
using KestrelPureOwin;
7-
using Microsoft.AspNetCore.Server.Kestrel;
8+
using Microsoft.AspNetCore.Server.Kestrel.Core;
89
using SqlStreamStore.Streams;
10+
using MidFunc = System.Func<
11+
System.Func<
12+
System.Collections.Generic.IDictionary<string, object>,
13+
System.Threading.Tasks.Task>,
14+
System.Func<
15+
System.Collections.Generic.IDictionary<string, object>,
16+
System.Threading.Tasks.Task>>;
917
using BuildFunc = System.Action<
1018
System.Func<
1119
System.Func<
@@ -18,18 +26,27 @@
1826
internal static class Program
1927
{
2028
private static readonly Random s_random = new Random();
29+
private const int DefaultPort = 8001;
2130

22-
public static int Main(string[] args)
31+
public static async Task<int> Main(string[] args)
2332
{
2433
var options = new KestrelServerOptions
2534
{
2635
AddServerHeader = false
2736
};
2837

38+
if(!int.TryParse(args.FirstOrDefault(), out var port))
39+
{
40+
port = DefaultPort;
41+
};
42+
2943
using(var server = new KestrelOwinServer(options))
3044
using(var streamStore = new InMemoryStreamStore())
3145
{
32-
server.Start("http://localhost:80", Configure(streamStore));
46+
await server.Start(new UriBuilder
47+
{
48+
Port = port
49+
}.Uri.ToString(), Configure(streamStore), CancellationToken.None);
3350

3451
DisplayMenu(streamStore);
3552
}
@@ -38,7 +55,21 @@ public static int Main(string[] args)
3855
}
3956

4057
private static Action<BuildFunc> Configure(IStreamStore streamStore)
41-
=> builder => builder.Use(SqlStreamStoreHalMiddleware.UseSqlStreamStoreHal(streamStore));
58+
=> builder => builder
59+
.Use(DisplayErrors)
60+
.Use(SqlStreamStoreHalMiddleware.UseSqlStreamStoreHal(streamStore));
61+
62+
private static MidFunc DisplayErrors => next => async env =>
63+
{
64+
try
65+
{
66+
await next(env);
67+
}
68+
catch(Exception ex)
69+
{
70+
Console.WriteLine(ex);
71+
}
72+
};
4273

4374
private static void DisplayMenu(IStreamStore streamStore)
4475
{

‎src/SqlStreamStore.HAL.DevServer/SqlStreamStore.HAL.DevServer.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
44
<TargetFramework>netcoreapp2.0</TargetFramework>
5+
<LangVersion>7.1</LangVersion>
56
</PropertyGroup>
67
<ItemGroup>
78
<ProjectReference Include="..\KestrelPureOwin\KestrelPureOwin.csproj" />

‎src/SqlStreamStore.HAL.Tests/AcceptHeaderTests.cs‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
namespace SqlStreamStore.HAL.Tests
2+
{
3+
using System;
4+
using System.Collections.Generic;
5+
using System.Linq;
6+
using System.Net;
7+
using System.Net.Http;
8+
using System.Net.Http.Headers;
9+
using System.Threading.Tasks;
10+
using Shouldly;
11+
using Xunit;
12+
13+
public class AcceptHeaderTests : IDisposable
14+
{
15+
private readonly SqlStreamStoreHalMiddlewareFixture _fixture;
16+
17+
public AcceptHeaderTests()
18+
{
19+
_fixture = new SqlStreamStoreHalMiddlewareFixture();
20+
}
21+
22+
public static IEnumerable<object[]> NotAcceptableCases()
23+
{
24+
var requestUris = new[] { "/stream", "/streams/a-stream", "/" };
25+
var methods = new[]
26+
{
27+
HttpMethod.Get,
28+
HttpMethod.Head,
29+
HttpMethod.Options,
30+
HttpMethod.Post,
31+
HttpMethod.Delete
32+
};
33+
var mediaTypes = new[] { "text/html", "application/hal", "application/hal+xml" };
34+
35+
return from requestUri in requestUris
36+
from method in methods
37+
from mediaType in mediaTypes
38+
select new object[] { requestUri, method, new MediaTypeWithQualityHeaderValue(mediaType) };
39+
}
40+
41+
[Theory, MemberData(nameof(NotAcceptableCases))]
42+
public async Task accept_other_than_hal_json_are_not_acceptable(
43+
string requestUri,
44+
HttpMethod method,
45+
MediaTypeWithQualityHeaderValue mediaType)
46+
{
47+
using(var response = await _fixture.HttpClient.SendAsync(new HttpRequestMessage(method, requestUri)
48+
{
49+
Headers = { Accept = { mediaType } }
50+
}))
51+
{
52+
response.StatusCode.ShouldBe(HttpStatusCode.NotAcceptable);
53+
}
54+
}
55+
56+
public void Dispose() => _fixture.Dispose();
57+
}
58+
}

‎src/SqlStreamStore.HAL.Tests/HeadersTests.cs‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
namespace SqlStreamStore.HAL.Tests
2+
{
3+
using System;
4+
using System.Collections.Generic;
5+
using System.Net.Http;
6+
using System.Threading.Tasks;
7+
using Shouldly;
8+
using Xunit;
9+
10+
public class HeadersTests : IDisposable
11+
{
12+
private const string StreamId = "a-stream";
13+
private readonly SqlStreamStoreHalMiddlewareFixture _fixture;
14+
15+
public HeadersTests()
16+
{
17+
_fixture = new SqlStreamStoreHalMiddlewareFixture();
18+
}
19+
20+
public void Dispose() => _fixture.Dispose();
21+
22+
public static IEnumerable<object[]> Methods()
23+
{
24+
yield return new object[] { HttpMethod.Head };
25+
yield return new object[] { HttpMethod.Get };
26+
}
27+
28+
[Theory, MemberData(nameof(Methods))]
29+
public async Task all_stream_head_link(HttpMethod method)
30+
{
31+
await _fixture.WriteNMessages(StreamId, 10);
32+
33+
var position = await _fixture.StreamStore.ReadHeadPosition();
34+
35+
using(var response = await _fixture.HttpClient.SendAsync(new HttpRequestMessage(method, "/stream")))
36+
{
37+
response.IsSuccessStatusCode.ShouldBeTrue();
38+
39+
response.Headers.GetValues(Constants.Headers.HeadPosition)
40+
.ShouldBe(new[] { $"{position}" });
41+
}
42+
}
43+
}
44+
}

‎src/SqlStreamStore.HAL.Tests/MiddlewareFixture.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ private MiddlewareFixture(OwinHttpMessageHandler messageHandler)
3636
HttpClient = new HttpClient(_messageHandler)
3737
{
3838
BaseAddress = new UriBuilder().Uri,
39-
DefaultRequestHeaders = { Accept = { new MediaTypeWithQualityHeaderValue("application/hal+json") } }
39+
DefaultRequestHeaders =
40+
{
41+
Accept = { new MediaTypeWithQualityHeaderValue(Constants.Headers.ContentTypes.HalJson) }
42+
}
4043
};
4144
}
4245
public HttpClient HttpClient { get; }

‎src/SqlStreamStore.HAL.Tests/OnlyReadsAreHandledTests.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ namespace SqlStreamStore.HAL.Tests
77
using System.Net.Http;
88
using System.Threading.Tasks;
99
using Microsoft.Owin;
10+
using Shouldly;
1011
using Xunit;
1112
using AppFunc = System.Func<
1213
System.Collections.Generic.IDictionary<string, object>,
@@ -24,7 +25,6 @@ public class OnlyReadsAreHandledTests : IDisposable
2425
private static readonly HttpMethod[] s_methods =
2526
{
2627
HttpMethod.Delete,
27-
HttpMethod.Options,
2828
HttpMethod.Post,
2929
HttpMethod.Put,
3030
HttpMethod.Trace,
@@ -59,7 +59,7 @@ public async Task non_supported_method_on_stream(HttpMethod method, string path)
5959
{
6060
var response = await fixture.HttpClient.SendAsync(new HttpRequestMessage(method, path));
6161

62-
Assert.Equal(HttpStatusCode.MethodNotAllowed, response.StatusCode);
62+
response.StatusCode.ShouldBe(HttpStatusCode.MethodNotAllowed);
6363
}
6464
}
6565

@@ -77,11 +77,10 @@ public async Task non_supported_method_on_all_stream(HttpMethod method, string p
7777
{
7878
var response = await fixture.HttpClient.SendAsync(new HttpRequestMessage(method, path));
7979

80-
Assert.Equal(HttpStatusCode.MethodNotAllowed, response.StatusCode);
80+
response.StatusCode.ShouldBe(HttpStatusCode.MethodNotAllowed);
8181
}
8282
}
8383

84-
8584
public void Dispose() => _streamStore.Dispose();
8685
}
8786
}

0 commit comments

Comments
 (0)