ewelink 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9b83156bba48622088845d22bd8fc3b559d6e8732acf4664ba35886c6c19d35
-  data.tar.gz: d69303e93b04b56fd713fc27220d15c4ab66ca767190a289d6440932dc468532
+  metadata.gz: 0663d2b0ebc1394f91996e8b8ee54954c8bf02b07b7cdec7448a7c0d2816a715
+  data.tar.gz: 4ad467928041577a73e382a241575c4ad9524c4c9d141df1e5689b673353bede
 SHA512:
-  metadata.gz: fa3fd8b8a36ad7e4570db2941ebdffc1d134106ea40ce93866eaebe7b81a4cc0a35920f5366a48c0a9141476101cc03be42adf244b15bcf98eeec64b0e77a312
-  data.tar.gz: d98f59eaec9c582dd0627a52a392c45e98e351676b69d36f081df4ec819153bd32e340ced77440152c674d58013f413d8e42a5e86a50f65d57efce5782f26943
+  metadata.gz: 529c2969099aa2db41238b5f4380f7a7dd69a68cf7e043546cc297fb43b8146b6fbe34ff1df19865de8bcf5b04d8bffbb20e274da7cb22da42b310cf808628b1
+  data.tar.gz: 6d74b68ecc5abfae875808286c1666ac793e1970104ea59e87ce34ccd3c0446baf82e0101e9406bbf6e6e08c23c957b275904d924ed480f11f3db4108901b4f7

data/README.mdown

@@ -77,6 +77,9 @@ api.press_rf_bridge_button!(button[:uuid])
 
 ### Additional options
 
+- `async_actions` (`true` | `false`): To perform actions (pressing an RF
+  bridge button or turning a switch on/off) in asynchronous mode. (default:
+  `false`).
 - `update_devices_status_on_connect` (`true` | `false`): To update devices
   status (on, off) when connecting to Ewelink API (default: `false`).
 

data/VERSION

@@ -1 +1 @@
-3.2.0
+3.3.0

data/ewelink.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'activesupport', '>= 6.0.0', '< 7.0.0'
   s.add_dependency 'faye-websocket', '>= 0.11.0', '< 0.12.0'
   s.add_dependency 'httparty', '>= 0.18.0', '< 0.19.0'
+  s.add_dependency 'thread', '>= 0.2.0', '< 0.3.0'
 
   s.add_development_dependency 'byebug', '>= 11.0.0', '< 12.0.0'
-  s.add_development_dependency 'rake', '>= 12.0.0', '< 13.0.0'
+  s.add_development_dependency 'rake', '>= 13.0.0', '< 14.0.0'
 end

data/lib/ewelink.rb

@@ -10,6 +10,7 @@ require 'logger'
 require 'openssl'
 require 'optparse'
 require 'set'
+require 'thread/pool'
 require 'timeout'
 
 module Ewelink

data/lib/ewelink/api.rb

@@ -18,7 +18,8 @@ module Ewelink
 
     attr_reader :email, :password, :phone_number
 
-    def initialize(email: nil, password:, phone_number: nil, update_devices_status_on_connect: false)
+    def initialize(async_actions: false, email: nil, password:, phone_number: nil, update_devices_status_on_connect: false)
+      @async_actions = async_actions.present?
       @email = email.presence.try(:strip)
       @mutexs = {}
       @password = password.presence || raise(Error.new(":password must be specified"))
@@ -32,25 +33,31 @@ module Ewelink
       start_web_socket_authentication_check_thread
     end
 
+    def async_actions?
+      @async_actions
+    end
+
     def press_rf_bridge_button!(uuid)
-      synchronize(:press_rf_bridge_button) do
-        button = find_rf_bridge_button!(uuid)
-        web_socket_wait_for(-> { web_socket_authenticated? }, initialize_web_socket: true) do
-          params = {
-            'action' => 'update',
-            'apikey' => button[:api_key],
-            'deviceid' => button[:device_id],
-            'params' => {
-              'cmd' => 'transmit',
-              'rfChl' => button[:channel],
-            },
-            'sequence' => web_socket_sequence,
-            'ts' => 0,
-            'userAgent' => 'app',
-          }
-          Ewelink.logger.debug(self.class.name) { "Pressing RF bridge button #{button[:uuid].inspect}" }
-          send_to_web_socket(JSON.generate(params))
-          true
+      process_action do
+        synchronize(:press_rf_bridge_button) do
+          button = find_rf_bridge_button!(uuid)
+          web_socket_wait_for(-> { web_socket_authenticated? }, initialize_web_socket: true) do
+            params = {
+              'action' => 'update',
+              'apikey' => button[:api_key],
+              'deviceid' => button[:device_id],
+              'params' => {
+                'cmd' => 'transmit',
+                'rfChl' => button[:channel],
+              },
+              'sequence' => web_socket_sequence,
+              'ts' => 0,
+              'userAgent' => 'app',
+            }
+            Ewelink.logger.debug(self.class.name) { "Pressing RF bridge button #{button[:uuid].inspect}" }
+            send_to_web_socket(JSON.generate(params))
+            true
+          end
         end
       end
     end
@@ -172,31 +179,33 @@ module Ewelink
     end
 
     def turn_switch!(uuid, on)
-      if ['on', :on, 'true'].include?(on)
-        on = true
-      elsif ['off', :off, 'false'].include?(on)
-        on = false
-      end
-      switch = find_switch!(uuid)
-      @web_socket_switches_statuses[switch[:uuid]] = nil
-      web_socket_wait_for(-> { web_socket_authenticated? }, initialize_web_socket: true) do
-        params = {
-          'action' => 'update',
-          'apikey' => switch[:api_key],
-          'deviceid' => switch[:device_id],
-          'params' => {
-            'switch' => on ? 'on' : 'off',
-          },
-          'sequence' => web_socket_sequence,
-          'ts' => 0,
-          'userAgent' => 'app',
-        }
-        Ewelink.logger.debug(self.class.name) { "Turning switch #{switch[:uuid].inspect} #{on ? 'on' : 'off'}" }
-        send_to_web_socket(JSON.generate(params))
+      process_action do
+        if ['on', :on, 'true'].include?(on)
+          on = true
+        elsif ['off', :off, 'false'].include?(on)
+          on = false
+        end
+        switch = find_switch!(uuid)
+        @web_socket_switches_statuses[switch[:uuid]] = nil
+        web_socket_wait_for(-> { web_socket_authenticated? }, initialize_web_socket: true) do
+          params = {
+            'action' => 'update',
+            'apikey' => switch[:api_key],
+            'deviceid' => switch[:device_id],
+            'params' => {
+              'switch' => on ? 'on' : 'off',
+            },
+            'sequence' => web_socket_sequence,
+            'ts' => 0,
+            'userAgent' => 'app',
+          }
+          Ewelink.logger.debug(self.class.name) { "Turning switch #{switch[:uuid].inspect} #{on ? 'on' : 'off'}" }
+          send_to_web_socket(JSON.generate(params))
+        end
+        sleep(SWITCH_STATUS_CHANGE_CHECK_TIMEOUT)
+        switch_on?(switch[:uuid]) # Waiting for switch status update
+        true
       end
-      sleep(SWITCH_STATUS_CHANGE_CHECK_TIMEOUT)
-      switch_on?(switch[:uuid]) # Waiting for switch status update
-      true
     end
 
     def update_devices_status_on_connect?
@@ -289,6 +298,13 @@ module Ewelink
       SecureRandom.hex[0, 8]
     end
 
+    def process_action(&block)
+      return yield unless async_actions?
+      @async_actions_thread_pool ||= Thread.pool(1)
+      @async_actions_thread_pool.process(&block)
+      nil
+    end
+
     def region
       @region ||= DEFAULT_REGION
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ewelink
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Alexis Toulotte
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-29 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -70,6 +70,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.19.0
+- !ruby/object:Gem::Dependency
+  name: thread
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -96,20 +116,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: 13.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 13.0.0
+        version: 14.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: 13.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 13.0.0
+        version: 14.0.0
 description: Manage eWeLink smart home devices
 email: al@alweb.org
 executables: