pgbus 0.17.2 → 0.18.0

data/lib/pgbus/web/streamer/stream_event_dispatcher.rb

@@ -105,6 +105,7 @@ module Pgbus
           # process-wide setting. Falls back to the global config
           # for production call sites that don't specify one.
           @config = config || Pgbus.configuration
+          @presence = PresenceTracker.new(config: @config, presence_provider: @presence_provider, logger: @logger)
           # Two write deadlines (issue #315 item 3). Fanout writes run serially
           # on this single thread, so a slow client stalls the connections
           # queued behind it — the short fanout deadline bounds that stall.
@@ -400,6 +401,16 @@ module Pgbus
             @stream_counter.increment_connections(stream)
             @registry.register(connection)
             presence_join(connection, stream)
+            # Step 6: announce the connection id only now (issue #521). A
+            # client that writes keyed by it right after pgbus:connected
+            # (Presence#set_state) must find the registered connection and
+            # its presence row. If that write finds the socket gone, run the
+            # disconnect now rather than leave the connection registered,
+            # and its seat on the roster, until the next heartbeat. A later
+            # DisconnectMessage for it (heartbeat, peer-close watcher) is a
+            # no-op: unregister reports false and the seat has already left.
+            connection.write_connected
+            handle_disconnect(DisconnectMessage.new(connection: connection)) if connection.dead?
           end
 
           record_stat(
@@ -408,10 +419,12 @@ module Pgbus
             started_at: started_at
           )
         rescue StandardError => e
-          # Same leak path for exceptions in steps 1-4. Mark dead and
+          # Same leak path for exceptions in steps 1-6. Mark dead and
           # scrub state so a transient failure on a single connect
           # doesn't permanently bloat @full_to_logical or leave a
-          # dangling LISTEN on the PG connection.
+          # dangling LISTEN on the PG connection. A connection already
+          # registered in step 5 is dead now, so the heartbeat sweep
+          # unregisters it (and leaves its seat) like any dead connection.
           remove_in_flight(stream, connection)
           @scanned_cursor.delete(connection)
           cleanup_stream_if_unused(stream)
@@ -428,6 +441,10 @@ module Pgbus
           @stream_counter.decrement_connections(stream) if removed
           presence_leave(connection, stream)
           cleanup_stream_if_unused(stream)
+          # A second DisconnectMessage for the same connection (heartbeat,
+          # peer-close watcher, a failed pgbus:connected write) is a no-op
+          # and must not count as another disconnect.
+          return unless removed
 
           record_stat(
             stream_name: stream,
@@ -436,19 +453,11 @@ module Pgbus
           )
         end
 
-        # Touches (refreshes last_seen_at for) the presence members on the
-        # given connections. Posted by the Heartbeat each tick so idle but
-        # still-connected members don't get swept. Connections without a
-        # presence member (non-presence streams, anonymous) are skipped.
+        # Touches the presence rows of the given connections and expires
+        # silent seats. Posted by the Heartbeat each tick so idle but
+        # still-connected members don't get swept (see PresenceTracker).
         def handle_presence_touch(msg)
-          msg.connections.each do |connection|
-            member_id = presence_member_of(connection)
-            next unless member_id
-
-            @presence_provider.call(connection.stream_name).touch(member_id: member_id)
-          rescue StandardError => e
-            @logger.error { "[Pgbus::Streamer::StreamEventDispatcher] presence touch failed: #{e.class}: #{e.message}" }
-          end
+          @presence.touch(msg.connections)
         end
 
         # If this stream has no remaining subscribers (registered or
@@ -640,35 +649,13 @@ module Pgbus
           connection.respond_to?(:id) && connection.id.to_s == exclude.to_s
         end
 
-        # Connection-driven presence (issue #169). Auto-joins a member when
-        # the stream is configured for presence and the connection's
-        # authorize-context yields a member id. Stores the member id on the
-        # connection so handle_disconnect/handle_presence_touch can act on
-        # it. Failures are logged and swallowed: a presence DB hiccup must
-        # not knock a live SSE connection out of the registry.
+        # Connection-driven presence (issues #169, #515): see PresenceTracker.
         def presence_join(connection, stream)
-          return unless @config&.stream_presence?(stream)
-
-          member = @config.presence_member_for(connection.context)
-          return unless member
-
-          @presence_provider.call(stream).join(member_id: member[:id], metadata: member[:metadata] || {})
-          connection.presence_member = member[:id] if connection.respond_to?(:presence_member=)
-        rescue StandardError => e
-          @logger.error { "[Pgbus::Streamer::StreamEventDispatcher] presence join failed: #{e.class}: #{e.message}" }
+          @presence.join(connection, stream)
         end
 
         def presence_leave(connection, stream)
