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

Bot-Utils/Properties/AssemblyInfo.cs

@@ -1,41 +1,46 @@
-using System.Reflection;
+using System.Reflection;
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
-
-// Allgemeine Informationen über eine Assembly werden über die folgenden
-// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
-// die einer Assembly zugeordnet sind.
-[assembly: AssemblyTitle("Bot-Utils")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Bot-Utils")]
-[assembly: AssemblyCopyright("Copyright ©  2018 - 17.02.2019")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
-// für COM-Komponenten unsichtbar.  Wenn Sie auf einen Typ in dieser Assembly von
-// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
-[assembly: ComVisible(false)]
-
-// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
-[assembly: Guid("bb7bfcb5-3db0-49e1-802a-3ce3eecc59f9")]
-
-// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
-//
-//      Hauptversion
-//      Nebenversion
-//      Buildnummer
-//      Revision
-//
-// 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.1")]
-[assembly: AssemblyFileVersion("1.1.1")]
 
-/*
+// Allgemeine Informationen über eine Assembly werden über die folgenden
- * 1.1.0 Remove Helper from Bot-Utils
+// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
- * 1.1.1 Update to local librarys
+// die einer Assembly zugeordnet sind.
+[assembly: AssemblyTitle("Bot-Utils")]
+[assembly: AssemblyDescription("Bot-Utils are helpers for programming a bot")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("BlubbFish")]
+[assembly: AssemblyProduct("Bot-Utils")]
+[assembly: AssemblyCopyright("Copyright ©  2018 - 12.03.2019")]
+[assembly: AssemblyTrademark("© BlubbFish")]
+[assembly: AssemblyCulture("")]
+
+// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
+// für COM-Komponenten unsichtbar.  Wenn Sie auf einen Typ in dieser Assembly von
+// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
+[assembly: ComVisible(false)]
+
+// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
+[assembly: Guid("bb7bfcb5-3db0-49e1-802a-3ce3eecc59f9")]
+
+// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+//
+//      Hauptversion
+//      Nebenversion
+//      Buildnummer
+//      Revision
+//
+// 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.6")]
+[assembly: AssemblyFileVersion("1.1.6")]
+
+/*
+ * 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
  */

Bot-Utils/Webserver.cs

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