pgbus 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d43bc708b048e8b81cae4c4954686fcd0f227fd8bc2498c599ab231f262ef607
-  data.tar.gz: 465eba8207a366a8f639f110e8131d064b46267161ffbf969b86aa470de56bfa
+  metadata.gz: 1a4669f7150717428ced89a13b5c8e7f9cf5d61d6eae6b19919d6408fefad06a
+  data.tar.gz: 4dc1c6db2f50ce6e0de5c845cd2813cbb299ad096dab2dcfa5169db368dfa0af
 SHA512:
-  metadata.gz: cbc395ea4f504b5295b7a90c50981aef8cce7b7a060a8488db2b8a3a73d9d08ae8a571a067626e1e269a501e87790f230231018d527096ebba89a6a743a390ac
-  data.tar.gz: 12ff4342c5fb3b1b30c328c7f373dcfcfd2db72d87d4a079e0538ba6857ca89b952078a6150ae495b560815bb637f396768397ccb250b98371096e146cb37b23
+  metadata.gz: 3184e872126937ec8660530143c610a64a0649bd60ab7c9bca6663e6883af3ec16144cfb3d7b74713ff0a5487b7f1edacba973e387a52f802237f9ff3a2c7b2c
+  data.tar.gz: bc0f72ace6413ad27899d7968b3fe6df822fd35f3b495bdbf24ccd95c9add029f5ebb3b11e462c0a30937bfca3082460e3c655533464becf73d6cb328ded8621

data/lib/pgbus/engine.rb

@@ -84,6 +84,15 @@ module Pgbus
           # `_` keeps RuboCop's Lint/Void from deleting the line.
           _autoload_trigger = Pgbus::Streams::TurboBroadcastable
           Pgbus::Streams.install_turbo_broadcastable_patch!
+
+          # Subscribe-side patch: override turbo_stream_from to render
+          # <pgbus-stream-source> (SSE) instead of <turbo-cable-stream-source>
+          # (ActionCable). Without this, third-party gems like
+          # hotwire-livereload that call turbo_stream_from in their views
+          # subscribe via ActionCable while the broadcast (patched above)
+          # goes through PGMQ — the message never arrives.
+          _autoload_trigger_override = Pgbus::Streams::TurboStreamOverride
+          Pgbus::Streams.install_turbo_stream_override!
         end
       end
     end

data/lib/pgbus/streams/turbo_stream_override.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Pgbus
+  module Streams
+    # Runtime patch that redirects `turbo_stream_from` (the view helper)
+    # through `pgbus_stream_from` when pgbus streams are enabled. This is
+    # the subscribe-side counterpart to `TurboBroadcastable` (which patches
+    # the publish-side `broadcast_stream_to`).
+    #
+    # Without this patch, third-party gems like hotwire-livereload call
+    # `turbo_stream_from "hotwire-livereload"` in their views, which
+    # renders a `<turbo-cable-stream-source>` element connected to
+    # ActionCable. Meanwhile, the `TurboBroadcastable` patch routes the
+    # broadcast through PGMQ/SSE. Publisher and subscriber end up on
+    # different transports — the message never arrives.
+    #
+    # After this patch, `turbo_stream_from` renders a `<pgbus-stream-source>`
+    # element instead, so both sides use PGMQ/SSE. When `streams_enabled`
+    # is false, the original turbo-rails behavior is preserved via `super`.
+    module TurboStreamOverride
+      def turbo_stream_from(*streamables, **attributes)
+        if Pgbus.configuration.streams_enabled
+          pgbus_stream_from(*streamables, **attributes)
+        else
+          super
+        end
+      end
+    end
+
+    # Apply the patch to Turbo::StreamsHelper. Idempotent: prepending the
+    # same module twice is a no-op. Called from Pgbus::Engine's initializer
+    # when both turbo-rails and pgbus streams are enabled.
+    def self.install_turbo_stream_override!
+      return unless defined?(::Turbo::StreamsHelper)
+      return if ::Turbo::StreamsHelper.ancestors.include?(TurboStreamOverride)
+
+      ::Turbo::StreamsHelper.prepend(TurboStreamOverride)
+    end
+  end
+end

data/lib/pgbus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pgbus
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgbus
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Mikael Henriksson
@@ -297,6 +297,7 @@ files:
 - lib/pgbus/streams/presence.rb
 - lib/pgbus/streams/signed_name.rb
 - lib/pgbus/streams/turbo_broadcastable.rb
+- lib/pgbus/streams/turbo_stream_override.rb
 - lib/pgbus/streams/watermark_cache_middleware.rb
 - lib/pgbus/uniqueness.rb
 - lib/pgbus/version.rb