atrea_control 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3801a6bbd9c137e26eecbf9adcb43d8d1ba7fd7dbcc19be4a95ff1ae5a189a47
-  data.tar.gz: efd8adb1f53738b28aac974260c0fca23d46ab3329ec745d2fce6d5bb73c43cf
+  metadata.gz: 4a5ccc9d8596b46a4ec4c2eb98e26b820c62bfdbf91c8c1b732adc9f858f31bf
+  data.tar.gz: bac1c0183608fe7f16c679578203fba54c10d8e2270be7d0bf68fb1f17d7cce4
 SHA512:
-  metadata.gz: a22728dedc9c10022d86dc433d81cacd91193a1851f4302d066763fa8f600c9a632dc02d235f97560d7300f72618ce25c57f83e4581085d049d41c36f7e0b340
-  data.tar.gz: e4348ee806d25350c3b2d1f861cec60f8b77504005aabd57115a82966ebb084735f7a8d04a4f79538dbbaa9dff777a34429551d90f302ebdf20dfddc632a09a2
+  metadata.gz: 657e441b8aa3ecfaa5eb8905ff6e22064d70d43984156bd15c6b7dfc17f6ed92e1a7c8318cd7febeb2ce68c621ff06f69561cd8861b642f2313f4421df098597
+  data.tar.gz: 97dcc1fa4810f952e4b89d2f610c93a2359debb663b0138f8bf3d5771ca9e4ddfb96be2d9c8e0a0a2a2667f1daa4533606704adfc9a89571a4d0852800cf7bf1

data/.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 /.idea
 /.bundle/
 /.yardoc

data/CHANGELOG.md

@@ -1,4 +1,9 @@
 ## [Unreleased]
+## [1.3.0] - 2021-12-11
+### Changed
+- store auth tokens outside
+- minimize selenium only for login
+
 ## [1.2.1] - 2021-10-30
 ### Changed
 - login procedure

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    atrea_control (1.2.1)
+    atrea_control (1.3.0)
       nokogiri (~> 1.12)
       rest-client (~> 2.1)
       selenium-webdriver (~> 3.142)
@@ -25,9 +25,9 @@ GEM
     http-cookie (1.0.4)
       domain_name (~> 0.5)
     method_source (1.0.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0901)
+    mime-types-data (3.2021.1115)
     netrc (0.11.0)
     nokogiri (1.12.5-x86_64-darwin)
       racc (~> 1.4)

data/lib/atrea_control/duplex.rb

@@ -14,6 +14,8 @@ module AtreaControl
     # @return [DateTime] store time of last update
     attr_reader :valid_for
 
+    attr_accessor :user_id, :unit_id, :auth_token
+
     # @param [String] login
     # @param [String] password
     # @param [Hash] sensors_map which box is related to sensor ID
@@ -32,7 +34,7 @@ module AtreaControl
 
       options = Selenium::WebDriver::Firefox::Options.new
       options.headless! unless ENV["NO_HEADLESS"]
-      @driver ||= Selenium::WebDriver.for :firefox, options: options
+      @driver ||= Selenium::WebDriver.for :firefox, capabilities: [options]
     end
 
     def logged?
@@ -48,10 +50,12 @@ module AtreaControl
       @login_in_progress = true
       logger.debug "start new login"
       driver.get CONTROL_URI
-      submit_login_form if user.nil? || !logged?
+      submit_login_form unless logged?
       finish_login
-      @login_in_progress = false
+      refresh!
       inspect
+    ensure
+      @login_in_progress = false
     end
 
     # Submit given credentials and proceed login
@@ -70,26 +74,30 @@ module AtreaControl
     def open_dashboard
       uri = driver.find_element(tag_name: "object").attribute "data"
       driver.get uri
+      user_id && unit_id && auth_token
       logger.debug "#{name} login success"
     end
 
     # @return [String]
     def name
-      return unless logged?
-
-      container = driver.find_element css: "div#pageTitle > h2"
-      container.text
-    end
-
-    # @return [String] ID of logged user
-    def user_id
-      @user_id ||= driver.execute_script("return window._user")
-    end
-
-    # @return [String] ID of recuperation unit
-    def unit_id
-      @unit_id ||= driver.execute_script("return window._unit")
-    end
+      @name ||= driver.find_element(css: "div#pageTitle > h2")&.text if logged?
+      @name
+    end
+
+    # # @return [String] ID of logged user
+    # def user_id
+    #   @user_id ||= driver.execute_script("return window._user")
+    # end
+    #
+    # # @return [String] ID of recuperation unit
+    # def unit_id
+    #   @unit_id ||= driver.execute_script("return window._unit")
+    # end
+    #
+    # # @return [String] session token
+    # def auth_token
+    #   @auth_token ||= user&.[]("auth")
+    # end
 
     # Window.user object from atrea
     # @return [Hash, nil]
