Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9e82a3bc58 | ||
|
|
03849c999a | ||
|
|
1b0fb91b08 | ||
|
|
37e185bceb | ||
|
|
9d2238caaf | ||
|
|
db25b03820 | ||
|
|
8932867ed9 | ||
|
|
cf3413a3d7 | ||
|
|
9705663328 | ||
|
|
6840fced1c | ||
|
|
39eac5222c | ||
|
|
41c8ccfee7 | ||
|
|
b3d60ad1ae | ||
|
|
b8fb0e7278 | ||
|
|
031076b3ba | ||
|
|
671388218e | ||
|
|
4a87299d98 | ||
|
|
ba1597ca3b |
@@ -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();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -37,6 +37,7 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
|
<Reference Include="System.Web" />
|
||||||
<Reference Include="System.Xml.Linq" />
|
<Reference Include="System.Xml.Linq" />
|
||||||
<Reference Include="System.Data.DataSetExtensions" />
|
<Reference Include="System.Data.DataSetExtensions" />
|
||||||
<Reference Include="Microsoft.CSharp" />
|
<Reference Include="Microsoft.CSharp" />
|
||||||
@@ -45,6 +46,7 @@
|
|||||||
<Reference Include="System.Xml" />
|
<Reference Include="System.Xml" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Compile Include="ABot.cs" />
|
||||||
<Compile Include="Bot.cs" />
|
<Compile Include="Bot.cs" />
|
||||||
<Compile Include="Events\CronEvent.cs" />
|
<Compile Include="Events\CronEvent.cs" />
|
||||||
<Compile Include="Events\ModulEventArgs.cs" />
|
<Compile Include="Events\ModulEventArgs.cs" />
|
||||||
@@ -58,6 +60,7 @@
|
|||||||
<Compile Include="Moduls\Mqtt.cs" />
|
<Compile Include="Moduls\Mqtt.cs" />
|
||||||
<Compile Include="Moduls\Overtaker.cs" />
|
<Compile Include="Moduls\Overtaker.cs" />
|
||||||
<Compile Include="Moduls\Statuspolling.cs" />
|
<Compile Include="Moduls\Statuspolling.cs" />
|
||||||
|
<Compile Include="MultiSourceBot.cs" />
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
<Compile Include="Webserver.cs" />
|
<Compile Include="Webserver.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
+4
-43
@@ -1,57 +1,20 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using System.Threading;
|
|
||||||
using BlubbFish.Utils.IoT.Bots.Moduls;
|
|
||||||
using BlubbFish.Utils.IoT.Bots.Events;
|
using BlubbFish.Utils.IoT.Bots.Events;
|
||||||
using BlubbFish.Utils.IoT.Bots.Interfaces;
|
using BlubbFish.Utils.IoT.Bots.Interfaces;
|
||||||
|
using BlubbFish.Utils.IoT.Bots.Moduls;
|
||||||
|
|
||||||
namespace BlubbFish.Utils.IoT.Bots {
|
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 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() {
|
protected void ModulDispose() {
|
||||||
foreach (KeyValuePair<String, AModul<T>> item in this.moduls) {
|
foreach (KeyValuePair<String, AModul<T>> item in this.moduls) {
|
||||||
item.Value.Dispose();
|
item.Value.Dispose();
|
||||||
Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.ModulDispose: Modul entladen: " + item.Key);
|
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) {
|
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());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -54,9 +54,7 @@ namespace BlubbFish.Utils.IoT.Bots.Moduls {
|
|||||||
|
|
||||||
protected abstract void LibUpadteThread(Object state);
|
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();
|
public abstract void Dispose();
|
||||||
|
|
||||||
|
|||||||
+18
-35
@@ -1,7 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.Threading;
|
|
||||||
using BlubbFish.Utils.IoT.Bots.Events;
|
using BlubbFish.Utils.IoT.Bots.Events;
|
||||||
using BlubbFish.Utils.IoT.Connector;
|
using BlubbFish.Utils.IoT.Connector;
|
||||||
using BlubbFish.Utils.IoT.Events;
|
using BlubbFish.Utils.IoT.Events;
|
||||||
@@ -9,52 +8,38 @@ using LitJson;
|
|||||||
|
|
||||||
namespace BlubbFish.Utils.IoT.Bots.Moduls {
|
namespace BlubbFish.Utils.IoT.Bots.Moduls {
|
||||||
public abstract class Mqtt<T> : AModul<T>, IDisposable {
|
public abstract class Mqtt<T> : AModul<T>, IDisposable {
|
||||||
protected readonly Thread connectionWatcher;
|
|
||||||
protected ABackend mqtt;
|
protected ABackend mqtt;
|
||||||
protected Dictionary<String, AModul<T>> modules;
|
protected Dictionary<String, AModul<T>> modules;
|
||||||
|
|
||||||
#region Constructor
|
#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
|
#endregion
|
||||||
|
|
||||||
#region Watcher
|
#region Connection
|
||||||
protected void ConnectionWatcherRunner() {
|
|
||||||
while (true) {
|
|
||||||
try {
|
|
||||||
if (this.mqtt == null || !this.mqtt.IsConnected) {
|
|
||||||
this.Reconnect();
|
|
||||||
}
|
|
||||||
Thread.Sleep(10000);
|
|
||||||
} catch (Exception) { }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void Reconnect() {
|
protected void Reconnect() {
|
||||||
Console.WriteLine("BlubbFish.Utils.IoT.Bots.Moduls.Mqtt.Reconnect()");
|
if(!this.config.ContainsKey("settings")) {
|
||||||
|
throw new ArgumentException("Setting section [settings] is missing!");
|
||||||
|
} else {
|
||||||
this.Disconnect();
|
this.Disconnect();
|
||||||
this.Connect();
|
this.Connect();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
protected abstract void Connect();
|
protected void Connect() {
|
||||||
|
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 abstract void Disconnect();
|
protected void Disconnect() => this.mqtt.Dispose();
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region AModul
|
#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
|
#endregion
|
||||||
|
|
||||||
protected Tuple<Boolean, MqttEvent> ChangeConfig(BackendEvent e, String topic) {
|
protected Tuple<Boolean, MqttEvent> ChangeConfig(BackendEvent e, String topic) {
|
||||||
@@ -90,7 +75,7 @@ namespace BlubbFish.Utils.IoT.Bots.Moduls {
|
|||||||
}
|
}
|
||||||
modul.SetConfig(newconf);
|
modul.SetConfig(newconf);
|
||||||
return new Tuple<Boolean, MqttEvent>(true, new MqttEvent("New Config", "Write"));
|
return new Tuple<Boolean, MqttEvent>(true, new MqttEvent("New Config", "Write"));
|
||||||
} catch (Exception) { }
|
} catch { }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return new Tuple<Boolean, MqttEvent>(false, null);
|
return new Tuple<Boolean, MqttEvent>(false, null);
|
||||||
@@ -102,8 +87,6 @@ namespace BlubbFish.Utils.IoT.Bots.Moduls {
|
|||||||
protected void Dispose(Boolean disposing) {
|
protected void Dispose(Boolean disposing) {
|
||||||
if (!this.disposedValue) {
|
if (!this.disposedValue) {
|
||||||
if (disposing) {
|
if (disposing) {
|
||||||
this.connectionWatcher.Abort();
|
|
||||||
while (this.connectionWatcher.ThreadState == ThreadState.Running) { Thread.Sleep(10); }
|
|
||||||
this.Disconnect();
|
this.Disconnect();
|
||||||
}
|
}
|
||||||
this.disposedValue = true;
|
this.disposedValue = true;
|
||||||
@@ -111,7 +94,7 @@ namespace BlubbFish.Utils.IoT.Bots.Moduls {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public override void Dispose() {
|
public override void Dispose() {
|
||||||
Dispose(true);
|
this.Dispose(true);
|
||||||
GC.SuppressFinalize(this);
|
GC.SuppressFinalize(this);
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,18 +1,19 @@
|
|||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using System.Runtime.CompilerServices;
|
using System.Resources;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
// Allgemeine Informationen über eine Assembly werden über die folgenden
|
// Allgemeine Informationen über eine Assembly werden über die folgenden
|
||||||
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
|
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
|
||||||
// die einer Assembly zugeordnet sind.
|
// die einer Assembly zugeordnet sind.
|
||||||
[assembly: AssemblyTitle("Bot-Utils")]
|
[assembly: AssemblyTitle("Bot-Utils")]
|
||||||
[assembly: AssemblyDescription("")]
|
[assembly: AssemblyDescription("Bot-Utils are helpers for programming a bot")]
|
||||||
[assembly: AssemblyConfiguration("")]
|
[assembly: AssemblyConfiguration("")]
|
||||||
[assembly: AssemblyCompany("")]
|
[assembly: AssemblyCompany("BlubbFish")]
|
||||||
[assembly: AssemblyProduct("Bot-Utils")]
|
[assembly: AssemblyProduct("Bot-Utils")]
|
||||||
[assembly: AssemblyCopyright("Copyright © 2018 - 17.02.2019")]
|
[assembly: AssemblyCopyright("Copyright © 2018 - 30.08.2019")]
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyTrademark("© BlubbFish")]
|
||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyCulture("")]
|
||||||
|
[assembly: NeutralResourcesLanguage("de-DE")]
|
||||||
|
|
||||||
// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
|
// 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
|
// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von
|
||||||
@@ -32,10 +33,21 @@ using System.Runtime.InteropServices;
|
|||||||
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
|
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
|
||||||
// indem Sie "*" wie unten gezeigt eingeben:
|
// indem Sie "*" wie unten gezeigt eingeben:
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
// [assembly: AssemblyVersion("1.0.*")]
|
||||||
[assembly: AssemblyVersion("1.1.1")]
|
[assembly: AssemblyVersion("1.2.1")]
|
||||||
[assembly: AssemblyFileVersion("1.1.1")]
|
[assembly: AssemblyFileVersion("1.2.1")]
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* 1.1.0 Remove Helper from Bot-Utils
|
* 1.1.0 Remove Helper from Bot-Utils
|
||||||
* 1.1.1 Update to local librarys
|
* 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.
|
||||||
|
* 1.2.1 When using Dispose, kill also mqtt connection and other tiny fixes
|
||||||
*/
|
*/
|
||||||
|
|||||||
+104
-43
@@ -1,37 +1,41 @@
|
|||||||
using BlubbFish.Utils.IoT.Connector;
|
using System;
|
||||||
using BlubbFish.Utils.IoT.Events;
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading;
|
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 Dictionary<String, String> config;
|
||||||
protected InIReader requests;
|
protected static InIReader requests;
|
||||||
protected HttpListener httplistener;
|
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.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 = new HttpListener();
|
||||||
this.httplistener.Prefixes.Add(this.config["prefix"]);
|
this.httplistener.Prefixes.Add(this.config["prefix"]);
|
||||||
this.httplistener.Start();
|
this.httplistener.Start();
|
||||||
ThreadPool.QueueUserWorkItem((o) => {
|
_ = ThreadPool.QueueUserWorkItem((o) => {
|
||||||
Console.WriteLine("Webserver is Running...");
|
Console.WriteLine("Webserver is Running...");
|
||||||
try {
|
try {
|
||||||
while (this.httplistener.IsListening) {
|
while(this.httplistener.IsListening) {
|
||||||
ThreadPool.QueueUserWorkItem((state) => {
|
ThreadPool.QueueUserWorkItem((state) => {
|
||||||
HttpListenerContext httplistenercontext = state as HttpListenerContext;
|
HttpListenerContext httplistenercontext = state as HttpListenerContext;
|
||||||
try {
|
try {
|
||||||
this.SendResponse(httplistenercontext);
|
this.SendWebserverResponse(httplistenercontext);
|
||||||
} catch { } finally {
|
} catch { } finally {
|
||||||
httplistenercontext.Response.OutputStream.Close();
|
httplistenercontext.Response.OutputStream.Close();
|
||||||
}
|
}
|
||||||
@@ -41,58 +45,115 @@ 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;
|
String restr = cont.Request.Url.PathAndQuery;
|
||||||
if (restr.StartsWith("/")) {
|
if(restr.StartsWith("/")) {
|
||||||
if(restr.IndexOf("?") != -1) {
|
if(restr.IndexOf("?") != -1) {
|
||||||
restr = restr.Substring(1, restr.IndexOf("?")-1);
|
restr = restr.Substring(1, restr.IndexOf("?") - 1);
|
||||||
} else {
|
} else {
|
||||||
restr = restr.Substring(1);
|
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 {
|
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.OutputStream.Write(output, 0, output.Length);
|
||||||
cont.Response.ContentType = "image/"+end;
|
if(printOutput) {
|
||||||
return;
|
Console.WriteLine("200 - " + cont.Request.Url.PathAndQuery);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
} else {
|
} 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);
|
Byte[] buf = Encoding.UTF8.GetBytes(file);
|
||||||
cont.Response.ContentLength64 = buf.Length;
|
cont.Response.ContentLength64 = buf.Length;
|
||||||
|
switch(end) {
|
||||||
|
case "css":
|
||||||
|
cont.Response.ContentType = "text/css";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
cont.Response.OutputStream.Write(buf, 0, buf.Length);
|
||||||
|
if(printOutput) {
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
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);
|
cont.Response.OutputStream.Write(buf, 0, buf.Length);
|
||||||
Console.WriteLine("200 - " + cont.Request.Url.PathAndQuery);
|
Console.WriteLine("200 - " + cont.Request.Url.PathAndQuery);
|
||||||
return;
|
return true;
|
||||||
}
|
|
||||||
} catch(Exception e) {
|
} catch(Exception e) {
|
||||||
Helper.WriteError("500 - " + e.Message);
|
Helper.WriteError("500 - " + e.Message + "\n\n" + e.StackTrace);
|
||||||
cont.Response.StatusCode = 500;
|
cont.Response.StatusCode = 500;
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
}
|
return false;
|
||||||
Helper.WriteError("404 - " + cont.Request.Url.PathAndQuery + " not found!");
|
|
||||||
cont.Response.StatusCode = 404;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Dispose() {
|
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.Stop();
|
||||||
this.httplistener.Close();
|
this.httplistener.Close();
|
||||||
|
if(this.databackend != null) {
|
||||||
|
this.databackend.Dispose();
|
||||||
|
}
|
||||||
|
base.Dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected abstract void Backend_MessageIncomming(Object sender, BackendEvent e);
|
protected abstract void Backend_MessageIncomming(Object sender, BackendEvent e);
|
||||||
|
protected abstract Boolean SendWebserverResponse(HttpListenerContext cont);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,92 @@
|
|||||||
|
# Contributing
|
||||||
|
|
||||||
|
When contributing to this repository, please first discuss the change you wish to make via issue,
|
||||||
|
email, or any other method with the owners of this repository before making a change.
|
||||||
|
|
||||||
|
Please note we have a code of conduct, please follow it in all your interactions with the project.
|
||||||
|
|
||||||
|
## Pull Request Process
|
||||||
|
|
||||||
|
1. Ensure any install or build dependencies are removed before the end of the layer when doing a
|
||||||
|
build.
|
||||||
|
2. Update the README.md with details of changes to the interface, this includes new environment
|
||||||
|
variables, exposed ports, useful file locations and container parameters.
|
||||||
|
3. Increase the version numbers in any examples files and the README.md to the new version that this
|
||||||
|
Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/).
|
||||||
|
4. You may merge the Pull Request in once you have the sign-off of two other developers, or if you
|
||||||
|
do not have permission to do that, you may request the second reviewer to merge it for you.
|
||||||
|
|
||||||
|
## Code of Conduct
|
||||||
|
|
||||||
|
### Our Pledge
|
||||||
|
|
||||||
|
In the interest of fostering an open and welcoming environment, we as
|
||||||
|
contributors and maintainers pledge to making participation in our project and
|
||||||
|
our community a harassment-free experience for everyone, regardless of age, body
|
||||||
|
size, disability, ethnicity, gender identity and expression, level of experience,
|
||||||
|
nationality, personal appearance, race, religion, or sexual identity and
|
||||||
|
orientation.
|
||||||
|
|
||||||
|
### Our Standards
|
||||||
|
|
||||||
|
Examples of behavior that contributes to creating a positive environment
|
||||||
|
include:
|
||||||
|
|
||||||
|
* Using welcoming and inclusive language
|
||||||
|
* Being respectful of differing viewpoints and experiences
|
||||||
|
* Gracefully accepting constructive criticism
|
||||||
|
* Focusing on what is best for the community
|
||||||
|
* Showing empathy towards other community members
|
||||||
|
|
||||||
|
Examples of unacceptable behavior by participants include:
|
||||||
|
|
||||||
|
* The use of sexualized language or imagery and unwelcome sexual attention or
|
||||||
|
advances
|
||||||
|
* Trolling, insulting/derogatory comments, and personal or political attacks
|
||||||
|
* Public or private harassment
|
||||||
|
* Publishing others' private information, such as a physical or electronic
|
||||||
|
address, without explicit permission
|
||||||
|
* Other conduct which could reasonably be considered inappropriate in a
|
||||||
|
professional setting
|
||||||
|
|
||||||
|
### Our Responsibilities
|
||||||
|
|
||||||
|
Project maintainers are responsible for clarifying the standards of acceptable
|
||||||
|
behavior and are expected to take appropriate and fair corrective action in
|
||||||
|
response to any instances of unacceptable behavior.
|
||||||
|
|
||||||
|
Project maintainers have the right and responsibility to remove, edit, or
|
||||||
|
reject comments, commits, code, wiki edits, issues, and other contributions
|
||||||
|
that are not aligned to this Code of Conduct, or to ban temporarily or
|
||||||
|
permanently any contributor for other behaviors that they deem inappropriate,
|
||||||
|
threatening, offensive, or harmful.
|
||||||
|
|
||||||
|
### Scope
|
||||||
|
|
||||||
|
This Code of Conduct applies both within project spaces and in public spaces
|
||||||
|
when an individual is representing the project or its community. Examples of
|
||||||
|
representing a project or community include using an official project e-mail
|
||||||
|
address, posting via an official social media account, or acting as an appointed
|
||||||
|
representative at an online or offline event. Representation of a project may be
|
||||||
|
further defined and clarified by project maintainers.
|
||||||
|
|
||||||
|
### Enforcement
|
||||||
|
|
||||||
|
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
||||||
|
reported by contacting the project team at git ATTTT blubbfish.net. All
|
||||||
|
complaints will be reviewed and investigated and will result in a response that
|
||||||
|
is deemed necessary and appropriate to the circumstances. The project team is
|
||||||
|
obligated to maintain confidentiality with regard to the reporter of an incident.
|
||||||
|
Further details of specific enforcement policies may be posted separately.
|
||||||
|
|
||||||
|
Project maintainers who do not follow or enforce the Code of Conduct in good
|
||||||
|
faith may face temporary or permanent repercussions as determined by other
|
||||||
|
members of the project's leadership.
|
||||||
|
|
||||||
|
### Attribution
|
||||||
|
|
||||||
|
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
|
||||||
|
available at [http://contributor-covenant.org/version/1/4][version]
|
||||||
|
|
||||||
|
[homepage]: http://contributor-covenant.org
|
||||||
|
[version]: http://contributor-covenant.org/version/1/4/
|
||||||
@@ -0,0 +1,165 @@
|
|||||||
|
GNU LESSER GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
|
||||||
|
This version of the GNU Lesser General Public License incorporates
|
||||||
|
the terms and conditions of version 3 of the GNU General Public
|
||||||
|
License, supplemented by the additional permissions listed below.
|
||||||
|
|
||||||
|
0. Additional Definitions.
|
||||||
|
|
||||||
|
As used herein, "this License" refers to version 3 of the GNU Lesser
|
||||||
|
General Public License, and the "GNU GPL" refers to version 3 of the GNU
|
||||||
|
General Public License.
|
||||||
|
|
||||||
|
"The Library" refers to a covered work governed by this License,
|
||||||
|
other than an Application or a Combined Work as defined below.
|
||||||
|
|
||||||
|
An "Application" is any work that makes use of an interface provided
|
||||||
|
by the Library, but which is not otherwise based on the Library.
|
||||||
|
Defining a subclass of a class defined by the Library is deemed a mode
|
||||||
|
of using an interface provided by the Library.
|
||||||
|
|
||||||
|
A "Combined Work" is a work produced by combining or linking an
|
||||||
|
Application with the Library. The particular version of the Library
|
||||||
|
with which the Combined Work was made is also called the "Linked
|
||||||
|
Version".
|
||||||
|
|
||||||
|
The "Minimal Corresponding Source" for a Combined Work means the
|
||||||
|
Corresponding Source for the Combined Work, excluding any source code
|
||||||
|
for portions of the Combined Work that, considered in isolation, are
|
||||||
|
based on the Application, and not on the Linked Version.
|
||||||
|
|
||||||
|
The "Corresponding Application Code" for a Combined Work means the
|
||||||
|
object code and/or source code for the Application, including any data
|
||||||
|
and utility programs needed for reproducing the Combined Work from the
|
||||||
|
Application, but excluding the System Libraries of the Combined Work.
|
||||||
|
|
||||||
|
1. Exception to Section 3 of the GNU GPL.
|
||||||
|
|
||||||
|
You may convey a covered work under sections 3 and 4 of this License
|
||||||
|
without being bound by section 3 of the GNU GPL.
|
||||||
|
|
||||||
|
2. Conveying Modified Versions.
|
||||||
|
|
||||||
|
If you modify a copy of the Library, and, in your modifications, a
|
||||||
|
facility refers to a function or data to be supplied by an Application
|
||||||
|
that uses the facility (other than as an argument passed when the
|
||||||
|
facility is invoked), then you may convey a copy of the modified
|
||||||
|
version:
|
||||||
|
|
||||||
|
a) under this License, provided that you make a good faith effort to
|
||||||
|
ensure that, in the event an Application does not supply the
|
||||||
|
function or data, the facility still operates, and performs
|
||||||
|
whatever part of its purpose remains meaningful, or
|
||||||
|
|
||||||
|
b) under the GNU GPL, with none of the additional permissions of
|
||||||
|
this License applicable to that copy.
|
||||||
|
|
||||||
|
3. Object Code Incorporating Material from Library Header Files.
|
||||||
|
|
||||||
|
The object code form of an Application may incorporate material from
|
||||||
|
a header file that is part of the Library. You may convey such object
|
||||||
|
code under terms of your choice, provided that, if the incorporated
|
||||||
|
material is not limited to numerical parameters, data structure
|
||||||
|
layouts and accessors, or small macros, inline functions and templates
|
||||||
|
(ten or fewer lines in length), you do both of the following:
|
||||||
|
|
||||||
|
a) Give prominent notice with each copy of the object code that the
|
||||||
|
Library is used in it and that the Library and its use are
|
||||||
|
covered by this License.
|
||||||
|
|
||||||
|
b) Accompany the object code with a copy of the GNU GPL and this license
|
||||||
|
document.
|
||||||
|
|
||||||
|
4. Combined Works.
|
||||||
|
|
||||||
|
You may convey a Combined Work under terms of your choice that,
|
||||||
|
taken together, effectively do not restrict modification of the
|
||||||
|
portions of the Library contained in the Combined Work and reverse
|
||||||
|
engineering for debugging such modifications, if you also do each of
|
||||||
|
the following:
|
||||||
|
|
||||||
|
a) Give prominent notice with each copy of the Combined Work that
|
||||||
|
the Library is used in it and that the Library and its use are
|
||||||
|
covered by this License.
|
||||||
|
|
||||||
|
b) Accompany the Combined Work with a copy of the GNU GPL and this license
|
||||||
|
document.
|
||||||
|
|
||||||
|
c) For a Combined Work that displays copyright notices during
|
||||||
|
execution, include the copyright notice for the Library among
|
||||||
|
these notices, as well as a reference directing the user to the
|
||||||
|
copies of the GNU GPL and this license document.
|
||||||
|
|
||||||
|
d) Do one of the following:
|
||||||
|
|
||||||
|
0) Convey the Minimal Corresponding Source under the terms of this
|
||||||
|
License, and the Corresponding Application Code in a form
|
||||||
|
suitable for, and under terms that permit, the user to
|
||||||
|
recombine or relink the Application with a modified version of
|
||||||
|
the Linked Version to produce a modified Combined Work, in the
|
||||||
|
manner specified by section 6 of the GNU GPL for conveying
|
||||||
|
Corresponding Source.
|
||||||
|
|
||||||
|
1) Use a suitable shared library mechanism for linking with the
|
||||||
|
Library. A suitable mechanism is one that (a) uses at run time
|
||||||
|
a copy of the Library already present on the user's computer
|
||||||
|
system, and (b) will operate properly with a modified version
|
||||||
|
of the Library that is interface-compatible with the Linked
|
||||||
|
Version.
|
||||||
|
|
||||||
|
e) Provide Installation Information, but only if you would otherwise
|
||||||
|
be required to provide such information under section 6 of the
|
||||||
|
GNU GPL, and only to the extent that such information is
|
||||||
|
necessary to install and execute a modified version of the
|
||||||
|
Combined Work produced by recombining or relinking the
|
||||||
|
Application with a modified version of the Linked Version. (If
|
||||||
|
you use option 4d0, the Installation Information must accompany
|
||||||
|
the Minimal Corresponding Source and Corresponding Application
|
||||||
|
Code. If you use option 4d1, you must provide the Installation
|
||||||
|
Information in the manner specified by section 6 of the GNU GPL
|
||||||
|
for conveying Corresponding Source.)
|
||||||
|
|
||||||
|
5. Combined Libraries.
|
||||||
|
|
||||||
|
You may place library facilities that are a work based on the
|
||||||
|
Library side by side in a single library together with other library
|
||||||
|
facilities that are not Applications and are not covered by this
|
||||||
|
License, and convey such a combined library under terms of your
|
||||||
|
choice, if you do both of the following:
|
||||||
|
|
||||||
|
a) Accompany the combined library with a copy of the same work based
|
||||||
|
on the Library, uncombined with any other library facilities,
|
||||||
|
conveyed under the terms of this License.
|
||||||
|
|
||||||
|
b) Give prominent notice with the combined library that part of it
|
||||||
|
is a work based on the Library, and explaining where to find the
|
||||||
|
accompanying uncombined form of the same work.
|
||||||
|
|
||||||
|
6. Revised Versions of the GNU Lesser General Public License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions
|
||||||
|
of the GNU Lesser General Public License from time to time. Such new
|
||||||
|
versions will be similar in spirit to the present version, but may
|
||||||
|
differ in detail to address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Library as you received it specifies that a certain numbered version
|
||||||
|
of the GNU Lesser General Public License "or any later version"
|
||||||
|
applies to it, you have the option of following the terms and
|
||||||
|
conditions either of that published version or of any later version
|
||||||
|
published by the Free Software Foundation. If the Library as you
|
||||||
|
received it does not specify a version number of the GNU Lesser
|
||||||
|
General Public License, you may choose any version of the GNU Lesser
|
||||||
|
General Public License ever published by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Library as you received it specifies that a proxy can decide
|
||||||
|
whether future versions of the GNU Lesser General Public License shall
|
||||||
|
apply, that proxy's public statement of acceptance of any version is
|
||||||
|
permanent authorization for you to choose that version for the
|
||||||
|
Library.
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
# BlubbFish.Utils.IoT.Bots (Bot-Utils)
|
||||||
|
Library that makes it easier to create bots.
|
||||||
|
|
||||||
|
## 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
|
||||||
|
* Mono.Posix
|
||||||
Reference in New Issue
Block a user