ewelink 1.3.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f2548dd14bcfce1ce4cacb1a2768687d88e15bb4dae14223cadccd61176ab3d
-  data.tar.gz: 995f4281dd22f168ffe90dc2f072209bd25b13487bb171d5dbcc4efc94380811
+  metadata.gz: 957d00b0d8171519a48b1cf828cbd78c21dbde34b93f2c1930273ad460d5a770
+  data.tar.gz: 0c636a47ac05f8428d9e099d952a0b89a512f8e199a3a85a72624c10a76590b3
 SHA512:
-  metadata.gz: 74821997ef9c625b2506ebda9229ddac0605f7e4dda4ac836c60974fa6d17a2ebcb9cfd306947c60d958409e5277b6d2ebe1189effef32f91730bfa0be2a9883
-  data.tar.gz: 0d1999216c2006a5f70102190196a9c890ef9ab0c9aa6464402f8c843a51c8211852c560e62778d901eb91bf19f331f1008dd500b998cb59daf6ebe72477e5b1
+  metadata.gz: c20dfab19c133d80913716e7be2b20e47958e841e61d7b401f28b73e642358d80ce698d5fd22410ede0bb783114c0e91dfc7a1b4760ebab3738aaba3081275af
+  data.tar.gz: 07664117dfacf9f32fa7e0965199bed938da619b75b313207d702d5ad83ebc2ceacbb76b266e40f3e995114542a110061ad271630a3b007fc2e4f1cbb2bccc58

data/VERSION

@@ -1 +1 @@
-1.3.0
+2.2.1

data/ewelink.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.0.0'
 
   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_development_dependency 'byebug', '>= 11.0.0', '< 12.0.0'

data/lib/ewelink.rb

@@ -1,12 +1,16 @@
 require 'active_support'
 require 'active_support/core_ext'
 require 'byebug' if ENV['DEBUGGER']
+require 'eventmachine'
+require 'faye/websocket'
 require 'httparty'
 require 'io/console'
 require 'json'
 require 'logger'
 require 'openssl'
 require 'optparse'
+require 'set'
+require 'timeout'
 
 module Ewelink
 

data/lib/ewelink/api.rb

@@ -5,12 +5,15 @@ module Ewelink
     APP_ID = 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq'
     APP_SECRET = '6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM'
     DEFAULT_REGION = 'us'
+    REQUEST_TIMEOUT = 10.seconds
     RF_BRIDGE_DEVICE_UIID = 28
     SWITCH_DEVICES_UIIDS = [1, 5, 6, 24]
-    TIMEOUT = 10
     URL = 'https://#{region}-api.coolkit.cc:8080'
     UUID_NAMESPACE = 'e25750fb-3710-41af-b831-23224f4dd609';
     VERSION = 8
+    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
 
@@ -19,31 +22,45 @@ 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_switches_statuses = {}
       raise(Error.new(":email or :phone_number must be specified")) if email.blank? && phone_number.blank?
     end
 
     def press_rf_bridge_button!(uuid)
       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,
-        }
-        rest_request(:post, '/api/user/device/status', body: JSON.generate(params), headers: authentication_headers)
-        true
+        web_socket_wait_for(-> { web_socket_authenticated? }) 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
 
     def reload
-      Ewelink.logger.debug(self.class.name) { 'Reloading API (authentication token, devices & region cache)' }
-      [:@authentication_token, :@devices, :@rf_bridge_buttons, :@region, :@switches].each do |variable|
+      Ewelink.logger.debug(self.class.name) { 'Reloading API (authentication token, devices, region,...)' }
+      dispose_web_socket
+      [
+        :@api_keys,
+        :@authentication_token,
+        :@devices,
+        :@region,
+        :@rf_bridge_buttons,
+        :@switches,
+      ].each do |variable|
         remove_instance_variable(variable) if instance_variable_defined?(variable)
       end
       self
@@ -56,10 +73,12 @@ module Ewelink
             Ewelink.logger.debug(self.class.name) { "Found #{devices.size} RF 433MHz bridge device(s)" }
           end
           rf_bridge_devices.each do |device|
