[1.2.0] Refactor Bot to ABot and refere MultiSourceBot, Webserver and Bot to it. Add MultiSourceBot. Rewrite Mqtt module so that it not need to watch the connection.

add a function GetPostParams

Bot-Utils/ABot.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Threading;
+
+namespace BlubbFish.Utils.IoT.Bots {
+  public abstract class ABot {
+    private Thread sig_thread;
+    private Boolean RunningProcess = true;
+
+    protected ProgramLogger logger = new ProgramLogger();
+
+    private void SetupShutdown(Object sender, ConsoleCancelEventArgs e) {
+      e.Cancel = true;
+      Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.SetupShutdown: Signalhandler Windows INT recieved.");
+      this.RunningProcess = false;
+    }
+
+    protected void WaitForShutdown() {
+      if(Type.GetType("Mono.Runtime") != null) {
+        this.sig_thread = new Thread(delegate () {
+          Mono.Unix.UnixSignal[] signals = new Mono.Unix.UnixSignal[] {
+            new Mono.Unix.UnixSignal(Mono.Unix.Native.Signum.SIGTERM),
+            new Mono.Unix.UnixSignal(Mono.Unix.Native.Signum.SIGINT)
+          };
+          Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.WaitForShutdown: Signalhandler Mono attached.");
+          while(true) {
+            Int32 i = Mono.Unix.UnixSignal.WaitAny(signals, -1);
+            Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.WaitForShutdown: Signalhandler Mono INT recieved " + i + ".");
+            this.RunningProcess = false;
+            break;
+          }
+        });
+        this.sig_thread.Start();
+      } else {
+        Console.CancelKeyPress += new ConsoleCancelEventHandler(this.SetupShutdown);
+        Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.WaitForShutdown: Signalhandler Windows attached.");
+      }
+      while(this.RunningProcess) {
+        Thread.Sleep(100);
+      }
+    }
+
+    public virtual void Dispose() {
+      if(this.sig_thread != null && this.sig_thread.IsAlive) {
+        this.sig_thread.Abort();
+      }
+    }
+  }
+}

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" />
@@ -45,6 +46,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ABot.cs" />
     <Compile Include="Bot.cs" />
     <Compile Include="Events\CronEvent.cs" />
     <Compile Include="Events\ModulEventArgs.cs" />
@@ -58,6 +60,7 @@
     <Compile Include="Moduls\Mqtt.cs" />
     <Compile Include="Moduls\Overtaker.cs" />
     <Compile Include="Moduls\Statuspolling.cs" />
+    <Compile Include="MultiSourceBot.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Webserver.cs" />
   </ItemGroup>

Bot-Utils/Bot.cs

@@ -1,57 +1,20 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using System.Threading;
-using BlubbFish.Utils.IoT.Bots.Moduls;
 using BlubbFish.Utils.IoT.Bots.Events;
 using BlubbFish.Utils.IoT.Bots.Interfaces;
+using BlubbFish.Utils.IoT.Bots.Moduls;
 
 namespace BlubbFish.Utils.IoT.Bots {
-  public abstract class Bot<T> {
+  public abstract class Bot<T> : ABot {
-    private Thread sig_thread;
-    private Boolean RunningProcess = true;
-    protected ProgramLogger logger = new ProgramLogger();
     protected readonly Dictionary<String, AModul<T>> moduls = new Dictionary<String, AModul<T>>();
 
-    protected void WaitForShutdown() {
-      if (Type.GetType("Mono.Runtime") != null) {
-        this.sig_thread = new Thread(delegate () {
-          Mono.Unix.UnixSignal[] signals = new Mono.Unix.UnixSignal[] {
-            new Mono.Unix.UnixSignal(Mono.Unix.Native.Signum.SIGTERM),
-            new Mono.Unix.UnixSignal(Mono.Unix.Native.Signum.SIGINT)
-          };
-          Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.WaitForShutdown: Signalhandler Mono attached.");
-          while (true) {
-            Int32 i = Mono.Unix.UnixSignal.WaitAny(signals, -1);
-            Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.WaitForShutdown: Signalhandler Mono INT recieved " + i + ".");
-            this.RunningProcess = false;
-            break;
-          }
-        });
-        this.sig_thread.Start();
-      } else {
-        Console.CancelKeyPress += new ConsoleCancelEventHandler(this.SetupShutdown);
-        Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.WaitForShutdown: Signalhandler Windows attached.");
-      }
-      while (this.RunningProcess) {
-        Thread.Sleep(100);
-      }
-    }
-
-    private void SetupShutdown(Object sender, ConsoleCancelEventArgs e) {
-      e.Cancel = true;
-      Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.SetupShutdown: Signalhandler Windows INT recieved.");
-      this.RunningProcess = false;
-    }
-
     protected void ModulDispose() {
       foreach (KeyValuePair<String, AModul<T>> item in this.moduls) {
         item.Value.Dispose();
         Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.ModulDispose: Modul entladen: " + item.Key);
       }
-      if (this.sig_thread != null && this.sig_thread.IsAlive) {
+      this.Dispose();
-        this.sig_thread.Abort();
-      }
     }
 
     protected void ModulLoader(String @namespace, Object library) {
@@ -92,8 +55,6 @@ namespace BlubbFish.Utils.IoT.Bots {
       }
     }
 
-    protected void ModulUpdate(Object sender, ModulEventArgs e) {
+    protected void ModulUpdate(Object sender, ModulEventArgs e) => Console.WriteLine(e.ToString());
-      Console.WriteLine(e.ToString());
-    }
   }
 }

Bot-Utils/Moduls/AModul.cs

@@ -54,9 +54,7 @@ namespace BlubbFish.Utils.IoT.Bots.Moduls {
 
     protected abstract void LibUpadteThread(Object state);
 
-    protected void HandleLibUpdate(Object sender, EventArgs e) {
+    protected void HandleLibUpdate(Object sender, EventArgs e) => ThreadPool.QueueUserWorkItem(this.LibUpadteThread, e);
-      ThreadPool.QueueUserWorkItem(this.LibUpadteThread, e);
-    }
 
     public abstract void Dispose();
 

Bot-Utils/Moduls/Mqtt.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using System.Threading;
 using BlubbFish.Utils.IoT.Bots.Events;
 using BlubbFish.Utils.IoT.Connector;
 using BlubbFish.Utils.IoT.Events;
@@ -9,52 +8,38 @@ using LitJson;
 
 namespace BlubbFish.Utils.IoT.Bots.Moduls {
   public abstract class Mqtt<T> : AModul<T>, IDisposable {
-    protected readonly Thread connectionWatcher;
     protected ABackend mqtt;
     protected Dictionary<String, AModul<T>> modules;
 
     #region Constructor
-    public Mqtt(T lib, InIReader settings) : base(lib, settings) {
+    public Mqtt(T lib, InIReader settings) : base(lib, settings) => this.Connect();
-      if (this.config.ContainsKey("settings")) {
-        this.connectionWatcher = new Thread(this.ConnectionWatcherRunner);
-        this.connectionWatcher.Start();
-      } else {
-        throw new ArgumentException("Setting section [settings] is missing!");
-      }
-    }
     #endregion
 
-    #region Watcher
+    #region Connection
-    protected void ConnectionWatcherRunner() {
+    protected void Reconnect() {
-      while (true) {
+      if(!this.config.ContainsKey("settings")) {
-        try {
+        throw new ArgumentException("Setting section [settings] is missing!");
-          if (this.mqtt == null || !this.mqtt.IsConnected) {
+      } else {
-            this.Reconnect();
+        this.Disconnect();
-          }
+        this.Connect();
-          Thread.Sleep(10000);
-        } catch (Exception) { }
       }
     }
 
-    protected void Reconnect() {
+    protected void Connect() {
-      Console.WriteLine("BlubbFish.Utils.IoT.Bots.Moduls.Mqtt.Reconnect()");
+      if(!this.config.ContainsKey("settings")) {
-      this.Disconnect();
+        throw new ArgumentException("Setting section [settings] is missing!");
-      this.Connect();
+      } else {
+        this.mqtt = ABackend.GetInstance(this.config["settings"], ABackend.BackendType.Data);
+      }
     }
 
-    protected abstract void Connect();
+    protected void Disconnect() => this.mqtt.Dispose();
-
-    protected abstract void Disconnect();
     #endregion
 
     #region AModul
-    public override void Interconnect(Dictionary<String, AModul<T>> moduls) {
+    public override void Interconnect(Dictionary<String, AModul<T>> moduls) => this.modules = moduls;
-      this.modules = moduls;
-    }
 
-    protected override void UpdateConfig() {
+    protected override void UpdateConfig() => this.Reconnect();
-      this.Reconnect();
-    }
     #endregion
 
     protected Tuple<Boolean, MqttEvent> ChangeConfig(BackendEvent e, String topic) {
@@ -90,7 +75,7 @@ namespace BlubbFish.Utils.IoT.Bots.Moduls {
             }
             modul.SetConfig(newconf);
             return new Tuple<Boolean, MqttEvent>(true, new MqttEvent("New Config", "Write"));
-          } catch (Exception) { }
+          } catch { }
         }
       }
       return new Tuple<Boolean, MqttEvent>(false, null);
@@ -102,8 +87,6 @@ namespace BlubbFish.Utils.IoT.Bots.Moduls {
     protected void Dispose(Boolean disposing) {
       if (!this.disposedValue) {
         if (disposing) {
-          this.connectionWatcher.Abort();
-          while (this.connectionWatcher.ThreadState == ThreadState.Running) { Thread.Sleep(10); }
           this.Disconnect();
         }
         this.disposedValue = true;
@@ -111,7 +94,7 @@ namespace BlubbFish.Utils.IoT.Bots.Moduls {
     }
 
     public override void Dispose() {
-      Dispose(true);
+      this.Dispose(true);
       GC.SuppressFinalize(this);
     }
     #endregion

Bot-Utils/MultiSourceBot.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using BlubbFish.Utils.IoT.Connector;
+
+namespace BlubbFish.Utils.IoT.Bots {
+  public abstract class MultiSourceBot : ABot {
+    protected Dictionary<String, ABackend> sources;
+    protected Dictionary<String, String> settings;
+
+    protected MultiSourceBot(Dictionary<String, ABackend> sources, Dictionary<String, String> settings) {
+      this.sources = sources;
+      this.settings = settings;
+    }
+  }
+}

Bot-Utils/Properties/AssemblyInfo.cs

@@ -1,5 +1,5 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
+using System.Resources;
 using System.Runtime.InteropServices;
 
 // Allgemeine Informationen über eine Assembly werden über die folgenden
@@ -10,9 +10,10 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("BlubbFish")]
 [assembly: AssemblyProduct("Bot-Utils")]
-[assembly: AssemblyCopyright("Copyright ©  2018 - 09.03.2019")]
+[assembly: AssemblyCopyright("Copyright ©  2018 - 27.05.2019")]
 [assembly: AssemblyTrademark("© BlubbFish")]
 [assembly: AssemblyCulture("")]
+[assembly: NeutralResourcesLanguage("de-DE")]
 
 // 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
@@ -32,12 +33,20 @@ 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.3")]
+[assembly: AssemblyVersion("1.2.0")]
-[assembly: AssemblyFileVersion("1.1.3")]
+[assembly: AssemblyFileVersion("1.2.0")]
 
 /*
  * 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
+ * 1.2.0 Refactor Bot to ABot and refere MultiSourceBot, Webserver and Bot to it. Add MultiSourceBot. Rewrite Mqtt module so that it not need to watch the connection. 
  */

Bot-Utils/Webserver.cs

@@ -1,37 +1,41 @@
-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 : ABot
-  public abstract class Webserver
   {
     protected Dictionary<String, String> config;
-    protected InIReader requests;
+    protected static InIReader requests;
     protected HttpListener httplistener;
+    protected ABackend databackend;
 
-    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,63 +45,109 @@ 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 "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;
+              if(printOutput) {
+                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("{%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;
+                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 void Dispose() {
+    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 override void Dispose() {
       this.httplistener.Stop();
       this.httplistener.Close();
+      base.Dispose();
     }
 
     protected abstract void Backend_MessageIncomming(Object sender, BackendEvent e);
+    protected abstract Boolean SendWebserverResponse(HttpListenerContext cont);
   }
 }