[1.2.3] Tiny Refactoring

Bot-Utils-4.7.1.sln

@@ -0,0 +1,49 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.136
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bot-Utils", "Bot-Utils\Bot-Utils-4.7.1.csproj", "{BB7BFCB5-3DB0-49E1-802A-3CE3EECC59F9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "litjson_4.7.1", "..\..\Librarys\litjson\litjson\litjson_4.7.1.csproj", "{91A14CD2-2940-4500-8193-56D37EDDDBAA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils-IoT", "..\Utils-IoT\Utils-IoT\Utils-IoT-4.7.1.csproj", "{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils", "..\Utils\Utils\Utils-4.7.1.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
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{BB7BFCB5-3DB0-49E1-802A-3CE3EECC59F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB7BFCB5-3DB0-49E1-802A-3CE3EECC59F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB7BFCB5-3DB0-49E1-802A-3CE3EECC59F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB7BFCB5-3DB0-49E1-802A-3CE3EECC59F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {99DB6F34-BD41-4AFF-82B7-E4B3EFDF56DC}
+	EndGlobalSection
+EndGlobal

Bot-Utils.sln

@@ -1,17 +1,15 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
+# Visual Studio Version 16
-VisualStudioVersion = 15.0.28307.136
+VisualStudioVersion = 16.0.29519.87
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bot-Utils", "Bot-Utils\Bot-Utils.csproj", "{BB7BFCB5-3DB0-49E1-802A-3CE3EECC59F9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bot-Utils", "Bot-Utils\Bot-Utils.csproj", "{CB48457C-C567-42BC-9E5B-DAE5A3383108}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "litjson_4.7.1", "..\..\Librarys\litjson\litjson\litjson_4.7.1.csproj", "{91A14CD2-2940-4500-8193-56D37EDDDBAA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils-IoT", "..\Utils-IoT\Utils-IoT\Utils-IoT.csproj", "{86E9D6ED-EE31-4FE7-AEA6-555DBBAA69A4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils-IoT", "..\Utils-IoT\Utils-IoT\Utils-IoT.csproj", "{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils", "..\Utils\Utils\Utils.csproj", "{110EB1ED-1567-4A7E-B8B5-E46F421E0684}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils", "..\Utils\Utils\Utils.csproj", "{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "litjson", "..\..\Librarys\litjson\litjson\litjson.csproj", "{A6EB1FF2-A3F1-4C97-8E7F-0F2CE4A8A820}"
-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
@@ -19,31 +17,27 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BB7BFCB5-3DB0-49E1-802A-3CE3EECC59F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB48457C-C567-42BC-9E5B-DAE5A3383108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BB7BFCB5-3DB0-49E1-802A-3CE3EECC59F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB48457C-C567-42BC-9E5B-DAE5A3383108}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BB7BFCB5-3DB0-49E1-802A-3CE3EECC59F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB48457C-C567-42BC-9E5B-DAE5A3383108}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BB7BFCB5-3DB0-49E1-802A-3CE3EECC59F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB48457C-C567-42BC-9E5B-DAE5A3383108}.Release|Any CPU.Build.0 = Release|Any CPU
-		{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86E9D6ED-EE31-4FE7-AEA6-555DBBAA69A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86E9D6ED-EE31-4FE7-AEA6-555DBBAA69A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86E9D6ED-EE31-4FE7-AEA6-555DBBAA69A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86E9D6ED-EE31-4FE7-AEA6-555DBBAA69A4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{110EB1ED-1567-4A7E-B8B5-E46F421E0684}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{110EB1ED-1567-4A7E-B8B5-E46F421E0684}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{110EB1ED-1567-4A7E-B8B5-E46F421E0684}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{110EB1ED-1567-4A7E-B8B5-E46F421E0684}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6EB1FF2-A3F1-4C97-8E7F-0F2CE4A8A820}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6EB1FF2-A3F1-4C97-8E7F-0F2CE4A8A820}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A6EB1FF2-A3F1-4C97-8E7F-0F2CE4A8A820}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A6EB1FF2-A3F1-4C97-8E7F-0F2CE4A8A820}.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
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {99DB6F34-BD41-4AFF-82B7-E4B3EFDF56DC}
+		SolutionGuid = {0F0DF907-D03F-41A9-B0A2-CA229CC259EE}
 	EndGlobalSection
 EndGlobal

