reso_api 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e36e84a9836dcd15e9fd545c3b4eb4b42759771dc9593d410de6ed8d6558ff4
-  data.tar.gz: ff23c4f1a94ee411f42a8d2f25e05e39d20a1e47a13ea2f5a0314b2a31a36b45
+  metadata.gz: 9b02d03482a2216a50877b15d2f8ff6951294625470fb09d9fa1753ece52e4f6
+  data.tar.gz: 3a7d7c7b2dc6af22e9af6575e2556a35b117af5e0839edf004d8f04d7f68ceb5
 SHA512:
-  metadata.gz: abd9c1f86ec78924c29b13a23c52b27e5f0ebfdcc888d52e3391a4d25ba606ccd3b49d4e4fba36339ebd14f22c5415244a81ab7201afbc9e5a9de5ec597c5a03
-  data.tar.gz: a3f09fb8c92dd56d1b8f1d0c5e24d5321d33d2d218de2172f50999ea5be02e46264e335bbb33dde12a806ea3e2ebb51a1381f4448c1ca4f771c1de998a6b1f8c
+  metadata.gz: db880d0367a2a249bb80bca2fddde68fd6aa70a8ab7a54d636a3629c88f2a1538b7adc0c89b9750af68154837c0b5782c1eeb839e2152c9915532ad52b80c70c
+  data.tar.gz: 2451fdda3931aad5aa2e25d2af334d262988ad1aaef0484fe8f96c368a5e39bb6cb0f1a37ae9a38b5dc93c5e369f0b61e86be23b7716befcf65f622a597308ee

data/lib/reso_api/app/models/reso/api/client.rb

@@ -50,6 +50,7 @@ module RESO
         define_method method_name do |*args, &block|
           hash = args.first.is_a?(Hash) ? args.first : {}
           endpoint = FILTERABLE_ENDPOINTS[method_name]
+          response = {}
           params = {
             "$select": hash[:select],
             "$filter": hash[:filter],
@@ -61,6 +62,7 @@ module RESO
             "$count": hash[:count].to_s.presence,
             "$debug": hash[:debug]
           }.compact
+          File.open("timespans", 'a') { |file| file.write("Timestamp\tDuration\tCode\tMessage\tPath\n") }
           if !block.nil?
             response = perform_call(endpoint, params)
             response["value"].each{|hash| block.call(hash)} if response["value"].class.eql?(Array)
@@ -106,12 +108,17 @@ module RESO
         if expiration > DateTime.now.utc
           return payload.token
         else
-          @oauth2_payload = oauth2_client.client_credentials.get_token
-          File.write(oauth2_token_path, @oauth2_payload.to_hash.to_json)
+          @oauth2_payload = fresh_oauth2_payload
           return @oauth2_payload.token
         end
       end
 
+      def fresh_oauth2_payload
+        @oauth2_payload = oauth2_client.client_credentials.get_token
+        File.write(oauth2_token_path, @oauth2_payload.to_hash.to_json)
+        return @oauth2_payload
+      end
+
       def oauth2_token_path
         File.join(Dir.tmpdir, [base_url.parameterize, "-oauth-token.json"].join)
       end
@@ -137,18 +144,34 @@ module RESO
 
       def perform_call(endpoint, params)
         uri = uri_for_endpoint(endpoint)
+        retries = 0
         if params.present?
           query = params.present? ? URI.encode_www_form(params).gsub("+", " ") : ""
           uri.query && uri.query.length > 0 ? uri.query += '&' + query : uri.query = query
           return URI::decode(uri.request_uri) if params.dig(:$debug).present?
         end
-        request = Net::HTTP::Get.new(uri.request_uri)
-        request['Authorization'] = "Bearer #{oauth2_token}"
-        response = Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
-          http.max_retries = 10
-          http.request(request)
+        begin
+          req = Net::HTTP::Get.new(uri.request_uri)
+          req['Authorization'] = "Bearer #{oauth2_token}"
+          res = Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
+            http.request(req)
+          end
+          response = JSON(res.body) rescue res.body
+          if response.is_a?(String) && response.include?('Bad Gateway')
+            raise StandardError
+          elsif response.is_a?(String) && response.include?('Unauthorized')
+            fresh_oauth2_payload
+            raise StandardError
+          elsif response.is_a?(Hash) && response.has_key?("error")
+            raise StandardError
+          end
+        rescue Net::ReadTimeout, StandardError
+          if (retries += 1) <= 5
+            sleep 10
+            retry
+          end
         end
-        return JSON(response.body) rescue response.body
+        return response
       end
 
     end

data/lib/reso_api/version.rb

@@ -1,3 +1,3 @@
 module ResoApi
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reso_api
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Michael Edlund
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-29 00:00:00.000000000 Z
+date: 2022-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler