[1.1.8] Add logger to Webserver Class

add a function GetPostParams

Bot-Utils/Bot-Utils.csproj

@@ -37,6 +37,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />

Bot-Utils/Properties/AssemblyInfo.cs

@@ -6,12 +6,12 @@ using System.Runtime.InteropServices;
 // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
 // die einer Assembly zugeordnet sind.
 [assembly: AssemblyTitle("Bot-Utils")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Bot-Utils are helpers for programming a bot")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("BlubbFish")]
 [assembly: AssemblyProduct("Bot-Utils")]
-[assembly: AssemblyCopyright("Copyright ©  2018 - 17.02.2019")]
+[assembly: AssemblyCopyright("Copyright ©  2018 - 15.04.2019")]
-[assembly: AssemblyTrademark("")]
+[assembly: AssemblyTrademark("© BlubbFish")]
 [assembly: AssemblyCulture("")]
 
 // Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
@@ -32,11 +32,18 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.2")]
+[assembly: AssemblyVersion("1.1.8")]
-[assembly: AssemblyFileVersion("1.1.2")]
+[assembly: AssemblyFileVersion("1.1.8")]
 
 /*
  * 1.1.0 Remove Helper from Bot-Utils
  * 1.1.1 Update to local librarys
  * 1.1.2 Fixing bug for Contenttype
+ * 1.1.3 Variables parsing now as a String
+ * 1.1.4 add Woff as Binary type
+ * 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 (default resources), 
+ *       also put returntype boolean, add function that parse post params, if path is a dictionary try to load index.html
+ * 1.1.7 Restrucutre loading, so that all is init and after the listener is started, REQUEST_URL_HOST gives now host and port
+ * 1.1.8 Add logger to Webserver Class
  */

Bot-Utils/Webserver.cs

@@ -1,103 +1,146 @@
-using BlubbFish.Utils.IoT.Connector;
+using System;
-using BlubbFish.Utils.IoT.Events;
+using System.Collections.Generic;
-using System;
+using System.IO;
-using System.Collections.Generic;
+using System.Net;
-using System.IO;
+using System.Text;
-using System.Linq;
+using System.Threading;
-using System.Net;
+using System.Web;
-using System.Text;
+using BlubbFish.Utils.IoT.Connector;
-using System.Threading;
+using BlubbFish.Utils.IoT.Events;
-using System.Threading.Tasks;
+using LitJson;
-
+
-namespace BlubbFish.Utils.IoT.Bots
+namespace BlubbFish.Utils.IoT.Bots {
-{
+  public abstract class Webserver
-  public abstract class Webserver
+  {
-  {
+    protected Dictionary<String, String> config;
-    protected Dictionary<String, String> config;
+    protected static InIReader requests;
-    protected InIReader requests;
+    protected HttpListener httplistener;
-    protected HttpListener httplistener;
+    protected ABackend databackend;
-
+    protected ProgramLogger logger = new ProgramLogger();
-    public Webserver(ABackend backend, Dictionary<String, String> settings, InIReader requests) {
+
-      this.config = settings;
+    public Webserver(ABackend backend, Dictionary<String, String> settings, InIReader requestslookup) {
-      this.requests = requests;
+      this.config = settings;
-      backend.MessageIncomming += this.Backend_MessageIncomming;
+      requests = requestslookup;
-      this.httplistener = new HttpListener();
+      this.databackend = backend;
-      this.httplistener.Prefixes.Add(this.config["prefix"]);
+    }
-      this.httplistener.Start();
+
-      ThreadPool.QueueUserWorkItem((o) => {
+    protected void StartListen() {
-        Console.WriteLine("Webserver is Running...");
+      this.databackend.MessageIncomming += this.Backend_MessageIncomming;
-        try {
+      this.httplistener = new HttpListener();
-          while (this.httplistener.IsListening) {
+      this.httplistener.Prefixes.Add(this.config["prefix"]);
-            ThreadPool.QueueUserWorkItem((state) => {
+      this.httplistener.Start();
-              HttpListenerContext httplistenercontext = state as HttpListenerContext;
+      ThreadPool.QueueUserWorkItem((o) => {
-              try {
+        Console.WriteLine("Webserver is Running...");
-                this.SendResponse(httplistenercontext);
+        try {
-              } catch { } finally {
+          while(this.httplistener.IsListening) {
-                httplistenercontext.Response.OutputStream.Close();
+            ThreadPool.QueueUserWorkItem((state) => {
-              }
+              HttpListenerContext httplistenercontext = state as HttpListenerContext;
-            }, this.httplistener.GetContext());
+              try {
-          }
+                this.SendWebserverResponse(httplistenercontext);
-        } catch { };
+              } catch { } finally {
-      });
+                httplistenercontext.Response.OutputStream.Close();
-    }
+              }
-
+            }, this.httplistener.GetContext());
-    protected virtual void SendResponse(HttpListenerContext cont) {
+          }
-      String restr = cont.Request.Url.PathAndQuery;
+        } catch { };
-      if (restr.StartsWith("/")) {
+      });
-        if(restr.IndexOf("?") != -1) {
+    }
-          restr = restr.Substring(1, restr.IndexOf("?")-1);
+
-        } else {
+    public static Boolean SendFileResponse(HttpListenerContext cont, String folder = "resources") {
-          restr = restr.Substring(1);
+      String restr = cont.Request.Url.PathAndQuery;
-        }
+      if(restr.StartsWith("/")) {
-        if(restr == "") {
+        if(restr.IndexOf("?") != -1) {
-          restr = "index.html";
+          restr = restr.Substring(1, restr.IndexOf("?") - 1);
-        }
+        } else {
-        String end = restr.IndexOf('.') != -1 ? restr.Substring(restr.IndexOf('.')+1) : "";
+          restr = restr.Substring(1);
-        if (File.Exists("resources/"+ restr)) {
+        }
-          try {
+        if(Directory.Exists(folder + "/" + restr)) {
-            if (end  == "png" || end == "jpg" || end == "jpeg" || end == "ico") {
+          restr += "/index.html";
-              Byte[] output = File.ReadAllBytes("resources/" + restr);
+        }
+        String end = restr.IndexOf('.') != -1 ? restr.Substring(restr.IndexOf('.') + 1) : "";
+        if(File.Exists(folder + "/" + restr)) {
+          try {
+            if(end == "png" || end == "jpg" || end == "jpeg" || end == "ico" || end == "woff") {
+              Byte[] output = File.ReadAllBytes(folder + "/" + restr);
               switch(end) {
-                case "ico": cont.Response.ContentType = "image/x-ico"; break;
+                case "ico":
-              }
+                  cont.Response.ContentType = "image/x-ico";
-              cont.Response.OutputStream.Write(output, 0, output.Length);
+                  break;
-              return;
+                case "woff":
-            } else {
+                  cont.Response.ContentType = "font/woff";
-              String file = File.ReadAllText("resources/" + restr);
+                  break;
-              if (this.requests.GetSections(false).Contains(restr)) {
+              }
-                Dictionary<String, String> vars = this.requests.GetSection(restr);
+              cont.Response.OutputStream.Write(output, 0, output.Length);
-                foreach (KeyValuePair<String, String> item in vars) {
+              return true;
-                  file = file.Replace("{%" + item.Key.ToUpper() + "%}", item.Value);
+            } else {
-                }
+              String file = File.ReadAllText(folder + "/" + restr);
-              }
+              if(requests.GetSections(false).Contains(restr)) {
-              file = file.Replace("{%REQUEST_URL_HOST%}", cont.Request.Url.Host);
+                Dictionary<String, String> vars = requests.GetSection(restr);
-              Byte[] buf = Encoding.UTF8.GetBytes(file);
+                foreach(KeyValuePair<String, String> item in vars) {
-              cont.Response.ContentLength64 = buf.Length;
+                  file = file.Replace("\"{%" + item.Key.ToUpper() + "%}\"", item.Value);
+                }
+              }
+              file = file.Replace("{%REQUEST_URL_HOST%}", cont.Request.Url.Host+":"+cont.Request.Url.Port);
+              Byte[] buf = Encoding.UTF8.GetBytes(file);
+              cont.Response.ContentLength64 = buf.Length;
               switch(end) {
-                case "css": cont.Response.ContentType = "text/css"; break;
+                case "css":
-              }
+                  cont.Response.ContentType = "text/css";
-              cont.Response.OutputStream.Write(buf, 0, buf.Length);
+                  break;
-              Console.WriteLine("200 - " + cont.Request.Url.PathAndQuery);
+              }
-              return;
+              cont.Response.OutputStream.Write(buf, 0, buf.Length);
-            }
+              Console.WriteLine("200 - " + cont.Request.Url.PathAndQuery);
-          } catch(Exception e) {
+              return true;
-            Helper.WriteError("500 - " + e.Message);
+            }
-            cont.Response.StatusCode = 500;
+          } catch(Exception e) {
-            return;
+            Helper.WriteError("500 - " + e.Message);
-          }
+            cont.Response.StatusCode = 500;
-        }
+            return false;
-        Helper.WriteError("404 - " + cont.Request.Url.PathAndQuery + " not found!");
+          }
-        cont.Response.StatusCode = 404;
+        }
-        return;
+      }
-      }
+      Helper.WriteError("404 - " + cont.Request.Url.PathAndQuery + " not found!");
-      return;
+      cont.Response.StatusCode = 404;
-    }
+      return false;
-
+    }
-    public void Dispose() {
+
-      this.httplistener.Stop();
+    public static Boolean SendJsonResponse(Object data, HttpListenerContext cont) {
-      this.httplistener.Close();
+      try {
-    }
+        Byte[] buf = Encoding.UTF8.GetBytes(JsonMapper.ToJson(data));
-
+        cont.Response.ContentLength64 = buf.Length;
-    protected abstract void Backend_MessageIncomming(Object sender, BackendEvent e);
+        cont.Response.OutputStream.Write(buf, 0, buf.Length);
-  }
+        Console.WriteLine("200 - " + cont.Request.Url.PathAndQuery);
-}
+        return true;
+      } catch { }
+      return false;
+    }
+
+    public static Dictionary<String, String> GetPostParams(HttpListenerRequest req) {
+      if(req.HttpMethod == "POST") {
+        if(req.HasEntityBody) {
+          StreamReader reader = new StreamReader(req.InputStream, req.ContentEncoding);
+          String rawData = reader.ReadToEnd();
+          req.InputStream.Close();
+          reader.Close();
+          Dictionary<String, String> ret = new Dictionary<String, String>();
+          foreach(String param in rawData.Split('&')) {
+            String[] kvPair = param.Split('=');
+            if(!ret.ContainsKey(kvPair[0])) {
+              ret.Add(kvPair[0], HttpUtility.UrlDecode(kvPair[1]));
+            }
+          }
+          return ret;
+        }
+      }
+      return new Dictionary<String, String>();
+    }
+
+    public void Dispose() {
+      this.httplistener.Stop();
+      this.httplistener.Close();
+    }
+
+    protected abstract void Backend_MessageIncomming(Object sender, BackendEvent e);
+    protected abstract Boolean SendWebserverResponse(HttpListenerContext cont);
+  }
+}