Bot-Utils/AWebserver.cs

@@ -5,26 +5,16 @@ using System.Net;
 using System.Text;
 using System.Threading;
 using System.Web;
-using BlubbFish.Utils.IoT.Connector;
-using BlubbFish.Utils.IoT.Events;
-using LitJson;
 
 namespace BlubbFish.Utils.IoT.Bots {
-  public abstract class Webserver : ABot
+  public abstract class AWebserver : ABot {
-  {
     protected Dictionary<String, String> config;
-    protected static InIReader requests;
-    protected HttpListener httplistener;
-    protected ABackend databackend;
     
-    public Webserver(ABackend backend, Dictionary<String, String> settings, InIReader requestslookup) {
+    protected HttpListener httplistener;
-      this.config = settings;
+
-      requests = requestslookup;
+    public AWebserver(Dictionary<String, String> settings) => this.config = settings;
-      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();
@@ -45,14 +35,64 @@ namespace BlubbFish.Utils.IoT.Bots {
       });
     }
 
-    public static Boolean SendFileResponse(HttpListenerContext cont, String folder = "resources", Boolean printOutput = true) {
+    public override void Dispose() {
+      if(this.httplistener.IsListening) {
+        this.httplistener.Stop();
+      }
+      this.httplistener.Close();
+      base.Dispose();
+    }
+
+    protected abstract Boolean SendWebserverResponse(HttpListenerContext cont);
+  }
+
+  #region HttpListener* Extensions
+  public static class HttpListenerHelper {
+    private static InIReader requests;
+
+    public static Dictionary<String, String> GetPostParams(this HttpListenerRequest request) {
+      if(request.HttpMethod == "POST") {
+        if(request.HasEntityBody) {
+          StreamReader reader = new StreamReader(request.InputStream, request.ContentEncoding);
+          String rawData = reader.ReadToEnd();
+          request.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 static Boolean SendStringResponse(this HttpListenerContext cont, String obj) => cont.SendBinaryResponse(Encoding.UTF8.GetBytes(obj));
+
+    public static Boolean SendBinaryResponse(this HttpListenerContext cont, Byte[] buf) {
+      try {
+        cont.Response.ContentLength64 = buf.Length;
+        cont.Response.OutputStream.Write(buf, 0, buf.Length);
+        Console.WriteLine("200 - " + cont.Request.Url.PathAndQuery);
+        return true;
+      } catch(Exception e) {
+        Helper.WriteError("500 - " + e.Message + "\n\n" + e.StackTrace);
+        cont.Response.StatusCode = 500;
+      }
+      return false;
+    }
+
+    public static Boolean SendFileResponse(this HttpListenerContext cont, String folder = "resources", Boolean printOutput = true) {
       String restr = cont.Request.Url.PathAndQuery;
       if(restr.StartsWith("/")) {
-        restr = restr.IndexOf("?") != -1 ? restr[1..restr.IndexOf("?")] : restr.Substring(1);
+        restr = restr.IndexOf("?") != -1 ? restr[1..restr.IndexOf("?")] : restr[1..];
         if(Directory.Exists(folder + "/" + restr)) {
           restr += "/index.html";
         }
-        String end = restr.IndexOf('.') != -1 ? restr.Substring(restr.IndexOf('.') + 1) : "";
+        String end = restr.IndexOf('.') != -1 ? restr[(restr.IndexOf('.') + 1)..] : "";
         if(File.Exists(folder + "/" + restr)) {
           try {
             if(end == "png" || end == "jpg" || end == "jpeg" || end == "ico" || end == "woff" || end == "mp4") {
@@ -75,13 +115,13 @@ namespace BlubbFish.Utils.IoT.Bots {
               return true;
             } else {
               String file = File.ReadAllText(folder + "/" + restr);
-              if(requests.GetSections(false).Contains(restr)) {
+              if(requests != null && requests.GetSections(false).Contains(restr)) {
                 Dictionary<String, String> vars = requests.GetSection(restr);
                 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+":"+cont.Request.Url.Port);
+              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) {
@@ -109,53 +149,7 @@ namespace BlubbFish.Utils.IoT.Bots {
       return false;
     }
 
-    public static Boolean SendJsonResponse(Object data, HttpListenerContext cont) {
+    public static void SetRequestsOverride(InIReader requestslookup) => requests = requestslookup;
-      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(Exception e) {
-        Helper.WriteError("500 - " + e.Message + "\n\n" + e.StackTrace);
-        cont.Response.StatusCode = 500;
-      }
-      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() {
-      if(this.httplistener.IsListening) {
-        this.httplistener.Stop();
-      }
-
-      this.httplistener.Close();
-      if(this.databackend != null) {
-        this.databackend.Dispose();
-      }
-      base.Dispose();
-    }
-
-    protected abstract void Backend_MessageIncomming(Object sender, BackendEvent e);
-    protected abstract Boolean SendWebserverResponse(HttpListenerContext cont);
   }
+  #endregion
 }

Bot-Utils/AWebserverDataBackend.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+using BlubbFish.Utils.IoT.Connector;
+using BlubbFish.Utils.IoT.Events;
+
+namespace BlubbFish.Utils.IoT.Bots {
+  public abstract class AWebserverDataBackend : AWebserver {
+    protected ABackend databackend;
+    protected AWebserverDataBackend(ABackend backend, Dictionary<String, String> settings) : base(settings) => this.databackend = backend;
+
+    protected void StartDataBackend() => this.databackend.MessageIncomming += this.Backend_MessageIncomming;
+
+    protected abstract void Backend_MessageIncomming(Object sender, BackendEvent e);
+
+    public override void Dispose() {
+      if(this.databackend != null) {
+        this.databackend.Dispose();
+      }
+      base.Dispose();
+    }
+  }
+}

Bot-Utils/Bot-Utils-4.7.1.csproj

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{BB7BFCB5-3DB0-49E1-802A-3CE3EECC59F9}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>BlubbFish.Utils.IoT.Bots</RootNamespace>
+    <AssemblyName>Bot-Utils</AssemblyName>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject />
+  </PropertyGroup>
+  <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" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ABot.cs" />
+    <Compile Include="Bot.cs" />
+    <Compile Include="Events\CronEvent.cs" />
+    <Compile Include="Events\ModulEventArgs.cs" />
+    <Compile Include="Events\SenmlEvent.cs" />
+    <Compile Include="Events\MqttEvent.cs" />
+    <Compile Include="Events\OvertakerEvent.cs" />
+    <Compile Include="Events\StatusPollingEvent.cs" />
+    <Compile Include="Interfaces\IForceLoad.cs" />
+    <Compile Include="Moduls\AModul.cs" />
+    <Compile Include="Moduls\CronJob.cs" />
+    <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>
+  <ItemGroup>
+    <Content Include="..\CHANGELOG.md" />
+	<Content Include="..\CONTRIBUTING.md" />
+	<Content Include="..\LICENSE" />
+	<Content Include="..\README.md" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Librarys\litjson\litjson\litjson_4.7.1.csproj">
+      <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>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Utils\Utils\Utils.csproj">
+      <Project>{fac8ce64-bf13-4ece-8097-aeb5dd060098}</Project>
+      <Name>Utils</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

Bot-Utils/Bot-Utils.csproj

@@ -1,92 +1,56 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{BB7BFCB5-3DB0-49E1-802A-3CE3EECC59F9}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BlubbFish.Utils.IoT.Bots</RootNamespace>
     <AssemblyName>Bot-Utils</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <PackageId>Bots.IoT.Utils.BlubbFish</PackageId>
-    <FileAlignment>512</FileAlignment>
+    <Version>1.2.3</Version>
-    <NuGetPackageImportStamp>
+    <AssemblyVersion>1.2.3</AssemblyVersion>
-    </NuGetPackageImportStamp>
+    <FileVersion>1.2.3</FileVersion>
-  </PropertyGroup>
+    <NeutralLanguage>de-DE</NeutralLanguage>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <Description>Bot-Utils are helpers for programming a bot</Description>
-    <DebugSymbols>true</DebugSymbols>
+    <Authors>BlubbFish</Authors>
-    <DebugType>full</DebugType>
+    <Company>BlubbFish</Company>
-    <Optimize>false</Optimize>
+    <Copyright>Copyright © BlubbFish 2018 - 09.01.2022</Copyright>
-    <OutputPath>bin\Debug\</OutputPath>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <PackageProjectUrl>http://git.blubbfish.net/vs_utils/Bot-Utils</PackageProjectUrl>
-    <ErrorReport>prompt</ErrorReport>
+    <RepositoryUrl>http://git.blubbfish.net/vs_utils/Bot-Utils.git</RepositoryUrl>
-    <WarningLevel>4</WarningLevel>
+    <RepositoryType>git</RepositoryType>
-  </PropertyGroup>
+    <PackageReleaseNotes>1.2.3 Tiny Refactoring
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+1.2.2 Going to netcore
-    <DebugType>pdbonly</DebugType>
+1.2.1 When using Dispose, kill also mqtt connection and other tiny fixes
-    <Optimize>true</Optimize>
+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.
-    <OutputPath>bin\Release\</OutputPath>
+1.1.9 Modify Output of SendFileResponse
-    <DefineConstants>TRACE</DefineConstants>
+1.1.8 Add logger to Webserver Class
-    <ErrorReport>prompt</ErrorReport>
+1.1.7 Restrucutre loading, so that all is init and after the listener is started, REQUEST_URL_HOST gives now host and port
-    <WarningLevel>4</WarningLevel>
+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
-  </PropertyGroup>
+1.1.5 add a function to send an object as json directly
-  <PropertyGroup>
+1.1.4 add Woff as Binary type
-    <StartupObject />
+1.1.3 Variables parsing now as a String
+1.1.2 Fixing bug for Contenttype
+1.1.1 Update to local librarys
+1.1.0 Remove Helper from Bot-Utils</PackageReleaseNotes>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
+    <ProjectReference Include="..\..\..\Librarys\litjson\litjson\litjson.csproj" />
-    <Reference Include="System.Core" />
+    <ProjectReference Include="..\..\Utils-IoT\Utils-IoT\Utils-IoT.csproj" />
-    <Reference Include="System.Web" />
+    <ProjectReference Include="..\..\Utils\Utils\Utils.csproj" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="ABot.cs" />
+    <Content Include="../CHANGELOG.md" />
-    <Compile Include="Bot.cs" />
+    <Content Include="../CONTRIBUTING.md" />
-    <Compile Include="Events\CronEvent.cs" />
+    <Content Include="../LICENSE" />
-    <Compile Include="Events\ModulEventArgs.cs" />
+    <Content Include="../README.md" />
-    <Compile Include="Events\SenmlEvent.cs" />
-    <Compile Include="Events\MqttEvent.cs" />
-    <Compile Include="Events\OvertakerEvent.cs" />
-    <Compile Include="Events\StatusPollingEvent.cs" />
-    <Compile Include="Interfaces\IForceLoad.cs" />
-    <Compile Include="Moduls\AModul.cs" />
-    <Compile Include="Moduls\CronJob.cs" />
-    <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>
+  
   <ItemGroup>
-    <Content Include="..\CHANGELOG.md" />
+    <None Include="..\LICENSE">
-	<Content Include="..\CONTRIBUTING.md" />
+      <Pack>True</Pack>
-	<Content Include="..\LICENSE" />
+      <PackagePath></PackagePath>
-	<Content Include="..\README.md" />
+    </None>
   </ItemGroup>
-  <ItemGroup>
+
-    <ProjectReference Include="..\..\..\Librarys\litjson\litjson\litjson_4.7.1.csproj">
-      <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>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Utils\Utils\Utils.csproj">
-      <Project>{fac8ce64-bf13-4ece-8097-aeb5dd060098}</Project>
-      <Name>Utils</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Bot-Utils/Bot-Utils_Core.csproj

@@ -1,53 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <RootNamespace>BlubbFish.Utils.IoT.Bots</RootNamespace>
-    <AssemblyName>Bot-Utils</AssemblyName>
-    <PackageId>Bots.IoT.Utils.BlubbFish</PackageId>
-    <Version>1.2.1</Version>
-    <AssemblyVersion>1.2.1</AssemblyVersion>
-    <FileVersion>1.2.1</FileVersion>
-    <NeutralLanguage>de-DE</NeutralLanguage>
-    <Description>Bot-Utils are helpers for programming a bot</Description>
-    <Authors>BlubbFish</Authors>
-    <Company>BlubbFish</Company>
-    <Copyright>Copyright © BlubbFish 2018 - 30.08.2019</Copyright>
-    <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <PackageProjectUrl>http://git.blubbfish.net/vs_utils/Bot-Utils</PackageProjectUrl>
-    <RepositoryUrl>http://git.blubbfish.net/vs_utils/Bot-Utils.git</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <PackageReleaseNotes>1.2.1 When using Dispose, kill also mqtt connection and other tiny fixes
-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.
-1.1.9 Modify Output of SendFileResponse
-1.1.8 Add logger to Webserver Class
-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.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.5 add a function to send an object as json directly
-1.1.4 add Woff as Binary type
-1.1.3 Variables parsing now as a String
-1.1.2 Fixing bug for Contenttype
-1.1.1 Update to local librarys
-1.1.0 Remove Helper from Bot-Utils</PackageReleaseNotes>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Librarys\litjson\litjson\litjson_Core.csproj" />
-    <ProjectReference Include="..\..\Utils-IoT\Utils-IoT\Utils-IoT_Core.csproj" />
-    <ProjectReference Include="..\..\Utils\Utils\Utils_Core.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="../CHANGELOG.md" />
-	<Content Include="../CONTRIBUTING.md" />
-	<Content Include="../LICENSE" />
-	<Content Include="../README.md" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\LICENSE">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
-  </ItemGroup>
-
-</Project>

Bot-Utils/Moduls/Mqtt.cs

@@ -25,13 +25,7 @@ namespace BlubbFish.Utils.IoT.Bots.Moduls {
       }
     }
 
-    protected void Connect() {
+    protected void Connect() => this.mqtt = !this.config.ContainsKey("settings") ? throw new ArgumentException("Setting section [settings] is missing!") : ABackend.GetInstance(this.config["settings"], ABackend.BackendType.Data);
-      if(!this.config.ContainsKey("settings")) {
-        throw new ArgumentException("Setting section [settings] is missing!");
-      } else {
-        this.mqtt = ABackend.GetInstance(this.config["settings"], ABackend.BackendType.Data);
-      }
-    }
 
     protected void Disconnect() => this.mqtt.Dispose();
     #endregion

Bot-Utils/Moduls/Overtaker.cs

@@ -22,7 +22,7 @@ namespace BlubbFish.Utils.IoT.Bots.Moduls {
       }
     }
 
-    protected void SetValues(Object sender, String name, Dictionary<String, String> dictionary) {
+    protected void SetValues(Object sender, String _, Dictionary<String, String> dictionary) {
       String from = dictionary["from"];
       String[] source = from.Split(':');
       if (source.Length != 2) {

Bot-Utils_Core.sln

@@ -1,43 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29519.87
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bot-Utils_Core", "Bot-Utils\Bot-Utils_Core.csproj", "{CB48457C-C567-42BC-9E5B-DAE5A3383108}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils-IoT_Core", "..\Utils-IoT\Utils-IoT\Utils-IoT_Core.csproj", "{86E9D6ED-EE31-4FE7-AEA6-555DBBAA69A4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils_Core", "..\Utils\Utils\Utils_Core.csproj", "{110EB1ED-1567-4A7E-B8B5-E46F421E0684}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "litjson_Core", "..\..\Librarys\litjson\litjson\litjson_Core.csproj", "{A6EB1FF2-A3F1-4C97-8E7F-0F2CE4A8A820}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CB48457C-C567-42BC-9E5B-DAE5A3383108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB48457C-C567-42BC-9E5B-DAE5A3383108}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CB48457C-C567-42BC-9E5B-DAE5A3383108}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CB48457C-C567-42BC-9E5B-DAE5A3383108}.Release|Any CPU.Build.0 = Release|Any CPU
-		{86E9D6ED-EE31-4FE7-AEA6-555DBBAA69A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{86E9D6ED-EE31-4FE7-AEA6-555DBBAA69A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{86E9D6ED-EE31-4FE7-AEA6-555DBBAA69A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{86E9D6ED-EE31-4FE7-AEA6-555DBBAA69A4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{110EB1ED-1567-4A7E-B8B5-E46F421E0684}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{110EB1ED-1567-4A7E-B8B5-E46F421E0684}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{110EB1ED-1567-4A7E-B8B5-E46F421E0684}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{110EB1ED-1567-4A7E-B8B5-E46F421E0684}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A6EB1FF2-A3F1-4C97-8E7F-0F2CE4A8A820}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A6EB1FF2-A3F1-4C97-8E7F-0F2CE4A8A820}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A6EB1FF2-A3F1-4C97-8E7F-0F2CE4A8A820}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A6EB1FF2-A3F1-4C97-8E7F-0F2CE4A8A820}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {0F0DF907-D03F-41A9-B0A2-CA229CC259EE}
-	EndGlobalSection
-EndGlobal

Changelog.md

@@ -0,0 +1,96 @@
+# Changelog
+
+## 1.2.3 - 2022-01-09 - Tiny Refactoring
+### New Features
+### Bugfixes
+### Changes
+* Cleanup Changelog
+* Tiny Refactorings
+
+## 1.2.2 - 2021-08-22 - Going to netcore
+### New Features
+* Split Wbserver to AWebserver and AWebserverDataBackend
+* Add mp4 as binary content
+* make a mirror of this repo on github
+### Bugfixes
+### Changes
+* change to c+ newer coding style
+* mograde to c# netcore 3.1
+
+## 1.2.1 - 2019-08-30 - When using Dispose, kill also mqtt connection and other tiny fixes
+### New Features
+* Add LICENSE, CONTRIBUTING.md and README.md
+### Bugfixes
+* When using Dispose, kill also mqtt connection
+### Changes
+* A bit more debugging
+
+## 1.2.0 - 2019-05-27 - Refactor Bot to ABot and refere MultiSourceBot
+### New Features
+* Add MultiSourceBot*
+* Refere MultiSourceBot, Webserver and Bot to it.
+### Bugfixes
+### Changes
+* Refactor Bot to ABot
+* Rewrite Mqtt module so that it not need to watch the connection.
+
+## 1.1.9 - 2019-04-21 - Modify Output of SendFileResponse
+### New Features
+* Modify Output of SendFileResponse
+### Bugfixes
+### Changes
+
+## 1.1.8 - 2019-04-15 - Add logger to Webserver Class
+### New Features
+* Add logger to Webserver Class
+### Bugfixes
+### Changes
+
+## 1.1.7 - 2019-04-14 - REQUEST_URL_HOST
+### New Features
+### Bugfixes
+### Changes
+* Restrucutre loading, so that all is init and after the listener is started, REQUEST_URL_HOST gives now host and port
+
+## 1.1.6 - 2019-04-03 - Refactoring and bugfixing
+### New Features
+* SendFileResponse with a parameter for the folder
+* add function that parse post params
+### Bugfixes
+### Changes
+
+## 1.1.5 - 2019-03-27 - add a function to send an object as json directly
+### New Features
+* add a function to send an object as json directly
+### Bugfixes
+### Changes
+
+## 1.1.4 - 2019-03-13 - add Woff as Binary type
+### New Features
+* add Woff as Binary type
+### Bugfixes
+### Changes
+
+## 1.1.3 - 2019-03-10 - Variables parsing now as a String
+### New Features
+### Bugfixes
+### Changes
+* Variables parsing now as a String
+
+## 1.1.2 - 2019-03-08 - Fixing bug for Contenttype
+### New Features
+### Bugfixes
+* Fixing bug for Contenttype
+### Changes
+
+## 1.1.1 - 2019-02-17 - Update to local librarys
+### New Features
+### Bugfixes
+### Changes
+* Update to local librarys
+
+## 1.1.0 - 2019-02-14 - Remove Helper from Bot-Utils
+### New Features
+* Remove Helper from Bot-Utils
+### Bugfixes
+### Changes

README.md

@@ -1,11 +1,12 @@
 # BlubbFish.Utils.IoT.Bots (Bot-Utils)
 Library that makes it easier to create bots. 
 
+Maybe you find this Repo on Github. This is a mirror from [here](https://git.blubbfish.net/vs_utils/Bot-Utils).
+
 ## Linking to
 ### Internal
 * BlubbFish.Utils ([Utils](http://git.blubbfish.net/vs_utils/Utils))
 * BlubbFish.Utils.IoT ([Utils-IoT](http://git.blubbfish.net/vs_utils/Utils-IoT))
 
 ### External
-* litjson
+* litjson ([Used Fork](https://github.com/blubbfish/litjson), [Original](https://github.com/LitJSON/litjson))
-* Mono.Posix