evok-to-mqtt 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8ab7e7ef98dfeb4999c89bb0a839984b137dd459
-  data.tar.gz: dcb6014d18c1ccfc4924a612efe3b97ade10873c
+SHA256:
+  metadata.gz: 58769f3fe86f38a1962500db4462407dd29f3b904cbc22cdc90fbf325b7b6038
+  data.tar.gz: 5859defffc657b7cbff987b23608e83cea6b3c39ac5cc2b2113a380fcaf1211a
 SHA512:
-  metadata.gz: 638cf1617141c77ea75f850aafe2d8b7a2e95745852f85efb17a0a99fa4e5439d8cdb8cbff186c695680660500ed8f327fce1a382e78a004d1af71311c0a0aaf
-  data.tar.gz: b643ea4a47cbedda5622218fb538ebe91122a14fbc13456080d97a22d9bb0b0822abf5a21bc55328c6926aa99891d37d0dc866456a877091e1326446846298a8
+  metadata.gz: b69315edff6a40f7a93f5f3eaa2f3e1ec564dc7c8e17bd878e3db980cb723a527ece2545b261bdcf9bd895dda436833c1177073e7a93909b8990e3771a2b534c
+  data.tar.gz: 38d197cf9882273a929f403052be8b5638448c7a7015ea8deaf627b880f3c702a9a89e77be8de82be794c7f50ea9544379cf1319619c69295790f41040229b05

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    evok-to-mqtt (0.1.1)
+    evok-to-mqtt (0.3.1)
       em-mqtt (~> 0.0.5)
+      jsonrpc-client (~> 0.1.3)
       websocket-eventmachine-client (~> 1.2)
 
 GEM
@@ -13,7 +14,14 @@ GEM
       eventmachine
       mqtt (>= 0.3.0)
     eventmachine (1.2.7)
+    faraday (0.15.4)
+      multipart-post (>= 1.2, < 3)
+    jsonrpc-client (0.1.3)
+      faraday
+      multi_json (>= 1.1.0)
     mqtt (0.5.0)
+    multi_json (1.13.1)
+    multipart-post (2.0.0)
     rake (10.5.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)

data/evok-to-mqtt.gemspec

@@ -20,8 +20,9 @@ Gem::Specification.new do |spec|
   spec.executables   = ["evok-to-mqtt"]
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "websocket-eventmachine-client", "~> 1.2"
   spec.add_dependency "em-mqtt", "~> 0.0.5"
+  spec.add_dependency "jsonrpc-client", "~> 0.1.3"
+  spec.add_dependency "websocket-eventmachine-client", "~> 1.2"
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

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

@@ -16,28 +16,34 @@ module EvokToMqtt
         # Neuron input is assumed for now
         if @statuses[id]
           if @statuses[id][:value] == 0 && evok_event['value'] == 1
-            mqtt.publish id, {action: 'down', data: payload}
+            #mqtt.publish id, {action: 'down', data: payload}
           elsif @statuses[id][:value] == 1 && evok_event['value'] == 0
-            mqtt.publish id, {action: 'up', data: payload}
-            mqtt.publish id, {action: 'click', data: payload} if now - @statuses[id][:changed_at] < 2  # seconds
-            # ignore events not changing value
+            #mqtt.publish id, {action: 'up', data: payload}
+            if now - @statuses[id][:changed_at] < 2  # seconds
+              mqtt.publish id, {action: 'click', data: payload}
+              puts "### click"
+            else
+              mqtt.publish id, {action: 'long_click', data: payload}
+              puts "### long_click"
+            end
           end
           @statuses[id][:value] = evok_event['value']
           @statuses[id][:changed_at] = now
         else
           @statuses[id] = {value: evok_event['value'], changed_at: now}
-          mqtt.publish id, {action: 'down', data: payload}
+          #mqtt.publish id, {action: 'down', data: payload} unless evok_event['value'] == 0  # ignore initial states received in batch
         end
+        puts
       end
 
       private
 
       def get_topic(dev, circuit)
         begin
-          return @mapping[dev][circuit] || "evok_raw/#{dev}/#{circuit}" # missing circuit
+          return @mapping[dev][circuit] || "evok/#{dev}/#{circuit}" # missing circuit
         rescue => ex
           puts "Warning: #{ex}, using raw topic"
-          return "evok_raw/#{dev}/#{circuit}" # missing section (dev)
+          return "evok/#{dev}/#{circuit}" # missing section (dev)
         end
       end
     end

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

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

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

@@ -16,16 +16,19 @@ module EvokToMqtt
       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.onmessage do |msg|
-          JSON.parse(msg).each do |event|
-            next if event['dev'] == 'wd'  # skip watchdog events
+          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
             puts "Recieved message: #{event}"
             @mapper.process(@mqtt, event)
           end
         end
 
-        @mqtt.subscribe('neuron/output/relay/#')
+        @mqtt.subscribe('neuron/relay/#')
         @mqtt.receive_callback do |msg|
           # WS set did not work, using REST for now
           data = JSON.parse(msg.payload)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evok-to-mqtt
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Marek Aufart
@@ -9,36 +9,50 @@ autorequire:
 bindir:
 - bin
 cert_chain: []
-date: 2018-12-25 00:00:00.000000000 Z
+date: 2019-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: websocket-eventmachine-client
+  name: em-mqtt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
-  name: em-mqtt
+  name: jsonrpc-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: websocket-eventmachine-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A bridge between Unipi EVOK and MQTT message bus