forest_admin_datasource_rpc 1.22.0 → 1.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 257ae1978e7bea8eaf90b4add89663c29aed4af4611f539bdb0dbd1c4407e701
-  data.tar.gz: 7a0ff918ce2888e3f2faf4e294fef542b04025bbc7598d5af0a57ce8aef8524d
+  metadata.gz: ee7aa557c745a41ad9255d6e71ba5fab30ed3b6f3b9c48d7ff24c4d031280d4b
+  data.tar.gz: 600f4cae467a95b84779dff19568b9a572f4ce64f12f49f6851112d165fb6bc4
 SHA512:
-  metadata.gz: 943b84abae7c5c66647e912d879cb3163d44be20bf43b32e1aa14f0a95fe408767a82456fce7953ad3833b5c85d4a2010236b83df5f5ab5b815b91a25d684daf
-  data.tar.gz: cabbe8f164f8aabdd5362b583de0b266d31ff6adab4bee0fa33a1193359b6d224f495942cddd5ba072d79f4d1e8483ed25b386a63185bb3c72799a9189d31a51
+  metadata.gz: ebbf43da8ccca6679c0e33f9765af986ac3b138b30db72bcc1a9e6775038db90f85469301ff3176721dd544c13d5c1d2371b6da15b99a77c578d011ce21eaaf6
+  data.tar.gz: 0f1eb73352ca77a4380548e657fc8dfaeff4910a971fc571fee401903880069ce6dec6251d74522a91a3769e89c990c0cd6642a2a1dbfd2fa042cd9a89986a84

data/lib/forest_admin_datasource_rpc/Utils/rpc_client.rb

@@ -60,7 +60,21 @@ module ForestAdminDatasourceRpc
       def make_request(endpoint, caller: nil, method: :get, payload: nil, symbolize_keys: false, if_none_match: nil)
         log_request_start(method, endpoint, if_none_match)
 
-        client = Faraday.new(url: @api_url) do |faraday|
+        client = build_faraday_client(symbolize_keys)
+        headers = build_request_headers(caller, if_none_match)
+
+        response = client.send(method, endpoint, payload, headers)
+        log_request_complete(response, endpoint)
+        response
+      rescue Faraday::ConnectionFailed => e
+        handle_connection_failed(endpoint, e)
+      rescue Faraday::TimeoutError => e
+        handle_timeout_error(endpoint, e)
+      end
+      # rubocop:enable Metrics/ParameterLists
+
+      def build_faraday_client(symbolize_keys)
+        Faraday.new(url: @api_url) do |faraday|
           faraday.request :json
           faraday.response :json, parser_options: { symbolize_names: symbolize_keys }
           faraday.adapter Faraday.default_adapter
@@ -68,7 +82,9 @@ module ForestAdminDatasourceRpc
           faraday.options.timeout = DEFAULT_TIMEOUT
           faraday.options.open_timeout = DEFAULT_OPEN_TIMEOUT
         end
+      end
 
+      def build_request_headers(caller, if_none_match)
         timestamp = Time.now.utc.iso8601(3)
         signature = generate_signature(timestamp)
 
@@ -80,12 +96,26 @@ module ForestAdminDatasourceRpc
 
         headers['forest_caller'] = caller.to_json if caller
         headers['If-None-Match'] = %("#{if_none_match}") if if_none_match
+        headers
+      end
 
-        response = client.send(method, endpoint, payload, headers)
-        log_request_complete(response, endpoint)
-        response
+      def handle_connection_failed(endpoint, error)
+        ForestAdminAgent::Facades::Container.logger&.log(
+          'Error',
+          "[RPC Client] Connection failed to #{@api_url}#{endpoint}: #{error.message}"
+        )
+        raise ForestAdminDatasourceToolkit::Exceptions::ForestException,
+              "RPC connection failed: Unable to connect to #{@api_url}. Please check if the RPC server is running."
+      end
+
+      def handle_timeout_error(endpoint, error)
+        ForestAdminAgent::Facades::Container.logger&.log(
+          'Error',
+          "[RPC Client] Request timeout to #{@api_url}#{endpoint}: #{error.message}"
+        )
+        raise ForestAdminDatasourceToolkit::Exceptions::ForestException,
+              "RPC request timeout: The RPC server at #{@api_url} did not respond in time."
       end
-      # rubocop:enable Metrics/ParameterLists
 
       def generate_signature(timestamp)
         OpenSSL::HMAC.hexdigest('SHA256', @auth_secret, timestamp)

data/lib/forest_admin_datasource_rpc/Utils/schema_polling_client.rb

@@ -69,6 +69,8 @@ module ForestAdminDatasourceRpc
         log_connection_error(e)
       rescue ForestAdminAgent::Http::Exceptions::AuthenticationOpenIdClient => e
         log_authentication_error(e)
+      rescue ForestAdminDatasourceToolkit::Exceptions::ForestException => e
+        log_rpc_error(e)
       rescue StandardError => e
         log_unexpected_error(e)
       end
@@ -108,7 +110,8 @@ module ForestAdminDatasourceRpc
 
         @introspection_schema = nil
       rescue Faraday::ConnectionFailed, Faraday::TimeoutError,
-             ForestAdminAgent::Http::Exceptions::AuthenticationOpenIdClient, StandardError => e
+             ForestAdminAgent::Http::Exceptions::AuthenticationOpenIdClient,
+             ForestAdminDatasourceToolkit::Exceptions::ForestException, StandardError => e
         handle_initial_fetch_error(e)
       end
 
@@ -213,6 +216,13 @@ module ForestAdminDatasourceRpc
         )
       end
 
+      def log_rpc_error(error)
+        ForestAdminAgent::Facades::Container.logger&.log(
+          'Warn',
+          "[Schema Polling] RPC error: #{error.message}"
+        )
+      end
+
       def log_authentication_error(error)
         ForestAdminAgent::Facades::Container.logger&.log(
           'Error',

data/lib/forest_admin_datasource_rpc/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceRpc
-  VERSION = "1.22.0"
+  VERSION = "1.22.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_rpc
 version: !ruby/object:Gem::Version
-  version: 1.22.0
+  version: 1.22.1
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-01-08 00:00:00.000000000 Z
+date: 2026-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64