evok-to-mqtt 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58769f3fe86f38a1962500db4462407dd29f3b904cbc22cdc90fbf325b7b6038
-  data.tar.gz: 5859defffc657b7cbff987b23608e83cea6b3c39ac5cc2b2113a380fcaf1211a
+  metadata.gz: a29afd3b938b2f10b9588d592a29ef3b462bcead45759de1a1663b092822911c
+  data.tar.gz: c904ca471f6a893be74cf1b93bf543f44485b8dfb1d55c8c84d98e288977aa07
 SHA512:
-  metadata.gz: b69315edff6a40f7a93f5f3eaa2f3e1ec564dc7c8e17bd878e3db980cb723a527ece2545b261bdcf9bd895dda436833c1177073e7a93909b8990e3771a2b534c
-  data.tar.gz: 38d197cf9882273a929f403052be8b5638448c7a7015ea8deaf627b880f3c702a9a89e77be8de82be794c7f50ea9544379cf1319619c69295790f41040229b05
+  metadata.gz: e4ada73da78156bd43da4cc4170cc92b0f3f30672c3c7d94798a54d362a7a72dfadb7d837254e649883d44e301879dfa55377887aa573b8b2c05ee723fcb4134
+  data.tar.gz: 9bf89733add87da5bff9a34d0c9623ad54fbbe97a28da5445bc471a12d8c9f027bc69bf83e056d3f5b54597e1838ff71d02a41338d9645d57588cf2949145616

data/Gemfile.lock

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

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

@@ -2,7 +2,7 @@ module EvokToMqtt
   module Mappers
     class ToHaab
       def initialize(mapping)
-        @mapping  = mapping
+        @mapping_config  = mapping
         @statuses = {}
       end
 
@@ -36,11 +36,18 @@ module EvokToMqtt
         puts
       end
 
+      def circuit_reverse_lookup(full_topic)
+        dev, topic = full_topic.split("/", 2)
+        @mapping_config[dev].each{|pin, a_topic| return pin if a_topic == topic}
+        puts "Warning: #{topic} pin was not found."
+        nil
+      end
+
       private
 
       def get_topic(dev, circuit)
         begin
-          return @mapping[dev][circuit] || "evok/#{dev}/#{circuit}" # missing circuit
+          return @mapping_config[dev][circuit] || @mapping_config[dev]['click'][circuit] || @mapping_config[dev]['toggle'][circuit] || "evok/#{dev}/#{circuit}" # missing circuit
         rescue => ex
           puts "Warning: #{ex}, using raw topic"
           return "evok/#{dev}/#{circuit}" # missing section (dev)

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

@@ -1,3 +1,3 @@
 module EvokToMqtt
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

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

@@ -1,8 +1,9 @@
+require 'em/mqtt'
 require 'eventmachine'
-require 'websocket-eventmachine-client'
 require 'json'
-require 'em/mqtt'
+require 'jsonrpc-client'
 require 'net/http'
+require 'websocket-eventmachine-client'
 
 module EvokToMqtt
   class Worker
@@ -14,11 +15,11 @@ 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)
-        #@evok_rpc = JSONRPC::Client.new(evok_host)
+        @evok_ws  = WebSocket::EventMachine::Client.connect(:uri => "ws://#{@evok_host}:8080/ws")
+        @evok_rpc = JSONRPC::Client.new("http://#{@evok_host}/rpc")
+        @mqtt     = EventMachine::MQTT::ClientConnection.connect(@mqtt_host)
 
-        @evok.onmessage do |msg|
+        @evok_ws.onmessage do |msg|
           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|
@@ -28,13 +29,12 @@ module EvokToMqtt
           end
         end
 
-        @mqtt.subscribe('neuron/relay/#')
+        @mqtt.subscribe('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'])
+          circuit = data['circuit'] || @mapper.circuit_reverse_lookup(msg.topic)
+          puts "Sending command #{msg.topic}: #{circuit} => #{data['value']}"
+          @evok_rpc.relay_set(circuit, data['value'])
         end
       end
     end

metadata

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