atrea_control 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 857675ccedb6095d28dced21a663615a053d1d12704da407ea0e6c029bd657eb
-  data.tar.gz: e2ed731b15bd2d742e230da0ae1b0b276f3b3d8a47dacac9f920424891507ed8
+  metadata.gz: ff5e62d3cbb95e39a1b342fa6662636255b8d78b6d76ab54f1e4c3cc12841afc
+  data.tar.gz: b1aa30c99ff332e261cb3c9e9752bba0eedd16e730bec244c67e91b51b2ab661
 SHA512:
-  metadata.gz: 98f9cbff3552cfc90bf823048d5724b56b0f40877a096bab44181c4890c310bda7c6bb2238376529c730070746455f36a5efe10fd0bf6d75ac62108c280052b9
-  data.tar.gz: 7b5737cdd13aae0767a6ed41329ddbb886c6002e2d2bb65b248a35306a582859056d32afd7253fab54ae026a22f487ce700ce095ceb4e0dcaf416d459961759b
+  metadata.gz: 881da41972aea45c4e3ea36b2a14ec44d87c9a8d42e6249048780bcfb9066c8c42b35d27770be7f23663a13cc3f0b663b621030adb58f52714851d7d3a833354
+  data.tar.gz: ee2aaa4913ab06f77ff3fab98661b53085519dffdb1b49786d39e32db80d365618d274e3aef17d12e6041bba9d8d7f030afe5616e5c106c16ccd84062bb88b83

data/.rubocop_todo.yml