-          member_id = presence_member_of(connection)
-          return unless member_id
-
-          @presence_provider.call(stream).leave(member_id: member_id)
-        rescue StandardError => e
-          @logger.error { "[Pgbus::Streamer::StreamEventDispatcher] presence leave failed: #{e.class}: #{e.message}" }
-        end
-
-        def presence_member_of(connection)
-          connection.respond_to?(:presence_member) ? connection.presence_member : nil
+          @presence.leave(connection, stream)
         end
 
         def monotonic_ms

data/lib/pgbus.rb

@@ -289,8 +289,10 @@ module Pgbus
     # Do NOT call close — the parent's @pgmq_mutex is in undefined
     # state post-fork and attempting to acquire it can deadlock.
     # The next call to Pgbus.client will lazily create a fresh one.
+    # Cached streams hold the client they were built with, so they go too.
     def reset_client!
       @client = nil
+      @stream_cache = nil
     end
 
     def logger

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgbus
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.18.0
 platform: ruby
 authors:
 - Mikael Henriksson
@@ -123,6 +123,8 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/pgbus/stream_source_element.js
+- app/assets/javascripts/pgbus/stream_source_element.min.js
+- app/assets/javascripts/pgbus/stream_source_element.min.js.map
 - app/controllers/concerns/pgbus/job_listing.rb
 - app/controllers/concerns/pgbus/process_listing.rb
 - app/controllers/pgbus/api/insights_controller.rb
@@ -143,11 +145,17 @@ files:
 - app/controllers/pgbus/queues_controller.rb
 - app/controllers/pgbus/recurring_tasks_controller.rb
 - app/frontend/pgbus/application.js
+- app/frontend/pgbus/application.min.js
+- app/frontend/pgbus/application.min.js.map
 - app/frontend/pgbus/modules/charts.js
+- app/frontend/pgbus/modules/charts.min.js
+- app/frontend/pgbus/modules/charts.min.js.map
 - app/frontend/pgbus/style.css
 - app/frontend/pgbus/tailwind.css
 - app/frontend/pgbus/vendor/apexcharts.js
 - app/frontend/pgbus/vendor/turbo.js
+- app/frontend/pgbus/vendor/turbo.min.js
+- app/frontend/pgbus/vendor/turbo.min.js.map
 - app/helpers/pgbus/application_helper.rb
 - app/helpers/pgbus/button_helper.rb
 - app/helpers/pgbus/dashboard_helper.rb
@@ -244,6 +252,7 @@ files:
 - lib/generators/pgbus/add_job_stats_queue_index_generator.rb
 - lib/generators/pgbus/add_outbox_generator.rb
 - lib/generators/pgbus/add_presence_generator.rb
+- lib/generators/pgbus/add_presence_seats_generator.rb
 - lib/generators/pgbus/add_processed_event_completion_generator.rb
 - lib/generators/pgbus/add_queue_states_generator.rb
 - lib/generators/pgbus/add_recurring_generator.rb
@@ -261,6 +270,7 @@ files:
 - lib/generators/pgbus/templates/add_job_stats_queue_index.rb.erb
 - lib/generators/pgbus/templates/add_outbox.rb.erb
 - lib/generators/pgbus/templates/add_presence.rb.erb
+- lib/generators/pgbus/templates/add_presence_seats.rb.erb
 - lib/generators/pgbus/templates/add_processed_event_completion.rb.erb
 - lib/generators/pgbus/templates/add_queue_states.rb.erb
 - lib/generators/pgbus/templates/add_recurring_tables.rb.erb
@@ -305,6 +315,8 @@ files:
 - lib/pgbus/concurrency/semaphore.rb
 - lib/pgbus/configuration.rb
 - lib/pgbus/configuration/capsule_dsl.rb
+- lib/pgbus/configuration/presence_settings.rb
+- lib/pgbus/configuration/stream_authorization.rb
 - lib/pgbus/current_attributes.rb
 - lib/pgbus/database_tasks_guard.rb
 - lib/pgbus/dead_letter_header.rb
@@ -466,6 +478,8 @@ files:
 - lib/pgbus/web/streamer/master_hub.rb
 - lib/pgbus/web/streamer/master_hub_boot.rb
 - lib/pgbus/web/streamer/outbound_pump.rb
+- lib/pgbus/web/streamer/peer_close_watcher.rb
+- lib/pgbus/web/streamer/presence_tracker.rb
 - lib/pgbus/web/streamer/registry.rb
 - lib/pgbus/web/streamer/stream_counter.rb
 - lib/pgbus/web/streamer/stream_event_dispatcher.rb