forest_admin_datasource_rpc 1.19.0 → 1.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bda7b1bdc68fc57f3fbee2e0bd7764c10a9023a7286fe72dedc6e5360428cee
-  data.tar.gz: 7c32e9ff356245fdf2e36e55992dc2281c09c98a207e21f0ffe6d175030d1bc4
+  metadata.gz: 8005cf0d61ee6de8ddd0551e4af829e6949b04e3efbc920b2f6471681d909c67
+  data.tar.gz: 265bdffa1cbc99e9e3cae4a174def1c2c3982d889a3b83619e52bf4c20e748de
 SHA512:
-  metadata.gz: 0f0088409aaaea1bd59ec7ca41945973874028ee697c0cf275d2c61f9663b571079ed4405e5705fa6ee7d4cc73d91d122b3a6a1cb300cc3ebaf9501d3163b606
-  data.tar.gz: 0f48d859a08cf51e2f1167a8189361a1aa7350189f9df653268f9bdde252638cc90e9c68fad1a23acf82612355e7049e1038b1a91a912a931491c30fc47e2962
+  metadata.gz: 5e682e70de460d239d7653ecb4e8345f5582c3cfc64e0c00e6c85c214abfb95e8c7ba68a44c21ba80169251d1a46d4d5f460bbe3dbfecaccb95d8a3a8803ce95
+  data.tar.gz: 064aa70451798d8321786b1fe2d4805e6b838a0c49f1fa539c3303d8b3c43381a22c81616d0a895fd282ad5abf111aad1f6de7fc460a36b6b881ab3f89b02726

data/lib/forest_admin_datasource_rpc/Utils/schema_polling_client.rb

@@ -13,13 +13,14 @@ module ForestAdminDatasourceRpc
       MAX_POLLING_INTERVAL = 3600
 
       def initialize(uri, auth_secret, polling_interval: DEFAULT_POLLING_INTERVAL, introspection_schema: nil,
-                     &on_schema_change)
+                     introspection_etag: nil, &on_schema_change)
         @uri = uri
         @auth_secret = auth_secret
         @polling_interval = polling_interval
         @on_schema_change = on_schema_change
         @closed = false
         @introspection_schema = introspection_schema
+        @introspection_etag = introspection_etag
         @current_schema = nil
         @cached_etag = nil
         @connection_attempts = 0
@@ -77,12 +78,12 @@ module ForestAdminDatasourceRpc
       def compute_etag(schema)
         return nil if schema.nil?
 
-        Digest::SHA1.hexdigest(schema.to_json)
+        Digest::SHA1.hexdigest(JSON.generate(schema))
       end
 
       def fetch_initial_schema_sync
         # If we have an introspection schema, send its ETag to avoid re-downloading unchanged schema
-        introspection_etag = compute_etag(@introspection_schema) if @introspection_schema
+        introspection_etag = @introspection_etag || (@introspection_schema && compute_etag(@introspection_schema))
         result = @rpc_client.fetch_schema('/forest/rpc-schema', if_none_match: introspection_etag)
 
         if result == RpcClient::NotModified
@@ -115,8 +116,9 @@ module ForestAdminDatasourceRpc
         if @introspection_schema
           # Fallback to introspection schema - don't crash
           @current_schema = @introspection_schema
-          @cached_etag = compute_etag(@current_schema)
+          @cached_etag = @introspection_etag || compute_etag(@current_schema)
           @introspection_schema = nil
+          @introspection_etag = nil
           @initial_sync_completed = true
           ForestAdminAgent::Facades::Container.logger&.log(
             'Warn',

data/lib/forest_admin_datasource_rpc/collection.rb

@@ -6,10 +6,9 @@ module ForestAdminDatasourceRpc
     include ForestAdminDatasourceRpc::Utils
     include ForestAdminDatasourceCustomizer::Decorators::Action
 
-    def initialize(datasource, name, options, schema)
+    def initialize(datasource, name, schema)
       super(datasource, name)
-      @options = options
-      @client = RpcClient.new(@options[:uri], @options[:auth_secret] || ForestAdminAgent::Facades::Container.cache(:auth_secret))
+      @client = datasource.shared_rpc_client
       @rpc_collection_uri = "/forest/rpc/#{name}"
       @base_params = { collection_name: name }
 

data/lib/forest_admin_datasource_rpc/datasource.rb

@@ -2,6 +2,8 @@ module ForestAdminDatasourceRpc
   class Datasource < ForestAdminDatasourceToolkit::Datasource
     include ForestAdminDatasourceRpc::Utils
 
+    attr_reader :shared_rpc_client
+
     def initialize(options, introspection, schema_polling_client = nil)
       super()
 
@@ -11,11 +13,15 @@ module ForestAdminDatasourceRpc
         "collections and #{introspection[:charts].length} charts."
       )
 
+      @shared_rpc_client = RpcClient.new(
+        options[:uri],
+        options[:auth_secret] || ForestAdminAgent::Facades::Container.cache(:auth_secret)
+      )
+
       introspection[:collections].each do |schema|
-        add_collection(Collection.new(self, schema[:name], options, schema))
+        add_collection(Collection.new(self, schema[:name], schema))
       end
 
-      @options = options
       @charts = introspection[:charts]
       @rpc_relations = introspection[:rpc_relations]
       @schema_polling_client = schema_polling_client
@@ -31,7 +37,6 @@ module ForestAdminDatasourceRpc
     end
 
     def render_chart(caller, name)
-      client = RpcClient.new(@options[:uri], @options[:auth_secret] || ForestAdminAgent::Facades::Container.cache(:auth_secret))
       url = 'forest/rpc-datasource-chart'
 
       ForestAdminAgent::Facades::Container.logger.log(
@@ -39,11 +44,10 @@ module ForestAdminDatasourceRpc
         "Forwarding datasource chart '#{name}' call to the Rpc agent on #{url}."
       )
 
-      client.call_rpc(url, caller: caller, method: :post, payload: { chart: name })
+      @shared_rpc_client.call_rpc(url, caller: caller, method: :post, payload: { chart: name })
     end
 
     def execute_native_query(connection_name, query, binds)
-      client = RpcClient.new(@options[:uri], @options[:auth_secret] || ForestAdminAgent::Facades::Container.cache(:auth_secret))
       url = 'forest/rpc-native-query'
 
       ForestAdminAgent::Facades::Container.logger.log(
@@ -51,8 +55,11 @@ module ForestAdminDatasourceRpc
         "Forwarding native query for connection '#{connection_name}' to the Rpc agent on #{url}."
       )
 
-      result = client.call_rpc(url, method: :post,
-                                    payload: { connection_name: connection_name, query: query, binds: binds })
+      result = @shared_rpc_client.call_rpc(
+        url,
+        method: :post,
+        payload: { connection_name: connection_name, query: query, binds: binds }
+      )
       ForestAdminDatasourceToolkit::Utils::HashHelper.convert_keys(result.to_a)
     end
 

data/lib/forest_admin_datasource_rpc/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceRpc
-  VERSION = "1.19.0"
+  VERSION = "1.19.2"
 end

data/lib/forest_admin_datasource_rpc.rb

@@ -16,6 +16,7 @@ module ForestAdminDatasourceRpc
     uri = options[:uri]
     auth_secret = options[:auth_secret] || ForestAdminAgent::Facades::Container.cache(:auth_secret)
     provided_introspection = options[:introspection]
+    provided_introspection_etag = options[:introspection_etag]
 
     polling_interval = options[:schema_polling_interval_sec] ||
                        ENV['SCHEMA_POLLING_INTERVAL_SEC']&.to_i ||
@@ -28,7 +29,8 @@ module ForestAdminDatasourceRpc
       uri,
       auth_secret,
       polling_interval: polling_interval,
-      introspection_schema: provided_introspection
+      introspection_schema: provided_introspection,
+      introspection_etag: provided_introspection_etag
     ) do
       Thread.new do
         logger = ForestAdminAgent::Facades::Container.logger

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_rpc
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 1.19.2
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-12-24 00:00:00.000000000 Z
+date: 2026-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64