ecobee 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b62f3e7da3fde7ec3f2b62407f1f4f656179ff29
-  data.tar.gz: 39a2c7d8f683b4094052ce433bc94d97064e6026
+  metadata.gz: 575fc2d302100473a36bfa0f69baa2e526411299
+  data.tar.gz: e51eddbffa9c14644f42b50c593e364ee29af2f0
 SHA512:
-  metadata.gz: bc42968dec571366c148e4c6ebaf365be8c587bfeaf31355aa833302b474776bd95e8c8fc04c61ea207a3a26d81e49dcd540154994e615fe67e2097fe0778236
-  data.tar.gz: a1d941292c3b5be46861e8020f03c515d85f3810009ad4eb7efbaea2dab1bd613a96b733aec772324ab8553a6982ea1309aceb240d142b094acf2037b5084592
+  metadata.gz: a69f91e5d21bdefd5bee37ee9ad4972b673a7c8c70a03479f5ac97ef4db283f75f426b11e2898e8d02470ff852f7566755be5f658a6928ce05732d66de54070c
+  data.tar.gz: c4905da53e6d28f7744008caa34267224f945e3b60396c87190b2b3d8a4af4b1c33267d5514b5b7b816c0cc17fc0a20eb573f8e72f1c101d4fd56182c379fc87

data/lib/ecobee.rb

@@ -14,6 +14,8 @@ module Ecobee
 
   class AuthError < HTTPError ; end
 
+  class RetryAuthError < AuthError ; end
+
   API_HOST = 'api.ecobee.com'
   API_PORT = 443
   API_URI_BASE= "https://#{API_HOST}:#{API_PORT}"
@@ -40,7 +42,8 @@ module Ecobee
 
   MAX_LOG_LENGTH = 1200
 
-  REFRESH_PAD = 30
+  AUTH_PAD = 30
+  REFRESH_PAD = 240
 
   SCOPES = [:smartWrite, :smartRead]
   DEFAULT_SCOPE = SCOPES[1]

data/lib/ecobee/http.rb

@@ -110,6 +110,8 @@ class HTTPError < StandardError ; end
         Net::HTTP.start(API_HOST, API_PORT)
       end
       @http
+    rescue SocketError => msg
+      raise Ecobee::HTTPError.new("HTTP.http SocketError => #{msg}")
     end
 
     def open_log(log_file)

data/lib/ecobee/token.rb

@@ -7,7 +7,6 @@ module Ecobee
                 :callbacks,
                 :http,
                 :pin,
-                :refresh_token,
                 :result,
                 :status,
                 :scope,
@@ -51,11 +50,12 @@ module Ecobee
     end
 
     def access_token
+     config_load if access_token_expired?
      if @access_token
        if access_token_expired?
          if @refresh_token
            @http.log "access_token: refreshing #{@access_token}, #{@access_token_expire}, #{Time.now.to_i}"
-           refresh_access_token
+           refresh_access_token_wrapper
          else
            @http.log "access_token: token_register"
            token_register 
@@ -90,6 +90,7 @@ module Ecobee
     end
 
     def config_load
+      # TODO: track file mod time & last_read to avoid excessive rereads
       config = config_read_our_section
       if @callbacks[:load].respond_to? :call
         config = @callbacks[:load].call(config)
@@ -116,34 +117,44 @@ module Ecobee
       "enter the PIN #{@pin || ''}"
     end
 
-    def refresh_access_token
+    def refresh_access_token(retries: 0)
       arg = sprintf("?grant_type=refresh_token&refresh_token=%s&client_id=%s",
-                    @refresh_token,
+                    refresh_token,
                     @app_key)
       result = @http.post(arg: arg,
                           no_auth: true,
                           resource_prefix: 'token',
                           validate_status: false)
       if result.key? 'error'
+        if retries > 0 && result['error'] == 'invalid_grant'
+          raise Ecobee::RetryAuthError.new
+        end
         @access_token, @access_token_expire, @pin, @scope, @refresh_token = nil
         config_save
-        raise Ecobee::AuthError.new(
-          "Result Error: (%s) %s" % [result['error'],
-                                     result['error_description']]
-        )
+        raise Ecobee::AuthError.new("Result Error: (%s) %s" % [
+                                    result['error'],
+                                    result['error_description']])
       else
-        @access_token = result['access_token']
-        @access_token_expire = Time.now.to_i + result['expires_in']
-        @pin = nil
-        @refresh_token = result['refresh_token']
-        @scope = result['scope']
-        @token_type = result['token_type']
-        @status = :ready
-        config_save
-        @access_token
+        result_load_to_memory result
       end 
     end
 
+    def refresh_access_token_wrapper
+      retries = 3
+      retries.times do |attempt|
+        begin
+          refresh_access_token(retries: retries - attempt)
+        rescue Ecobee::RetryAuthError.new
+          sleep 10
+        end
+      end
+    end
+
+    def refresh_token
+      config_load
+      @refresh_token
+    end
+
     def register_callback(type, *callback, &block)
       if block_given?
         puts "Registering #{type}"
@@ -205,18 +216,22 @@ module Ecobee
           )
         end
       else
-        @status = :ready
-        @access_token = result['access_token']
-        @token_type = result['token_type']
-        @access_token_expire = Time.now.to_i + result['expires_in']
-        @refresh_token = result['refresh_token']
-        @scope = result['scope']
-        @pin = nil
-        config_save
-        @access_token
+        result_load_to_memory result
       end
     end
 
+    def result_load_to_memory(result)
+      @status = :ready
+      @access_token = result['access_token']
+      @access_token_expire = Time.now.to_i + result['expires_in']
+      @pin = nil
+      @refresh_token = result['refresh_token']
+      @scope = result['scope']
+      @token_type = result['token_type']
+      config_save
+      @access_token
+    end
+
     def config_load_to_memory(config)
       @app_key ||= config['app_key']
       if !@access_token

data/lib/ecobee/version.rb

@@ -1,3 +1,3 @@
 module Ecobee
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecobee
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Rob Zwissler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2016-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler