Compare commits
7 Commits
feature/pa
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d2a3a82b95 | ||
|
|
6ad805841d | ||
|
|
d152b8f3ae | ||
|
|
81dd1f8bd5 | ||
|
|
c4db0f2d2c | ||
|
|
f01672f714 | ||
|
|
03ebfa1321 |
21
LICENSE
Normal file
21
LICENSE
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
MIT License
|
||||||
|
|
||||||
|
Copyright (c) 2024 00asdf, GHXX
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
|
|
@ -213,7 +213,7 @@ public sealed class HttpServer {
|
||||||
|
|
||||||
private readonly Dictionary<Type, IParameterConverter> stringToTypeParameterConverters = new();
|
private readonly Dictionary<Type, IParameterConverter> stringToTypeParameterConverters = new();
|
||||||
|
|
||||||
private static string NormalizeUrlPath(string url) {
|
private string NormalizeUrlPath(string url) {
|
||||||
var fwdSlashUrl = url.Replace('\\', '/');
|
var fwdSlashUrl = url.Replace('\\', '/');
|
||||||
|
|
||||||
var segments = fwdSlashUrl.Trim('/').Split('/', StringSplitOptions.RemoveEmptyEntries).ToList();
|
var segments = fwdSlashUrl.Trim('/').Split('/', StringSplitOptions.RemoveEmptyEntries).ToList();
|
||||||
|
|
@ -242,7 +242,12 @@ public sealed class HttpServer {
|
||||||
}
|
}
|
||||||
rv.AppendJoin('/', simplifiedSegmentsReversed.Reverse<string>());
|
rv.AppendJoin('/', simplifiedSegmentsReversed.Reverse<string>());
|
||||||
|
|
||||||
return '/' + (rv.ToString().TrimEnd('/') + (fwdSlashUrl.EndsWith('/') ? "/" : "")).TrimStart('/');
|
var suffix = (rv.ToString().TrimEnd('/') + (fwdSlashUrl.EndsWith('/') ? "/" : "")).TrimStart('/');
|
||||||
|
if (conf.TrimTrailingSlash) {
|
||||||
|
suffix = suffix.TrimEnd('/');
|
||||||
|
}
|
||||||
|
|
||||||
|
return '/' + suffix;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task ProcessRequestAsync(HttpListenerContext ctx) {
|
private async Task ProcessRequestAsync(HttpListenerContext ctx) {
|
||||||
|
|
@ -328,10 +333,18 @@ public sealed class HttpServer {
|
||||||
var splittedReqPath = reqPath[1..].Split('/');
|
var splittedReqPath = reqPath[1..].Split('/');
|
||||||
for (int i = 0; i < pparams.Count; i++) {
|
for (int i = 0; i < pparams.Count; i++) {
|
||||||
var pparam = pparams[i];
|
var pparam = pparams[i];
|
||||||
|
string paramValue;
|
||||||
if (pparam.IsCatchAll)
|
if (pparam.IsCatchAll)
|
||||||
convertedMParamValues[pparam.ArgPos] = string.Join('/', splittedReqPath[pparam.SegmentStartPos..]);
|
paramValue = string.Join('/', splittedReqPath[pparam.SegmentStartPos..]);
|
||||||
else
|
else
|
||||||
convertedMParamValues[pparam.ArgPos] = splittedReqPath[pparam.SegmentStartPos];
|
paramValue = splittedReqPath[pparam.SegmentStartPos];
|
||||||
|
|
||||||
|
if (stringToTypeParameterConverters[pparam.Type].TryConvertFromString(paramValue, out var res))
|
||||||
|
convertedMParamValues[pparam.ArgPos] = res;
|
||||||
|
else {
|
||||||
|
await HandleDefaultErrorPageAsync(rc, HttpStatusCode.BadRequest);
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,10 @@ public class SimpleHttpServerConfiguration {
|
||||||
/// See description of <see cref="DisableLogMessagePrinting"/>
|
/// See description of <see cref="DisableLogMessagePrinting"/>
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public CustomLogMessageHandler? LogMessageHandler { get; init; } = null;
|
public CustomLogMessageHandler? LogMessageHandler { get; init; } = null;
|
||||||
|
/// <summary>
|
||||||
|
/// If set to true, paths ending with / are identical to paths without said trailing slash. E.g. /index is then the same as /index/
|
||||||
|
/// </summary>
|
||||||
|
public bool TrimTrailingSlash { get; init; } = true;
|
||||||
|
|
||||||
public SimpleHttpServerConfiguration() { }
|
public SimpleHttpServerConfiguration() { }
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ internal record EndpointInvocationInfo {
|
||||||
/// </summary>
|
/// </summary>
|
||||||
internal readonly object? typeInstanceReference;
|
internal readonly object? typeInstanceReference;
|
||||||
|
|
||||||
public EndpointInvocationInfo(MethodInfo methodInfo, List<PathParameterInfo> pathParameters, List<QueryParameterInfo> queryParameters, InternalEndpointCheckAttribute[] requiredChecks,
|
public EndpointInvocationInfo(MethodInfo methodInfo, List<PathParameterInfo> pathParameters, List<QueryParameterInfo> queryParameters, InternalEndpointCheckAttribute[] requiredChecks,
|
||||||
object? typeInstanceReference) {
|
object? typeInstanceReference) {
|
||||||
|
|
||||||
this.methodInfo = methodInfo ?? throw new ArgumentNullException(nameof(methodInfo));
|
this.methodInfo = methodInfo ?? throw new ArgumentNullException(nameof(methodInfo));
|
||||||
|
|
|
||||||
|
|
@ -83,18 +83,15 @@ internal class PathTree<T> where T : class {
|
||||||
catchAllNext = new();
|
catchAllNext = new();
|
||||||
catchAllNext.AddSuccessor(segments[1..], newLeafData);
|
catchAllNext.AddSuccessor(segments[1..], newLeafData);
|
||||||
return;
|
return;
|
||||||
} else { // must be single wildcard otherwise
|
} else { // must be single wildcard otherwise
|
||||||
Assert(pathWildcardNext == null);
|
pathWildcardNext ??= new();
|
||||||
pathWildcardNext = new();
|
|
||||||
pathWildcardNext.AddSuccessor(segments[1..], newLeafData);
|
pathWildcardNext.AddSuccessor(segments[1..], newLeafData);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// otherwise we want to add a new constant path successor
|
// otherwise we want to add a new constant path successor
|
||||||
if (next == null) {
|
next ??= new();
|
||||||
next = new();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (next.TryGetValue(seg, out var existingNode)) {
|
if (next.TryGetValue(seg, out var existingNode)) {
|
||||||
existingNode.AddSuccessor(segments[1..], newLeafData);
|
existingNode.AddSuccessor(segments[1..], newLeafData);
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,12 @@ public class RequestContext : IDisposable {
|
||||||
|
|
||||||
public void SetStatusCode(HttpStatusCode status) => SetStatusCode((int) status);
|
public void SetStatusCode(HttpStatusCode status) => SetStatusCode((int) status);
|
||||||
|
|
||||||
|
public async Task SetStatusCodeWriteLineDisposeAsync(HttpStatusCode status, string message) {
|
||||||
|
SetStatusCode(status);
|
||||||
|
await WriteLineToRespAsync(message);
|
||||||
|
await RespWriter.FlushAsync();
|
||||||
|
}
|
||||||
|
|
||||||
public async Task SetStatusCodeAndDisposeAsync(int status) {
|
public async Task SetStatusCodeAndDisposeAsync(int status) {
|
||||||
using (this) {
|
using (this) {
|
||||||
SetStatusCode(status);
|
SetStatusCode(status);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user