forest_admin_datasource_rpc 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 149a87567ed3ae82d40b0273341c681e2714aa7a336106ad6a0ccebc4d8ea60d
-  data.tar.gz: 878a081448c802e6406d905f60d7470b3ef379705ce307bebb64d8ce8dfffe34
+  metadata.gz: ede19279c81c39b065be45f1741b08acc5babc63efdec6314a9c691631eb41a7
+  data.tar.gz: 7e9701d233a9fa29ce2e5197ce8d5a41bba5daec470ed2e519cb1441ca7266b1
 SHA512:
-  metadata.gz: 17578e18fd03f6749bf3392a304f3e1e1230d1d6d0b82a0947175d9101782e90288d5a03213953f7cb937499d9bf78349a96c034cb0a88c43199aafe7b144d91
-  data.tar.gz: 9d82189dfd1d88f6973aeb9a30ccd6702006c406dd6aa490bff247e655a416df44b2cba982f6405e4835429cf5df54eeefc9cfa5e18fadffbeb79a29e0419498
+  metadata.gz: 7668783a404d091882070ae683cac5db1d04447c74310e7ce572c060ab2891589d8eb6ac919b93357edaca6a282ff297f3204d8858a47c8ab932c27a4cdc123a
+  data.tar.gz: e98bf680d0e374e2974470d209d52b61ffa28a977dcc332c9fb091c289a8458a1591cbc888e5a025ff0f0aac7e999c22e9bcfe9eae88e42d6dc5c441bc72878a

data/lib/forest_admin_datasource_rpc/Utils/sse_client.rb

@@ -6,17 +6,58 @@ require 'ld-eventsource'
 module ForestAdminDatasourceRpc
   module Utils
     class SseClient
+      attr_reader :closed
+
+      MAX_BACKOFF_DELAY = 30 # seconds
+      INITIAL_BACKOFF_DELAY = 2 # seconds
+
       def initialize(uri, auth_secret, &on_rpc_stop)
         @uri = uri
         @auth_secret = auth_secret
         @on_rpc_stop = on_rpc_stop
         @client = nil
         @closed = false
+        @connection_attempts = 0
+        @reconnect_thread = nil
+        @connecting = false
       end
 
       def start
         return if @closed
 
+        attempt_connection
+      end
+
+      def close
+        return if @closed
+
+        @closed = true
+        ForestAdminRpcAgent::Facades::Container.logger&.log('Debug', '[SSE Client] Closing connection')
+
+        # Stop reconnection thread if running
+        if @reconnect_thread&.alive?
+          @reconnect_thread.kill
+          @reconnect_thread = nil
+        end
+
+        begin
+          @client&.close
+        rescue StandardError => e
+          ForestAdminRpcAgent::Facades::Container.logger&.log('Debug',
+                                                              "[SSE Client] Error during close: #{e.message}")
+        end
+
+        ForestAdminRpcAgent::Facades::Container.logger&.log('Debug', '[SSE Client] Connection closed')
+      end
+
+      private
+
+      def attempt_connection
+        return if @closed
+        return if @connecting
+
+        @connecting = true
+        @connection_attempts += 1
         timestamp = Time.now.utc.iso8601(3)
         signature = generate_signature(timestamp)
 
@@ -26,29 +67,106 @@ module ForestAdminDatasourceRpc
           'X_SIGNATURE' => signature
         }
 
-        ForestAdminRpcAgent::Facades::Container.logger.log('Debug', "Connecting to SSE at #{@uri}.")
+        ForestAdminRpcAgent::Facades::Container.logger&.log(
+          'Debug',
+          "[SSE Client] Connecting to #{@uri} (attempt ##{@connection_attempts})"
+        )
 
-        @client = SSE::Client.new(@uri, headers: headers) do |client|
-          client.on_event do |event|
-            handle_event(event)
+        begin
+          # Close existing client if any
+          begin
+            @client&.close
+          rescue StandardError
+            # Ignore close errors
           end
 
-          client.on_error do |err|
-            # TODO: optimisation on client close
-            # ForestAdminRpcAgent::Facades::Container.logger.log('Warn', "[SSE] Error: #{err.class} - #{err.message}")
+          @client = SSE::Client.new(@uri, headers: headers) do |client|
+            client.on_event do |event|
+              handle_event(event)
+            end
+
+            client.on_error do |err|
+              handle_error_with_reconnect(err)
+            end
           end
+
+          ForestAdminRpcAgent::Facades::Container.logger&.log('Debug', '[SSE Client] Connected successfully')
+        rescue StandardError => e
+          ForestAdminRpcAgent::Facades::Container.logger&.log(
+            'Error',
+            "[SSE Client] Failed to connect: #{e.class} - #{e.message}"
+          )
+          @connecting = false
+          schedule_reconnect
         end
       end
 
