[1.1.9] Modify Output of SendFileResponse

add a function GetPostParams

.gitignore

@@ -0,0 +1,3 @@
+/.vs
+/Bot-Utils/obj
+/Bot-Utils/bin

Bot-Utils.sln

@@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils-IoT", "..\Utils-IoT\U
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils", "..\Utils\Utils\Utils.csproj", "{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Posix", "..\..\Librarys\Mono.Posix\Mono.Posix\Mono.Posix.csproj", "{E2CA132E-E85C-40AD-BE94-B138AA68772B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,6 +35,10 @@ Global
 		{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2CA132E-E85C-40AD-BE94-B138AA68772B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2CA132E-E85C-40AD-BE94-B138AA68772B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2CA132E-E85C-40AD-BE94-B138AA68772B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2CA132E-E85C-40AD-BE94-B138AA68772B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Bot-Utils/Bot-Utils.csproj

@@ -35,11 +35,9 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Mono.Posix">
-      <HintPath>..\..\Zway-Bot\packages\Mono.Posix.dll</HintPath>
-    </Reference>
     <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" />
@@ -69,6 +67,10 @@
       <Project>{91a14cd2-2940-4500-8193-56d37edddbaa}</Project>
       <Name>litjson_4.7.1</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Librarys\Mono.Posix\Mono.Posix\Mono.Posix.csproj">
+      <Project>{e2ca132e-e85c-40ad-be94-b138aa68772b}</Project>
+      <Name>Mono.Posix</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Utils-IoT\Utils-IoT\Utils-IoT.csproj">
       <Project>{b870e4d5-6806-4a0b-b233-8907eedc5afc}</Project>
       <Name>Utils-IoT</Name>

Bot-Utils/Properties/AssemblyInfo.cs

@@ -1,17 +1,16 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 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: AssemblyDescription("Bot-Utils are helpers for programming a bot")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("BlubbFish")]
 [assembly: AssemblyProduct("Bot-Utils")]
-[assembly: AssemblyCopyright("Copyright ©  2018 - 02.10.2018")]
+[assembly: AssemblyCopyright("Copyright ©  2018 - 21.04.2019")]
-[assembly: AssemblyTrademark("")]
+[assembly: AssemblyTrademark("© BlubbFish")]
 [assembly: AssemblyCulture("")]
 
 // Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
@@ -32,9 +31,19 @@ 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.0")]
+[assembly: AssemblyVersion("1.1.9")]
-[assembly: AssemblyFileVersion("1.1.0")]
+[assembly: AssemblyFileVersion("1.1.9")]
 
 /*
  * 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
+ * 1.1.9 Modify Output of SendFileResponse
  */

Bot-Utils/Webserver.cs

@@ -1,37 +1,42 @@
-using BlubbFish.Utils.IoT.Connector;
+using System;
-using BlubbFish.Utils.IoT.Events;
-using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
 using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
+using System.Web;
+using BlubbFish.Utils.IoT.Connector;
+using BlubbFish.Utils.IoT.Events;
+using LitJson;
 
-namespace BlubbFish.Utils.IoT.Bots
+namespace BlubbFish.Utils.IoT.Bots {
-{
   public abstract class Webserver
   {
     protected Dictionary<String, String> config;
-    protected InIReader requests;
+    protected static InIReader requests;
     protected HttpListener httplistener;
+    protected ABackend databackend;
+    protected ProgramLogger logger = new ProgramLogger();
 
-    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.databackend = backend;
+    }
+
+    protected void StartListen() {
+      this.databackend.MessageIncomming += this.Backend_MessageIncomming;
       this.httplistener = new HttpListener();
       this.httplistener.Prefixes.Add(this.config["prefix"]);
       this.httplistener.Start();
       ThreadPool.QueueUserWorkItem((o) => {
         Console.WriteLine("Webserver is Running...");
         try {
-          while (this.httplistener.IsListening) {
+          while(this.httplistener.IsListening) {
             ThreadPool.QueueUserWorkItem((state) => {
               HttpListenerContext httplistenercontext = state as HttpListenerContext;
               try {
-                this.SendResponse(httplistenercontext);
+                this.SendWebserverResponse(httplistenercontext);
               } catch { } finally {
                 httplistenercontext.Response.OutputStream.Close();
               }
@@ -41,51 +46,100 @@ namespace BlubbFish.Utils.IoT.Bots
       });
     }
 
-    protected virtual void SendResponse(HttpListenerContext cont) {
+    public static Boolean SendFileResponse(HttpListenerContext cont, String folder = "resources", Boolean printOutput = true) {
       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 == "") {
+        if(Directory.Exists(folder + "/" + 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 {
-            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 "woff":
+                  cont.Response.ContentType = "font/woff";
+                  break;
+              }
               cont.Response.OutputStream.Write(output, 0, output.Length);
-              cont.Response.ContentType = "image/"+end;
+              if(printOutput) {
-              return;
+                Console.WriteLine("200 - " + cont.Request.Url.PathAndQuery);
+              }
+              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);
+              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;
+              }
               cont.Response.OutputStream.Write(buf, 0, buf.Length);
-              Console.WriteLine("200 - " + cont.Request.Url.PathAndQuery);
+              if(printOutput) {
-              return;
+                Console.WriteLine("200 - " + cont.Request.Url.PathAndQuery);
+              }
+              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;
+      if(printOutput) {
+        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 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() {
@@ -94,5 +148,6 @@ namespace BlubbFish.Utils.IoT.Bots
     }
 
     protected abstract void Backend_MessageIncomming(Object sender, BackendEvent e);
+    protected abstract Boolean SendWebserverResponse(HttpListenerContext cont);
   }
 }