forest_admin_rpc_agent 1.13.3 → 1.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc072dfa0eb0ee3eb6030d5940d51a267885e520548c4fb2f2e30e6ff729865d
-  data.tar.gz: 208ff7e08b008015673153e86eefc713f02f6685e4871d9fc413735cb4a9a8ab
+  metadata.gz: d53c87e67caf6c3d8d25e0153e5e2d9d70c9c2729068a8fdf9b1ae87fc1d2a9c
+  data.tar.gz: 33e47c98fa34e2334d1e11a6bf24a4402d3d71ef7fee86339de5b5a201577c96
 SHA512:
-  metadata.gz: bd2154d299d309b5d25b6874b3adabbecf31783f2b9ccbd5046812da27460b42d66261ab8dec2f02121d806c12159fcec46ffef475a549144ccba148d6d39ad8
-  data.tar.gz: 94d5a94f3277a712cc6e044c3fbff38d9a37e6b281ced666d7fbd32b5f2e4aa51d629635b2ffab77de6cb0a18bc651b2acc0a18c677bf168c667db93ae948f5d
+  metadata.gz: 9a8955692b0f1e9665c1449422d59ae40f3806c3be9e16f2a4de9a43a4a5e907ce1d0eafa0699fbdbf5b48cafb9b772cdbdfde12b45f1b9d0b95f819e50fb49c
+  data.tar.gz: 5bceed442425fdcbf317aab144eb58f05414d857183fe81a47339504701e1086c8c88938672854705952e5907e2a314b5a9377ddcd480dbdd371a3f03035c2a4

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.13.4"
 end

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.13.4
 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-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64