Compare commits
No commits in common. "master" and "feature/pathparams" have entirely different histories.
master
...
feature/pa
21
LICENSE
21
LICENSE
|
|
@ -1,21 +0,0 @@
|
|||
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 string NormalizeUrlPath(string url) {
|
||||
private static string NormalizeUrlPath(string url) {
|
||||
var fwdSlashUrl = url.Replace('\\', '/');
|
||||
|
||||
var segments = fwdSlashUrl.Trim('/').Split('/', StringSplitOptions.RemoveEmptyEntries).ToList();
|
||||
|
|
@ -242,12 +242,7 @@ public sealed class HttpServer {
|
|||
}
|
||||
rv.AppendJoin('/', simplifiedSegmentsReversed.Reverse<string>());
|
||||
|
||||
var suffix = (rv.ToString().TrimEnd('/') + (fwdSlashUrl.EndsWith('/') ? "/" : "")).TrimStart('/');
|
||||
if (conf.TrimTrailingSlash) {
|
||||
suffix = suffix.TrimEnd('/');
|
||||
}
|
||||
|
||||
return '/' + suffix;
|
||||
return '/' + (rv.ToString().TrimEnd('/') + (fwdSlashUrl.EndsWith('/') ? "/" : "")).TrimStart('/');
|
||||
}
|
||||
|
||||
private async Task ProcessRequestAsync(HttpListenerContext ctx) {
|
||||
|
|
@ -333,18 +328,10 @@ public sealed class HttpServer {
|
|||
var splittedReqPath = reqPath[1..].Split('/');
|
||||
for (int i = 0; i < pparams.Count; i++) {
|
||||
var pparam = pparams[i];
|
||||
string paramValue;
|
||||
if (pparam.IsCatchAll)
|
||||
paramValue = string.Join('/', splittedReqPath[pparam.SegmentStartPos..]);
|
||||
convertedMParamValues[pparam.ArgPos] = string.Join('/', splittedReqPath[pparam.SegmentStartPos..]);
|
||||
else
|
||||
paramValue = splittedReqPath[pparam.SegmentStartPos];
|
||||
|
||||
if (stringToTypeParameterConverters[pparam.Type].TryConvertFromString(paramValue, out var res))
|
||||
convertedMParamValues[pparam.ArgPos] = res;
|
||||
else {
|
||||
await HandleDefaultErrorPageAsync(rc, HttpStatusCode.BadRequest);
|
||||
return;
|
||||
}
|
||||
convertedMParamValues[pparam.ArgPos] = splittedReqPath[pparam.SegmentStartPos];
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,10 +13,6 @@ public class SimpleHttpServerConfiguration {
|
|||
/// See description of <see cref="DisableLogMessagePrinting"/>
|
||||
/// </summary>
|
||||
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() { }
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ internal record EndpointInvocationInfo {
|
|||
/// </summary>
|
||||
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) {
|
||||
|
||||
this.methodInfo = methodInfo ?? throw new ArgumentNullException(nameof(methodInfo));
|
||||
|
|
|
|||
|
|
@ -83,15 +83,18 @@ internal class PathTree<T> where T : class {
|
|||
catchAllNext = new();
|
||||
catchAllNext.AddSuccessor(segments[1..], newLeafData);
|
||||
return;
|
||||
} else { // must be single wildcard otherwise
|
||||
pathWildcardNext ??= new();
|
||||
} else { // must be single wildcard otherwise
|
||||
Assert(pathWildcardNext == null);
|
||||
pathWildcardNext = new();
|
||||
pathWildcardNext.AddSuccessor(segments[1..], newLeafData);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// otherwise we want to add a new constant path successor
|
||||
next ??= new();
|
||||
if (next == null) {
|
||||
next = new();
|
||||
}
|
||||
|
||||
if (next.TryGetValue(seg, out var existingNode)) {
|
||||
existingNode.AddSuccessor(segments[1..], newLeafData);
|
||||
|
|
|
|||
|
|
@ -35,12 +35,6 @@ public class RequestContext : IDisposable {
|
|||
|
||||
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) {
|
||||
using (this) {
|
||||
SetStatusCode(status);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user