tesses50
/
tesses.webserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix SPA Server and 404 on IVirtualFileSystem 

RouteServer now returns NotFoundServer or another server
MountableServer now can implicitly support NotFoundServer
This commit is contained in:
Mike Nolan 2023-06-08 14:04:59 -05:00
parent e75b2048c9
commit 5e557faaaf
7 changed files with 54 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Tesses.WebServer.FileServer/Program.cs
View File

@ -15,6 +15,7 @@ namespace Tesses.WebServer.ConsoleApp
StaticServer static_server = new StaticServer(lfs,true); StaticServer static_server = new StaticServer(lfs,true);
static_server.AllowUpload=true; static_server.AllowUpload=true;
static_server.RedirectToRootInsteadOfNotFound = true;
HttpServerListener s = new HttpServerListener(new System.Net.IPEndPoint(ip, 24240),static_server); HttpServerListener s = new HttpServerListener(new System.Net.IPEndPoint(ip, 24240),static_server);

1
Tesses.WebServer.FileServer/files/apple/demi-lovato/file.txt Normal file
View File

@ -0,0 +1 @@
Hi

12
Tesses.WebServer.FileServer/files/index.html Normal file
View File

@ -0,0 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
</head>
<body>
<h1>Hello</h1>
</body>
</html>

0
Tesses.WebServer.FileServer/files/table Normal file
View File

35
Tesses.WebServer.NetStandard/SimpleHttpCode.cs
View File

@ -485,25 +485,47 @@ namespace Tesses.WebServer
public delegate void HttpAction(ServerContext ctx); public delegate void HttpAction(ServerContext ctx);
public class RouteServer : Server public class RouteServer : Server
{ {
public RouteServer() : this(new NotFoundServer())
{
}
public RouteServer(IServer otherServer)
{
this.otherServer=otherServer;
}
public List<(ShouldProcessFunc ShouldProcessFunc, HttpActionAsync Action)> Methods = new List<(ShouldProcessFunc ShouldProcessFunc, HttpActionAsync Action)>(); public List<(ShouldProcessFunc ShouldProcessFunc, HttpActionAsync Action)> Methods = new List<(ShouldProcessFunc ShouldProcessFunc, HttpActionAsync Action)>();
private IServer otherServer;
public override async Task GetAsync(ServerContext ctx) public override async Task GetAsync(ServerContext ctx)
{ {
await Process(ctx); if(!await Process(ctx))
{
await Guaranteed(otherServer).GetAsync(ctx);
}
} }
public override async Task PostAsync(ServerContext ctx) public override async Task PostAsync(ServerContext ctx)
{ {
await Process(ctx); if(!await Process(ctx))
{
await Guaranteed(otherServer).PostAsync(ctx);
}
} }
public override async Task OtherAsync(ServerContext ctx) public override async Task OtherAsync(ServerContext ctx)
{ {
await Process(ctx); if(!await Process(ctx))
{
await Guaranteed(otherServer).OtherAsync(ctx);
}
} }
public override async Task OptionsAsync(ServerContext ctx) public override async Task OptionsAsync(ServerContext ctx)
{ {
await Process(ctx); if(!await Process(ctx))
{
await Guaranteed(otherServer).OptionsAsync(ctx);
}
} }
private async Task Process(ServerContext ctx) private async Task<bool> Process(ServerContext ctx)
{ {
foreach(var (shouldProcessFunc,action) in Methods) foreach(var (shouldProcessFunc,action) in Methods)
{ {
@ -514,8 +536,9 @@ namespace Tesses.WebServer
} }
await action(ctx); await action(ctx);
return; return true;
} }
return false;
} }
/// <summary> /// <summary>
/// Adds the specified action to the route collection. /// Adds the specified action to the route collection.

6
Tesses.WebServer.NetStandard/Tesses.WebServer.NetStandard.csproj
View File

@ -5,9 +5,9 @@
<PackageId>Tesses.WebServer</PackageId> <PackageId>Tesses.WebServer</PackageId>
<Author>Mike Nolan</Author> <Author>Mike Nolan</Author>
<Company>Tesses</Company> <Company>Tesses</Company>
<Version>1.0.4.0</Version> <Version>1.0.4.1</Version>
<AssemblyVersion>1.0.4.0</AssemblyVersion> <AssemblyVersion>1.0.4.1</AssemblyVersion>
<FileVersion>1.0.4.0</FileVersion> <FileVersion>1.0.4.1</FileVersion>
<Description>A TCP Listener HTTP(s) Server</Description> <Description>A TCP Listener HTTP(s) Server</Description>
<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression> <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance> <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>

11
Tesses.WebServer.NetStandard/TessesServer.cs
View File

@ -604,7 +604,7 @@ namespace Tesses.WebServer
{ {
foreach(var def in _defaultFileNames) foreach(var def in _defaultFileNames)
{ {
var _name = Special.Root / path; var _name = Special.Root / path / def; //woops we need the def here
name=_name.Path; name=_name.Path;
if(_fs.FileExists(_name)) if(_fs.FileExists(_name))
{ {
@ -1072,12 +1072,13 @@ namespace Tesses.WebServer
case WebServerPathType.NotFound: case WebServerPathType.NotFound:
if(RedirectToRootInsteadOfNotFound) if(RedirectToRootInsteadOfNotFound)
{ {
var fileEntry2 = fileHandler.GetPath("/"); var fileEntry2 = fileHandler.GetPath("/");
switch(fileEntry.Type) switch(fileEntry2.Type)
{ {
case WebServerPathType.File: case WebServerPathType.File:
using(var strm = fileHandler.Open(fileEntry2)) using(var strm = fileHandler.Open(fileEntry2))
await ctx.SendStreamAsync(strm,HeyRed.Mime.MimeTypesMap.GetMimeType(fileEntry.FileName)); await ctx.SendStreamAsync(strm,HeyRed.Mime.MimeTypesMap.GetMimeType(fileEntry2.FileName));
break; break;
case WebServerPathType.Directory: case WebServerPathType.Directory:
if(AllowListingDirectories) if(AllowListingDirectories)
@ -1336,6 +1337,10 @@ namespace Tesses.WebServer
public MountableServer(IServer root) public MountableServer(IServer root)
{ {
_root = root; _root = root;
}
public MountableServer() : this(new NotFoundServer())
{
} }
IServer _root; IServer _root;
private (string Key,IServer Value) GetFromPath(ServerContext ctx) private (string Key,IServer Value) GetFromPath(ServerContext ctx)