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

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 - 12.03.2019")]
-[assembly: AssemblyTrademark("")]
+[assembly: AssemblyTrademark("© BlubbFish")]
 [assembly: AssemblyCulture("")]
 
 // Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
@@ -32,11 +32,15 @@ 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.6")]
-[assembly: AssemblyFileVersion("1.1.2")]
+[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,5 +1,6 @@
 using BlubbFish.Utils.IoT.Connector;
 using BlubbFish.Utils.IoT.Events;
+using LitJson;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -14,12 +15,12 @@ namespace BlubbFish.Utils.IoT.Bots
   public abstract class Webserver
   {
     protected Dictionary<String, String> config;
-    protected InIReader requests;
+    protected static InIReader requests;
     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.requests = requests;
+      requests = requestslookup;
       backend.MessageIncomming += this.Backend_MessageIncomming;
       this.httplistener = new HttpListener();
       this.httplistener.Prefixes.Add(this.config["prefix"]);
@@ -31,7 +32,7 @@ namespace BlubbFish.Utils.IoT.Bots
             ThreadPool.QueueUserWorkItem((state) => {
               HttpListenerContext httplistenercontext = state as HttpListenerContext;
               try {
-                this.SendResponse(httplistenercontext);
+                this.SendWebserverResponse(httplistenercontext);
               } catch { } finally {
                 httplistenercontext.Response.OutputStream.Close();
               }
@@ -41,56 +42,73 @@ 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;
-      if (restr.StartsWith("/")) {
+      if(restr.StartsWith("/")) {
         if(restr.IndexOf("?") != -1) {
-          restr = restr.Substring(1, restr.IndexOf("?")-1);
+          restr = restr.Substring(1, restr.IndexOf("?") - 1);
         } else {
           restr = restr.Substring(1);
         }
         if(restr == "") {
           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 {
-            if (end  == "png" || end == "jpg" || end == "jpeg" || end == "ico") {
+            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) {
-                case "ico": cont.Response.ContentType = "image/x-ico"; break;
+                case "ico":
+                  cont.Response.ContentType = "image/x-ico";
+                  break;
+                case "woff":
+                  cont.Response.ContentType = "font/woff";
+                  break;
               }
               cont.Response.OutputStream.Write(output, 0, output.Length);
-              return;
+              return true;
             } 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);
                 }
               }
               file = file.Replace("{%REQUEST_URL_HOST%}", cont.Request.Url.Host);
               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";
+                  break;
               }
               cont.Response.OutputStream.Write(buf, 0, buf.Length);
               Console.WriteLine("200 - " + cont.Request.Url.PathAndQuery);
-              return;
+              return true;
             }
           } catch(Exception e) {
             Helper.WriteError("500 - " + e.Message);
             cont.Response.StatusCode = 500;
-            return;
+            return false;
           }
         }
-        Helper.WriteError("404 - " + cont.Request.Url.PathAndQuery + " not found!");
-        cont.Response.StatusCode = 404;
-        return;
       }
-      return;
+      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() {
@@ -99,5 +117,6 @@ namespace BlubbFish.Utils.IoT.Bots
     }
 
     protected abstract void Backend_MessageIncomming(Object sender, BackendEvent e);
+    protected abstract Boolean SendWebserverResponse(HttpListenerContext cont);
   }
 }