ewelink 2.2.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2392627c54c851fb5fd14194b484b56b1013b7a26e8d5bafe2a79e37dfa80464
-  data.tar.gz: 2a5362bafa04f9e3cf212a5899b4e6183514fdff68b3146a4fa245c52e8fcadd
+  metadata.gz: 45f904d5e72d0038360340adc26dd7eb963f664804b43eee8235ee02d48f60ff
+  data.tar.gz: 98ee94c2d9187ea17250c3f32c1932f8c0df8a2123c341a47159c32e2aec66e9
 SHA512:
-  metadata.gz: b2d3ecbf884461e11a51cf7e4efe7438f1c066cc7c076629371c96b3255b50f2a3f4e0314f6a40f9b7247adef06d69eb0b1f66b31ebcabff1c46b7def21d8291
-  data.tar.gz: a2d064d2af9e800ef0165bf5d614e4857abb0503b1faad7e280f3f2df422f08c5c49e57e10b3202bfcac700dc667861690c0a29a44faaf13a5ae00307201fe87
+  metadata.gz: 42977ef17b87c9c6710973968ca739d642108d6595861a870090ef13fbe5332b7ff99fba0dc8444e8022dfba065f4334426daf2dc423ed08314b3939cc41e69a
+  data.tar.gz: 4fa2068348c252aecfa1f0d55f91013a17658a3403fa7813208f34f027757b2459181323aae9a9d8c71c915ac8c83e881150c4eacee77ed85832b1adaeadb451

data/VERSION

@@ -1 +1 @@
-2.2.0
+3.1.0

data/lib/ewelink/api.rb

@@ -11,7 +11,9 @@ module Ewelink
     URL = 'https://#{region}-api.coolkit.cc:8080'
     UUID_NAMESPACE = 'e25750fb-3710-41af-b831-23224f4dd609';
     VERSION = 8
+    WEB_SOCKET_CHECK_AUTHENTICATION_TIMEOUT = 30.seconds
     WEB_SOCKET_PING_TOLERANCE_FACTOR = 1.5
+    SWITCH_STATUS_CHANGE_CHECK_TIMEOUT = 2.seconds
     WEB_SOCKET_WAIT_INTERVAL = 0.2.seconds
 
     attr_reader :email, :password, :phone_number
@@ -21,15 +23,18 @@ module Ewelink
       @mutexs = {}
       @password = password.presence || raise(Error.new(":password must be specified"))
       @phone_number = phone_number.presence.try(:strip)
-      @web_socket_authenticated_api_keys = Set.new
+      @web_socket_authenticated = false
       @web_socket_switches_statuses = {}
-      raise(Error.new(":email or :phone_number must be specified")) if email.blank? && phone_number.blank?
+
+      raise(Error.new(':email or :phone_number must be specified')) if email.blank? && phone_number.blank?
+
+      start_web_socket_authentication_check_thread
     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? }) do
