ewelink 4.1.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cba69a24adaf18a0be08cbf1618b612d6d0e90fd788d8b9f2360f7d19f67406
-  data.tar.gz: adc650eac1533d343320490132302827a79f0fc4a0571d0dcba91ef926e5f682
+  metadata.gz: f2f26d6875823958f38a894377c7dfbce3531d7f98b1c1c69b18bd88caf44c1d
+  data.tar.gz: d25335eb91529c57d2780c42e8cef5856cb7bfa7f222e5282816bff122854b08
 SHA512:
-  metadata.gz: 39ab9a66085401bb70f34f74b9220e70ad691c5db65b180816d5a284462162064364d6e6ed3f2b5d990f9c3fa3450472fb0b13ba0b3ecbca1a22042de3926d28
-  data.tar.gz: 19b1627d07a411ef4fe04578f924a7d339413d65d7132b8cd7614877b1e72300b5cbd51f1f9a6469807fe3179e37a65c048f1e699601c4eb3b4f05b82b0e663f
+  metadata.gz: 42786625ddc6d8482a5d85922e25b4b650e080866148b378aeb579ad25e0dcee00d4f12b8ebf74492e207d80e6ed0d65b6f0c71ccdaf5c3f81280b1efbd4bc7b
+  data.tar.gz: 8eb9cc344312a30a7b0924ff02b052516bf5123a7d706acb15e000b91db2c91ecf56a2173d22543403f7fbbc31773e30d97d3c5379ad37ab42e34b55f8f67366

data/VERSION

@@ -1 +1 @@
-4.1.0
+5.0.0

data/lib/ewelink/api.rb

@@ -2,13 +2,14 @@ module Ewelink
 
   class Api
 
-    APP_ID = 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq'.freeze
-    APP_SECRET = '6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM'.freeze
+    APP_ID = 'Uw83EKZFxdif7XFXEsrpduz5YyjP7nTl'.freeze
+    APP_SECRET = 'mXLOjea0woSMvK9gw7Fjsy7YlFO4iSu6'.freeze
+    DEFAULT_COUNTRY_CODE = '+44'.freeze
     DEFAULT_REGION = 'us'.freeze
     REQUEST_TIMEOUT = 10.seconds
     RF_BRIDGE_DEVICE_UIID = 28
     SWITCH_DEVICES_UIIDS = [1, 5, 6, 24].freeze
-    URL = 'https://#{region}-api.coolkit.cc:8080'.freeze
+    URL = 'https://#{region}-apia.coolkit.cc'.freeze
     VERSION = 8
     WEB_SOCKET_CHECK_AUTHENTICATION_TIMEOUT = 30.seconds
     WEB_SOCKET_PING_TOLERANCE_FACTOR = 1.5
@@ -40,23 +41,21 @@ module Ewelink
       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
+          headers = authentication_headers.merge(
+            'X-CK-Appid' => APP_ID,
+            'X-CK-Nonce' => nonce,
+          )
+          params = {
+            'type' => 1,
+            'id' => button[:device_id],
+            'params' => {
+              'cmd' => 'transmit',
+              'rfChl' => button[:channel],
+            },
+          }
+          body = JSON.generate(params)
+          response = rest_request(:post, '/v2/device/thing/status', headers:, body:)
+          response['error'] == 0
         end
       end
     end
