ewelink 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb352abf05d6bb6ef2f3b277c6f551d436bed969086478d3e121fd2e178fe4f9
-  data.tar.gz: b74266f2cbc92457a3bb0dc087752299a5a9f8348d3928a79d8c3c0719653e6a
+  metadata.gz: 2392627c54c851fb5fd14194b484b56b1013b7a26e8d5bafe2a79e37dfa80464
+  data.tar.gz: 2a5362bafa04f9e3cf212a5899b4e6183514fdff68b3146a4fa245c52e8fcadd
 SHA512:
-  metadata.gz: 2c5bb695c7d0094436454694008dd3c05c660fb1c7dfe2436ec1fa2fae3341559f901f3b9ae4ebfa99fcc276dcd4ceee02205ed1608d03e515b8da64b52f8a25
-  data.tar.gz: 4713a948c736a40496b3b33fff3b83253a4559693d692cfaa7251a4fc2d3f0e67699834f6513226edcbfe6cf7759ab54b1cb6c5a24cbe1559f54a75d6cbda6fd
+  metadata.gz: b2d3ecbf884461e11a51cf7e4efe7438f1c066cc7c076629371c96b3255b50f2a3f4e0314f6a40f9b7247adef06d69eb0b1f66b31ebcabff1c46b7def21d8291
+  data.tar.gz: a2d064d2af9e800ef0165bf5d614e4857abb0503b1faad7e280f3f2df422f08c5c49e57e10b3202bfcac700dc667861690c0a29a44faaf13a5ae00307201fe87

data/VERSION

@@ -1 +1 @@
-2.1.1
+2.2.0

data/ewelink.gemspec

@@ -16,8 +16,8 @@ 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_dependency 'websocket-client-simple', '>= 0.3.0', '< 0.4.0'
 
   s.add_development_dependency 'byebug', '>= 11.0.0', '< 12.0.0'
   s.add_development_dependency 'rake', '>= 12.0.0', '< 13.0.0'

data/lib/ewelink.rb

@@ -1,6 +1,8 @@
 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'
@@ -9,7 +11,6 @@ require 'openssl'
 require 'optparse'
 require 'set'
 require 'timeout'
-require 'websocket-client-simple'
 
 module Ewelink
 

data/lib/ewelink/api.rb

@@ -50,7 +50,7 @@ module Ewelink
     end
 
     def reload
-      Ewelink.logger.debug(self.class.name) { 'Reloading API (authentication token, devices, region, connections,...)' }
+      Ewelink.logger.debug(self.class.name) { 'Reloading API (authentication token, devices, region,...)' }
       dispose_web_socket
       [
         :@api_keys,
@@ -102,21 +102,20 @@ module Ewelink
     def switch_on?(uuid)
       switch = find_switch!(uuid)
       if @web_socket_switches_statuses[switch[:uuid]].nil?
-        params = {
-          'action' => 'query',
-          'apikey' => switch[:api_key],
-          'deviceid' => switch[:device_id],
-          'sequence' => web_socket_sequence,
-          'ts' => 0,
-          'userAgent' => 'app',
-        }
         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
-        Ewelink.logger.debug(self.class.name) { "Switch #{switch[:uuid].inspect} is #{@web_socket_switches_statuses[switch[:uuid]]}" }
         @web_socket_switches_statuses[switch[:uuid]] == 'on'
       end
     end
@@ -176,6 +175,24 @@ module Ewelink
       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
@@ -221,14 +238,16 @@ module Ewelink
     end
 
     def dispose_web_socket
+      Ewelink.logger.debug(self.class.name) { 'Dispose WebSocket' }
       @web_socket_authenticated_api_keys.clear
       @web_socket_switches_statuses.clear
 
-      if @web_socket_ping_thread
-        if Thread.current == @web_socket_ping_thread
-          Thread.current[:stop] = true
+      [@web_socket_ping_thread, @web_socket_thread].each do |thread|
+        next unless thread
+        if Thread.current == thread
+          thread[:stop] = true
         else
-          @web_socket_ping_thread.kill
+          thread.kill
         end
       end
 
@@ -244,6 +263,7 @@ module Ewelink
         :@last_web_socket_pong_at,
         :@web_socket_ping_interval,
         :@web_socket_ping_thread,
+        :@web_socket_thread,
         :@web_socket_url,
         :@web_socket,
       ].each do |variable|