+        web_socket_wait_for(-> { web_socket_authenticated? }, initialize_web_socket: true) do
           params = {
             'action' => 'update',
             'apikey' => button[:api_key],
@@ -50,15 +55,40 @@ module Ewelink
     end
 
     def reload
-      Ewelink.logger.debug(self.class.name) { 'Reloading API (authentication token, devices, region,...)' }
-      dispose_web_socket
+      Ewelink.logger.debug(self.class.name) { 'Reloading API (authentication token, api key, devices, region, connections,...)' }
+
+      @web_socket_authenticated = false
+      @web_socket_switches_statuses.clear
+
+      [@web_socket_ping_thread, @web_socket_thread].each do |thread|
+        next unless thread
+        if Thread.current == thread
+          thread[:stop] = true
+        else
+          thread.kill
+        end
+      end
+
+      if @web_socket.present?
+        begin
+          @web_socket.close if @web_socket.open?
+        rescue
+          # Ignoring close errors
+        end
+      end
+
       [
-        :@api_keys,
-        :@authentication_token,
+        :@authentication_infos,
         :@devices,
+        :@last_web_socket_pong_at,
         :@region,
         :@rf_bridge_buttons,
         :@switches,
+        :@web_socket_ping_interval,
+        :@web_socket_ping_thread,
+        :@web_socket_thread,
+        :@web_socket_url,
+        :@web_socket,
       ].each do |variable|
         remove_instance_variable(variable) if instance_variable_defined?(variable)
       end
@@ -102,7 +132,7 @@ module Ewelink
     def switch_on?(uuid)
       switch = find_switch!(uuid)
       if @web_socket_switches_statuses[switch[:uuid]].nil?
-        web_socket_wait_for(-> { web_socket_authenticated? }) do
+        web_socket_wait_for(-> { web_socket_authenticated? }, initialize_web_socket: true) do
           Ewelink.logger.debug(self.class.name) { "Checking switch #{switch[:uuid].inspect} status" }
           params = {
             'action' => 'query',
@@ -115,7 +145,7 @@ module Ewelink
           send_to_web_socket(JSON.generate(params))
         end
       end
-      web_socket_wait_for(-> { !@web_socket_switches_statuses[switch[:uuid]].nil? }) do
+      web_socket_wait_for(-> { !@web_socket_switches_statuses[switch[:uuid]].nil? }, initialize_web_socket: true) do
         @web_socket_switches_statuses[switch[:uuid]] == 'on'
       end
     end
@@ -148,7 +178,7 @@ module Ewelink
       end
       switch = find_switch!(uuid)
       @web_socket_switches_statuses[switch[:uuid]] = nil
-      web_socket_wait_for(-> { web_socket_authenticated? }) do
+      web_socket_wait_for(-> { web_socket_authenticated? }, initialize_web_socket: true) do
         params = {
           'action' => 'update',
           'apikey' => switch[:api_key],
@@ -163,43 +193,40 @@ module Ewelink
         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
 
     private
 
-    def api_keys
-      synchronize(:api_keys) do
-        @api_keys ||= Set.new(devices.map { |device| device['apikey'] })
-      end
+    def api_key
+      authentication_infos[:api_key]
     end
 
-    def authenticate_web_socket_api_keys
-      api_keys.each do |api_key|
-        params = {
-          'action' => 'userOnline',
-          'apikey' => api_key,
-          'appid' => APP_ID,
-          'at' => authentication_token,
-          'nonce' => nonce,
-          'sequence' => web_socket_sequence,
-          'ts' => Time.now.to_i,
-          'userAgent' => 'app',
-          'version' => VERSION,
-        }
-        Ewelink.logger.debug(self.class.name) { "Authenticating WebSocket API key: #{api_key.truncate(16).inspect}" }
-        send_to_web_socket(JSON.generate(params))
-      end
+    def authenticate_web_socket_api_key
+      params = {
+        'action' => 'userOnline',
+        'apikey' => api_key,
+        'appid' => APP_ID,
+        'at' => authentication_token,
+        'nonce' => nonce,
+        'sequence' => web_socket_sequence,
+        'ts' => Time.now.to_i,
+        'userAgent' => 'app',
+        'version' => VERSION,
+      }
+      Ewelink.logger.debug(self.class.name) { "Authenticating WebSocket API key: #{api_key.truncate(16).inspect}" }
+      send_to_web_socket(JSON.generate(params))
     end
 
     def authentication_headers
       { 'Authorization' => "Bearer #{authentication_token}" }
     end
 
-    def authentication_token
-      synchronize(:authentication_token) do
-        @authentication_token ||= begin
+    def authentication_infos
+      synchronize(:authentication_infos) do
+        @authentication_infos ||= begin
           params = {
             'appid' => APP_ID,
             'imei' => SecureRandom.uuid.upcase,
@@ -216,11 +243,19 @@ module Ewelink
           body = JSON.generate(params)
           response = rest_request(:post, '/api/user/login', { body: body, headers: { 'Authorization' => "Sign #{Base64.encode64(OpenSSL::HMAC.digest('SHA256', APP_SECRET, body))}" } })
           raise(Error.new('Authentication token not found')) if response['at'].blank?
-          response['at'].tap { Ewelink.logger.debug(self.class.name) { 'Authentication token found' } }
+          raise(Error.new('API key not found')) if response['user'].blank? || response['user']['apikey'].blank?
+          {
+            authentication_token: response['at'].tap { Ewelink.logger.debug(self.class.name) { 'Authentication token found' } },
+            api_key: response['user']['apikey'].tap { Ewelink.logger.debug(self.class.name) { 'API key found' } },
+          }
         end
       end
     end
 
+    def authentication_token
+      authentication_infos[:authentication_token]
+    end
+
     def devices
       synchronize(:devices) do
         @devices ||= begin
@@ -237,40 +272,6 @@ module Ewelink
       end
     end
 
-    def dispose_web_socket
-      Ewelink.logger.debug(self.class.name) { 'Dispose WebSocket' }
-      @web_socket_authenticated_api_keys.clear
-      @web_socket_switches_statuses.clear
-
-      [@web_socket_ping_thread, @web_socket_thread].each do |thread|
-        next unless thread
-        if Thread.current == thread
-          thread[:stop] = true
-        else
-          thread.kill
-        end
-      end
-
-      if @web_socket.present?
-        begin
-          @web_socket.close if @web_socket.open?
-        rescue
-          # Ignoring close errors
-        end
-      end
-
-      [
-        :@last_web_socket_pong_at,
-        :@web_socket_ping_interval,
-        :@web_socket_ping_thread,
-        :@web_socket_thread,
-        :@web_socket_url,
-        :@web_socket,
-      ].each do |variable|
-        remove_instance_variable(variable) if instance_variable_defined?(variable)
-      end
-    end
-
     def find_rf_bridge_button!(uuid)
       rf_bridge_buttons.find { |button| button[:uuid] == uuid } || raise(Error.new("No such RF bridge button with UUID: #{uuid.inspect}"))
     end
@@ -299,7 +300,7 @@ module Ewelink
         Ewelink.logger.debug(self.class.name) { "Switched to region #{region.inspect}" }
         return rest_request(method, path, options)
       end
-      remove_instance_variable(:@authentication_token) if instance_variable_defined?(:@authentication_token) && [401, 403].include?(response['error'])
+      remove_instance_variable(:@authentication_infos) if instance_variable_defined?(:@authentication_infos) && [401, 403].include?(response['error'])
       raise(Error.new("#{method} #{url}: #{response['error']} #{response['msg']}".strip)) if response['error'].present? && response['error'] != 0
       response.to_h
     rescue Errno::ECONNREFUSED, OpenSSL::OpenSSLError, SocketError, Timeout::Error => e
@@ -307,16 +308,30 @@ module Ewelink
     end
 
     def send_to_web_socket(message)
-      if web_socket_outdated_ping?
-        Ewelink.logger.warn(self.class.name) { 'WebSocket ping is outdated' }
-        dispose_web_socket
-      end
       web_socket.send(message)
     rescue => e
-      dispose_web_socket
+      reload
       raise Error.new(e)
     end
 
+    def start_web_socket_authentication_check_thread
+      raise Error.new('WebSocket authentication check must only be started once') if @web_socket_authentication_check_thread.present?
+
+      @web_socket_authentication_check_thread = Thread.new do
+        loop do
+          Ewelink.logger.debug(self.class.name) { 'Checking if WebSocket is authenticated' }
+          begin
+            web_socket_wait_for(-> { web_socket_authenticated? }, initialize_web_socket: true) do
+              Ewelink.logger.debug(self.class.name) { 'WebSocket is authenticated' }
+            end
+          rescue => e
+            Ewelink.logger.error(self.class.name) { e }
+          end
+          sleep(WEB_SOCKET_CHECK_AUTHENTICATION_TIMEOUT)
+        end
+      end
+    end
+
     def start_web_socket_ping_thread(interval)
       @last_web_socket_pong_at = Time.now
       @web_socket_ping_interval = interval
@@ -336,24 +351,34 @@ module Ewelink
     end
 
     def web_socket
+      if web_socket_outdated_ping?
+        Ewelink.logger.warn(self.class.name) { 'WebSocket ping is outdated' }
+        reload
+      end
+
       synchronize(:web_socket) do
         next @web_socket if @web_socket
 
+        # Initializes caches before opening WebSocket: important in order to
+        # NOT cumulate requests Timeouts from #web_socket_wait_for.
+        api_key
+        web_socket_url
+
+        Ewelink.logger.debug(self.class.name) { "Opening WebSocket to #{web_socket_url.inspect}" }
+
         @web_socket_thread = Thread.new do
           EventMachine.run do
-            Ewelink.logger.debug(self.class.name) { "Opening WebSocket to #{web_socket_url.inspect}" }
-
-            @web_socket = Faye::WebSocket::Client.new('wss://as-pconnect3.coolkit.cc:8080/api/ws')
+            @web_socket = Faye::WebSocket::Client.new(web_socket_url)
 
             @web_socket.on(:close) do |event|
               Ewelink.logger.debug(self.class.name) { 'WebSocket closed' }
-              dispose_web_socket
+              reload
             end
 
             @web_socket.on(:open) do |event|
               Ewelink.logger.debug(self.class.name) { 'WebSocket opened' }
               @last_web_socket_pong_at = Time.now
-              authenticate_web_socket_api_keys
+              authenticate_web_socket_api_key
             end
 
             @web_socket.on(:message) do |event|
@@ -369,11 +394,13 @@ module Ewelink
                 json = JSON.parse(message)
               rescue => e
                 Ewelink.logger.error(self.class.name) { 'WebSocket JSON parse error' }
+                reload
                 next
               end
 
               if json.key?('error') && json['error'] != 0
                 Ewelink.logger.error(self.class.name) { "WebSocket message error: #{message.inspect}" }
+                reload
                 next
               end
 
@@ -381,8 +408,8 @@ module Ewelink
                 start_web_socket_ping_thread(json['config']['hbInterval'] + 7)
               end
 
-              if json['apikey'].present? && !@web_socket_authenticated_api_keys.include?(json['apikey'])
-                @web_socket_authenticated_api_keys << json['apikey']
+              if json['apikey'].present? && !@web_socket_authenticated && json['apikey'] == api_key
+                @web_socket_authenticated = true
                 Ewelink.logger.debug(self.class.name) { "WebSocket successfully authenticated API key: #{json['apikey'].truncate(16).inspect}" }
               end
 
@@ -397,18 +424,14 @@ module Ewelink
           end
         end
 
-        Timeout.timeout(REQUEST_TIMEOUT) do
-          while @web_socket.blank?
-            sleep(WEB_SOCKET_WAIT_INTERVAL)
-          end
+        web_socket_wait_for(-> { @web_socket.present? }) do
+          @web_socket
         end
-
-        @web_socket
       end
     end
 
     def web_socket_authenticated?
-      api_keys == @web_socket_authenticated_api_keys
+      @web_socket_authenticated.present?
     end
 
     def web_socket_outdated_ping?
@@ -438,13 +461,18 @@ module Ewelink
       end
     end
 
-    def web_socket_wait_for(condition, &block)
-      web_socket # Initializes WebSocket
-      Timeout.timeout(REQUEST_TIMEOUT) do
-        while !condition.call
-          sleep(WEB_SOCKET_WAIT_INTERVAL)
+    def web_socket_wait_for(condition, initialize_web_socket: false, &block)
+      web_socket if initialize_web_socket
+      begin
+        Timeout.timeout(REQUEST_TIMEOUT) do
+          while !condition.call
+            sleep(WEB_SOCKET_WAIT_INTERVAL)
+          end
+          block_given? ? yield : true
         end
-        block_given? ? yield : true
+      rescue => e
+        reload
+        raise Error.new(e)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ewelink
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Alexis Toulotte
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport