[1.8.3] Update to changed ConnectorDataMqtt and remove Scral from code,... (997a0508) · Commits · MONICA / Lora Gateway / Lora-Bot

Lora-Bot/Lora-Bot.csproj

+0 −4

Original line number	Diff line number	Diff line
		@@ -44,7 +44,6 @@
		</ItemGroup>
		<ItemGroup>
		<Compile Include="Moduls\Mqtt.cs" />
		<Compile Include="Moduls\Scral.cs" />
		<Compile Include="Moduls\Txtout.cs" />
		<Compile Include="Program.cs" />
		<Compile Include="Properties\AssemblyInfo.cs" />
		@@ -80,9 +79,6 @@
		</ProjectReference>
		</ItemGroup>
		<ItemGroup>
		<None Include="config-example\scral.conf.example">
		<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
		</None>
		<None Include="config-example\mqtt.conf.example">
		<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
		</None>

Lora-Bot/Moduls/Mqtt.cs

+1 −18

Original line number	Diff line number	Diff line
		@@ -8,27 +8,10 @@ using Fraunhofer.Fit.Iot.Lora;

		namespace Fraunhofer.Fit.IoT.Bots.LoraBot.Moduls {
		class Mqtt : Mqtt<LoraController> {
		private Boolean mqttconnect = false;

		public override event ModulEvent Update;

		public Mqtt(LoraController lib, InIReader settings) : base(lib, settings) { }

		protected override void Connect() {
		this.mqtt = ABackend.GetInstance(this.config["settings"], ABackend.BackendType.Data);
		Console.WriteLine("Fraunhofer.Fit.IoT.Bots.LoraBot.Moduls.Mqtt.Connect");
		this.mqttconnect = true;
		}

		protected override void Disconnect() {
		this.mqttconnect = false;
		if (this.mqtt != null) {
		this.mqtt.Dispose();
		}
		this.mqtt = null;
		Console.WriteLine("Fraunhofer.Fit.IoT.Bots.LoraBot.Moduls.Mqtt.Disconnect");
		}

		public override void EventLibSetter() {
		this.library.DataUpdate += this.HandleLibUpdate;
		this.library.PanicUpdate += this.HandleLibUpdate;
		@@ -37,7 +20,7 @@ namespace Fraunhofer.Fit.IoT.Bots.LoraBot.Moduls {

		protected override void LibUpadteThread(Object state) {
		try {
		if (this.mqttconnect) {
		if (this.mqtt.IsConnected) {
		if(state.GetType().HasInterface(typeof(IMqtt))) {
		IMqtt sensor = state as IMqtt;
		((ADataBackend)this.mqtt).Send("lora/" + sensor.MqttTopic(), sensor.ToJson());

Lora-Bot/Moduls/Scral.cs

deleted100644 → 0

+0 −170

Original line number	Diff line number	Diff line
		using System;
		using System.Collections.Generic;
		using System.IO;
		using System.Net;
		using System.Text;
		using BlubbFish.Utils;
		using BlubbFish.Utils.IoT.Bots.Moduls;
		using Fraunhofer.Fit.Iot.Lora;
		using Fraunhofer.Fit.Iot.Lora.Events;
		using LitJson;

		namespace Fraunhofer.Fit.IoT.Bots.LoraBot.Moduls {
		public class Scral : AModul<LoraController> {
		private readonly List<String> nodes = new List<String>();
		public override event ModulEvent Update;
		private readonly Object getLock = new Object();
		private readonly Boolean authRequired;
		private readonly String auth;

		public Scral(LoraController lib, InIReader settings) : base(lib, settings) {
		if (!this.config.ContainsKey("general")) {
		throw new ArgumentException("Fraunhofer.Fit.IoT.Bots.LoraBot.Moduls.Scral: Config section [general] not exist");
		}
		if (!this.config["general"].ContainsKey("server")) {
		throw new ArgumentException("Fraunhofer.Fit.IoT.Bots.LoraBot.Moduls.Scral: In config section [general] value server not exist");
		}
		if (!this.config["general"].ContainsKey("user") && !this.config["general"].ContainsKey("pass")) {
		this.authRequired = false;
		} else if (!this.config["general"].ContainsKey("user")) {
		throw new ArgumentException("Fraunhofer.Fit.IoT.Bots.LoraBot.Moduls.Scral: In config section [general] value user not exist");
		} else if (!this.config["general"].ContainsKey("pass")) {
		throw new ArgumentException("Fraunhofer.Fit.IoT.Bots.LoraBot.Moduls.Scral: In config section [general] value pass not exist");
		} else {
		this.auth = "Basic " + Convert.ToBase64String(Encoding.ASCII.GetBytes(this.config["general"]["user"] + ":" + this.config["general"]["pass"]));
		this.authRequired = true;
		}
		if (!this.config.ContainsKey("update")) {
		throw new ArgumentException("Fraunhofer.Fit.IoT.Bots.LoraBot.Moduls.Scral: Config section [update] not exist");
		}
		if (!this.config["update"].ContainsKey("addr")) {
		throw new ArgumentException("Fraunhofer.Fit.IoT.Bots.LoraBot.Moduls.Scral: In config section [update] value addr not exist");
		}
		if (!this.config["update"].ContainsKey("method")) {
		throw new ArgumentException("Fraunhofer.Fit.IoT.Bots.LoraBot.Moduls.Scral: In config section [update] value method not exist");
		}
		if (!this.config.ContainsKey("register")) {
		throw new ArgumentException("Fraunhofer.Fit.IoT.Bots.LoraBot.Moduls.Scral: Config section [register] not exist");
		}
		if (!this.config["register"].ContainsKey("addr")) {
		throw new ArgumentException("Fraunhofer.Fit.IoT.Bots.LoraBot.Moduls.Scral: In config section [register] value addr not exist");
		}
		if (!this.config["register"].ContainsKey("method")) {
		throw new ArgumentException("Fraunhofer.Fit.IoT.Bots.LoraBot.Moduls.Scral: In config section [register] value method not exist");
		}

		}

		public override void EventLibSetter() {
		this.library.DataUpdate += this.HandleLibUpdate;
		}

		protected override void LibUpadteThread(Object state) {
		try {
		if (state is DataUpdateEvent data) {
		if (!this.nodes.Contains(data.Name)) {
		this.SendRegister(data);
		this.nodes.Add(data.Name);
		}
		this.SendUpdate(data);
		}
		} catch (Exception e) {
		Helper.WriteError("Fraunhofer.Fit.IoT.Bots.LoraBot.Moduls.Scral.LibUpadteThread: " + e.Message);
		}
		}

		private void SendUpdate(DataUpdateEvent data) {
		if (data.Gps.Fix) {
		Dictionary<String, Object> d = new Dictionary<String, Object> {
		{ "type", "uwb" },
		{ "tagId", data.Name },
		{ "timestamp", DateTime.Now.ToString("o") },
		{ "lat", data.Gps.Latitude },
		{ "lon", data.Gps.Longitude },
		{ "bearing", data.Rssi },
		{ "herr", data.Gps.Hdop },
		{ "battery_level", data.Snr }
		};
		try {
		String addr = this.config["update"]["addr"];
		if (Enum.TryParse(this.config["update"]["method"], true, out RequestMethod meth)) {
		this.RequestString(addr, JsonMapper.ToJson(d), false, meth);
		this.Update?.Invoke(this, new BlubbFish.Utils.IoT.Bots.Events.ModulEventArgs(addr, meth.ToString(), JsonMapper.ToJson(d), "SCRAL"));
		}
		} catch (Exception e) {
		Helper.WriteError("Fraunhofer.Fit.IoT.Bots.LoraBot.Moduls.Scral.SendUpdate: " + e.Message);
		this.SendRegister(data);
		}
		}
		}

		private void SendRegister(DataUpdateEvent data) {
		Dictionary<String, Object> d = new Dictionary<String, Object> {
		{ "device", "wearable" },
		{ "sensor", "tag" },
		{ "type", "uwb" },
		{ "tagId", data.Name },
		{ "timestamp", DateTime.Now.ToString("o") },
		{ "unitOfMeasurements", "meters" },
		{ "observationType", "propietary" },
		{ "state", "active" }
		};
		try {
		String addr = this.config["register"]["addr"];
		if (Enum.TryParse(this.config["register"]["method"], true, out RequestMethod meth)) {
		this.RequestString(addr, JsonMapper.ToJson(d), false, meth);
		this.Update?.Invoke(this, new BlubbFish.Utils.IoT.Bots.Events.ModulEventArgs(addr, meth.ToString(), JsonMapper.ToJson(d), "SCRAL"));
		}
		} catch (Exception e) {
		Helper.WriteError("Fraunhofer.Fit.IoT.Bots.LoraBot.Moduls.Scral.SendRegister: " + e.Message);
		}
		}

		public override void Dispose() { }

		protected override void UpdateConfig() { }

		#region HTTP Request
		private String RequestString(String address, String json = "", Boolean withoutput = true, RequestMethod method = RequestMethod.GET) {
		String ret = null;
		lock (this.getLock) {
		HttpWebRequest request = WebRequest.CreateHttp(this.config["general"]["server"] + address);
		request.Timeout = 2000;
		if (this.authRequired) {
		request.Headers.Add(HttpRequestHeader.Authorization, this.auth);
		}
		if (method == RequestMethod.POST \|\| method == RequestMethod.PUT) {
		Byte[] requestdata = Encoding.ASCII.GetBytes(json);
		request.ContentLength = requestdata.Length;
		request.Method = method.ToString();
		request.ContentType = "application/json";
		using (Stream stream = request.GetRequestStream()) {
		stream.Write(requestdata, 0, requestdata.Length);
		}
		}
		try {
		using (HttpWebResponse response = (HttpWebResponse)request.GetResponse()) {
		if (response.StatusCode == HttpStatusCode.Unauthorized) {
		Console.Error.WriteLine("Benutzer oder Passwort falsch!");
		throw new Exception("Benutzer oder Passwort falsch!");
		}
		if (withoutput) {
		StreamReader reader = new StreamReader(response.GetResponseStream());
		ret = reader.ReadToEnd();
		}
		}
		} catch (Exception e) {
		throw new WebException("Error while uploading to Scal. Resource: \"" + this.config["general"]["server"] + address + "\" Method: " + method + " Data: " + json + " Fehler: " + e.Message);
		}
		}
		return ret;
		}

		private enum RequestMethod {
		GET,
		POST,
		PUT
		}
		#endregion
		}
		}

Lora-Bot/Moduls/Txtout.cs

+1 −3

Original line number	Diff line number	Diff line
		@@ -24,9 +24,7 @@ namespace Fraunhofer.Fit.IoT.Bots.LoraBot.Moduls {

		}

		public override void EventLibSetter() {
		this.library.DataUpdate += this.HandleLibUpdate;
		}
		public override void EventLibSetter() => this.library.DataUpdate += this.HandleLibUpdate;

		protected override void LibUpadteThread(Object state) {
		try {

Lora-Bot/Program.cs

+5 −6

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ namespace Fraunhofer.Fit.IoT.Bots.LoraBot {
		this.ModulEvents();
		lora.DataUpdate += this.LoraDataUpdate;
		lora.StatusUpdate += this.LoraStatusUpdate;
		lora.PanicUpdate += this.LoraPanicUpdate;
		this.WaitForShutdown();
		Console.WriteLine("after wait");
		this.ModulDispose();
		@@ -47,13 +48,11 @@ namespace Fraunhofer.Fit.IoT.Bots.LoraBot {
		}
		}

		private void LoraStatusUpdate(Object sender, StatusUpdateEvent e) {
		Console.WriteLine("-> Lora-Status: " + e.ToString());
		}
		private void LoraPanicUpdate(Object sender, PanicUpdateEvent e) => Console.WriteLine("-> Lora-Panic: " + e.ToString());

		private void LoraDataUpdate(Object sender, DataUpdateEvent e) {
		Console.WriteLine("-> Lora-Data: " + e.ToString());
		}
		private void LoraStatusUpdate(Object sender, StatusUpdateEvent e) => Console.WriteLine("-> Lora-Status: " + e.ToString());

		private void LoraDataUpdate(Object sender, DataUpdateEvent e) => Console.WriteLine("-> Lora-Data: " + e.ToString());

		}
		}

Admin message