@@ -286,15 +306,29 @@ module Ewelink
       raise Error.new(e)
     end
 
-    def send_to_web_socket(data)
+    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(data)
-    rescue
+      web_socket.send(message)
+    rescue => e
       dispose_web_socket
-      raise
+      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)
@@ -303,94 +337,73 @@ module Ewelink
 
     def web_socket
       synchronize(:web_socket) do
-        @web_socket ||= begin
-          api = self
+        next @web_socket if @web_socket
 
-          WebSocket::Client::Simple.connect(web_socket_url) do |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.on(:close) do
-              api.instance_eval do
-                Ewelink.logger.debug(self.class.name) { 'WebSocket closed' }
-                dispose_web_socket
-              end
+            @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(:error) do |e|
-              api.instance_eval do
-                Ewelink.logger.warn(self.class.name) { "WebSocket error: #{e}" }
-                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 |message|
-              api.instance_eval do
-                if message.data == 'pong'
-                  Ewelink.logger.debug(self.class.name) { "Received WebSocket #{message.data.inspect} message" }
-                  @last_web_socket_pong_at = Time.now
-                  next
-                end
+            @web_socket.on(:message) do |event|
+              message = event.data
 
-                begin
-                  response = JSON.parse(message.data)
-                rescue => e
-                  Ewelink.logger.error(self.class.name) { "WebSocket JSON parse error" }
-                  next
-                end
+              if message == 'pong'
+                Ewelink.logger.debug(self.class.name) { "Received WebSocket #{message.inspect} message" }
+                @last_web_socket_pong_at = Time.now
+                next
+              end
 
-                if response.key?('error') && response['error'] != 0
-                  Ewelink.logger.error(self.class.name) { "WebSocket message error: #{message.data}" }
-                  next
-                end
+              begin
+                json = JSON.parse(message)
+              rescue => e
+                Ewelink.logger.error(self.class.name) { 'WebSocket JSON parse error' }
+                next
+              end
 
-                if !@web_socket_ping_thread && response.key?('config') && response['config']['hb'] == 1 && response['config']['hbInterval'].present?
-                  @last_web_socket_pong_at = Time.now
-                  @web_socket_ping_interval = response['config']['hbInterval'] + 7
-                  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
+              if json.key?('error') && json['error'] != 0
+                Ewelink.logger.error(self.class.name) { "WebSocket message error: #{message.inspect}" }
+                next
+              end
 
-                if response['apikey'].present? && !@web_socket_authenticated_api_keys.include?(response['apikey'])
-                  @web_socket_authenticated_api_keys << response['apikey']
-                  Ewelink.logger.debug(self.class.name) { "WebSocket successfully authenticated API key: #{response['apikey'].truncate(16).inspect}" }
-                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 response['deviceid'].present? && response['params'].is_a?(Hash) && response['params']['switch'].present?
-                  switch = switches.find { |switch| switch[:device_id] == response['deviceid'] }
-                  @web_socket_switches_statuses[switch[:uuid]] = response['params']['switch'] if switch.present?
-                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
-            end
 
-            web_socket.on(:open) do
-              api.instance_eval do
-                Ewelink.logger.debug(self.class.name) { 'WebSocket opened' }
-                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))
+              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
 
@@ -428,13 +441,10 @@ module Ewelink
     def web_socket_wait_for(condition, &block)
       web_socket # Initializes WebSocket
       Timeout.timeout(REQUEST_TIMEOUT) do
-        loop do
-          if condition.call
-            return yield if block_given?
-            return true
-          end
+        while !condition.call
           sleep(WEB_SOCKET_WAIT_INTERVAL)
         end
+        block_given? ? yield : true
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ewelink
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Alexis Toulotte
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -31,45 +31,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 7.0.0
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.11.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.11.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
-  name: websocket-client-simple
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.18.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.18.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement