vs_utils/Bot-Utils
1
0
Fork 0
Code Issues Pull Requests Releases 17 Wiki Activity

rename functions and make SendFileResponse with a parameter for the folder, not finished yet

Browse Source
This commit is contained in:
BlubbFish 2019-04-01 18:15:22 +02:00
parent 031076b3ba
commit b8fb0e7278
2 changed files with 43 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Bot-Utils/Properties/AssemblyInfo.cs
View File

@ -32,8 +32,8 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
// indem Sie "*" wie unten gezeigt eingeben: // indem Sie "*" wie unten gezeigt eingeben:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.1.5")] [assembly: AssemblyVersion("1.1.6")]
[assembly: AssemblyFileVersion("1.1.5")] [assembly: AssemblyFileVersion("1.1.6")]
/* /*
* 1.1.0 Remove Helper from Bot-Utils * 1.1.0 Remove Helper from Bot-Utils
@ -42,4 +42,5 @@ using System.Runtime.InteropServices;
* 1.1.3 Variables parsing now as a String * 1.1.3 Variables parsing now as a String
* 1.1.4 add Woff as Binary type * 1.1.4 add Woff as Binary type
* 1.1.5 add a function to send an object as json directly * 1.1.5 add a function to send an object as json directly
* 1.1.6 rename functions and make SendFileResponse with a parameter for the folder
*/ */

60
Bot-Utils/Webserver.cs
View File

@ -15,12 +15,12 @@ namespace BlubbFish.Utils.IoT.Bots
public abstract class Webserver public abstract class Webserver
{ {
protected Dictionary<String, String> config; protected Dictionary<String, String> config;
protected InIReader requests; protected static InIReader requests;
protected HttpListener httplistener; protected HttpListener httplistener;
public Webserver(ABackend backend, Dictionary<String, String> settings, InIReader requests) { public Webserver(ABackend backend, Dictionary<String, String> settings, InIReader requestslookup) {
this.config = settings; this.config = settings;
this.requests = requests; requests = requestslookup;
backend.MessageIncomming += this.Backend_MessageIncomming; backend.MessageIncomming += this.Backend_MessageIncomming;
this.httplistener = new HttpListener(); this.httplistener = new HttpListener();
this.httplistener.Prefixes.Add(this.config["prefix"]); this.httplistener.Prefixes.Add(this.config["prefix"]);
@ -32,7 +32,7 @@ namespace BlubbFish.Utils.IoT.Bots
ThreadPool.QueueUserWorkItem((state) => { ThreadPool.QueueUserWorkItem((state) => {
HttpListenerContext httplistenercontext = state as HttpListenerContext; HttpListenerContext httplistenercontext = state as HttpListenerContext;
try { try {
this.SendResponse(httplistenercontext); this.SendWebserverResponse(httplistenercontext);
} catch { } finally { } catch { } finally {
httplistenercontext.Response.OutputStream.Close(); httplistenercontext.Response.OutputStream.Close();
} }
@ -42,33 +42,37 @@ namespace BlubbFish.Utils.IoT.Bots
}); });
} }
protected virtual void SendResponse(HttpListenerContext cont) { public static Boolean SendFileResponse(HttpListenerContext cont, String folder) {
String restr = cont.Request.Url.PathAndQuery; String restr = cont.Request.Url.PathAndQuery;
if (restr.StartsWith("/")) { if(restr.StartsWith("/")) {
if(restr.IndexOf("?") != -1) { if(restr.IndexOf("?") != -1) {
restr = restr.Substring(1, restr.IndexOf("?")-1); restr = restr.Substring(1, restr.IndexOf("?") - 1);
} else { } else {
restr = restr.Substring(1); restr = restr.Substring(1);
} }
if(restr == "") { if(restr == "") {
restr = "index.html"; restr = "index.html";
} }
String end = restr.IndexOf('.') != -1 ? restr.Substring(restr.IndexOf('.')+1) : ""; String end = restr.IndexOf('.') != -1 ? restr.Substring(restr.IndexOf('.') + 1) : "";
if (File.Exists("resources/"+ restr)) { if(File.Exists(folder + "/" + restr)) {
try { try {
if (end == "png" || end == "jpg" || end == "jpeg" || end == "ico" || end == "woff") { if(end == "png" || end == "jpg" || end == "jpeg" || end == "ico" || end == "woff") {
Byte[] output = File.ReadAllBytes("resources/" + restr); Byte[] output = File.ReadAllBytes(folder + "/" + restr);
switch(end) { switch(end) {
case "ico": cont.Response.ContentType = "image/x-ico"; break; case "ico":
case "woff": cont.Response.ContentType = "font/woff"; break; cont.Response.ContentType = "image/x-ico";
break;
case "woff":
cont.Response.ContentType = "font/woff";
break;
} }
cont.Response.OutputStream.Write(output, 0, output.Length); cont.Response.OutputStream.Write(output, 0, output.Length);
return; return true;
} else { } else {
String file = File.ReadAllText("resources/" + restr); String file = File.ReadAllText(folder + "/" + restr);
if (this.requests.GetSections(false).Contains(restr)) { if(requests.GetSections(false).Contains(restr)) {
Dictionary<String, String> vars = this.requests.GetSection(restr); Dictionary<String, String> vars = requests.GetSection(restr);
foreach (KeyValuePair<String, String> item in vars) { foreach(KeyValuePair<String, String> item in vars) {
file = file.Replace("\"{%" + item.Key.ToUpper() + "%}\"", item.Value); file = file.Replace("\"{%" + item.Key.ToUpper() + "%}\"", item.Value);
} }
} }
@ -76,30 +80,35 @@ namespace BlubbFish.Utils.IoT.Bots
Byte[] buf = Encoding.UTF8.GetBytes(file); Byte[] buf = Encoding.UTF8.GetBytes(file);
cont.Response.ContentLength64 = buf.Length; cont.Response.ContentLength64 = buf.Length;
switch(end) { switch(end) {
case "css": cont.Response.ContentType = "text/css"; break; case "css":
cont.Response.ContentType = "text/css";
break;
} }
cont.Response.OutputStream.Write(buf, 0, buf.Length); cont.Response.OutputStream.Write(buf, 0, buf.Length);
Console.WriteLine("200 - " + cont.Request.Url.PathAndQuery); Console.WriteLine("200 - " + cont.Request.Url.PathAndQuery);
return; return true;
} }
} catch(Exception e) { } catch(Exception e) {
Helper.WriteError("500 - " + e.Message); Helper.WriteError("500 - " + e.Message);
cont.Response.StatusCode = 500; cont.Response.StatusCode = 500;
return; return false;
}
} }
} }
Helper.WriteError("404 - " + cont.Request.Url.PathAndQuery + " not found!"); Helper.WriteError("404 - " + cont.Request.Url.PathAndQuery + " not found!");
cont.Response.StatusCode = 404; cont.Response.StatusCode = 404;
return; return false;
}
return;
} }
protected void SendJsonResponse(Object data, HttpListenerContext cont) { public static Boolean SendJsonResponse(Object data, HttpListenerContext cont) {
try {
Byte[] buf = Encoding.UTF8.GetBytes(JsonMapper.ToJson(data)); Byte[] buf = Encoding.UTF8.GetBytes(JsonMapper.ToJson(data));
cont.Response.ContentLength64 = buf.Length; cont.Response.ContentLength64 = buf.Length;
cont.Response.OutputStream.Write(buf, 0, buf.Length); cont.Response.OutputStream.Write(buf, 0, buf.Length);
Console.WriteLine("200 - " + cont.Request.Url.PathAndQuery); Console.WriteLine("200 - " + cont.Request.Url.PathAndQuery);
return true;
} catch { }
return false;
} }
public void Dispose() { public void Dispose() {
@ -108,5 +117,6 @@ namespace BlubbFish.Utils.IoT.Bots
} }
protected abstract void Backend_MessageIncomming(Object sender, BackendEvent e); protected abstract void Backend_MessageIncomming(Object sender, BackendEvent e);
protected abstract Boolean SendWebserverResponse(HttpListenerContext cont);
} }
} }