-      def close
+      def handle_error_with_reconnect(err)
+        # Ignore errors when client is intentionally closed
         return if @closed
 
-        @closed = true
-        @client&.close
-        # ForestAdminRpcAgent::Facades::Container.logger.log('Debug', '[SSE] Client closed')
+        is_auth_error = false
+        log_level = 'Warn'
+
+        error_message = case err
+                        when SSE::Errors::HTTPStatusError
+                          # Extract more details from HTTP errors
+                          status = err.respond_to?(:status) ? err.status : 'unknown'
+                          body = err.respond_to?(:body) && !err.body.to_s.strip.empty? ? err.body : 'empty response'
+                          is_auth_error = status.to_s =~ /^(401|403)$/
+
+                          # Auth errors during reconnection are expected (server shutdown or credentials expiring)
+                          log_level = 'Debug' if is_auth_error
+
+                          "HTTP #{status} - #{body}"
+                        when EOFError, IOError
+                          # Connection lost is expected when server stops
+                          log_level = 'Debug'
+                          "Connection lost: #{err.class}"
+                        when StandardError
+                          "#{err.class} - #{err.message}"
+                        else
+                          err.to_s
+                        end
+
+        ForestAdminRpcAgent::Facades::Container.logger&.log(log_level, "[SSE Client] Error: #{error_message}")
+
+        # Close client immediately to prevent ld-eventsource from reconnecting with stale credentials
+        begin
+          @client&.close
+        rescue StandardError
+          # Ignore close errors
+        end
+
+        # Reset connecting flag and schedule reconnection
+        @connecting = false
+
+        # For auth errors, increase attempt count to get longer backoff
+        @connection_attempts += 2 if is_auth_error
+
+        schedule_reconnect
       end
 
-      private
+      def schedule_reconnect
+        return if @closed
+        return if @reconnect_thread&.alive?
+
+        @reconnect_thread = Thread.new do
+          delay = calculate_backoff_delay
+          ForestAdminRpcAgent::Facades::Container.logger&.log(
+            'Debug',
+            "[SSE Client] Reconnecting in #{delay} seconds..."
+          )
+          sleep(delay)
+          attempt_connection unless @closed
+        end
+      end
+
+      def calculate_backoff_delay
+        # Exponential backoff: 1, 2, 4, 8, 16, 30, 30, ...
+        delay = INITIAL_BACKOFF_DELAY * (2**[@connection_attempts - 1, 0].max)
+        [delay, MAX_BACKOFF_DELAY].min
+      end
 
       def handle_event(event)
         type = event.type.to_s.strip
@@ -56,14 +174,34 @@ module ForestAdminDatasourceRpc
 
         case type
         when 'heartbeat'
-          # ForestAdminRpcAgent::Facades::Container.logger.log('Debug', '[SSE] Heartbeat')
+          if @connecting
+            @connecting = false
+            @connection_attempts = 0
+            ForestAdminRpcAgent::Facades::Container.logger&.log('Debug', '[SSE Client] Connection stable')
+          end
         when 'RpcServerStop'
-          # ForestAdminRpcAgent::Facades::Container.logger.log('Debug', '[SSE] RpcServerStop received')
-          @on_rpc_stop&.call
+          ForestAdminRpcAgent::Facades::Container.logger&.log('Debug', '[SSE Client] RpcServerStop received')
+          handle_rpc_stop
         else
-          ForestAdminRpcAgent::Facades::Container.logger.log('Debug',
-                                                             "[SSE] Unknown event: #{type} with payload: #{data}")
+          ForestAdminRpcAgent::Facades::Container.logger&.log(
+            'Debug',
+            "[SSE Client] Unknown event: #{type} with payload: #{data}"
+          )
         end
+      rescue StandardError => e
+        ForestAdminRpcAgent::Facades::Container.logger&.log(
+          'Error',
+          "[SSE Client] Error handling event: #{e.class} - #{e.message}"
+        )
+      end
+
+      def handle_rpc_stop
+        @on_rpc_stop&.call
+      rescue StandardError => e
+        ForestAdminRpcAgent::Facades::Container.logger&.log(
+          'Error',
+          "[SSE Client] Error in RPC stop callback: #{e.class} - #{e.message}"
+        )
       end
 
       def generate_signature(timestamp)

data/lib/forest_admin_datasource_rpc/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceRpc
-  VERSION = "1.7.1"
+  VERSION = "1.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_rpc
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Matthieu