actioncable-next 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5831ed0f565c3bc58899a26ec3097bf47ea7cb518f380e0db05a8bad6fcc5dd
-  data.tar.gz: 92aae3e36883530c9b51ee7acdb0e7df231aed27d60b5f8a4d31426c7158822e
+  metadata.gz: a3500aff266cab716b9cc6ef36748f32ecd4e6b5e1d24a1c8ce462c0e3e2dd9d
+  data.tar.gz: 74123e275958e25046b8a3a10ac7a3c2b5fa8066c63209baf591f3623100e867
 SHA512:
-  metadata.gz: ef8e96d02d595e9004acc936acc8c116d1ac846664dbdf3455b0cfb8f872ba3dbbecfd3dfb3772a53b796505c02a592947bf838690d9c5f0b2c844a40e70e7a4
-  data.tar.gz: bf36b4a97cd76f02d4162a70d27751ae15333d5c1c23654199bd59214dc061b0b779aa9dd28c73ca080f075fc5bc8972db86d6e98ce137c4b78f330bd3e5540c
+  metadata.gz: e6662409e60c2c0a2ac869771d05df9c620529a0cc92642e6bc3b5c953e1f78e3d64460953ecee186d713c8079e0b296fc25a8faadca646128a4c6b28f01c175
+  data.tar.gz: 588b659b2eddf199182e25bd7bec23f386621f97abdb169d33c81ac8022556cfa2ad8275cbaad3cf420c8f89306974843f47f851d7db3db0d37363f352d6e120

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## main
 
+## 0.3.0
+
+- Sync with upstream (Rails 8.1.1).
+
+- Do not call `#subscribed` when subscription is rejected in a `before_subscribe` callback.
+
 ## 0.2.0
 
 - Performance: store connections in a Hash, not an Array.

data/lib/action_cable/channel/base.rb

@@ -2,7 +2,6 @@
 
 # :markup: markdown
 
-require "set"
 require "active_support/rescuable"
 require "active_support/parameter_filter"
 
@@ -133,7 +132,10 @@ module ActionCable
               # Except for public instance methods of Base and its ancestors
               ActionCable::Channel::Base.public_instance_methods(true) +
               # Be sure to include shadowed public instance methods of this class
-              public_instance_methods(false)).uniq.map(&:to_s)
+              public_instance_methods(false) -
+              # Except the internal methods
+              internal_methods).uniq
+            methods.map!(&:name)
             methods.to_set
           end
         end
@@ -146,6 +148,10 @@ module ActionCable
             @action_methods = nil
           end
 
+          def internal_methods
+            super
+          end
+
           # Refresh the cached action_methods when a new action_method is added.
           def method_added(name) # :doc:
             super
@@ -166,6 +172,7 @@ module ActionCable
 
         @reject_subscription = nil
         @subscription_confirmation_sent = nil
+        @unsubscribed = false
 
         delegate_connection_identifiers
       end
@@ -190,7 +197,7 @@ module ActionCable
       # confirms or rejects the subscription.
       def subscribe_to_channel
         run_callbacks :subscribe do
-          subscribed
+          subscribed unless subscription_rejected?
         end
 
         reject_subscription if subscription_rejected?
@@ -201,11 +208,16 @@ module ActionCable
       # cleanup with callbacks. This method is not intended to be called directly by
       # the user. Instead, override the #unsubscribed callback.
       def unsubscribe_from_channel # :nodoc:
+        @unsubscribed = true
         run_callbacks :unsubscribe do
           unsubscribed
         end
       end
 
+      def unsubscribed? # :nodoc:
+        @unsubscribed
+      end
+
       private
         # Called once a consumer has become a subscriber of the channel. Usually the
         # place to set up any streams you want this channel to be sending to the

data/lib/action_cable/channel/broadcasting.rb

@@ -10,19 +10,19 @@ module ActionCable
       extend ActiveSupport::Concern
 
       module ClassMethods
-        # Broadcast a hash to a unique broadcasting for this `model` in this channel.
-        def broadcast_to(model, message)
-          ActionCable.server.broadcast(broadcasting_for(model), message)
+        # Broadcast a hash to a unique broadcasting for this array of `broadcastables` in this channel.
+        def broadcast_to(broadcastables, message)
+          ActionCable.server.broadcast(broadcasting_for(broadcastables), message)
         end
 
         # Returns a unique broadcasting identifier for this `model` in this channel:
         #
         #     CommentsChannel.broadcasting_for("all") # => "comments:all"
         #
-        # You can pass any object as a target (e.g. Active Record model), and it would
+        # You can pass an array of objects as a target (e.g. Active Record model), and it would
         # be serialized into a string under the hood.
-        def broadcasting_for(model)
-          serialize_broadcasting([ channel_name, model ])
+        def broadcasting_for(broadcastables)
+          serialize_broadcasting([ channel_name ] + Array(broadcastables))
         end
 
         private

data/lib/action_cable/channel/callbacks.rb

@@ -39,6 +39,8 @@ module ActionCable
       extend  ActiveSupport::Concern
       include ActiveSupport::Callbacks
 
+      INTERNAL_METHODS = [:_run_subscribe_callbacks, :_run_unsubscribe_callbacks] # :nodoc:
+
       included do
         define_callbacks :subscribe
         define_callbacks :unsubscribe
@@ -70,6 +72,11 @@ module ActionCable
           set_callback(:unsubscribe, :after, *methods, &block)
         end
         alias_method :on_unsubscribe, :after_unsubscribe
+
+        private
+          def internal_methods
+            INTERNAL_METHODS
+          end
       end
     end
   end

data/lib/action_cable/channel/streams.rb

@@ -88,6 +88,8 @@ module ActionCable
       # callback. Defaults to `coder: nil` which does no decoding, passes raw
       # messages.
       def stream_from(broadcasting, callback = nil, coder: nil, &block)
+        return if unsubscribed?
+
         broadcasting = String(broadcasting)
 
         # Don't send the confirmation until pubsub#subscribe is successful
@@ -104,15 +106,15 @@ module ActionCable
         end)
       end
 
-      # Start streaming the pubsub queue for the `model` in this channel. Optionally,
+      # Start streaming the pubsub queue for the `broadcastables` in this channel. Optionally,
       # you can pass a `callback` that'll be used instead of the default of just
       # transmitting the updates straight to the subscriber.
       #
       # Pass `coder: ActiveSupport::JSON` to decode messages as JSON before passing to
       # the callback. Defaults to `coder: nil` which does no decoding, passes raw
       # messages.
-      def stream_for(model, ...)
-        stream_from(broadcasting_for(model), ...)
+      def stream_for(broadcastables, ...)
+        stream_from(broadcasting_for(broadcastables), ...)
       end
 
       # Unsubscribes streams from the named `broadcasting`.

data/lib/action_cable/connection/identification.rb

@@ -2,8 +2,6 @@
 
 # :markup: markdown
 
-require "set"
-
 module ActionCable
   module Connection
     module Identification

data/lib/action_cable/connection/subscriptions.rb

@@ -40,7 +40,7 @@ module ActionCable
 
       class UnknownSubscription < Error
         def initialize(identifier)
-          "Unable to find subscription with identifier: #{identifier}"
+          super "Unable to find subscription with identifier: #{identifier}"
         end
       end
 

data/lib/action_cable/connection/test_case.rb

@@ -142,11 +142,8 @@ module ActionCable
     #
     # ## Basic example
     #
-    # Unit tests are written as follows:
-    #
-    # 1.  Simulate a connection attempt by calling `connect`.
-    # 2.  Assert state, e.g. identifiers, has been assigned.
-    #
+    # Unit tests are written by first simulating a connection attempt by calling
+    # `connect` and then asserting state, e.g. identifiers, have been assigned.
     #
     #     class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase
     #       def test_connects_with_proper_cookie

data/lib/action_cable/gem_version.rb

@@ -10,9 +10,9 @@ module ActionCable
 
   module VERSION
     MAJOR = 8
-    MINOR = 0
-    TINY  = 0
-    PRE   = "alpha"
+    MINOR = 1
+    TINY  = 1
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_cable/server/base.rb

@@ -10,7 +10,7 @@ module ActionCable
     class ThreadedExecutor # :nodoc:
       def initialize(max_size: 10)
         @executor = Concurrent::ThreadPoolExecutor.new(
-          name: "ActionCable server",
+          name: "ActionCable-streamer",
           min_threads: 1,
           max_threads: max_size,
           max_queue: 0,

data/lib/action_cable/server/broadcasting.rb

@@ -21,10 +21,12 @@ module ActionCable
     #     ActionCable.server.broadcast \
     #       "web_notifications_1", { title: "New things!", body: "All that's fit for print" }
     #
-    #     # Client-side CoffeeScript, which assumes you've already requested the right to send web notifications:
-    #     App.cable.subscriptions.create "WebNotificationsChannel",
-    #       received: (data) ->
-    #         new Notification data['title'], body: data['body']
+    #     // Client-side JavaScript, which assumes you've already requested the right to send web notifications:
+    #     App.cable.subscriptions.create("WebNotificationsChannel", {
+    #       received: function(data) {
+    #         new Notification(data['title'], { body: data['body'] });
+    #       }
+    #     });
     module Broadcasting
       # Broadcast a hash directly to a named `broadcasting`. This will later be JSON
       # encoded.

data/lib/action_cable/server/worker.rb

@@ -20,7 +20,7 @@ module ActionCable
 
       def initialize(max_size: 5)
         @executor = Concurrent::ThreadPoolExecutor.new(
-          name: "ActionCable worker",
+          name: "ActionCable-server",
           min_threads: 1,
           max_threads: max_size,
           max_queue: 0,

data/lib/action_cable/subscription_adapter/base.rb

@@ -32,7 +32,8 @@ module ActionCable
       end
 
       def identifier
-        config.cable[:id] ||= "ActionCable-PID-#{$$}"
+        config.cable[:id] = "ActionCable-PID-#{$$}" unless config.cable.key?(:id)
+        config.cable[:id]
       end
     end
   end

data/lib/action_cable/subscription_adapter/postgresql.rb

@@ -36,18 +36,17 @@ module ActionCable
       end
 
       def with_subscriptions_connection(&block) # :nodoc:
-        ar_conn = ActiveRecord::Base.connection_pool.checkout.tap do |conn|
-          # Action Cable is taking ownership over this database connection, and will
-          # perform the necessary cleanup tasks
-          ActiveRecord::Base.connection_pool.remove(conn)
-        end
+        # Action Cable is taking ownership over this database connection, and will
+        # perform the necessary cleanup tasks.
+        # We purposedly avoid #checkout to not end up with a pinned connection
+        ar_conn = ActiveRecord::Base.connection_pool.new_connection
         pg_conn = ar_conn.raw_connection
 
         verify!(pg_conn)
         pg_conn.exec("SET application_name = #{pg_conn.escape_identifier(identifier)}")
         yield pg_conn
       ensure
-        ar_conn.disconnect!
+        ar_conn&.disconnect!
       end
 
       def with_broadcast_connection(&block) # :nodoc:

data/lib/action_cable/subscription_adapter/redis.rb

@@ -162,7 +162,7 @@ module ActionCable
                 begin
                   conn = @adapter.redis_connection_for_subscriptions
                   listen conn
-                rescue ConnectionError => e
+                rescue *CONNECTION_ERRORS => e
                   reset
                   if retry_connecting?
                     logger&.warn "Redis connection failed: #{e.message}. Trying to reconnect..."
@@ -211,7 +211,7 @@ module ActionCable
             end
 
             if ::Redis::VERSION < "5"
-              ConnectionError = ::Redis::BaseConnectionError
+              CONNECTION_ERRORS = [::Redis::BaseConnectionError].freeze
 
               class SubscribedClient
                 def initialize(raw_client)
@@ -245,7 +245,12 @@ module ActionCable
                 SubscribedClient.new(conn._client)
               end
             else
-              ConnectionError = RedisClient::ConnectionError
+              CONNECTION_ERRORS = [
+                ::Redis::BaseConnectionError,
+
+                # Some older versions of redis-rb sometime leak underlying exceptions
+                RedisClient::ConnectionError,
+              ].freeze
 
               def extract_subscribed_client(conn)
                 conn

data/lib/actioncable-next.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActionCableNext
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/rails/generators/channel/channel_generator.rb

@@ -59,17 +59,17 @@ module Rails
         def create_channel_javascript_file
           channel_js_path = File.join("app/javascript/channels", class_path, "#{file_name}_channel")
           js_template "javascript/channel", channel_js_path
-          gsub_file "#{channel_js_path}.js", /\.\/consumer/, "channels/consumer" unless using_js_runtime?
+          gsub_file "#{channel_js_path}.js", /\.\/consumer/, "channels/consumer" if using_importmap?
         end
 
         def import_channels_in_javascript_entrypoint
           append_to_file "app/javascript/application.js",
-            using_js_runtime? ? %(import "./channels"\n) : %(import "channels"\n)
+            using_importmap? ? %(import "channels"\n) : %(import "./channels"\n)
         end
 
         def import_channel_in_javascript_entrypoint
           append_to_file "app/javascript/channels/index.js",
-            using_js_runtime? ? %(import "./#{file_name}_channel"\n) : %(import "channels/#{file_name}_channel"\n)
+            using_importmap? ? %(import "channels/#{file_name}_channel"\n) : %(import "./#{file_name}_channel"\n)
         end
 
         def install_javascript_dependencies
@@ -105,7 +105,7 @@ pin_all_from "app/javascript/channels", under: "channels"
         end
 
         def using_bun?
-          # Cannot assume bun.lockb has been generated yet so we look for a file known to
+          # Cannot assume Bun lockfile has been generated yet so we look for a file known to
           # be generated by the jsbundling-rails gem
           @using_bun ||= using_js_runtime? && root.join("bun.config.js").exist?
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actioncable-next
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Pratik Naik
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-04 00:00:00.000000000 Z
+date: 2025-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -167,7 +167,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/anycable/actioncable-next
-  changelog_uri: https://github.com/anycable/actioncable-next/blob/v0.2.0/CHANGELOG.md
+  changelog_uri: https://github.com/anycable/actioncable-next/blob/v0.3.0/CHANGELOG.md
   source_code_uri: https://github.com/anycable/actioncable-next
   rubygems_mfa_required: 'true'
 post_install_message:
@@ -178,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="