Zway [v1.5.0] Throw Exception if 3 times failed to connect to Raspberry server, add 3 new commandlcasses to IgnoredClasses

Zway-Bot [v1.7.0] rewrite to Threaded Modules, edit service file for systemd

Zway-Bot/Moduls/Mqtt.cs

@@ -63,40 +63,44 @@ namespace BlubbFish.IoT.Bots.ZwayBot.Moduls {
     }
 
     protected virtual void MqttUpdate(Object sender, BackendEvent e) {
-      if (e.From.ToString().StartsWith("zwavebot/devices/") && (e.From.ToString().EndsWith("/set") || e.From.ToString().EndsWith("/get"))) {
-        Match m = new Regex("^zwavebot/devices/(\\d+)/(\\d+)/(\\d+)/[gs]et$|^zwavebot/devices/(\\d+)/(\\d+)/(\\d+)/(\\d+)/[gs]et$").Match(e.From.ToString());
-        String id = "";
-        if (m.Groups[1].Success) {
-          id = m.Groups[1].Value + "-" + m.Groups[2].Value + "-" + m.Groups[3].Value;
-        }
-        if (m.Groups[4].Success) {
-          id = m.Groups[4].Value + "-" + m.Groups[5].Value + "-" + m.Groups[6].Value + "-" + m.Groups[7].Value;
-        }
-        ACommandClass c = this.library.GetCommandClass(id);
-        if (c == null) {
-          return;
-        }
-        if (e.From.ToString().EndsWith("/set")) {
-          try {
-            JsonData a = JsonMapper.ToObject(e.Message);
-            foreach (String item in a.Keys) {
-              String key = item.ToUpperLower();
-              if (c.HasProperty(key)) {
-                c.SetProperty(key, a[item].ToString());
-                this.Update?.Invoke(this, new MqttEvent(c.Id, a[item].ToString()));
-              }
+      try {
+        if (this.mqttConnect) {
+          if (e.From.ToString().StartsWith("zwavebot/devices/") && (e.From.ToString().EndsWith("/set") || e.From.ToString().EndsWith("/get"))) {
+            Match m = new Regex("^zwavebot/devices/(\\d+)/(\\d+)/(\\d+)/[gs]et$|^zwavebot/devices/(\\d+)/(\\d+)/(\\d+)/(\\d+)/[gs]et$").Match(e.From.ToString());
+            String id = "";
+            if (m.Groups[1].Success) {
+              id = m.Groups[1].Value + "-" + m.Groups[2].Value + "-" + m.Groups[3].Value;
             }
-          } catch (Exception) { }
-        } else if (e.From.ToString().EndsWith("/get")) {
-          c.PollOnce = true;
-          ((ADataBackend)this.mqtt).Send("zwavebot/devices/" + c.MqttTopic(), c.ToJson());
-          this.Update?.Invoke(this, new MqttEvent(e.From.ToString(), "Dataget"));
+            if (m.Groups[4].Success) {
+              id = m.Groups[4].Value + "-" + m.Groups[5].Value + "-" + m.Groups[6].Value + "-" + m.Groups[7].Value;
+            }
+            ACommandClass c = this.library.GetCommandClass(id);
+            if (c == null) {
+              return;
+            }
+            if (e.From.ToString().EndsWith("/set")) {
+              try {
+                JsonData a = JsonMapper.ToObject(e.Message);
+                foreach (String item in a.Keys) {
+                  String key = item.ToUpperLower();
+                  if (c.HasProperty(key)) {
+                    c.SetProperty(key, a[item].ToString());
+                    this.Update?.Invoke(this, new MqttEvent(c.Id, a[item].ToString()));
+                  }
+                }
+              } catch (Exception) { }
+            } else if (e.From.ToString().EndsWith("/get")) {
+              c.PollOnce = true;
+              ((ADataBackend)this.mqtt).Send("zwavebot/devices/" + c.MqttTopic(), c.ToJson());
+              this.Update?.Invoke(this, new MqttEvent(e.From.ToString(), "Dataget"));
+            }
+          }
+          Tuple<Boolean, MqttEvent> cs = this.ChangeConfig(e, "zwavebot/config/");
+          if (cs.Item1) {
+            this.Update?.Invoke(this, cs.Item2);
+          }
         }
-      }
-      Tuple<Boolean, MqttEvent> cs = this.ChangeConfig(e, "zwavebot/config/");
-      if (cs.Item1) {
-        this.Update?.Invoke(this, cs.Item2);
-      }
+      } catch { }
     }
     #endregion
   }

Zway-Bot/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("BlubbFish")]
 [assembly: AssemblyProduct("Zway-Bot")]
-[assembly: AssemblyCopyright("Copyright ©  2017 - 05.06.2018")]
+[assembly: AssemblyCopyright("Copyright ©  2017 - 29.09.2018")]
 [assembly: AssemblyTrademark("BlubbFish")]
 [assembly: AssemblyCulture("")]
 
@@ -31,8 +31,8 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.2")]
-[assembly: AssemblyFileVersion("1.6.2")]
+[assembly: AssemblyVersion("1.7.0")]
+[assembly: AssemblyFileVersion("1.7.0")]
 [assembly: NeutralResourcesLanguage("de-DE")]
 
 // “Internet Of Things” icon by By Michael Wohlwend, US, from thenounproject.com.

Zway-Bot/dpkg/make-deb.sh

@@ -6,7 +6,7 @@ OUTPUT="../bin/Release"
 
 EXEC="$ROOT/usr/local/bin/zwaybot"
 CONFIG="$ROOT/etc/zwaybot"
-SYSTEMD="$ROOT/etc/systemd/system"
+SYSTEMD="$ROOT/lib/systemd/system"
 LOGROTATE="$ROOT/etc/logrotate.d"
 
 DEBIAN="$ROOT/DEBIAN"

Zway-Bot/dpkg/postinst

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+systemctl enable zwaybot
 systemctl daemon-reload
 if [[ $(systemctl is-active zwaybot || true) == "active" ]]
 then

Zway-Bot/dpkg/zwaybot.service

@@ -11,6 +11,7 @@ WorkingDirectory=/usr/local/bin/zwaybot
 # ExecStartPre=/bin/rm /var/log/zwaybot.log && /bin/touch /var/log/zwaybot.log && /bin/chown zwaybot:zwaybot /var/log/zwaybot.log && /bin/chmod 644 /var/log/zwaybot.log
 ExecStart=/usr/bin/mono /usr/local/bin/zwaybot/Zway-Bot.exe
 KillMode=control-group
+TimeoutStopSec=5
 Restart=on-failure
 StandardOutput=null
 StandardError=syslog