+            api_key = device['apikey'].presence || next
             device_id = device['deviceid'].presence || next
             device_name = device['name'].presence || next
             buttons = device['params']['rfList'].each do |rf|
               button = {
+                api_key: api_key,
                 channel: rf['rfChl'],
                 device_id: device_id,
                 device_name: device_name,
@@ -83,15 +102,23 @@ module Ewelink
 
     def switch_on?(uuid)
       switch = find_switch!(uuid)
-      params = {
-        'appid' => APP_ID,
-        'deviceid' => switch[:device_id],
-        'nonce' => nonce,
-        'ts' => Time.now.to_i,
-        'version' => VERSION,
-      }
-      response = rest_request(:get, '/api/user/device/status', headers: authentication_headers, query: params)
-      response['params']['switch'] == 'on'
+      if @web_socket_switches_statuses[switch[:uuid]].nil?
+        web_socket_wait_for(-> { web_socket_authenticated? }) do
+          Ewelink.logger.debug(self.class.name) { "Checking switch #{switch[:uuid].inspect} status" }
+          params = {
+            'action' => 'query',
+            'apikey' => switch[:api_key],
+            'deviceid' => switch[:device_id],
+            'sequence' => web_socket_sequence,
+            'ts' => 0,
+            'userAgent' => 'app',
+          }
+          send_to_web_socket(JSON.generate(params))
+        end
+      end
+      web_socket_wait_for(-> { !@web_socket_switches_statuses[switch[:uuid]].nil? }) do
+        @web_socket_switches_statuses[switch[:uuid]] == 'on'
+      end
     end
 
     def switches
@@ -99,9 +126,11 @@ module Ewelink
         @switches ||= [].tap do |switches|
           switch_devices = devices.select { |device| SWITCH_DEVICES_UIIDS.include?(device['uiid']) }
           switch_devices.each do |device|
+            api_key = device['apikey'].presence || next
             device_id = device['deviceid'].presence || next
             name = device['name'].presence || next
             switch = {
+              api_key: api_key,
               device_id: device_id,
               name: name,
             }
@@ -119,22 +148,53 @@ module Ewelink
         on = false
       end
       switch = find_switch!(uuid)
-      params = {
-        'appid' => APP_ID,
-        'deviceid' => switch[:device_id],
-        'nonce' => nonce,
-        'params' => {
-          'switch' => on ? 'on' : 'off',
-        },
-        'ts' => Time.now.to_i,
-        'version' => VERSION,
-      }
-      rest_request(:post, '/api/user/device/status', body: JSON.generate(params), headers: authentication_headers)
+      @web_socket_switches_statuses[switch[:uuid]] = nil
+      web_socket_wait_for(-> { web_socket_authenticated? }) 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
 
     private
 
+    def api_keys
+      synchronize(:api_keys) do
+        @api_keys ||= Set.new(devices.map { |device| device['apikey'] })
+      end
+    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
+    end
+
     def authentication_headers
       { 'Authorization' => "Bearer #{authentication_token}" }
     end
@@ -179,6 +239,40 @@ 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
@@ -200,7 +294,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 = 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: REQUEST_TIMEOUT))
       raise(Error.new("#{method} #{url}: #{response.code}")) unless response.success?
       if response['error'] == 301 && response['region'].present?
         @region = response['region']
@@ -209,15 +303,155 @@ module Ewelink
       end
       remove_instance_variable(:@authentication_token) if instance_variable_defined?(:@authentication_token) && [401, 403].include?(response['error'])
       raise(Error.new("#{method} #{url}: #{response['error']} #{response['msg']}".strip)) if response['error'].present? && response['error'] != 0
-      response
+      response.to_h
     rescue Errno::ECONNREFUSED, OpenSSL::OpenSSLError, SocketError, Timeout::Error => e
       raise Error.new(e)
     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
+      raise Error.new(e)
+    end
+
+    def start_web_socket_ping_thread(interval)
+      @last_web_socket_pong_at = Time.now
+      @web_socket_ping_interval = interval
+      Ewelink.logger.debug(self.class.name) { "Creating thread for WebSocket ping every #{@web_socket_ping_interval} seconds" }
+      @web_socket_ping_thread = Thread.new do
+        loop do
+          break if Thread.current[:stop]
+          sleep(@web_socket_ping_interval)
+          Ewelink.logger.debug(self.class.name) { 'Sending WebSocket ping' }
+          send_to_web_socket('ping')
+        end
+      end
+    end
+
     def synchronize(name, &block)
       (@mutexs[name] ||= Mutex.new).synchronize(&block)
     end
 
