forest_admin_rpc_agent 1.17.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aacf1c4f41b79f86b3b7f3a00caa96f546cc67d38031f7f550e3cb5ae4ec232
-  data.tar.gz: bf9a970a7322632045f32487767cd0e50c8b1087c2dc702ddd01cad900f5b7bc
+  metadata.gz: 8ae3dd638af2e91737911aa2436d2b25c11d556863ed638b08ebfbb95ee61cdd
+  data.tar.gz: 1e6e61aa06ee5015b272364e9ce6f49c6e6ffb218a16ac6f981a7d1219d31767
 SHA512:
-  metadata.gz: c8c65145002a3c4adea8332210a86e257de9a16bcc7bfecfc8ef7bab6d94cc1dafc9adddc7ea378854d1d55a5db1f2716a0110253e02e87aadfdc42b52231f3c
-  data.tar.gz: b148bfcf994516aee7a7d72bfdaac13cdab37a222fb6181798a162589e390819563eedfd8eca4ca1e01832882c1043058d805e0478a1e0872f27fbcfbe767f97
+  metadata.gz: 8589283a71fb4124c12c1efa1d30bdac436cd2bb595a2c309bea55b327e639bf25cddbb3775e353d6b528f7e167e56729a295ec49d8d5aa7967da86759e1dc2e
+  data.tar.gz: c3419b02182fec4b8ac8078df6efc4d56abbf5dea07120fe6770e50278ad1c00f41e486464c34d7115757988773562eff0b7d19502fb89650d77d8cc59976794

data/lib/forest_admin_rpc_agent/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminRpcAgent
-  VERSION = "1.17.0"
+  VERSION = "1.18.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_rpc_agent
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.18.0
 platform: ruby
 authors:
 - Matthieu
@@ -176,10 +176,7 @@ files:
 - lib/forest_admin_rpc_agent/routes/list.rb
 - lib/forest_admin_rpc_agent/routes/native_query.rb
 - lib/forest_admin_rpc_agent/routes/schema.rb
-- lib/forest_admin_rpc_agent/routes/sse.rb
 - lib/forest_admin_rpc_agent/routes/update.rb
-- lib/forest_admin_rpc_agent/sse_connection_manager.rb
-- lib/forest_admin_rpc_agent/sse_streamer.rb
 - lib/forest_admin_rpc_agent/thor/install.rb
 - lib/forest_admin_rpc_agent/version.rb
 homepage: https://www.forestadmin.com

data/lib/forest_admin_rpc_agent/routes/sse.rb

@@ -1,166 +0,0 @@
-require 'jsonapi-serializers'
-
-module ForestAdminRpcAgent
-  module Routes
-    class Sse
-      DEFAULT_HEARTBEAT_INTERVAL = 10
-
-      def initialize(url = 'sse', method = 'get', name = 'rpc_sse', heartbeat_interval: DEFAULT_HEARTBEAT_INTERVAL)
-        @url = url
-        @method = method
-        @name = name
-        @heartbeat_interval = heartbeat_interval
-      end
-
-      def registered(app)
-        if defined?(Sinatra) && (app == Sinatra::Base || app.ancestors.include?(Sinatra::Base))
-          register_sinatra(app)
-        elsif defined?(Rails) && app.is_a?(ActionDispatch::Routing::Mapper)
-          register_rails(app)
-        else
-          raise NotImplementedError,
-                "Unsupported application type: #{app.class}. #{self} works with Sinatra::Base or ActionDispatch::Routing::Mapper."
-        end
-      end
-
-      def register_sinatra(app)
-        route_instance = self
-        app.send(@method.to_sym, "/#{@url}") do
-          auth_middleware = ForestAdminRpcAgent::Middleware::Authentication.new(->(_env) { [200, {}, ['OK']] })
-          status, headers, response = auth_middleware.call(env)
-
-          halt status, headers, response if status != 200
-
-          content_type 'text/event-stream'
-          headers 'Cache-Control' => 'no-cache',
-                  'Connection' => 'keep-alive',
-                  'X-Accel-Buffering' => 'no'
-
-          stream(:keep_open) do |out|
-            # Register this connection; any previous connection will be terminated
-            connection = ForestAdminRpcAgent::SseConnectionManager.register_connection
-
-            server_stopped = false
-            received_signal = nil
-            stop_proc = proc do |sig|
-              connection.terminate
-              server_stopped = true
-              received_signal = sig
-            end
-            original_int_handler = trap('INT', stop_proc)
-            original_term_handler = trap('TERM', stop_proc)
-
-            begin
-              streamer = SseStreamer.new(out)
-
-              while connection.active?
-                streamer.write('', event: 'heartbeat')
-                sleep route_instance.instance_variable_get(:@heartbeat_interval)
-              end
-
-              # Send RpcServerStop only if server is stopping (not client disconnect)
-              if server_stopped
-                begin
-                  streamer.write({ event: 'RpcServerStop' }, event: 'RpcServerStop')
-                  ForestAdminRpcAgent::Facades::Container.logger&.log('Debug', '[SSE] RpcServerStop event sent')
-                rescue StandardError => e
-                  ForestAdminRpcAgent::Facades::Container.logger&.log('Debug', "[SSE] Error sending stop event: #{e.message}")
-                end
-              end
-            rescue IOError, Errno::EPIPE => e
-              # Client disconnected normally
-              ForestAdminRpcAgent::Facades::Container.logger&.log('Debug', "[SSE] Client disconnected: #{e.message}")
-            ensure
-              trap('INT', original_int_handler)
-              trap('TERM', original_term_handler)
-              ForestAdminRpcAgent::SseConnectionManager.unregister_connection(connection)
-              out.close if out.respond_to?(:close)
-
-              # Re-send the signal to allow proper server shutdown
-              Process.kill(received_signal, Process.pid) if received_signal
-            end
-          end
-        end
-      end
-
-      def register_rails(router)
-        route_instance = self
-        handler = proc do |hash|
-          request = ActionDispatch::Request.new(hash)
-          auth_middleware = ForestAdminRpcAgent::Middleware::Authentication.new(->(_env) { [200, {}, ['OK']] })
-          status, headers, response = auth_middleware.call(request.env)
-
-          if status == 200
-            headers = {
-              'Content-Type' => 'text/event-stream',
-              'Cache-Control' => 'no-cache',
-              'Connection' => 'keep-alive',
-              'X-Accel-Buffering' => 'no'
-            }
-
-            # Register this connection; any previous connection will be terminated
-            connection = ForestAdminRpcAgent::SseConnectionManager.register_connection
-
-            server_stopped = false
-            received_signal = nil
-            stop_proc = proc do |sig|
-              connection.terminate
-              server_stopped = true
-              received_signal = sig
-            end
-            original_int_handler = trap('INT', stop_proc)
-            original_term_handler = trap('TERM', stop_proc)
-
-            body = Enumerator.new do |yielder|
-              stream = SseStreamer.new(yielder)
-
-              begin
-                ForestAdminRpcAgent::Facades::Container.logger&.log('Debug', '[SSE] Starting stream')
-
-                while connection.active?
-                  stream.write('', event: 'heartbeat')
-                  sleep route_instance.instance_variable_get(:@heartbeat_interval)
-                end
-
-                # Send RpcServerStop only if server is stopping (not client disconnect)
-                if server_stopped
-                  begin
-                    stream.write({ event: 'RpcServerStop' }, event: 'RpcServerStop')
-                    ForestAdminRpcAgent::Facades::Container.logger&.log('Debug', '[SSE] RpcServerStop event sent')
-                  rescue StandardError => e
-                    ForestAdminRpcAgent::Facades::Container.logger&.log('Debug', "[SSE] Error sending stop event: #{e.message}")
-                  end
-                end
-              rescue IOError, Errno::EPIPE => e
-                # Client disconnected normally
-                ForestAdminRpcAgent::Facades::Container.logger&.log('Debug', "[SSE] Client disconnected: #{e.message}")
-              rescue StandardError => e
-                ForestAdminRpcAgent::Facades::Container.logger&.log('Error', "[SSE] Unexpected error: #{e.message}")
-                ForestAdminRpcAgent::Facades::Container.logger&.log('Error', e.backtrace.join("\n"))
-              ensure
-                trap('INT', original_int_handler)
-                trap('TERM', original_term_handler)
-                ForestAdminRpcAgent::SseConnectionManager.unregister_connection(connection)
-                ForestAdminRpcAgent::Facades::Container.logger&.log('Debug', '[SSE] Stream stopped')
-
-                # Re-send the signal to allow proper server shutdown
-                Process.kill(received_signal, Process.pid) if received_signal
-              end
-            end
-
-            [status, headers, body]
-          else
-            [status, headers, response]
-          end
-        end
-
-        router.match @url,
-                     defaults: { format: 'event-stream' },
-                     to: handler,
-                     via: @method,
-                     as: @name,
-                     route_alias: @name
-      end
-    end
-  end
-end

data/lib/forest_admin_rpc_agent/sse_connection_manager.rb

@@ -1,81 +0,0 @@
-module ForestAdminRpcAgent
-  # Manages SSE connections to ensure only one active connection at a time.
-  # When a new connection is established, the previous one is terminated.
-  # This prevents zombie loops when the master restarts and reconnects.
-  class SseConnectionManager
-    @mutex = Mutex.new
-    @current_connection = nil
-
-    class << self
-      # Registers a new SSE connection and terminates any existing one.
-      # Returns a connection object that can be used to check if the connection is still active.
-      def register_connection
-        connection = Connection.new
-
-        @mutex.synchronize do
-          # Terminate the previous connection if it exists
-          if @current_connection
-            ForestAdminRpcAgent::Facades::Container.logger&.log(
-              'Debug',
-              '[SSE ConnectionManager] Terminating previous connection'
-            )
-            @current_connection.terminate
-          end
-
-          @current_connection = connection
-          ForestAdminRpcAgent::Facades::Container.logger&.log(
-            'Debug',
-            "[SSE ConnectionManager] New connection registered (id: #{connection.id})"
-          )
-        end
-
-        connection
-      end
-
-      # Unregisters a connection when it's closed normally.
-      def unregister_connection(connection)
-        @mutex.synchronize do
-          if @current_connection&.id == connection.id
-            @current_connection = nil
-            ForestAdminRpcAgent::Facades::Container.logger&.log(
-              'Debug',
-              "[SSE ConnectionManager] Connection unregistered (id: #{connection.id})"
-            )
-          end
-        end
-      end
-
-      # Returns the current active connection (for testing purposes)
-      def current_connection
-        @mutex.synchronize { @current_connection }
-      end
-
-      # Resets the manager state (for testing purposes)
-      def reset!
-        @mutex.synchronize do
-          @current_connection&.terminate
-          @current_connection = nil
-        end
-      end
-    end
-
-    # Represents an individual SSE connection
-    class Connection
-      attr_reader :id
-
-      def initialize
-        @id = SecureRandom.uuid
-        @active = true
-        @mutex = Mutex.new
-      end
-
-      def active?
-        @mutex.synchronize { @active }
-      end
-
-      def terminate
-        @mutex.synchronize { @active = false }
-      end
-    end
-  end
-end

data/lib/forest_admin_rpc_agent/sse_streamer.rb

@@ -1,14 +0,0 @@
-require 'json'
-
-module ForestAdminRpcAgent
-  class SseStreamer
-    def initialize(yielder)
-      @yielder = yielder
-    end
-
-    def write(object, event: nil)
-      @yielder << "event: #{event}\n" if event
-      @yielder << "data: #{JSON.dump(object)}\n\n"
-    end
-  end
-end