Timerix/DTLib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for ServeFilesRouteHandler

Browse Source
This commit is contained in:
Timerix 2025-03-23 01:20:25 +05:00
parent 386d71260c
commit 2b5d6b6a54
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DTLib.Web/DTLib.Web.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<!--package info--> <!--package info-->
<PackageId>DTLib.Web</PackageId> <PackageId>DTLib.Web</PackageId>
<Version>1.1.1</Version> <Version>1.1.2</Version>
<Authors>Timerix</Authors> <Authors>Timerix</Authors>
<Description>HTTP Server with simple routing</Description> <Description>HTTP Server with simple routing</Description>
<RepositoryType>GIT</RepositoryType> <RepositoryType>GIT</RepositoryType>
@ -25,6 +25,6 @@
<ProjectReference Include="..\DTLib\DTLib.csproj" /> <ProjectReference Include="..\DTLib\DTLib.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(Configuration)' != 'Debug' "> <ItemGroup Condition=" '$(Configuration)' != 'Debug' ">
<PackageReference Include="DTLib" Version="1.6.4" /> <PackageReference Include="DTLib" Version="1.6.5" />
</ItemGroup> </ItemGroup>
</Project> </Project>

25
DTLib.Web/Routes/ServeFilesRouteHandler.cs
View File

@ -7,23 +7,30 @@ public class ServeFilesRouteHandler(IOPath _publicDir, string _homePageUrl = "in
if (ctx.Request.HttpMethod != "GET") if (ctx.Request.HttpMethod != "GET")
return HttpStatusCode.BadRequest; return HttpStatusCode.BadRequest;
string requestPath = ctx.Request.Url?.AbsolutePath ?? "/"; string requestPath = ctx.Request.Url?.AbsolutePath!;
if (requestPath == "/") if (string.IsNullOrEmpty(requestPath) || requestPath == "/")
{
requestPath = _homePageUrl; requestPath = _homePageUrl;
}
string ext = Path.Extension(requestPath).Str; string ext = Path.Extension(requestPath).Str;
IOPath filePath = Path.Concat(_publicDir, requestPath); IOPath filePath = Path.Concat(_publicDir, requestPath);
if (!File.Exists(filePath)) if (!File.Exists(filePath))
return HttpStatusCode.NotFound; return HttpStatusCode.NotFound;
string contentType = ext switch List<(string key, string val)> headers = ext switch
{ {
"html" => "text/html", "html" => [("Content-Type", "text/html")],
"css" => "text/css", "css" => [("Content-Type", "text/css")],
"js" or "jsx" or "ts" or "tsx" or "map" => "text/javascript", "js" or "jsx" or "ts" or "tsx" or "map" => [("Content-Type", "text/javascript")],
_ => "binary/octet-stream" _ =>
[
("Content-Type", "binary/octet-stream"),
("Content-Disposition", $"attachment filename={filePath.LastName()}")
]
}; };
ctx.Response.Headers.Set("Content-Type", contentType); foreach (var header in headers)
ctx.Response.Headers.Set("Content-Disposition", "attachment filename=" + filePath.LastName()); ctx.Response.Headers.Set(header.key, header.val);
var fileStream = File.OpenRead(filePath); var fileStream = File.OpenRead(filePath);
ctx.Response.ContentLength64 = fileStream.Length; ctx.Response.ContentLength64 = fileStream.Length;

2
DTLib.Web/WebApp.cs
View File

@ -54,7 +54,7 @@ public class WebApp
{ {
_logger.LogInfo(logContext, $"[{ctx.Request.HttpMethod}] {ctx.Request.RawUrl} from {ctx.Request.RemoteEndPoint} ..."); _logger.LogInfo(logContext, $"[{ctx.Request.HttpMethod}] {ctx.Request.RawUrl} from {ctx.Request.RemoteEndPoint} ...");
var status = await _router.Resolve(ctx); var status = await _router.Resolve(ctx);
_logger.LogInfo(logContext, status); _logger.LogInfo(logContext, $"{(int)status} ({status})");
} }
catch (Exception ex) catch (Exception ex)
{ {