Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8e41d15e4e | |||
| 1862aa7da2 | |||
| 628db8db10 | |||
| 55425d2afa |
@ -1,71 +1,58 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Reflection;
|
||||
using System.Runtime.Loader;
|
||||
using System.Threading;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Bots {
|
||||
public abstract class ABot {
|
||||
#if !NETCOREAPP
|
||||
private Thread sig_thread;
|
||||
#endif
|
||||
private Boolean RunningProcess = true;
|
||||
private readonly ProgramLogger logger = null;
|
||||
|
||||
protected ProgramLogger logger = new ProgramLogger();
|
||||
public Boolean DebugLogging {
|
||||
get;
|
||||
}
|
||||
|
||||
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;
|
||||
public ABot(String[] _, Boolean fileLogging, String configSearchPath) {
|
||||
InIReader.SetSearchPath(new List<String>() { "/etc/"+ configSearchPath, Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\"+ configSearchPath });
|
||||
if(fileLogging) {
|
||||
this.logger = new ProgramLogger(InIReader.GetInstance("settings").GetValue("logging", "path", Assembly.GetEntryAssembly().GetName().Name + ".log"));
|
||||
}
|
||||
if(Boolean.TryParse(InIReader.GetInstance("settings").GetValue("logging", "debug", "true"), out Boolean debuglog)) {
|
||||
this.DebugLogging = debuglog;
|
||||
}
|
||||
}
|
||||
|
||||
private void ConsoleCancelEvent(Object sender, ConsoleCancelEventArgs e) {
|
||||
e.Cancel = true;
|
||||
Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.ConsoleCancelEvent()");
|
||||
this.RunningProcess = false;
|
||||
}
|
||||
|
||||
#if NETCOREAPP
|
||||
private void Default_Unloading(AssemblyLoadContext obj) {
|
||||
Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.SetupShutdown: Signalhandler Windows NETCORE recieved.");
|
||||
this.RunningProcess = false;
|
||||
Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.WaitForShutdown: Shutdown.");
|
||||
this.Dispose();
|
||||
}
|
||||
private void Unloading(AssemblyLoadContext obj) => this.RunningProcess = false;
|
||||
|
||||
private void ProcessExit(Object sender, EventArgs e) => this.RunningProcess = false;
|
||||
#endif
|
||||
|
||||
protected void WaitForShutdown() {
|
||||
if(Type.GetType("Mono.Runtime") != null) {
|
||||
#if !NETCOREAPP
|
||||
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();
|
||||
#endif
|
||||
} else {
|
||||
#if NETCOREAPP
|
||||
AssemblyLoadContext.Default.Unloading += this.Default_Unloading;
|
||||
Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.WaitForShutdown: Signalhandler Netcore attached.");
|
||||
#endif
|
||||
Console.CancelKeyPress += new ConsoleCancelEventHandler(this.SetupShutdown);
|
||||
Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.WaitForShutdown: Signalhandler Windows attached.");
|
||||
}
|
||||
while(this.RunningProcess) {
|
||||
Thread.Sleep(100);
|
||||
}
|
||||
Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.WaitForShutdown: Shutdown.");
|
||||
protected void WaitForShutdown() {
|
||||
#if NETCOREAPP
|
||||
AssemblyLoadContext.Default.Unloading += this.Unloading;
|
||||
AppDomain.CurrentDomain.ProcessExit += this.ProcessExit;
|
||||
Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.WaitForShutdown: Attach Unloading and ProcessExit.");
|
||||
#endif
|
||||
Console.CancelKeyPress += new ConsoleCancelEventHandler(this.ConsoleCancelEvent);
|
||||
Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.WaitForShutdown: Attach ConsoleCancelEvent.");
|
||||
while(this.RunningProcess) {
|
||||
Thread.Sleep(100);
|
||||
}
|
||||
Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.WaitForShutdown: Shutdown.");
|
||||
}
|
||||
|
||||
|
||||
|
||||
public virtual void Dispose() {
|
||||
#if !NETCOREAPP
|
||||
if(this.sig_thread != null && this.sig_thread.IsAlive) {
|
||||
this.sig_thread.Abort();
|
||||
}
|
||||
#endif
|
||||
Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.Dispose: Shutdown.");
|
||||
this.RunningProcess = false;
|
||||
this.logger?.Dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -12,7 +12,7 @@ namespace BlubbFish.Utils.IoT.Bots {
|
||||
|
||||
protected HttpListener httplistener;
|
||||
|
||||
public AWebserver(Dictionary<String, String> settings) => this.config = settings;
|
||||
public AWebserver(String[] args, Boolean fileLogging, String configSearchPath, Dictionary<String, String> settings) : base(args, fileLogging, configSearchPath) => this.config = settings;
|
||||
|
||||
protected void StartListen() {
|
||||
this.httplistener = new HttpListener();
|
||||
|
||||
@ -7,7 +7,7 @@ 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 AWebserverDataBackend(String[] args, Boolean fileLogging, String configSearchPath, ABackend backend, Dictionary<String, String> settings) : base(args, fileLogging, configSearchPath, settings) => this.databackend = backend;
|
||||
|
||||
protected void StartDataBackend() => this.databackend.MessageIncomming += this.Backend_MessageIncomming;
|
||||
|
||||
|
||||
@ -5,31 +5,35 @@
|
||||
<RootNamespace>BlubbFish.Utils.IoT.Bots</RootNamespace>
|
||||
<AssemblyName>Bot-Utils</AssemblyName>
|
||||
<PackageId>Bots.IoT.Utils.BlubbFish</PackageId>
|
||||
<Version>1.2.2</Version>
|
||||
<AssemblyVersion>1.2.2</AssemblyVersion>
|
||||
<FileVersion>1.2.2</FileVersion>
|
||||
<Version>1.2.6</Version>
|
||||
<NeutralLanguage>de-DE</NeutralLanguage>
|
||||
<Description>Bot-Utils are helpers for programming a bot</Description>
|
||||
<Authors>BlubbFish</Authors>
|
||||
<Company>BlubbFish</Company>
|
||||
<Copyright>Copyright © BlubbFish 2018 - 22.08.2021</Copyright>
|
||||
<Copyright>Copyright © BlubbFish 2018 - 25.01.2022</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.2 Going to netcore
|
||||
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>
|
||||
<PackageReleaseNotes>
|
||||
1.2.6 - 2022-01-25 - Makeing Logging easyier
|
||||
1.2.5 - 2022-01-20 - Better linux handling
|
||||
1.2.4 - 2022-01-18 - Config enabled module loading
|
||||
1.2.3 - 2022-01-09 - Tiny Refactoring
|
||||
1.2.2 - 2021-08-22 - Going to netcore
|
||||
1.2.1 - 2019-08-30 - When using Dispose, kill also mqtt connection and other tiny fixes
|
||||
1.2.0 - 2019-05-27 - Refactor Bot to ABot and refere MultiSourceBot
|
||||
1.1.9 - 2019-04-21 - Modify Output of SendFileResponse
|
||||
1.1.8 - 2019-04-15 - Add logger to Webserver Class
|
||||
1.1.7 - 2019-04-14 - REQUEST_URL_HOST
|
||||
1.1.6 - 2019-04-03 - Refactoring and bugfixing
|
||||
1.1.5 - 2019-03-27 - add a function to send an object as json directly
|
||||
1.1.4 - 2019-03-13 - add Woff as Binary type
|
||||
1.1.3 - 2019-03-10 - Variables parsing now as a String
|
||||
1.1.2 - 2019-03-08 - Fixing bug for Contenttype
|
||||
1.1.1 - 2019-02-17 - Update to local librarys
|
||||
1.1.0 - 2019-02-14 - Remove Helper from Bot-Utils
|
||||
</PackageReleaseNotes>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@ -9,8 +9,11 @@ namespace BlubbFish.Utils.IoT.Bots {
|
||||
public abstract class Bot<T> : ABot {
|
||||
protected readonly Dictionary<String, AModul<T>> moduls = new Dictionary<String, AModul<T>>();
|
||||
|
||||
public Bot(String[] args, Boolean fileLogging, String configSearchPath) : base(args, fileLogging, configSearchPath) { }
|
||||
|
||||
protected void ModulDispose() {
|
||||
foreach (KeyValuePair<String, AModul<T>> item in this.moduls) {
|
||||
Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.ModulDispose: Entlade Modul: " + item.Key);
|
||||
item.Value.Dispose();
|
||||
Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.ModulDispose: Modul entladen: " + item.Key);
|
||||
}
|
||||
@ -25,13 +28,18 @@ namespace BlubbFish.Utils.IoT.Bots {
|
||||
String name = t.Name;
|
||||
try {
|
||||
if (InIReader.ConfigExist(name.ToLower())) {
|
||||
Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.ModulLoader: Load Modul " + name);
|
||||
this.moduls.Add(name, (AModul<T>)t.GetConstructor(new Type[] { typeof(T), typeof(InIReader) }).Invoke(new Object[] { library, InIReader.GetInstance(name.ToLower()) }));
|
||||
Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.ModulLoader: Loaded Modul " + name);
|
||||
} else if (t.HasInterface(typeof(IForceLoad))) {
|
||||
Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.ModulLoader: Load Modul Forced " + name);
|
||||
Dictionary<String, String> modulconfig = InIReader.GetInstance(name.ToLower()).GetSection("modul");
|
||||
if(!(modulconfig.ContainsKey("enabled") && modulconfig["enabled"].ToLower() == "false")) {
|
||||
Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.ModulLoader: Load Modul " + name);
|
||||
this.moduls.Add(name, (AModul<T>)t.GetConstructor(new Type[] { typeof(T), typeof(InIReader) }).Invoke(new Object[] { library, InIReader.GetInstance(name.ToLower()) }));
|
||||
Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.ModulLoader: Loaded Modul " + name);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
if (t.HasInterface(typeof(IForceLoad))) {
|
||||
Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.ModulLoader: Forced Load Modul " + name);
|
||||
this.moduls.Add(name, (AModul<T>)t.GetConstructor(new Type[] { typeof(T), typeof(InIReader) }).Invoke(new Object[] { library, null }));
|
||||
Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.ModulLoader: Loaded Modul Forced " + name);
|
||||
Console.WriteLine("BlubbFish.Utils.IoT.Bots.Bot.ModulLoader: Forced Loaded Modul " + name);
|
||||
}
|
||||
} catch(Exception e) {
|
||||
Helper.WriteError(e.InnerException.Message);
|
||||
@ -55,6 +63,10 @@ namespace BlubbFish.Utils.IoT.Bots {
|
||||
}
|
||||
}
|
||||
|
||||
protected void ModulUpdate(Object sender, ModulEventArgs e) => Console.WriteLine(e.ToString());
|
||||
protected void ModulUpdate(Object sender, ModulEventArgs e) {
|
||||
if(this.DebugLogging) {
|
||||
Console.WriteLine(e.ToString());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,170 +1,162 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Threading;
|
||||
using BlubbFish.Utils.IoT.Bots.Interfaces;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Bots.Moduls {
|
||||
public abstract class CronJob<T> : AModul<T>, IDisposable, IForceLoad {
|
||||
protected readonly List<Tuple<String, Action<Object>, Object>> internalCron = new List<Tuple<String, Action<Object>, Object>>();
|
||||
protected Thread thread;
|
||||
protected DateTime crontime;
|
||||
|
||||
protected readonly Dictionary<String, String> cron_named = new Dictionary<String, String> {
|
||||
{ "@yearly", "0 0 1 1 *" },
|
||||
{ "@annually", "0 0 1 1 *" },
|
||||
{ "@monthly", "0 0 1 * *" },
|
||||
{ "@weekly", "0 0 * * 0" },
|
||||
{ "@daily", "0 0 * * *" },
|
||||
{ "@hourly", "0 * * * *" }
|
||||
};
|
||||
|
||||
#region Constructor
|
||||
public CronJob(T lib, InIReader settings) : base(lib, settings) {
|
||||
this.crontime = DateTime.Now;
|
||||
this.thread = new Thread(this.Runner);
|
||||
this.thread.Start();
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Cronjobrunner
|
||||
protected void Runner() {
|
||||
Thread.Sleep(DateTime.Now.AddMinutes(1).AddSeconds(DateTime.Now.Second * -1).AddMilliseconds(DateTime.Now.Millisecond * -1) - DateTime.Now);
|
||||
while (true) {
|
||||
if (this.crontime.Minute != DateTime.Now.Minute) {
|
||||
this.crontime = DateTime.Now;
|
||||
if (this.config.Count != 0) {
|
||||
foreach (KeyValuePair<String, Dictionary<String, String>> item in this.config) {
|
||||
if (item.Value.ContainsKey("cron") && item.Value.ContainsKey("set") && this.ParseCronString(item.Value["cron"])) {
|
||||
this.SetValues(item.Value["set"]);
|
||||
}
|
||||
}
|
||||
}
|
||||
foreach (Tuple<String, Action<Object>, Object> item in this.internalCron) {
|
||||
if (this.ParseCronString(item.Item1)) {
|
||||
item.Item2?.Invoke(item.Item3);
|
||||
}
|
||||
}
|
||||
}
|
||||
Thread.Sleep(100);
|
||||
}
|
||||
}
|
||||
|
||||
protected abstract void SetValues(String value);
|
||||
#endregion
|
||||
|
||||
#region CronFunctions
|
||||
protected Boolean ParseCronString(String cronstring) {
|
||||
cronstring = cronstring.Trim();
|
||||
if (this.cron_named.ContainsKey(cronstring)) {
|
||||
cronstring = this.cron_named[cronstring];
|
||||
}
|
||||
String[] value = cronstring.Split(' ');
|
||||
if (value.Length != 5) {
|
||||
return false;
|
||||
}
|
||||
if (!this.CheckDateStr(this.crontime.ToString("mm"), value[0], "0-59")) {
|
||||
return false;
|
||||
}
|
||||
if (!this.CheckDateStr(this.crontime.ToString("HH"), value[1], "0-23")) {
|
||||
return false;
|
||||
}
|
||||
if (!this.CheckDateStr(this.crontime.ToString("MM"), value[3], "1-12")) {
|
||||
return false;
|
||||
}
|
||||
if (value[2] != "*" && value[4] != "*") {
|
||||
if (!this.CheckDateStr(this.crontime.ToString("dd"), value[2], "1-31") && !this.CheckDateStr(((Int32)this.crontime.DayOfWeek).ToString(), value[4], "0-7")) {
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
if (!this.CheckDateStr(this.crontime.ToString("dd"), value[2], "1-31")) {
|
||||
return false;
|
||||
}
|
||||
if (!this.CheckDateStr(((Int32)this.crontime.DayOfWeek).ToString(), value[4], "0-7")) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
protected Boolean CheckDateStr(String date, String cron, String limit) {
|
||||
cron = cron.ToLower();
|
||||
for (Int32 i = 0; i <= 6; i++) {
|
||||
cron = cron.Replace(DateTime.Parse("2015-01-" + (4 + i) + "T00:00:00").ToString("ddd", CultureInfo.CreateSpecificCulture("en-US")), i.ToString());
|
||||
cron = cron.Replace(DateTime.Parse("2015-01-" + (4 + i) + "T00:00:00").ToString("dddd", CultureInfo.CreateSpecificCulture("en-US")), i.ToString());
|
||||
}
|
||||
for (Int32 i = 1; i <= 12; i++) {
|
||||
cron = cron.Replace(DateTime.Parse("2015-" + i + "-01T00:00:00").ToString("MMM", CultureInfo.CreateSpecificCulture("en-US")), i.ToString());
|
||||
cron = cron.Replace(DateTime.Parse("2015-" + i + "-01T00:00:00").ToString("MMMM", CultureInfo.CreateSpecificCulture("en-US")), i.ToString());
|
||||
}
|
||||
if (cron.Contains("*")) {
|
||||
cron = cron.Replace("*", limit);
|
||||
}
|
||||
if (cron.Contains("-")) {
|
||||
MatchCollection m = new Regex("(\\d+)-(\\d+)").Matches(cron);
|
||||
foreach (Match p in m) {
|
||||
List<String> s = new List<String>();
|
||||
for (Int32 i = Math.Min(Int32.Parse(p.Groups[1].Value), Int32.Parse(p.Groups[2].Value)); i <= Math.Max(Int32.Parse(p.Groups[1].Value), Int32.Parse(p.Groups[2].Value)); i++) {
|
||||
s.Add(i.ToString());
|
||||
}
|
||||
cron = cron.Replace(p.Groups[0].Value, String.Join(",", s));
|
||||
}
|
||||
}
|
||||
Int32 match = 0;
|
||||
if (cron.Contains("/")) {
|
||||
Match m = new Regex("/(\\d+)").Match(cron);
|
||||
cron = cron.Replace(m.Groups[0].Value, "");
|
||||
match = Int32.Parse(m.Groups[1].Value);
|
||||
}
|
||||
Dictionary<Int32, String> ret = new Dictionary<Int32, String>();
|
||||
if (!cron.Contains(",")) {
|
||||
ret.Add(Int32.Parse(cron), "");
|
||||
} else {
|
||||
foreach (String item in cron.Split(',')) {
|
||||
if (!ret.ContainsKey(Int32.Parse(item))) {
|
||||
ret.Add(Int32.Parse(item), "");
|
||||
}
|
||||
}
|
||||
}
|
||||
if (match != 0) {
|
||||
Dictionary<Int32, String> r = new Dictionary<Int32, String>();
|
||||
foreach (KeyValuePair<Int32, String> item in ret) {
|
||||
if (item.Key % match == 0) {
|
||||
r.Add(item.Key, "");
|
||||
}
|
||||
}
|
||||
ret = r;
|
||||
}
|
||||
return ret.ContainsKey(Int32.Parse(date));
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region AModul
|
||||
public override void SetInterconnection(String cron, Action<Object> hook, Object data) => this.internalCron.Add(new Tuple<String, Action<Object>, Object>(cron, hook, data));
|
||||
|
||||
protected override void UpdateConfig() { }
|
||||
#endregion
|
||||
|
||||
#region IDisposable Support
|
||||
private Boolean disposedValue = false;
|
||||
|
||||
protected virtual void Dispose(Boolean disposing) {
|
||||
if (!this.disposedValue) {
|
||||
if (disposing) {
|
||||
if (this.thread != null) {
|
||||
this.thread.Abort();
|
||||
while (this.thread.ThreadState == ThreadState.Running) { Thread.Sleep(100); }
|
||||
}
|
||||
}
|
||||
this.thread = null;
|
||||
this.disposedValue = true;
|
||||
}
|
||||
}
|
||||
|
||||
public override void Dispose() {
|
||||
this.Dispose(true);
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Threading;
|
||||
|
||||
using BlubbFish.Utils.IoT.Bots.Interfaces;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Bots.Moduls {
|
||||
public abstract class CronJob<T> : AModul<T>, IForceLoad {
|
||||
protected readonly List<Tuple<String, Action<Object>, Object>> internalCron = new List<Tuple<String, Action<Object>, Object>>();
|
||||
protected Thread thread;
|
||||
protected Boolean threadRunning = false;
|
||||
protected DateTime crontime;
|
||||
|
||||
protected readonly Dictionary<String, String> cron_named = new Dictionary<String, String> {
|
||||
{ "@yearly", "0 0 1 1 *" },
|
||||
{ "@annually", "0 0 1 1 *" },
|
||||
{ "@monthly", "0 0 1 * *" },
|
||||
{ "@weekly", "0 0 * * 0" },
|
||||
{ "@daily", "0 0 * * *" },
|
||||
{ "@hourly", "0 * * * *" }
|
||||
};
|
||||
|
||||
#region Constructor
|
||||
public CronJob(T lib, InIReader settings) : base(lib, settings) {
|
||||
this.crontime = DateTime.Now;
|
||||
this.thread = new Thread(this.Runner);
|
||||
this.threadRunning = true;
|
||||
this.thread.Start();
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Cronjobrunner
|
||||
protected void Runner() {
|
||||
DateTime nextminute = DateTime.Now.AddMinutes(1).AddSeconds(DateTime.Now.Second * -1).AddMilliseconds(DateTime.Now.Millisecond * -1);
|
||||
while(nextminute > DateTime.Now && this.threadRunning) {
|
||||
Thread.Sleep(100);
|
||||
}
|
||||
while (this.threadRunning) {
|
||||
if (this.crontime.Minute != DateTime.Now.Minute) {
|
||||
this.crontime = DateTime.Now;
|
||||
if (this.config.Count != 0) {
|
||||
foreach (KeyValuePair<String, Dictionary<String, String>> item in this.config) {
|
||||
if (item.Value.ContainsKey("cron") && item.Value.ContainsKey("set") && this.ParseCronString(item.Value["cron"])) {
|
||||
this.SetValues(item.Value["set"]);
|
||||
}
|
||||
}
|
||||
}
|
||||
foreach (Tuple<String, Action<Object>, Object> item in this.internalCron) {
|
||||
if (this.ParseCronString(item.Item1)) {
|
||||
item.Item2?.Invoke(item.Item3);
|
||||
}
|
||||
}
|
||||
}
|
||||
Thread.Sleep(100);
|
||||
}
|
||||
}
|
||||
|
||||
protected abstract void SetValues(String value);
|
||||
#endregion
|
||||
|
||||
#region CronFunctions
|
||||
protected Boolean ParseCronString(String cronstring) {
|
||||
cronstring = cronstring.Trim();
|
||||
if (this.cron_named.ContainsKey(cronstring)) {
|
||||
cronstring = this.cron_named[cronstring];
|
||||
}
|
||||
String[] value = cronstring.Split(' ');
|
||||
if (value.Length != 5) {
|
||||
return false;
|
||||
}
|
||||
if (!this.CheckDateStr(this.crontime.ToString("mm"), value[0], "0-59")) {
|
||||
return false;
|
||||
}
|
||||
if (!this.CheckDateStr(this.crontime.ToString("HH"), value[1], "0-23")) {
|
||||
return false;
|
||||
}
|
||||
if (!this.CheckDateStr(this.crontime.ToString("MM"), value[3], "1-12")) {
|
||||
return false;
|
||||
}
|
||||
if (value[2] != "*" && value[4] != "*") {
|
||||
if (!this.CheckDateStr(this.crontime.ToString("dd"), value[2], "1-31") && !this.CheckDateStr(((Int32)this.crontime.DayOfWeek).ToString(), value[4], "0-7")) {
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
if (!this.CheckDateStr(this.crontime.ToString("dd"), value[2], "1-31")) {
|
||||
return false;
|
||||
}
|
||||
if (!this.CheckDateStr(((Int32)this.crontime.DayOfWeek).ToString(), value[4], "0-7")) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
protected Boolean CheckDateStr(String date, String cron, String limit) {
|
||||
cron = cron.ToLower();
|
||||
for (Int32 i = 0; i <= 6; i++) {
|
||||
cron = cron.Replace(DateTime.Parse("2015-01-" + (4 + i) + "T00:00:00").ToString("ddd", CultureInfo.CreateSpecificCulture("en-US")), i.ToString());
|
||||
cron = cron.Replace(DateTime.Parse("2015-01-" + (4 + i) + "T00:00:00").ToString("dddd", CultureInfo.CreateSpecificCulture("en-US")), i.ToString());
|
||||
}
|
||||
for (Int32 i = 1; i <= 12; i++) {
|
||||
cron = cron.Replace(DateTime.Parse("2015-" + i + "-01T00:00:00").ToString("MMM", CultureInfo.CreateSpecificCulture("en-US")), i.ToString());
|
||||
cron = cron.Replace(DateTime.Parse("2015-" + i + "-01T00:00:00").ToString("MMMM", CultureInfo.CreateSpecificCulture("en-US")), i.ToString());
|
||||
}
|
||||
if (cron.Contains("*")) {
|
||||
cron = cron.Replace("*", limit);
|
||||
}
|
||||
if (cron.Contains("-")) {
|
||||
MatchCollection m = new Regex("(\\d+)-(\\d+)").Matches(cron);
|
||||
foreach (Match p in m) {
|
||||
List<String> s = new List<String>();
|
||||
for (Int32 i = Math.Min(Int32.Parse(p.Groups[1].Value), Int32.Parse(p.Groups[2].Value)); i <= Math.Max(Int32.Parse(p.Groups[1].Value), Int32.Parse(p.Groups[2].Value)); i++) {
|
||||
s.Add(i.ToString());
|
||||
}
|
||||
cron = cron.Replace(p.Groups[0].Value, String.Join(",", s));
|
||||
}
|
||||
}
|
||||
Int32 match = 0;
|
||||
if (cron.Contains("/")) {
|
||||
Match m = new Regex("/(\\d+)").Match(cron);
|
||||
cron = cron.Replace(m.Groups[0].Value, "");
|
||||
match = Int32.Parse(m.Groups[1].Value);
|
||||
}
|
||||
Dictionary<Int32, String> ret = new Dictionary<Int32, String>();
|
||||
if (!cron.Contains(",")) {
|
||||
ret.Add(Int32.Parse(cron), "");
|
||||
} else {
|
||||
foreach (String item in cron.Split(',')) {
|
||||
if (!ret.ContainsKey(Int32.Parse(item))) {
|
||||
ret.Add(Int32.Parse(item), "");
|
||||
}
|
||||
}
|
||||
}
|
||||
if (match != 0) {
|
||||
Dictionary<Int32, String> r = new Dictionary<Int32, String>();
|
||||
foreach (KeyValuePair<Int32, String> item in ret) {
|
||||
if (item.Key % match == 0) {
|
||||
r.Add(item.Key, "");
|
||||
}
|
||||
}
|
||||
ret = r;
|
||||
}
|
||||
return ret.ContainsKey(Int32.Parse(date));
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region AModul
|
||||
public override void SetInterconnection(String cron, Action<Object> hook, Object data) => this.internalCron.Add(new Tuple<String, Action<Object>, Object>(cron, hook, data));
|
||||
|
||||
protected override void UpdateConfig() { }
|
||||
|
||||
public override void Dispose() {
|
||||
this.threadRunning = false;
|
||||
while(this.thread != null && this.thread.IsAlive) {
|
||||
Thread.Sleep(10);
|
||||
}
|
||||
this.thread = null;
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
||||
@ -7,7 +7,7 @@ using BlubbFish.Utils.IoT.Events;
|
||||
using LitJson;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Bots.Moduls {
|
||||
public abstract class Mqtt<T> : AModul<T>, IDisposable {
|
||||
public abstract class Mqtt<T> : AModul<T> {
|
||||
protected ABackend mqtt;
|
||||
protected Dictionary<String, AModul<T>> modules;
|
||||
|
||||
@ -25,13 +25,7 @@ namespace BlubbFish.Utils.IoT.Bots.Moduls {
|
||||
}
|
||||
}
|
||||
|
||||
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 void Connect() => this.mqtt = !this.config.ContainsKey("settings") ? throw new ArgumentException("Setting section [settings] is missing!") : ABackend.GetInstance(this.config["settings"], ABackend.BackendType.Data);
|
||||
|
||||
protected void Disconnect() => this.mqtt.Dispose();
|
||||
#endregion
|
||||
@ -40,6 +34,8 @@ namespace BlubbFish.Utils.IoT.Bots.Moduls {
|
||||
public override void Interconnect(Dictionary<String, AModul<T>> moduls) => this.modules = moduls;
|
||||
|
||||
protected override void UpdateConfig() => this.Reconnect();
|
||||
|
||||
public override void Dispose() => this.Disconnect();
|
||||
#endregion
|
||||
|
||||
protected Tuple<Boolean, MqttEvent> ChangeConfig(BackendEvent e, String topic) {
|
||||
@ -80,23 +76,5 @@ namespace BlubbFish.Utils.IoT.Bots.Moduls {
|
||||
}
|
||||
return new Tuple<Boolean, MqttEvent>(false, null);
|
||||
}
|
||||
|
||||
#region IDisposable Support
|
||||
private Boolean disposedValue = false;
|
||||
|
||||
protected void Dispose(Boolean disposing) {
|
||||
if (!this.disposedValue) {
|
||||
if (disposing) {
|
||||
this.Disconnect();
|
||||
}
|
||||
this.disposedValue = true;
|
||||
}
|
||||
}
|
||||
|
||||
public override void Dispose() {
|
||||
this.Dispose(true);
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Bots.Moduls {
|
||||
public abstract class Overtaker<T> : AModul<T>, IDisposable {
|
||||
public abstract class Overtaker<T> : AModul<T> {
|
||||
protected readonly Dictionary<String, Dictionary<String, String>> events = new Dictionary<String, Dictionary<String, String>>();
|
||||
|
||||
#region Constructor
|
||||
@ -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) {
|
||||
@ -62,23 +62,8 @@ namespace BlubbFish.Utils.IoT.Bots.Moduls {
|
||||
#region AModul
|
||||
public override void Interconnect(Dictionary<String, AModul<T>> moduls) { }
|
||||
protected override void UpdateConfig() => this.ParseIni();
|
||||
#endregion
|
||||
|
||||
#region IDisposable Support
|
||||
private Boolean disposedValue = false;
|
||||
|
||||
protected virtual void Dispose(Boolean disposing) {
|
||||
if (!this.disposedValue) {
|
||||
if (disposing) {
|
||||
}
|
||||
this.disposedValue = true;
|
||||
}
|
||||
public override void Dispose() {
|
||||
}
|
||||
|
||||
public override void Dispose() {
|
||||
this.Dispose(true);
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
#endregion
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@ using System.Collections.Generic;
|
||||
using BlubbFish.Utils.IoT.Bots.Interfaces;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Bots.Moduls {
|
||||
public abstract class Statuspolling<T> : AModul<T>, IDisposable, IForceLoad {
|
||||
public abstract class Statuspolling<T> : AModul<T>, IForceLoad {
|
||||
|
||||
#region Constructor
|
||||
public Statuspolling(T lib, InIReader settings) : base(lib, settings) { }
|
||||
@ -31,22 +31,7 @@ namespace BlubbFish.Utils.IoT.Bots.Moduls {
|
||||
}
|
||||
}
|
||||
protected override void UpdateConfig() { }
|
||||
#endregion
|
||||
|
||||
#region IDisposable Support
|
||||
private Boolean disposedValue = false;
|
||||
|
||||
protected virtual void Dispose(Boolean disposing) {
|
||||
if (!this.disposedValue) {
|
||||
if (disposing) {
|
||||
}
|
||||
this.disposedValue = true;
|
||||
}
|
||||
}
|
||||
|
||||
public override void Dispose() {
|
||||
this.Dispose(true);
|
||||
GC.SuppressFinalize(this);
|
||||
public override void Dispose() {
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
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 {
|
||||
@ -10,7 +8,7 @@ namespace BlubbFish.Utils.IoT.Bots {
|
||||
protected Dictionary<String, ABackend> sources;
|
||||
protected Dictionary<String, String> settings;
|
||||
|
||||
protected MultiSourceBot(Dictionary<String, ABackend> sources, Dictionary<String, String> settings) {
|
||||
protected MultiSourceBot(String[] args, Boolean fileLogging, String configSearchPath, Dictionary<String, ABackend> sources, Dictionary<String, String> settings) : base(args, fileLogging, configSearchPath) {
|
||||
this.sources = sources;
|
||||
this.settings = settings;
|
||||
}
|
||||
|
||||
87
Changelog.md
87
Changelog.md
@ -1,13 +1,51 @@
|
||||
## 1.2.2 - Going to netcore
|
||||
# Changelog
|
||||
|
||||
## 1.2.6 - 2022-01-25 - Makeing Logging easyier
|
||||
### New Features
|
||||
* Construct the Programm logger only if enabled
|
||||
* Set Searchpath by default for a Bot
|
||||
* Add an option that allows to debug logging (by default on)
|
||||
### Bugfixes
|
||||
### Changes
|
||||
* Deconstruct Programmlogger
|
||||
* Change all classes that extend ABot
|
||||
* Module messages also uses debug logging flag
|
||||
* Codingstyles
|
||||
|
||||
## 1.2.5 - 2022-01-20 - Better linux handling
|
||||
### New Features
|
||||
* Add ProcessExit Handler in ABot
|
||||
* Add Output in ModulDispose
|
||||
### Bugfixes
|
||||
* Eleminate Hangs in Cronjob, when in startup phase it not blocks shutdown
|
||||
### Changes
|
||||
* Reweite ABot, remove Mono Code
|
||||
* Codingstyle
|
||||
|
||||
## 1.2.4 - 2022-01-18 - Config enabled module loading
|
||||
### New Features
|
||||
* Modules can have an enabled=true|false in config, so that also enables or disables moduleloading.
|
||||
### Bugfixes
|
||||
### Changes
|
||||
|
||||
## 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
|
||||
## 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
|
||||
@ -15,51 +53,72 @@
|
||||
### Changes
|
||||
* A bit more debugging
|
||||
|
||||
## 1.2.0
|
||||
## 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
|
||||
## 1.1.9 - 2019-04-21 - Modify Output of SendFileResponse
|
||||
### New Features
|
||||
* Modify Output of SendFileResponse
|
||||
### Bugfixes
|
||||
### Changes
|
||||
|
||||
## 1.1.8
|
||||
## 1.1.8 - 2019-04-15 - Add logger to Webserver Class
|
||||
### New Features
|
||||
* Add logger to Webserver Class
|
||||
### Bugfixes
|
||||
### Changes
|
||||
|
||||
## 1.1.7
|
||||
## 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
|
||||
## 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
|
||||
## 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
|
||||
## 1.1.4 - 2019-03-13 - add Woff as Binary type
|
||||
### New Features
|
||||
* add Woff as Binary type
|
||||
### Bugfixes
|
||||
### Changes
|
||||
|
||||
## 1.1.3
|
||||
## 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
|
||||
## 1.1.2 - 2019-03-08 - Fixing bug for Contenttype
|
||||
### New Features
|
||||
### Bugfixes
|
||||
* Fixing bug for Contenttype
|
||||
### Changes
|
||||
|
||||
## 1.1.1
|
||||
## 1.1.1 - 2019-02-17 - Update to local librarys
|
||||
### New Features
|
||||
### Bugfixes
|
||||
### Changes
|
||||
* Update to local librarys
|
||||
|
||||
## 1.1.0
|
||||
## 1.1.0 - 2019-02-14 - Remove Helper from Bot-Utils
|
||||
### New Features
|
||||
* Remove Helper from Bot-Utils
|
||||
* Remove Helper from Bot-Utils
|
||||
### Bugfixes
|
||||
### Changes
|
||||
|
||||
Loading…
Reference in New Issue
Block a user