evok-to-mqtt 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b8a025e0a49655d2600d98163bb1038e0cdba9a4a4131012940efb8e17b8b63
-  data.tar.gz: d564c74d4024df8ecbee13394ffe70163ce0eb2cd96dc7e16abbe6f99ea4e8ae
+  metadata.gz: 785d9c7a80a6d0f3f6542cdcb31948d2b953d1af846c759a7b7eb63dd2010b36
+  data.tar.gz: 66b75d061bb64340a98c716adf2248195e56b7bb9f2ad5f21923122f261af01b
 SHA512:
-  metadata.gz: 91d6da3ddae3de197b740bb0b8504a0b8000cf4af0068748b625bf0659825e01982595e6c8a359a5aac7c9c111a7349b32baf93e550d13b4e2fdf6e847a3e591
-  data.tar.gz: 9723748c9e94304aa33c72a43c5154c896231663d0f8f69d450ff0c693aa7f154002e7dee9a15fee7546554359aae23f8123fddc6d7320749d9a361d5360cb6e
+  metadata.gz: 9533b2226a696eadde3e3332b80d393de5ddc0a3d8f0b29e7cd4585a4aa98f85655026981f1f8167a08c54be587093bc81e1c6368880342546e5c6dd4285e146
+  data.tar.gz: 20332590c4b7a427fb5ebedce3eb5ced30049175c0b7d3675a99a2e36ab114f798dec55bb2c4fa9c5686a258b40805e223bdff920e52e2a714917c5e2d6ef806

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    evok-to-mqtt (0.1.0)
+    evok-to-mqtt (0.1.1)
       em-mqtt (~> 0.0.5)
       websocket-eventmachine-client (~> 1.2)
 

data/lib/evok-to-mqtt/mappers/to_haab.rb

@@ -8,7 +8,7 @@ module EvokToMqtt
       def process(mqtt, evok_event)
         # puts "Statuses"
         # p @statuses
-        id      = evok_event["circuit"]
+        id      = "neuron/#{evok_event["dev"]}/#{evok_event["circuit"]}"
         now     = Time.now
         payload = evok_event
 

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

@@ -1,3 +1,3 @@
 module EvokToMqtt
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

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

@@ -2,6 +2,7 @@ require 'eventmachine'
 require 'websocket-eventmachine-client'
 require 'json'
 require 'em/mqtt'
+require 'net/http'
 
 module EvokToMqtt
   class Worker
@@ -14,21 +15,24 @@ module EvokToMqtt
     def run
       EM.run do
         @evok = WebSocket::EventMachine::Client.connect(:uri => "ws://#{@evok_host}:8080/ws")
-        @mqtt = ::EventMachine::MQTT::ClientConnection.connect(@mqtt_host)
+        @mqtt = EventMachine::MQTT::ClientConnection.connect(@mqtt_host)
 
         @evok.onmessage do |msg|
-          puts "Recieved message: #{msg}"
           JSON.parse(msg).each do |event|
+            next if event['dev'] == 'wd'  # skip watchdog events
+            puts "Recieved message: #{event}"
             @mapper.process(@mqtt, event)
           end
         end
 
-        #@mqtt.subscribe('neuron/#')
-        #@mqtt.receive_callback do |topic,message|
-        #  puts "################################"
-        #  puts topic
-        #  puts message
-        #end
+        @mqtt.subscribe('neuron/output/relay/#')
+        @mqtt.receive_callback do |msg|
+          # WS set did not work, using REST for now
+          data = JSON.parse(msg.payload)
+          puts "Sending command #{msg.topic} => #{data['value']}"
+          uri = URI("http://#{@evok_host}/rest/#{data['dev']}/#{data['circuit']}")
+          Net::HTTP.post_form(uri, 'value' => data['value'])
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evok-to-mqtt
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Marek Aufart
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2018-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-eventmachine-client