@@ -87,6 +86,7 @@ module Ewelink
       %i(
         @authentication_infos
         @devices
+        @homes_ids
         @last_web_socket_pong_at
         @region
         @rf_bridge_buttons
@@ -105,21 +105,21 @@ module Ewelink
     def rf_bridge_buttons
       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|
+          rf_bridge_devices = devices.select { |device| device['itemData']['extra']['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|
-            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|
+            api_key = device['itemData']['apikey'].presence || next
+            device_id = device['itemData']['deviceid'].presence || next
+            device_name = device['itemData']['name'].presence || next
+            buttons = device['itemData']['params']['rfList'].each do |rf|
               button = {
                 api_key:,
                 channel: rf['rfChl'],
                 device_id:,
                 device_name:,
               }
-              remote_info = device['tags']['zyx_info'].find { |info| info['buttonName'].find { |data| data.key?(button[:channel].to_s) } }.presence || next
+              remote_info = device['itemData']['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
@@ -160,15 +160,15 @@ module Ewelink
     def switches
       synchronize(:switches) do
         @switches ||= [].tap do |switches|
-          switch_devices = devices.select { |device| SWITCH_DEVICES_UIIDS.include?(device['uiid']) }
+          switch_devices = devices.select { |device| SWITCH_DEVICES_UIIDS.include?(device['itemData']['extra']['uiid']) }
           switch_devices.each do |device|
-            api_key = device['apikey'].presence || next
-            device_id = device['deviceid'].presence || next
-            name = device['name'].presence || next
+            api_key = device['itemData']['apikey'].presence || next
+            device_id = device['itemData']['deviceid'].presence || next
+            name = device['itemData']['name'].presence || next
             switch = {
               api_key:,
               device_id:,
-              model: device['productModel'],
+              model: device['itemData']['productModel'],
               name:,
             }
             switch[:uuid] = Digest::UUID.uuid_v5(Digest::UUID::DNS_NAMESPACE, switch[:device_id])
@@ -242,12 +242,8 @@ module Ewelink
       synchronize(:authentication_infos) do
         @authentication_infos ||= begin
           params = {
-            'appid' => APP_ID,
-            'imei' => SecureRandom.uuid.upcase,
-            'nonce' => nonce,
+            'countryCode' => DEFAULT_COUNTRY_CODE,
             'password' => password,
-            'ts' => Time.now.to_i,
-            'version' => VERSION,
           }
           if email.present?
             params['email'] = email
@@ -255,12 +251,20 @@ module Ewelink
             params['phoneNumber'] = phone_number
           end
           body = JSON.generate(params)
-          response = rest_request(:post, '/api/user/login', { body:, headers: { 'Authorization' => "Sign #{Base64.encode64(OpenSSL::HMAC.digest('SHA256', APP_SECRET, body))}" } })
-          raise(Error.new('Authentication token not found')) if response['at'].blank?
-          raise(Error.new('API key not found')) if response['user'].blank? || response['user']['apikey'].blank?
+          response = rest_request(:post, '/v2/user/login', {
+            body:,
+            headers: {
+              'Authorization' => "Sign #{Base64.encode64(OpenSSL::HMAC.digest('SHA256', APP_SECRET, body))}",
+              'X-CK-Appid': APP_ID,
+              'X-CK-Nonce': nonce,
+            },
+          })
+          raise(Error.new('Invalid authentication response')) unless response['data'].is_a?(Hash) && response['data']['user'].is_a?(Hash)
+          raise(Error.new('Authentication token not found')) unless response['data']['at'].present?
+          raise(Error.new('API key not found')) unless response['data']['user']['apikey'].present?
           {
-            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' } },
+            api_key: response['data']['user']['apikey'].tap { Ewelink.logger.debug(self.class.name) { 'API key found' } },
+            authentication_token: response['data']['at'].tap { Ewelink.logger.debug(self.class.name) { 'Authentication token found' } },
           }
         end
       end
@@ -273,15 +277,22 @@ module Ewelink
     def devices
       synchronize(:devices) do
         @devices ||= begin
-          params = {
-            'appid' => APP_ID,
-            'getTags' => 1,
-            'nonce' => nonce,
-            'ts' => Time.now.to_i,
-            'version' => VERSION,
-          }
-          response = rest_request(:get, '/api/user/device', headers: authentication_headers, query: params)
-          response['devicelist'].tap { |devices| Ewelink.logger.debug(self.class.name) { "Found #{devices.size} device(s)" } }
+          devices = []
+          homes_ids.each do |home_id|
+            params = {
+              'familyid' => home_id,
+              'num' => 0,
+            }
+            headers = authentication_headers.merge(
+              'X-CK-Appid' => APP_ID,
+              'X-CK-Nonce' => nonce,
+            )
+            response = rest_request(:get, '/v2/device/thing', headers:, query: params)
+            raise('Invalid devices response') unless response['data'].is_a?(Hash) && response['data']['thingList'].is_a?(Array)
+            devices += response['data']['thingList']
+          end
+          Ewelink.logger.debug(self.class.name) { "Found #{devices.size} device(s)" }
+          devices
         end
       end
     end
@@ -294,6 +305,20 @@ module Ewelink
       switches.find { |switch| switch[:uuid] == uuid } || raise(Error.new("No such switch with UUID: #{uuid.inspect}"))
     end
 
+    def homes_ids
+      synchronize(:homes_ids) do
+        @homes_ids ||= begin
+          headers = authentication_headers.merge(
+            'X-CK-Appid' => APP_ID,
+            'X-CK-Nonce' => nonce,
+          )
+          response = rest_request(:get, '/v2/family', headers:)
+          raise('Invalid homes response') unless response['data'].is_a?(Hash) && response['data']['familyList'].is_a?(Array)
+          response['data']['familyList'].map { |home| home['id'] }.compact.uniq
+        end
+      end
+    end
+
     def nonce
       SecureRandom.hex[0, 8]
     end
@@ -311,17 +336,17 @@ module Ewelink
 
     def rest_request(method, path, options = {})
       url = "#{URL.gsub('#{region}', region)}#{path}"
+      url.gsub!(/#{Regexp.escape("#{region}-api")}/, "#{region}-disp") if options[:dispatch].present?
       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:).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']
+      if response['error'] == 10_004 && response['data'].present? && response['data']['region'].present?
+        @region = response['data']['region']
         Ewelink.logger.debug(self.class.name) { "Switched to region #{region.inspect}" }
         return rest_request(method, path, options)
       end
-      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
@@ -468,13 +493,12 @@ module Ewelink
       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)
+          response = rest_request(:post, '/dispatch/app', body: JSON.generate(params), dispatch: true, 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")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ewelink
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Alexis Toulotte
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-20 00:00:00.000000000 Z
+date: 2022-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport