forest_admin_rpc_agent 1.24.9 → 1.24.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b8aaad20b61e08a4d514134dca85b74fa62d9900ae969a7e71cfde348f2ec9b
-  data.tar.gz: 108a43ccf7bcbe484cdc40be1c237411c6491cc53edd4fc37af7a7e74e1490b7
+  metadata.gz: e9fa17e49cf27d2ea01774033fb039ecd0f2187edbc849afe877e82f89320b1c
+  data.tar.gz: 9f902d097fe0e06e53211c9bbcaa0b61517749e3159dbb3053daafab864f5536
 SHA512:
-  metadata.gz: 3317ac42c0cc2fef69874252d59dbf6a05de42fdf2906c94f15c9434391f8e53f6dd7a61ae53c985bbb7975e1da994f140365e70f124071661fb5b4634866251
-  data.tar.gz: 591a0469cc3b65bc4c37b88a8aad8e23001336467ef2949b85c8c68246e19b179b50bd40f03ed871750f2e2232960327522d23149c4e1c9371d52061bc2d5cce
+  metadata.gz: 62277e517d79e82886e0c17bfd22d72e864ec19a81221bfbb509a0f1868d61e5a9b17fc19e87b35130be63f5dd6d6262233592adfb13b08c0b5d2a8ae4962d9a
+  data.tar.gz: 87559d0e479182188ec8643d788091921f7c019928c1085dfd95f1243b40771525c23f346e9140d8f9e259d95d2234382eec4ace9cba9b4dde96bcd41b912f57

data/lib/forest_admin_rpc_agent/agent.rb

@@ -5,13 +5,12 @@ module ForestAdminRpcAgent
   class Agent < ForestAdminAgent::Builder::AgentFactory
     include ForestAdminAgent::Http::Exceptions
 
-    attr_reader :rpc_collections, :cached_schema, :cached_schema_hash
+    attr_reader :rpc_collections, :cached_schema
 
     def setup(options)
       super
       @rpc_collections = []
       @cached_schema = nil
-      @cached_schema_hash = nil
       @customizer = ForestAdminRpcAgent::DatasourceCustomizer.new
     end
 
@@ -31,9 +30,7 @@ module ForestAdminRpcAgent
 
       datasource = @container.resolve(:datasource)
 
-      # Build and cache RPC schema from live datasource
       @cached_schema = build_rpc_schema_from_datasource(datasource)
-      compute_and_cache_hash
 
       # Write schema file for reference (only in development mode)
       # Uses the same serialization as the /rpc-schema route
@@ -54,11 +51,15 @@ module ForestAdminRpcAgent
       self
     end
 
-    # Check if provided hash matches the cached schema hash
+    # Check if provided hash matches the cached schema etag
     def schema_hash_matches?(provided_hash)
-      return false unless @cached_schema_hash && provided_hash
+      return false unless @cached_schema && @cached_schema[:etag] && provided_hash
 
-      @cached_schema_hash == provided_hash
+      @cached_schema[:etag] == provided_hash
+    end
+
+    def cached_schema_hash
+      @cached_schema&.dig(:etag)
     end
 
     private
@@ -131,6 +132,13 @@ module ForestAdminRpcAgent
       schema[:native_query_connections] = datasource.live_query_connections.keys
                                                     .map { |connection_name| { name: connection_name } }
 
+      schema[:etag] = Digest::SHA1.hexdigest(schema.to_json)
+
+      ForestAdminRpcAgent::Facades::Container.logger.log(
+        'Debug',
+        "RPC agent schema etag computed: #{schema[:etag]}"
+      )
+
       schema
     end
 
@@ -141,16 +149,5 @@ module ForestAdminRpcAgent
         @rpc_collections.include?(relation.foreign_collection)
       end
     end
-
-    def compute_and_cache_hash
-      return unless @cached_schema
-
-      @cached_schema_hash = Digest::SHA1.hexdigest(@cached_schema.to_json)
-
-      ForestAdminRpcAgent::Facades::Container.logger.log(
-        'Debug',
-        "RPC agent schema hash computed: #{@cached_schema_hash}"
-      )
-    end
   end
 end

data/lib/forest_admin_rpc_agent/routes/schema.rb

@@ -15,22 +15,19 @@ module ForestAdminRpcAgent
       def handle_request(args)
         agent = ForestAdminRpcAgent::Agent.instance
         client_etag = extract_if_none_match(args)
+        etag = agent.cached_schema_hash
 
-        # If client has cached schema and ETag matches, return 304 Not Modified
         if client_etag && agent.schema_hash_matches?(client_etag)
           ForestAdminRpcAgent::Facades::Container.logger.log(
             'Debug',
             'ETag matches, returning 304 Not Modified'
           )
           return { status: HTTP_NOT_MODIFIED, content: nil,
-                   headers: { 'ETag' => agent.cached_schema_hash } }
+                   headers: { 'ETag' => etag } }
         end
 
-        # Get schema from cache (or build from datasource if not cached)
         schema = agent.cached_schema
-        etag = agent.cached_schema_hash
 
-        # Return schema with ETag header
         {
           status: HTTP_OK,
           content: schema,

data/lib/forest_admin_rpc_agent/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminRpcAgent
-  VERSION = "1.24.9"
+  VERSION = "1.24.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_rpc_agent
 version: !ruby/object:Gem::Version
-  version: 1.24.9
+  version: 1.24.10
 platform: ruby
 authors:
 - Matthieu