forest_admin_rpc_agent 1.16.4 → 1.16.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fc96b913c73d5ac4922e3c2366a73d56a7a65c1eee60428f49d2f19a770f05a
-  data.tar.gz: 8e1417b461af67e525b8e1af06483d001b37ad11ec9e7a0c4ce12e452706fafd
+  metadata.gz: 61c267e0f4478a14bb31888e27d27c667074664e3edc3f63d60e71d3a64b84d8
+  data.tar.gz: 8dcfa34e4f3be0c81434999b363036bd0806fc210a07f1f833fa643ce99b6efe
 SHA512:
-  metadata.gz: 9ac705763d0e5afa2357e3701616ea8693f65902c904c584303726f2610b4a2c5b9b2ececd6c8bb866c5acd116bc6923cf2d6183aeb3b6a400519a7c4391e849
-  data.tar.gz: baa4798d78bfff90cb23946253bf4bed7e73959aa6da59902fcee836ccf95a5eb9ad1f316bed51dd3e0788f54d08d6b0bba0347fd9fcef96410d3cf38c1cc95a
+  metadata.gz: ed2f6d0a8470a07fd3ba641f4ec53ddf2ed2dab751bdeaed8cfa48a4a897891f61584c5e3117e7cc7acb0d56a04516758f5f3281f55d5ae50b2bc9872868ebe2
+  data.tar.gz: 6e69218d6db3390e6f86fd0c1ac39d9792bae33768fa4f42389ca09d82ec1eaa6c332de6423e483904340c56bfdc7d06fb8b8299d6910af5351b2dc153115dbb

data/lib/forest_admin_rpc_agent/routes/sse.rb

@@ -3,7 +3,7 @@ require 'jsonapi-serializers'
 module ForestAdminRpcAgent
   module Routes
     class Sse
-      DEFAULT_HEARTBEAT_INTERVAL = 1
+      DEFAULT_HEARTBEAT_INTERVAL = 10
 
       def initialize(url = 'sse', method = 'get', name = 'rpc_sse', heartbeat_interval: DEFAULT_HEARTBEAT_INTERVAL)
         @url = url
@@ -37,11 +37,13 @@ module ForestAdminRpcAgent
                   'X-Accel-Buffering' => 'no'
 
           stream(:keep_open) do |out|
-            should_continue = true
+            # 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|
-              should_continue = false
+              connection.terminate
               server_stopped = true
               received_signal = sig
             end
@@ -51,7 +53,7 @@ module ForestAdminRpcAgent
             begin
               streamer = SseStreamer.new(out)
 
-              while should_continue
+              while connection.active?
                 streamer.write('', event: 'heartbeat')
                 sleep route_instance.instance_variable_get(:@heartbeat_interval)
               end
@@ -71,6 +73,7 @@ module ForestAdminRpcAgent
             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
@@ -95,11 +98,13 @@ module ForestAdminRpcAgent
               'X-Accel-Buffering' => 'no'
             }
 
-            should_continue = true
+            # 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|
-              should_continue = false
+              connection.terminate
               server_stopped = true
               received_signal = sig
             end
@@ -112,7 +117,7 @@ module ForestAdminRpcAgent
               begin
                 ForestAdminRpcAgent::Facades::Container.logger&.log('Debug', '[SSE] Starting stream')
 
-                while should_continue
+                while connection.active?
                   stream.write('', event: 'heartbeat')
                   sleep route_instance.instance_variable_get(:@heartbeat_interval)
                 end
@@ -135,6 +140,7 @@ module ForestAdminRpcAgent
               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

data/lib/forest_admin_rpc_agent/sse_connection_manager.rb

@@ -0,0 +1,81 @@
+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/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminRpcAgent
-  VERSION = "1.16.4"
+  VERSION = "1.16.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_rpc_agent
 version: !ruby/object:Gem::Version
-  version: 1.16.4
+  version: 1.16.5
 platform: ruby
 authors:
 - Matthieu
@@ -178,6 +178,7 @@ files:
 - 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