@@ -1,12 +1,12 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude`
-# on 2021-09-13 19:43:25 UTC using RuboCop version 1.20.0.
+# on 2021-10-26 20:31:23 UTC using RuboCop version 1.22.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
+# Offense count: 2
 # Configuration parameters: CountComments, Max, CountAsOne, ExcludedMethods, IgnoredMethods.
 # IgnoredMethods: refine
 Metrics/BlockLength:
@@ -14,13 +14,19 @@ Metrics/BlockLength:
     - '**/*.gemspec'
     - 'spec/atrea_control/duplex_spec.rb'
 
-# Offense count: 4
+# Offense count: 1
+# Configuration parameters: CountComments, Max, CountAsOne.
+Metrics/ClassLength:
+  Exclude:
+    - 'lib/atrea_control/duplex.rb'
+
+# Offense count: 5
 # Configuration parameters: .
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
   EnforcedStyle: receive
 
-# Offense count: 1
+# Offense count: 2
 # Configuration parameters: Max.
 RSpec/MultipleExpectations:
   Exclude:
@@ -31,7 +37,7 @@ RSpec/StubbedMock:
   Exclude:
     - 'spec/atrea_control/duplex_spec.rb'
 
-# Offense count: 4
+# Offense count: 5
 RSpec/SubjectStub:
   Exclude:
     - 'spec/atrea_control/duplex_spec.rb'
@@ -60,9 +66,9 @@ Style/MutableConstant:
   Exclude:
     - 'spec/atrea_control/duplex_spec.rb'
 
-# Offense count: 1
+# Offense count: 2
 # Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
   Exclude:

data/CHANGELOG.md

@@ -1,4 +1,8 @@
 ## [Unreleased]
+## [1.2.0] - 2021-10-26
+### Changed
+- use internal unit.php for read values
+- reload login automatically if session expire
 ## [1.1.0] - 2021-10-22
 ### Added
 - to_json

data/Gemfile

@@ -9,4 +9,7 @@ gem "rake", "~> 13.0"
 gem "rspec", "~> 3.10"
 gem "rubocop", "~> 1.7", require: false
 gem "rubocop-rspec", "~> 2.4", require: false
-gem "simplecov", require: false, group: :test
+group :test do
+  gem "simplecov", require: false
+  gem "webmock", "~> 3.14"
+end

data/Gemfile.lock

@@ -1,22 +1,49 @@
 PATH
   remote: .
   specs:
-    atrea_control (1.1.0)
+    atrea_control (1.2.0)
+      nokogiri (~> 1.12)
+      rest-client (~> 2.1)
       selenium-webdriver (~> 3.142)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     childprocess (3.0.0)
+    crack (0.4.5)
+      rexml
     diff-lcs (1.4.4)
     docile (1.4.0)
-    parallel (1.20.1)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    hashdiff (1.0.1)
+    http-accept (1.7.0)
+    http-cookie (1.0.4)
+      domain_name (~> 0.5)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2021.0901)
+    netrc (0.11.0)
+    nokogiri (1.12.5-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.12.5-x86_64-linux)
+      racc (~> 1.4)
+    parallel (1.21.0)
     parser (3.0.2.0)
       ast (~> 2.4.1)
+    public_suffix (4.0.6)
+    racc (1.6.0)
     rainbow (3.0.0)
     rake (13.0.6)
     regexp_parser (2.1.1)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -31,20 +58,19 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.20.0)
+    rubocop (1.22.2)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.9.1, < 2.0)
+      rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.11.0)
+    rubocop-ast (1.12.0)
       parser (>= 3.0.1.1)
-    rubocop-rspec (2.4.0)
-      rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
+    rubocop-rspec (2.5.0)
+      rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     rubyzip (2.3.2)
     selenium-webdriver (3.142.7)
@@ -56,7 +82,14 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.3)
-    unicode-display_width (2.0.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8)
+    unicode-display_width (2.1.0)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   x86_64-darwin-19
@@ -69,6 +102,7 @@ DEPENDENCIES
   rubocop (~> 1.7)
   rubocop-rspec (~> 2.4)
   simplecov
+  webmock (~> 3.14)
 
 BUNDLED WITH
    2.2.17

data/atrea_control.gemspec

@@ -34,5 +34,7 @@ Gem::Specification.new do |spec|
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html
 
+  spec.add_dependency "nokogiri", "~> 1.12"
+  spec.add_dependency "rest-client", "~> 2.1"
   spec.add_dependency "selenium-webdriver", "~> 3.142"
 end

data/lib/atrea_control/duplex.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require "logger"
+require "nokogiri"
+require "rest-client"
 require "selenium-webdriver"
 
 module AtreaControl
@@ -8,6 +10,10 @@ module AtreaControl
   class Duplex
     CONTROL_URI = "https://control.atrea.eu/"
 
+    attr_reader :current_mode, :current_power, :outdoor_temperature
+    # @return [DateTime] store time of last update
+    attr_reader :valid_for
+
     # @param [String] login
     # @param [String] password
     # @param [Hash] sensors_map which box is related to sensor ID
@@ -21,6 +27,7 @@ module AtreaControl
       @sensors = sensors_map
     end
 
+    # @return [Selenium::WebDriver::Firefox::Driver]
     def driver
       return @driver if defined?(@driver)
 
@@ -44,8 +51,7 @@ module AtreaControl
 
       submit = form.find_element(css: "input[type=submit]")
       submit.click
-      finish_login
-      inspect
+      finish_login && inspect
     end
 
     # Retrieve dashboard URI from object tag and open it again
@@ -64,82 +70,124 @@ module AtreaControl
       container.text
     end
 
-    def unit_id
-      return unless logged?
-
-      element = driver.find_element css: "div#pageTitle > a"
-      element.attribute(:href) =~ /unit=(\d+)/
-      Regexp.last_match(1)
+    # @return [String] ID of logged user
+    def user_id
+      @user_id ||= driver.execute_script("return window._user")
     end
 
-    # @return [Float]
-    def outdoor_temperature
-      return unless logged?
-
-      element = sensor_element(@sensors[__method__])
-      element.find_element(css: "div").text.to_f
+    # @return [String] ID of recuperation unit
+    def unit_id
+      @unit_id ||= driver.execute_script("return window._unit")
     end
 
-    # @return [Float] in %
-    def current_power
-      return unless logged?
-
-      # element = driver.find_element id: "contentBox#{@sensors[__method__]}"
-      element = sensor_element(@sensors[__method__])
-      element.find_element(css: "div:first-child").text.to_f
+    # @return [String]
+    def user_auth
+      @user_auth ||= driver.execute_script("return window.user")&.[] "auth"
     end
 
     # @return [String]
-    def current_mode
-      return unless logged?
+    def current_mode_name
+      return current_mode unless logged?
 
-      element = sensor_element(@sensors[__method__])
+      element = sensor_element(@sensors[:current_mode])
       element.find_element(css: "div:first-child").text
     end
 
     # quit selenium browser
     def close
       @logged = false
+      @user_auth = nil
       driver.quit
+      remove_instance_variable :@driver
     end
 
+    alias logout! close
+
     def as_json(_options = nil)
       {
         logged: logged?,
-        current_mode: current_mode,
+        current_mode: current_mode_name,
         current_power: current_power,
         outdoor_temperature: outdoor_temperature,
+        valid_for: valid_for,
       }
     end
 
+    alias values as_json
+
     def to_json(*args)
       as_json.to_json(*args)
     end
 
     def inspect
-      "<AtreaControl name: '#{name}' outdoor_temperature: #{outdoor_temperature}°C current_power: #{current_power}% current_mode: '#{current_mode}'>"
+      "<AtreaControl name: '#{name}' outdoor_temperature: '#{outdoor_temperature}°C' current_power: '#{current_power}%' current_mode: '#{current_mode_name}' valid_for: '#{valid_for}'>"
     end
 
+    def call_unit!
+      return false unless user_auth
+
+      parse_response(response_comm_unit)
+      @valid_for = Time.now
+      as_json
+    rescue RestClient::Forbidden
+      close if @logged
+      login && call_unit!
+    end
 
     private
 
-    def logger
-      @logger ||= ::Logger.new($stdout)
+    def parse_response(response)
+      xml = Nokogiri::XML response.body
+      sensors_values = @sensors.transform_values do |id|
+        xml.xpath("//O[@I=\"#{id}\"]/@V").last&.value
+      end
+      refresh_data(sensors_values)
     end
 
-    def sensor_element(sensor_id)
-      driver.find_element id: "contentBox#{sensor_id}"
+    # @param [Hash] values
+    # @return [Hash]
+    def refresh_data(values)
+      @outdoor_temperature = values[:outdoor_temperature].to_f / 10
+      @current_power = values[:current_power].to_f
+      @current_mode = mode_map[values[:current_mode]]
+
+      as_json
+    end
+
+    # ? I10204 ?
+    def mode_map
+      { "0" => "Vypnuto", "1" => "Automat", "2" => "Větrání", "6" => "Rozvážení" }
+    end
+
+    def logger
+      @logger ||= ::Logger.new($stdout)
     end
 
     def finish_login
       13.times do |i|
         return true if open_dashboard
       rescue Selenium::WebDriver::Error::NoSuchElementError => _e
-        t = [5 * (1 + i), 25].min
+        t = [3 * (1 + i), 25].min
         logger.debug "waiting #{t}s for login..."
         sleep t
       end
       raise Error, "unable to login"
     end
+
+    def sensor_element(sensor_id)
+      driver.find_element id: "contentBox#{sensor_id}"
+    end
+
+    # @return [RestClient::Response]
+    def response_comm_unit
+      params = {
+        _user: user_id,
+        _unit: unit_id,
+        auth: user_auth,
+        _t: "config/xml.xml",
+      }
+      autologin_token = CGI.escape([@login, @password].join("\b"))
+      RestClient.get "https://control.atrea.eu/comm/sw/unit.php", { Cookie: "autoLogin=#{autologin_token}", params: params }
+    end
   end
 end

data/lib/atrea_control/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AtreaControl
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: atrea_control
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Lukáš Pokorný
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement