blackstack-core 1.2.29 → 1.2.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61e89c40560e966edd297c6fbce7e0099a94bce4dd88c0653f7e20feceb8234e
-  data.tar.gz: 28543d06207cc6399371e857b0982ec7432801e5344372304165a0aaa4053660
+  metadata.gz: f9422bf619ee5c62514cede0f715c896f9721bd679c106b328dce187a5a404a6
+  data.tar.gz: 46f704d4f1ce7e8c6d5664ef4c3de74bc5a1dd6179e42f8247956410445fccb4
 SHA512:
-  metadata.gz: 8545ef59846393d06cb272b8e503847b3c11e9837933ac770c546acf724265a6e560407dea7bcbe67bccf49ec505b89463b4aab52bb83094fdeb792b517f7479
-  data.tar.gz: 3eaac8af64b460a4cf941d3756faa219da65a75300cbe47fe1574ae4bb9426e3a5d6a2c028dcb81e940646bc4566f433ed48493cbf4665c5eee58d76b341823f
+  metadata.gz: 4cffd17c2b4a54c112fc6cacd6fec8a3f48b9286ea83e401662770a6580f4c40c030a229be9b3a066b965fb5a853cb79eb85d7ae15d358e8ca5908d0fe830eab
+  data.tar.gz: b71b7512bd2e941742359dd7135772956ed8956eafb98dc1c459760e0055a8009faabb14d3bd9e300047b401a747f053794cce0deaf6ddfd8cb4d3e7b2ef9ef9

data/lib/functions.rb

@@ -862,6 +862,10 @@ module BlackStack
     DEFAULT_SSL_VERIFY_MODE = OpenSSL::SSL::VERIFY_NONE
     SUCCESS = 'success'
 
+    DEFAULT_OPEN_TIMEOUT  = 10    # seconds to wait for the initial connection
+    DEFAULT_READ_TIMEOUT  = 30    # seconds to wait for each response
+    DEFAULT_RETRY_ATTEMPTS = 3
+
     @@lockfiles = []
 
     @@max_api_call_channels = 0 # 0 means infinite
@@ -927,32 +931,81 @@ module BlackStack
     #
     # TODO: parameter support_redirections has been deprecated.
     #
-    def self.call_post(url, body = {}, ssl_verify_mode=BlackStack::Netting::DEFAULT_SSL_VERIFY_MODE, support_redirections=true)
-      # issue: https://github.com/leandrosardi/mysaas/issues/59
-      #
-      # when ruby pushes hash of hashes (or hash of arrays), all values are converted into strings.
-      # and arrays are mapped to the last element only.
-      #
-      # the solution is to convert each element of the hash into a string using `.to_json` method.
-      #
-      # references:
-      # - https://stackoverflow.com/questions/1667630/how-do-i-convert-a-string-object-into-a-hash-object
-      # - https://stackoverflow.com/questions/67572866/how-to-build-complex-json-to-post-to-a-web-service-with-rails-5-2-and-faraday-ge
-      #
-      # iterate the keys of the hash
-      #
-      params = {} # not needed for post calls to access points
-      path = URI::parse(url).path
-      domain = url.gsub(/#{Regexp.escape(path)}/, '')
-
-      conn = Faraday.new(domain, :ssl=>{:verify=>ssl_verify_mode!=OpenSSL::SSL::VERIFY_NONE})
-      ret = conn.post(path, params) do |req|
-        req.body = body.to_json
-        req.headers['Content-Type'] = 'application/json'
-        req.headers['Accept'] =  'application/json'
+    def self.call_post(url,
+      body = {},
+      ssl_verify_mode = BlackStack::Netting::DEFAULT_SSL_VERIFY_MODE,
+      support_redirections = true)
+
+      max_redirects = 5
+      attempts      = 0
+
+      while attempts < DEFAULT_RETRY_ATTEMPTS
+        begin
+          # Create a basic Faraday connection
+          conn = Faraday.new(
+            url: url, #"#{uri.scheme}://#{uri.host}:#{uri.port}", 
+            ssl: { verify: ssl_verify_mode != OpenSSL::SSL::VERIFY_NONE },
+            request: {
+              open_timeout: DEFAULT_OPEN_TIMEOUT,
+              timeout:      DEFAULT_READ_TIMEOUT
+            }
+          ) do |f|
+            f.adapter Faraday.default_adapter
+          end
+
+          # Perform the initial POST request
+          response = conn.post(uri.path) do |req|
+            req.body = JSON.generate(body) # Manually serialize to JSON
+            req.headers['Content-Type'] = 'application/json'
+            req.headers['Accept']       = 'application/json'
+          end
+
+          # Manually handle HTTP redirects if requested
+          redirect_count = 0
+          while support_redirections &&
+            response.status.between?(300, 399) &&
+            response.headers['location'] &&
+            redirect_count < max_redirects
+
+            redirect_count += 1
+            new_url = URI.join(url, response.headers['location']).to_s
+
+            # Update `url` for the next iteration
+            url = new_url
+            uri = URI.parse(new_url)
+
+            response = conn.post(uri.path) do |req|
+              req.body = JSON.generate(body)
+              req.headers['Content-Type'] = 'application/json'
+              req.headers['Accept']       = 'application/json'
+            end
+          end
+
+          # Raise an error if the final response is not 2xx
+          unless response.success?
+            raise "HTTP #{response.status}: #{response.body}"
+          end
+
+          # If all is good, return the Faraday response object
+          return response
+
+        rescue Errno::ETIMEDOUT, Timeout::Error, Faraday::ConnectionFailed => e
+          # Basic retry logic for transient network errors
+          attempts += 1
+          if attempts < DEFAULT_RETRY_ATTEMPTS
+            sleep_time = 2**attempts
+            sleep(sleep_time)  # Exponential backoff
+            retry
+          else
+            # Too many failures, re-raise
+            raise e
+          end
+        rescue => e
+          # For any other error, just re-raise
+          raise e
+        end
       end
-      ret
-    end
+    end # def self.call_post
 
     # TODO: deprecated
     def self.api_call(url, params={}, method=BlackStack::Netting::CALL_METHOD_POST, ssl_verify_mode=BlackStack::Netting::DEFAULT_SSL_VERIFY_MODE, max_retries=5)
@@ -963,9 +1016,8 @@ module BlackStack
       while (nTries < max_retries && bSuccess == false)
         begin
           nTries = nTries + 1
-          uri = URI(url)
-          res = BlackStack::Netting::call_post(uri, params, ssl_verify_mode) if method==BlackStack::Netting::CALL_METHOD_POST
-          res = BlackStack::Netting::call_get(uri, params, ssl_verify_mode) if method==BlackStack::Netting::CALL_METHOD_GET
+          res = BlackStack::Netting::call_post(url, params, ssl_verify_mode) if method==BlackStack::Netting::CALL_METHOD_POST
+          res = BlackStack::Netting::call_get(url, params, ssl_verify_mode) if method==BlackStack::Netting::CALL_METHOD_GET
           parsed = JSON.parse(res.body)
           if (parsed['status']==BlackStack::Netting::SUCCESS)
             bSuccess = true

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: blackstack-core
 version: !ruby/object:Gem::Version
-  version: 1.2.29
+  version: 1.2.31
 platform: ruby
 authors:
 - Leandro Daniel Sardi
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-01-13 00:00:00.000000000 Z
+date: 2025-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: content_spinning
@@ -86,7 +85,6 @@ homepage: https://rubygems.org/gems/blackstack-core
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -101,8 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Core modules, functions and constants for the BlackStack framework.
 test_files: []