+    def web_socket
+      synchronize(:web_socket) do
+        next @web_socket if @web_socket
+
+        @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.on(:close) do |event|
+              Ewelink.logger.debug(self.class.name) { 'WebSocket closed' }
+              dispose_web_socket
+            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
+            end
+
+            @web_socket.on(:message) do |event|
+              message = event.data
+
+              if message == 'pong'
+                Ewelink.logger.debug(self.class.name) { "Received WebSocket #{message.inspect} message" }
+                @last_web_socket_pong_at = Time.now
+                next
+              end
+
+              begin
+                json = JSON.parse(message)
+              rescue => e
+                Ewelink.logger.error(self.class.name) { 'WebSocket JSON parse error' }
+                next
+              end
+
+              if json.key?('error') && json['error'] != 0
+                Ewelink.logger.error(self.class.name) { "WebSocket message error: #{message.inspect}" }
+                next
+              end
+
+              if !@web_socket_ping_thread && json.key?('config') && json['config']['hb'] == 1 && json['config']['hbInterval'].present?
+                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']
+                Ewelink.logger.debug(self.class.name) { "WebSocket successfully authenticated API key: #{json['apikey'].truncate(16).inspect}" }
+              end
+
+              if json['deviceid'].present? && json['params'].is_a?(Hash) && json['params']['switch'].present?
+                switch = switches.find { |switch| switch[:device_id] == json['deviceid'] }
+                if switch.present?
+                  @web_socket_switches_statuses[switch[:uuid]] = json['params']['switch']
+                  Ewelink.logger.debug(self.class.name) { "Switch #{switch[:uuid].inspect} is #{@web_socket_switches_statuses[switch[:uuid]]}" }
+                end
+              end
+            end
+          end
+        end
+
+        Timeout.timeout(REQUEST_TIMEOUT) do
+          while @web_socket.blank?
+            sleep(WEB_SOCKET_WAIT_INTERVAL)
+          end
+        end
+
+        @web_socket
+      end
+    end
+
+    def web_socket_authenticated?
+      api_keys == @web_socket_authenticated_api_keys
+    end
+
+    def web_socket_outdated_ping?
+      @last_web_socket_pong_at.present? && @web_socket_ping_interval.present? && @last_web_socket_pong_at < (@web_socket_ping_interval * WEB_SOCKET_PING_TOLERANCE_FACTOR).seconds.ago
+    end
+
+    def web_socket_sequence
+      (Time.now.to_f * 1000).round.to_s
+    end
+
+    def web_socket_url
+      synchronize(:web_socket_url) do
+        @web_socket_url ||= begin
+          params = {
+            'accept' => 'ws',
+            'appid' => APP_ID,
+            'nonce' => nonce,
+            'ts' => Time.now.to_i,
+            'version' => VERSION,
+          }
+          response = rest_request(:post, '/dispatch/app', body: JSON.generate(params), headers: authentication_headers)
+          raise('Error while getting WebSocket URL') unless response['error'] == 0
+          domain = response['domain'].presence || raise("Can't get WebSocket server domain")
+          port = response['port'].presence || raise("Can't get WebSocket server port")
+          "wss://#{domain}:#{port}/api/ws".tap { |url| Ewelink.logger.debug(self.class.name) { "WebSocket URL is: #{url.inspect}" } }
+        end
+      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)
+        end
+        block_given? ? yield : true
+      rescue
+        dispose_web_socket
+      end
+    end
+
   end
 
 end

data/lib/ewelink/runner.rb

@@ -9,7 +9,7 @@ module Ewelink
       options[:turn_switches_on_uuids].each { |uuid| api.turn_switch!(uuid, :on) }
       options[:turn_switches_off_uuids].each { |uuid| api.turn_switch!(uuid, :off) }
       options[:press_rf_bridge_buttons_uuids].each { |uuid| api.press_rf_bridge_button!(uuid) }
-      puts(JSON.pretty_generate(options[:switch_status_uuids].map { |uuid| [uuid, api.switch_on?(uuid) ? 'on' : 'off'] }.to_h))
+      puts(JSON.pretty_generate(options[:switch_status_uuids].map { |uuid| [uuid, api.switch_on?(uuid) ? 'on' : 'off'] }.to_h)) if options[:switch_status_uuids].present?
     end
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ewelink
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Alexis Toulotte
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-31 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,6 +30,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.0.0
+- !ruby/object:Gem::Dependency
+  name: faye-websocket
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement