forest_admin_rpc_agent 1.13.3 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc072dfa0eb0ee3eb6030d5940d51a267885e520548c4fb2f2e30e6ff729865d
-  data.tar.gz: 208ff7e08b008015673153e86eefc713f02f6685e4871d9fc413735cb4a9a8ab
+  metadata.gz: 9fb58efd1964b8dbf5c8e9c10b6557297196df287759952fdeff7eef3949e836
+  data.tar.gz: 01f76fae8c2ee42d73cd2e454fe9bdaee2a16aea47cf37e38081af45931e884e
 SHA512:
-  metadata.gz: bd2154d299d309b5d25b6874b3adabbecf31783f2b9ccbd5046812da27460b42d66261ab8dec2f02121d806c12159fcec46ffef475a549144ccba148d6d39ad8
-  data.tar.gz: 94d5a94f3277a712cc6e044c3fbff38d9a37e6b281ced666d7fbd32b5f2e4aa51d629635b2ffab77de6cb0a18bc651b2acc0a18c677bf168c667db93ae948f5d
+  metadata.gz: 25c49b286bce40a650d73bf684ca6b50b6bd5dfec85d546f5460dfc64dd4babaf01fd67d45f05fea865ab69d94490e53f65626ebc186eb03f3f3c5815680b6de
+  data.tar.gz: 3507ba4f38bb3b4344f47958899d797e11a53e8aece6ab3e2cd45b2201630f84b3d7d82bdf4b427cbc87cdf22118dedb9b5bb01ff84d41021211afde3728b36b

data/config/routes.rb

@@ -1,14 +1,19 @@
 ForestAdminRpcAgent::Engine.routes.draw do
-  route_classes = ForestAdminRpcAgent::Routes.constants.reject { |route| route.to_s == 'BaseRoute' }
+  next if defined?(Rake) && Rake.respond_to?(:application) && Rake.application&.top_level_tasks&.any?
 
-  route_classes.each do |route|
-    route_class = ForestAdminRpcAgent::Routes.const_get(route)
-
-    route_instance = route_class.new
-    if route_instance.respond_to?(:registered)
+  begin
+    # Use cached_route_instances to avoid recomputing routes during Rails initialization
+    ForestAdminRpcAgent::Http::Router.cached_route_instances.each do |route_instance|
       route_instance.registered(self)
-    else
-      Rails.logger.warn "Skipping route: #{route_class} (does not respond to :registered)"
     end
+  rescue StandardError => e
+    error_message = "[ForestAdminRpcAgent] CRITICAL: Failed to initialize routes: #{e.class} - #{e.message}\n" \
+                    "#{e.backtrace.join("\n")}"
+    begin
+      ForestAdminRpcAgent::Facades::Container.logger.log('Error', error_message)
+    rescue StandardError
+      puts error_message
+    end
+    raise e
   end
 end

data/lib/forest_admin_rpc_agent/http/router.rb

@@ -0,0 +1,92 @@
+module ForestAdminRpcAgent
+  module Http
+    class Router
+      # Mutex for thread-safe cache operations
+      @mutex = Mutex.new
+
+      def self.cached_route_instances
+        return route_instances.freeze if cache_disabled?
+
+        return @cached_route_instances if @cached_route_instances
+
+        @mutex.synchronize do
+          @cached_route_instances ||= begin
+            start_time = Time.now
+            computed_routes = route_instances
+            elapsed = ((Time.now - start_time) * 1000).round(2)
+
+            log_message = "[ForestAdminRpcAgent] Computed #{computed_routes.size} routes " \
+                          "in #{elapsed}ms (caching enabled)"
+            log_to_available_logger('Info', log_message)
+
+            computed_routes.freeze
+          end
+        end
+      end
+
+      def self.cache_disabled?
+        config = ForestAdminRpcAgent::Facades::Container.config_from_cache
+        config&.dig(:disable_route_cache) == true
+      rescue StandardError
+        # Config not available, default to caching enabled
+        false
+      end
+
+      def self.reset_cached_route_instances!
+        @mutex.synchronize do
+          @cached_route_instances = nil
+        end
+      end
+
+      def self.log_to_available_logger(level, message)
+        ForestAdminRpcAgent::Facades::Container.logger.log(level, message)
+      rescue StandardError
+        puts message
+      end
+
+      def self.route_instances
+        route_classes = ForestAdminRpcAgent::Routes.constants.reject { |route| route.to_s == 'BaseRoute' }
+
+        route_instances = []
+
+        route_classes.each do |route_name|
+          route_class = ForestAdminRpcAgent::Routes.const_get(route_name)
+
+          # Skip if it's not a class or if it doesn't look like a route
+          unless route_class.is_a?(Class)
+            log_to_available_logger(
+              'Warn',
+              "Skipping constant: #{route_name} (not a class)"
+            )
+            next
+          end
+
+          begin
+            route_instance = route_class.new
+
+            unless route_instance.respond_to?(:registered)
+              log_to_available_logger(
+                'Warn',
+                "Skipping route: #{route_class} (does not respond to :registered)"
+              )
+              next
+            end
+
+            route_instances << route_instance
+          rescue ArgumentError => e
+            # Skip classes that require constructor arguments (not routes)
+            log_to_available_logger(
+              'Warn',
+              "Skipping constant: #{route_name} (requires constructor arguments: #{e.message})"
+            )
+            next
+          rescue StandardError => e
+            raise e.class, "Failed to instantiate route '#{route_name}': #{e.message}"
+          end
+        end
+
+        route_instances
+      end
+    end
+  end
+end

data/lib/forest_admin_rpc_agent/middleware/authentication.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module ForestAdminRpcAgent
   module Middleware
     class Authentication
@@ -19,7 +21,16 @@ module ForestAdminRpcAgent
           return [401, { 'Content-Type' => 'application/json' }, [{ error: 'Unauthorized' }.to_json]]
         end
 
-        @app.call(env)
+        status, headers, response = @app.call(env)
+
+        if request.get_header('HTTP_FOREST_CALLER')
+          caller = ForestAdminDatasourceToolkit::Components::Caller.new(
+            **(JSON.parse(request.get_header('HTTP_FOREST_CALLER')).symbolize_keys)
+          )
+          headers = headers.merge({ caller: caller })
+        end
+
+        [status, headers, response]
       end
 
       private

data/lib/forest_admin_rpc_agent/routes/action_execute.rb

@@ -12,19 +12,15 @@ module ForestAdminRpcAgent
       end
 
       def handle_request(args)
-        return '{}' unless args[:params]['collection_name']
+        return {} unless args[:params]['collection_name']
 
         datasource = ForestAdminRpcAgent::Facades::Container.datasource
         collection = datasource.get_collection(args[:params]['collection_name'])
-
-        caller = ForestAdminDatasourceToolkit::Components::Caller.new(
-          **args[:params]['caller'].to_h.transform_keys(&:to_sym)
-        )
         filter = FilterFactory.from_plain_object(args[:params]['filter'])
         data = args[:params]['data']
         action = args[:params]['action']
 
-        collection.execute(caller, action, data, filter).to_json
+        collection.execute(args[:caller], action, data, filter)
       end
     end
   end

data/lib/forest_admin_rpc_agent/routes/action_form.rb

@@ -12,24 +12,17 @@ module ForestAdminRpcAgent
       end
 
       def handle_request(args)
-        return '{}' unless args[:params]['collection_name']
+        return {} unless args[:params]['collection_name']
 
         datasource = ForestAdminRpcAgent::Facades::Container.datasource
         collection = datasource.get_collection(args[:params]['collection_name'])
-
-        caller = if args[:params].key?('caller')
-                   ForestAdminDatasourceToolkit::Components::Caller.new(
-                     **args[:params]['caller'].to_h.transform_keys(&:to_sym)
-                   )
-                 end
         filter = FilterFactory.from_plain_object(args[:params]['filter'])
         metas = args[:params]['metas'] || {}
         data = args[:params]['data']
         action = args[:params]['action']
 
-        form = collection.get_form(caller, action, data, filter, metas)
-        form = encode_file_element(form)
-        form.to_json
+        form = collection.get_form(args[:caller], action, data, filter, metas)
+        encode_file_element(form)
       end
 
       def encode_file_element(elements)

data/lib/forest_admin_rpc_agent/routes/aggregate.rb

@@ -12,11 +12,8 @@ module ForestAdminRpcAgent
       end
 
       def handle_request(args)
-        return '{}' unless args[:params]['collection_name']
+        return {} unless args[:params]['collection_name']
 
-        caller = ForestAdminDatasourceToolkit::Components::Caller.new(
-          **args[:params]['caller'].to_h.transform_keys(&:to_sym)
-        )
         datasource = ForestAdminRpcAgent::Facades::Container.datasource
         collection = datasource.get_collection(args[:params]['collection_name'])
 
@@ -27,7 +24,7 @@ module ForestAdminRpcAgent
         )
         filter = FilterFactory.from_plain_object(args[:params]['filter'])
 
-        collection.aggregate(caller, filter, aggregation, args[:params]['limit']).to_json
+        collection.aggregate(args[:caller], filter, aggregation, args[:params]['limit'])
       end
     end
   end

data/lib/forest_admin_rpc_agent/routes/base_route.rb

@@ -20,7 +20,8 @@ module ForestAdminRpcAgent
 
       def register_sinatra(app)
         app.send(@method.to_sym, @url) do
-          handle_request(params)
+          result = handle_request(params)
+          serialize_response(result)
         end
       end
 
@@ -33,8 +34,8 @@ module ForestAdminRpcAgent
 
           if status == 200
             params = request.query_parameters.merge(request.request_parameters)
-
-            [200, { 'Content-Type' => 'application/json' }, [handle_request({ params: params })]]
+            result = handle_request({ params: params, caller: headers[:caller] })
+            [200, { 'Content-Type' => 'application/json' }, [serialize_response(result)]]
           else
             [status, headers, response]
           end
@@ -47,6 +48,14 @@ module ForestAdminRpcAgent
                      as: @name,
                      route_alias: @name
       end
+
+      private
+
+      def serialize_response(result)
+        return result if result.is_a?(String) && (result.start_with?('{', '['))
+
+        result.to_json
+      end
     end
   end
 end

data/lib/forest_admin_rpc_agent/routes/chart.rb

@@ -10,17 +10,13 @@ module ForestAdminRpcAgent
       end
 
       def handle_request(args)
-        return '{}' unless args[:params]['collection_name']
+        return {} unless args[:params]['collection_name']
 
-        chart_name = args[:params]['name']
-        caller = ForestAdminDatasourceToolkit::Components::Caller.new(
-          **args[:params]['caller'].to_h.transform_keys(&:to_sym)
-        )
+        chart_name = args[:params]['chart']
         datasource = ForestAdminRpcAgent::Facades::Container.datasource
         collection = datasource.get_collection(args[:params]['collection_name'])
 
-        primary_key_values = ForestAdminAgent::Utils::Id.unpack_id(collection, args[:params]['record_id'])
-        collection.render_chart(caller, chart_name, primary_key_values)
+        collection.render_chart(caller, chart_name, args[:params]['record_id'])
       end
     end
   end

data/lib/forest_admin_rpc_agent/routes/create.rb

@@ -8,15 +8,12 @@ module ForestAdminRpcAgent
       end
 
       def handle_request(args)
-        return '{}' unless args[:params]['collection_name']
+        return {} unless args[:params]['collection_name']
 
-        caller = ForestAdminDatasourceToolkit::Components::Caller.new(
-          **args[:params]['caller'].to_h.transform_keys(&:to_sym)
-        )
         datasource = ForestAdminRpcAgent::Facades::Container.datasource
         collection = datasource.get_collection(args[:params]['collection_name'])
 
-        [collection.create(caller, args[:params]['data'])].to_json
+        [collection.create(args[:caller], args[:params]['data'].first)]
       end
     end
   end

data/lib/forest_admin_rpc_agent/routes/datasource_chart.rb

@@ -8,15 +8,12 @@ module ForestAdminRpcAgent
       end
 
       def handle_request(args)
-        return '{}' unless args[:params]['chart']
+        return {} unless args[:params]['chart']
 
         chart_name = args[:params]['chart']
-        caller = ForestAdminDatasourceToolkit::Components::Caller.new(
-          **args[:params]['caller'].to_h.transform_keys(&:to_sym)
-        )
         datasource = ForestAdminRpcAgent::Facades::Container.datasource
 
-        datasource.render_chart(caller, chart_name).to_json
+        datasource.render_chart(args[:caller], chart_name)
       end
     end
   end

data/lib/forest_admin_rpc_agent/routes/delete.rb

@@ -12,16 +12,13 @@ module ForestAdminRpcAgent
       end
 
       def handle_request(args)
-        return '{}' unless args[:params]['collection_name']
+        return {} unless args[:params]['collection_name']
 
-        caller = ForestAdminDatasourceToolkit::Components::Caller.new(
-          **args[:params]['caller'].to_h.transform_keys(&:to_sym)
-        )
         datasource = ForestAdminRpcAgent::Facades::Container.datasource
         collection = datasource.get_collection(args[:params]['collection_name'])
         filter = FilterFactory.from_plain_object(args[:params]['filter'])
 
-        collection.delete(caller, filter).to_json
+        collection.delete(args[:caller], filter)
       end
     end
   end

data/lib/forest_admin_rpc_agent/routes/list.rb

@@ -12,17 +12,14 @@ module ForestAdminRpcAgent
       end
 
       def handle_request(args)
-        return '{}' unless args[:params]['collection_name']
+        return {} unless args[:params]['collection_name']
 
-        caller = ForestAdminDatasourceToolkit::Components::Caller.new(
-          **args[:params]['caller'].to_h.transform_keys(&:to_sym)
-        )
         datasource = ForestAdminRpcAgent::Facades::Container.datasource
         collection = datasource.get_collection(args[:params]['collection_name'])
         projection = Projection.new(args[:params]['projection'])
         filter = FilterFactory.from_plain_object(args[:params]['filter'])
 
-        collection.list(caller, filter, projection).to_json
+        collection.list(args[:caller], filter, projection)
       end
     end
   end

data/lib/forest_admin_rpc_agent/routes/native_query.rb

@@ -8,14 +8,14 @@ module ForestAdminRpcAgent
       end
 
       def handle_request(args)
-        return '{}' unless args[:params]['connection_name'] && args[:params]['query']
+        return {} unless args[:params]['connection_name'] && args[:params]['query']
 
         connection_name = args[:params]['connection_name']
         query = args[:params]['query']
         binds = args[:params]['binds'] || []
         datasource = ForestAdminRpcAgent::Facades::Container.datasource
 
-        datasource.execute_native_query(connection_name, query, binds).to_json
+        datasource.execute_native_query(connection_name, query, binds)
       end
     end
   end

data/lib/forest_admin_rpc_agent/routes/schema.rb

@@ -18,15 +18,10 @@ module ForestAdminRpcAgent
                                          .map { |_name, collection| collection.schema.merge({ name: collection.name }) }
                                          .sort_by { |collection| collection[:name] }
 
-        connections = []
-        agent.customizer.datasources.each do |root_datasource|
-          connections = connections.union(
-            root_datasource.live_query_connections.keys.map { |connection_name| { name: connection_name } }
-          )
-        end
+        connections = datasource.live_query_connections.keys.map { |connection_name| { name: connection_name } }
         schema[:native_query_connections] = connections
 
-        schema.to_json
+        schema
       end
     end
   end

data/lib/forest_admin_rpc_agent/routes/sse.rb

@@ -5,7 +5,7 @@ module ForestAdminRpcAgent
     class Sse
       DEFAULT_HEARTBEAT_INTERVAL = 1
 
-      def initialize(url = 'rpc-sse', method = 'get', name = 'rpc_sse', heartbeat_interval: DEFAULT_HEARTBEAT_INTERVAL)
+      def initialize(url = 'sse', method = 'get', name = 'rpc_sse', heartbeat_interval: DEFAULT_HEARTBEAT_INTERVAL)
         @url = url
         @method = method
         @name = name

data/lib/forest_admin_rpc_agent/routes/update.rb

@@ -10,16 +10,13 @@ module ForestAdminRpcAgent
       end
 
       def handle_request(args)
-        return '{}' unless args[:params]['collection_name']
+        return {} unless args[:params]['collection_name']
 
-        caller = ForestAdminDatasourceToolkit::Components::Caller.new(
-          **args[:params]['caller'].to_h.transform_keys(&:to_sym)
-        )
         datasource = ForestAdminRpcAgent::Facades::Container.datasource
         collection = datasource.get_collection(args[:params]['collection_name'])
         filter = FilterFactory.from_plain_object(args[:params]['filter'])
 
-        collection.update(caller, filter, args[:params]['data']).to_json
+        collection.update(args[:caller], filter, args[:params]['patch'])
       end
     end
   end

data/lib/forest_admin_rpc_agent/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminRpcAgent
-  VERSION = "1.13.3"
+  VERSION = "1.14.0"
 end

data/lib/forest_admin_rpc_agent.rb

@@ -23,6 +23,7 @@ module ForestAdminRpcAgent
   setting :logger_level, default: 'info'
   setting :logger, default: nil
   setting :customize_error_message, default: nil
+  setting :disable_route_cache, default: false
 
   begin
     require 'thor'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_rpc_agent
 version: !ruby/object:Gem::Version
-  version: 1.13.3
+  version: 1.14.0
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-05 00:00:00.000000000 Z
+date: 2025-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -162,6 +162,7 @@ files:
 - lib/forest_admin_rpc_agent/extensions/config_loader.rb
 - lib/forest_admin_rpc_agent/extensions/sinatra_extension.rb
 - lib/forest_admin_rpc_agent/facades/container.rb
+- lib/forest_admin_rpc_agent/http/router.rb
 - lib/forest_admin_rpc_agent/middleware/authentication.rb
 - lib/forest_admin_rpc_agent/routes/action_execute.rb
 - lib/forest_admin_rpc_agent/routes/action_form.rb