reso_api 0.4.5 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 783eaa57a1160b45fb74a5aa0c2e159c7e498abcc0ff2eb89b86caabbad019dc
-  data.tar.gz: 2d31ba3674b7b3298fb85f33df80a544103de89a26465047a0e4b9e434f8a9e9
+  metadata.gz: d52973c086bdbeff331fc267832e7ece9c7002d5f10e9273c619e9ff985a2ffa
+  data.tar.gz: ac5cfd9c1416bb0a43d38d514ca7b3213f133749630869bc55fb2855c797e99c
 SHA512:
-  metadata.gz: b19fed3dbd9fb764357b5a49d3347b43017e28722bfd3462726af79fe9235699c63c0723c7a69e2da6aae487cd1ee579e88d03ab394395d3e8467619f4d26b92
-  data.tar.gz: 334a26aa6f3f2ed207573670e8bbc65ea4fa41bd9503285644b79cc1f102718ac845783e714d7ae2da4f2c162d467561ec3d17737e70328be70dc4260ecbbafc
+  metadata.gz: 13689a885600bd73802304c034c9b48bfa1f635fc2016e2be3780575a6a142f6e80809e6af010d65dd4d63be1567c5bf08f33cd89925343932d4dcb1ab3bc455
+  data.tar.gz: c770fb9aba3551dd8ee037a37a8ddb6853af78d6530b78856ad45a5d045caeeba0c32ca70f75889a8182a95f8283ac93e273945894284924210365c32b3d7bb5

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],
@@ -106,12 +107,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,17 +143,36 @@ 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.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
+          else
+            raise
+          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.5"
+  VERSION = "0.4.8"
 end

metadata

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