forest_admin_datasource_rpc 1.16.2 → 1.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 125dddf4e300c8f56852cef145cffa5402449cf4832a19c1d0602ebcb07cb733
-  data.tar.gz: 8b791dc37bb3b2c1667c20f76e99b45c4de52b9aba6c7d34e227196d05955045
+  metadata.gz: be0a00b5ca26d9036b622fd38dad0f6578aa1aade7052c6375dcece422b83226
+  data.tar.gz: be0b96219b613b0511416f0f557b310348fe1889fc1497e0115d61d7eb250087
 SHA512:
-  metadata.gz: 7bdc39e2196fad784f0929119d79162c580e58bb94282bd61a547e012c8642d9b0ec104a94224294ff0e139066dea9af7545565c3718c3436c89f6009245e491
-  data.tar.gz: 9135542c6fa1a160b46bb634ef3dfba2d1f102d26913929dcea52942dfd4cf95ebd9b569234a24079ebe0ddec75178da1170de82805bb02e7f8b6cdd21d4ec1a
+  metadata.gz: 63d1a2248a321c38f59cfbed6ea2d924710c29a33f65245634f3369c70c08524959cbc898d06d56db14b459133aa8d1888eeed90c46ec1e67244e62a7e8e36b3
+  data.tar.gz: 911a400b9b6f9efc37bb3135f1c0ce357e91793f20204a364db166342af466503288215e531e98dcd90e23637e773b795b6ac20e3e0ce46272b9efca49c92331

data/lib/forest_admin_datasource_rpc/datasource.rb

@@ -2,7 +2,7 @@ module ForestAdminDatasourceRpc
   class Datasource < ForestAdminDatasourceToolkit::Datasource
     include ForestAdminDatasourceRpc::Utils
 
-    def initialize(options, introspection)
+    def initialize(options, introspection, sse_client = nil)
       super()
 
       ForestAdminAgent::Facades::Container.logger.log(
@@ -18,6 +18,8 @@ module ForestAdminDatasourceRpc
       @options = options
       @charts = introspection[:charts]
       @rpc_relations = introspection[:rpc_relations]
+      @sse_client = sse_client
+      @cleaned_up = false
 
       native_query_connections = introspection[:native_query_connections] || []
       @live_query_connections = native_query_connections.to_h { |conn| [conn[:name], conn[:name]] }
@@ -50,5 +52,22 @@ module ForestAdminDatasourceRpc
                                     payload: { connection_name: connection_name, query: query, binds: binds })
       ForestAdminDatasourceToolkit::Utils::HashHelper.convert_keys(result.to_a)
     end
+
+    def cleanup
+      return if @cleaned_up
+
+      @cleaned_up = true
+
+      if @sse_client
+        ForestAdminAgent::Facades::Container.logger&.log('Info', '[RPCDatasource] Closing SSE connection...')
+        @sse_client.close
+        ForestAdminAgent::Facades::Container.logger&.log('Info', '[RPCDatasource] SSE connection closed')
+      end
+    rescue StandardError => e
+      ForestAdminAgent::Facades::Container.logger&.log(
+        'Error',
+        "[RPCDatasource] Error during cleanup: #{e.class} - #{e.message}"
+      )
+    end
   end
 end

data/lib/forest_admin_datasource_rpc/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceRpc
-  VERSION = "1.16.2"
+  VERSION = "1.16.3"
 end

data/lib/forest_admin_datasource_rpc.rb

@@ -55,7 +55,44 @@ module ForestAdminDatasourceRpc
       end
       sse.start
 
-      ForestAdminDatasourceRpc::Datasource.new(options, schema)
+      datasource = ForestAdminDatasourceRpc::Datasource.new(options, schema, sse)
+
+      # Setup cleanup hooks for proper SSE client shutdown
+      setup_cleanup_hooks(datasource)
+
+      datasource
+    end
+  end
+
+  def self.setup_cleanup_hooks(datasource)
+    # Register cleanup handler for graceful shutdown
+    at_exit do
+      datasource.cleanup
+    rescue StandardError => e
+      # Silently ignore errors during exit cleanup to prevent test pollution
+      warn "[RPCDatasource] Error during at_exit cleanup: #{e.message}" if $VERBOSE
+    end
+
+    # Handle SIGINT (Ctrl+C)
+    Signal.trap('INT') do
+      begin
+        ForestAdminAgent::Facades::Container.logger&.log('Info', '[RPCDatasource] Received SIGINT, cleaning up...')
+      rescue StandardError
+        # Logger might not be available
+      end
+      datasource.cleanup
+      exit(0)
+    end
+
+    # Handle SIGTERM (default kill signal)
+    Signal.trap('TERM') do
+      begin
+        ForestAdminAgent::Facades::Container.logger&.log('Info', '[RPCDatasource] Received SIGTERM, cleaning up...')
+      rescue StandardError
+        # Logger might not be available
+      end
+      datasource.cleanup
+      exit(0)
     end
   end
 end

metadata

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