@@ -107,8 +115,8 @@ module AtreaControl
 
     # quit selenium browser
     def close
-      @user_auth = nil
       driver.quit
+    ensure
       remove_instance_variable :@driver
     end
 
@@ -116,8 +124,7 @@ module AtreaControl
 
     def as_json(_options = nil)
       {
-        logged: logged?,
-        current_mode: current_mode_name,
+        current_mode: current_mode,
         current_power: current_power,
         outdoor_temperature: outdoor_temperature,
         valid_for: valid_for,
@@ -130,9 +137,9 @@ module AtreaControl
       as_json.to_json(*args)
     end
 
-    def inspect
-      "<AtreaControl name: '#{name}' outdoor_temperature: '#{outdoor_temperature}°C' current_power: '#{current_power}%' current_mode: '#{current_mode_name}' valid_for: '#{valid_for}'>"
-    end
+    # def inspect
+    #   "<AtreaControl name: '#{name}' outdoor_temperature: '#{outdoor_temperature}°C' current_power: '#{current_power}%' current_mode: '#{current_mode}' valid_for: '#{valid_for}'>"
+    # end
 
     def call_unit!
       return false if @login_in_progress
@@ -141,18 +148,25 @@ module AtreaControl
       parse_response(response_comm_unit)
       @valid_for = Time.now
       as_json
-    rescue RestClient::Forbidden
-      logger.debug "session expired..."
-      close if @logged
-      login && call_unit!
     end
 
     private
 
+    # @see scripts.php -> loadRD5Values(node, init)
+    # @note
+    #   if(values[key]>32767) values[key]-=65536;
+    # 			if(params[key] && params[key].offset)
+    # 				values[key]=values[key]-params[key].offset;
+    # 			if(params[key] && params[key].coef)
+    # 				values[key]=values[key]/params[key].coef;
     def parse_response(response)
       xml = Nokogiri::XML response.body
       sensors_values = @sensors.transform_values do |id|
-        xml.xpath("//O[@I=\"#{id}\"]/@V").last&.value
+        value = xml.xpath("//O[@I=\"#{id}\"]/@V").last&.value.to_i
+        value -= 65_536 if value > 32_767
+        # value -= 0 if "offset"
+        # value -= 0 if "coef"
+        value
       end
       refresh_data(sensors_values)
     end
@@ -160,7 +174,7 @@ module AtreaControl
     # @param [Hash] values
     # @return [Hash]
     def refresh_data(values)
-      @outdoor_temperature = values[:outdoor_temperature].to_f / 10
+      @outdoor_temperature = values[:outdoor_temperature].to_f / 10.0
       @current_power = values[:current_power].to_f
       @current_mode = mode_map[values[:current_mode]]
 
@@ -169,7 +183,7 @@ module AtreaControl
 
     # ? I10204 ?
     def mode_map
-      { "0" => "Vypnuto", "1" => "Automat", "2" => "Větrání", "6" => "Rozvážení" }
+      { 0 => "Vypnuto", 1 => "Automat", 2 => "Větrání", 6 => "Rozvážení" }
     end
 
     def logger
@@ -194,13 +208,21 @@ module AtreaControl
     # @return [RestClient::Response]
     def response_comm_unit
       params = {
-        _user: user_id,
+        _user: user_id.to_i,
         _unit: unit_id,
-        auth: user&.[]("auth"),
+        auth: auth_token || "null",
         _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
+
+    # Update tokens based on current state
+    def refresh!
+      @user_id = driver.execute_script("return window._user")
+      @unit_id = driver.execute_script("return window._unit")
+      @auth_token = user&.[]("auth")
+    end
+
   end
 end

data/lib/atrea_control/version.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
 module AtreaControl
-  VERSION = "1.2.1"
+
+  VERSION = "1.3.0"
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atrea_control
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Lukáš Pokorný
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-30 00:00:00.000000000 Z
+date: 2021-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri