ewelink 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa2540d5e8dcf125b91c086731711b772516e28466e33b2bb668bd143abb5fe7
-  data.tar.gz: caf1bfa5d91d0edefc143f49230b0592aafecbbb40e7e80a7d5279f5c3685e0d
+  metadata.gz: 21968b7bb562eb3c32f0011a501ea3978fabd5ba3cc50164854e7a544c607f09
+  data.tar.gz: cdedc7c05271d76f5f38317b3276bae9c24c7380877e97988c0aea9f048d88fa
 SHA512:
-  metadata.gz: c09430a4c2f0a31d62c20828f8e0591cff4f808e9660ae3d309c5fd67edde27aa750ba2d864b1c2d0ad99268b32cb8b05837c407afa268a74ae4d6254aac3859
-  data.tar.gz: 2a5d636f6a571ece7e7cf83cac4eae90b9457212e6260b946c1172dd773e1a438e4ecdf31dee531ada59810440fa4e7a1bfa0af996c974c133e52f61a644638d
+  metadata.gz: ddd38e7e100f20ce2a96edcf3e2c3a3ac1c2945c0ad49e93aeeb3ecf943d08db03756afb4847c28c55a7601f952a13abe1034858f66ba46ec8e6359523a2b696
+  data.tar.gz: fb913f0ae36bf7f72bb27c8af1e863deb55b8309f23a79dc799e677c2f5706671a7a7b2efdff1ad8a7bfeec46c6ffc23774564738a12ad4dc20ebf1f2f1fd2f8

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/ewelink/api.rb

@@ -23,20 +23,22 @@ module Ewelink
     end
 
     def press_rf_bridge_button!(uuid)
-      button = find_rf_bridge_button!(uuid)
-      params = {
-        'appid' => APP_ID,
-        'deviceid' => button[:device_id],
-        'nonce' => nonce,
-        'params' => {
-          'cmd' => 'transmit',
-          'rfChl' => button[:channel],
-        },
-        'ts' => Time.now.to_i,
-        'version' => VERSION,
-      }
-      http_request(:post, '/api/user/device/status', body: JSON.generate(params), headers: authentication_headers)
-      true
+      synchronize(:press_rf_bridge_button) do
+        button = find_rf_bridge_button!(uuid)
+        params = {
+          'appid' => APP_ID,
+          'deviceid' => button[:device_id],
+          'nonce' => nonce,
+          'params' => {
+            'cmd' => 'transmit',
+            'rfChl' => button[:channel],
+          },
+          'ts' => Time.now.to_i,
+          'version' => VERSION,
+        }
+        http_request(:post, '/api/user/device/status', body: JSON.generate(params), headers: authentication_headers)
+        true
+      end
     end
 
     def reload
@@ -48,33 +50,35 @@ module Ewelink
     end
 
     def rf_bridge_buttons
-      @rf_bridge_buttons ||= [].tap do |buttons|
-        rf_bridge_devices = devices.select { |device| device['uiid'] == RF_BRIDGE_DEVICE_UIID }.tap do |devices|
-          Ewelink.logger.debug(self.class.name) { "Found #{devices.size} RF 433MHz Bridge device(s)" }
-        end
-        rf_bridge_devices.each do |device|
-          device_id = device['deviceid'].presence || next
-          device_name = device['name'].presence || next
-          buttons = device['params']['rfList'].each do |rf|
-            button = {
-              channel: rf['rfChl'],
-              device_id: device_id,
-              device_name: device_name,
-            }
-            remote_info = device['tags']['zyx_info'].find { |info| info['buttonName'].find { |data| data.key?(button[:channel].to_s) } }.presence || next
-            remote_name = remote_info['name'].try(:squish).presence || next
-            button_info = remote_info['buttonName'].find { |info| info.key?(button[:channel].to_s) }.presence || next
-            button_name = button_info.values.first.try(:squish).presence || next
-            button.merge!({
-              name: button_name,
-              remote_name: remote_name,
-              remote_type: remote_info['remote_type'],
-            })
-            button[:uuid] = Digest::UUID.uuid_v5(UUID_NAMESPACE, "#{button[:device_id]}/#{button[:channel]}")
-            buttons << button
+      synchronize(:rf_bridge_buttons) do
+        @rf_bridge_buttons ||= [].tap do |buttons|
+          rf_bridge_devices = devices.select { |device| device['uiid'] == RF_BRIDGE_DEVICE_UIID }.tap do |devices|
+            Ewelink.logger.debug(self.class.name) { "Found #{devices.size} RF 433MHz bridge device(s)" }
           end
-        end
-      end.tap { |buttons| Ewelink.logger.debug(self.class.name) { "Found #{buttons.size} RF 433MHz bridge button(s)" } }
+          rf_bridge_devices.each do |device|
+            device_id = device['deviceid'].presence || next
+            device_name = device['name'].presence || next
+            buttons = device['params']['rfList'].each do |rf|
+              button = {
+                channel: rf['rfChl'],
+                device_id: device_id,
+                device_name: device_name,
+              }
+              remote_info = device['tags']['zyx_info'].find { |info| info['buttonName'].find { |data| data.key?(button[:channel].to_s) } }.presence || next
+              remote_name = remote_info['name'].try(:squish).presence || next
+              button_info = remote_info['buttonName'].find { |info| info.key?(button[:channel].to_s) }.presence || next
+              button_name = button_info.values.first.try(:squish).presence || next
+              button.merge!({
+                name: button_name,
+                remote_name: remote_name,
+                remote_type: remote_info['remote_type'],
+              })
+              button[:uuid] = Digest::UUID.uuid_v5(UUID_NAMESPACE, "#{button[:device_id]}/#{button[:channel]}")
+              buttons << button
+            end
+          end
+        end.tap { |buttons| Ewelink.logger.debug(self.class.name) { "Found #{buttons.size} RF 433MHz bridge button(s)" } }
+      end
     end
 
     def switch_on?(uuid)
@@ -91,19 +95,21 @@ module Ewelink
     end
 
     def switches
-      @switches ||= [].tap do |switches|
-        switch_devices = devices.select { |device| SWITCH_DEVICES_UIIDS.include?(device['uiid']) }
-        switch_devices.each do |device|
-          device_id = device['deviceid'].presence || next
-          name = device['name'].presence || next
-          switch = {
-            device_id: device_id,
-            name: name,
-          }
-          switch[:uuid] = Digest::UUID.uuid_v5(UUID_NAMESPACE, switch[:device_id])
-          switches << switch
-        end
-      end.tap { |switches| Ewelink.logger.debug(self.class.name) { "Found #{switches.size} switch(es)" } }
+      synchronize(:switches) do
+        @switches ||= [].tap do |switches|
+          switch_devices = devices.select { |device| SWITCH_DEVICES_UIIDS.include?(device['uiid']) }
+          switch_devices.each do |device|
+            device_id = device['deviceid'].presence || next
+            name = device['name'].presence || next
+            switch = {
+              device_id: device_id,
+              name: name,
+            }
+            switch[:uuid] = Digest::UUID.uuid_v5(UUID_NAMESPACE, switch[:device_id])
+            switches << switch
+          end
+        end.tap { |switches| Ewelink.logger.debug(self.class.name) { "Found #{switches.size} switch(es)" } }
+      end
     end
 
     def turn_switch!(uuid, on)
@@ -194,7 +200,7 @@ module Ewelink
       method = method.to_s.upcase
       headers = (options[:headers] || {}).reverse_merge('Content-Type' => 'application/json')
       Ewelink.logger.debug(self.class.name) { "#{method} #{url}" }
-      response = synchronize(:http_request) { HTTParty.send(method.downcase, url, options.merge(headers: headers).reverse_merge(timeout: TIMEOUT)) }
+      response = HTTParty.send(method.downcase, url, options.merge(headers: headers).reverse_merge(timeout: TIMEOUT))
       raise(Error.new("#{method} #{url}: #{response.code}")) unless response.success?
       if response['error'] == 301 && response['region'].present?
         @region = response['region']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ewelink
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Alexis Toulotte