evok-to-mqtt 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b720744d57a263c6b0c60c6ee803e5aaad8623a4d261d1b1a0f622cad9505d6d
-  data.tar.gz: 4c1dffae20ed554168ffc3cc164da2cd41c57631b9ba01e17a86d293fabb237e
+  metadata.gz: a73c3008dc5b6c22247932eb7ca61582cbf7aeb33917924f07d43fc6361af1a8
+  data.tar.gz: de29658b6075ad56a9630408719508923474ff42986c662db8ce7795f810116a
 SHA512:
-  metadata.gz: '09c085a68974c594e982c8a0b379eaaedc7a75b8cb6ed78035c1c160cca4a0891842f71ebe27961b5054cd386fc941f0d5865864e40acbbba820475a264fa1a6'
-  data.tar.gz: b526ee6f2d18179f0558d57fbd775d8aa2f28f8f874668979cc0002fcfb7bd61ddefafb4271158d963f11aa2768a70f0b2a45c7f4d09a37af9296acad80617b0
+  metadata.gz: 1be82749bd4f691e237ceb296297bb189042d44df6b08a0b6d52c659b9f8323fa51bcfbf2424693ef022436759e7727516aa5e1d01d19ab4fef1c81fbaa60525
+  data.tar.gz: 9f3b3162b2793498bac1cd5ed9e12a112c784831817d7dfd6b1405623c3918c75a98df63a8f2792188fcabc8caaabe22ccca1a12ffb1ee86b6cf1d834c806d73

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    evok-to-mqtt (0.4.0)
+    evok-to-mqtt (0.5.0)
       em-mqtt (~> 0.0.5)
       jsonrpc-client (~> 0.1.3)
       slop (~> 4.7.0)

data/lib/evok-to-mqtt/version.rb

@@ -1,3 +1,3 @@
 module EvokToMqtt
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/lib/evok-to-mqtt/worker.rb

@@ -23,15 +23,17 @@ module EvokToMqtt
           data = JSON.parse(msg)
           data = [data] if data.is_a? Hash # temp is not in array in evok messages, but in hash..
           data.each do |event|
-            next if !event.is_a?(Hash) || %w(wd ai ao relay).include?(event['dev']) # want just input and temp, skip the rest for now
+            next if !event.is_a?(Hash) || %w(wd ai ao).include?(event['dev']) # want just relay, input and temp, skip the rest for now (better to whitelist)
             puts "#{Time.now} Recieved message: #{event}"
             @mapper.process(@mqtt, event)
           end
         end
 
-        @mqtt.subscribe('relay/#')
+        # send commands to relay only for now, maybe do more lightweight not to subscribe to everything
+        @mqtt.subscribe('#')
         @mqtt.receive_callback do |msg|
           data = JSON.parse(msg.payload)
+          next unless data['action'] == 'cmd'
           circuit = data['circuit'] || @mapper.circuit_reverse_lookup(msg.topic)
           puts "#{Time.now} Sending command #{msg.topic}: #{circuit} => #{data['value']}"
           @evok_rpc.relay_set(circuit, data['value'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evok-to-mqtt
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Marek Aufart