actioncable 7.0.4.3 → 7.0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2622a0bda2ac4e21aef9acb2345a385ddcb76b9623b0880b81ebef1b135eb1d1
-  data.tar.gz: f0065045a66e532260bff962f925ae844b230160a1d1e07f33bcbc774941206d
+  metadata.gz: f0b157e84c123c5c09c4d01ae257a2be69f755aa995a4fc124be0ff78d51c3f2
+  data.tar.gz: fad558caa312b76636d2bc9fe58dfe59a6cd233b83a5e59884c3a146b2a67627
 SHA512:
-  metadata.gz: 5f6d3cf4c904c9213e901235c310f12b416a2fcb7570f859463f932fc15b2831988cc8cddf0e4d45d19571143a3cddd19bf9683f35f092cf363f4dcc2eec2506
-  data.tar.gz: edf288bef934a10d639748750277edd2c8ecf1b4d4cee650bfd8bbd43517923417083f6cc2860f52acb2d0e99c3cb976118dc66e62b180f7cea61669d2503b2a
+  metadata.gz: f331494a48497d24d09b299bae351fc4d43b433c8a5a7453ac52be0ea26440172173b2a9c96189558058f5181d8b4093deac7b87f873cb64c7f1eb19d32cb8c2
+  data.tar.gz: 98c7611eac2cec92bf2e6e2dd1b03794d5a136c5b45d74472abe3b0b93132e93c519ada3dd8d7e0de3d740dd8e100500367abf769c27ab08859cc2be936f5ca9

data/CHANGELOG.md

@@ -1,3 +1,37 @@
+## Rails 7.0.7.2 (August 22, 2023) ##
+
+*   No changes.
+
+
+## Rails 7.0.7.1 (August 22, 2023) ##
+
+*   No changes.
+
+
+## Rails 7.0.7 (August 09, 2023) ##
+
+*   No changes.
+
+
+## Rails 7.0.6 (June 29, 2023) ##
+
+*   Fix Action Cable Redis configuration with sentinels.
+
+    *Dmitriy Ivliev*
+
+
+## Rails 7.0.5.1 (June 26, 2023) ##
+
+*   No changes.
+
+
+## Rails 7.0.5 (May 24, 2023) ##
+
+*   Restore Action Cable Redis pub/sub listener on connection failure.
+
+    *Vladimir Dementyev*
+
+
 ## Rails 7.0.4.3 (March 13, 2023) ##
 
 *   No changes.

data/README.md

@@ -15,7 +15,7 @@ API documentation is at:
 
 * https://api.rubyonrails.org
 
-Bug reports for the Ruby on Rails project can be filed here:
+Bug reports for the Ruby on \Rails project can be filed here:
 
 * https://github.com/rails/rails/issues
 

data/lib/action_cable/gem_version.rb

@@ -9,8 +9,8 @@ module ActionCable
   module VERSION
     MAJOR = 7
     MINOR = 0
-    TINY  = 4
-    PRE   = "3"
+    TINY  = 7
+    PRE   = "2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_cable/subscription_adapter/redis.rb

@@ -46,7 +46,7 @@ module ActionCable
 
       private
         def listener
-          @listener || @server.mutex.synchronize { @listener ||= Listener.new(self, @server.event_loop) }
+          @listener || @server.mutex.synchronize { @listener ||= Listener.new(self, config_options, @server.event_loop) }
         end
 
         def redis_connection_for_broadcasts
@@ -56,11 +56,15 @@ module ActionCable
         end
 
         def redis_connection
-          self.class.redis_connector.call(@server.config.cable.symbolize_keys.merge(id: identifier))
+          self.class.redis_connector.call(config_options)
+        end
+
+        def config_options
+          @config_options ||= @server.config.cable.deep_symbolize_keys.merge(id: identifier)
         end
 
         class Listener < SubscriberMap
-          def initialize(adapter, event_loop)
+          def initialize(adapter, config_options, event_loop)
             super()
 
             @adapter = adapter
@@ -69,6 +73,11 @@ module ActionCable
             @subscribe_callbacks = Hash.new { |h, k| h[k] = [] }
             @subscription_lock = Mutex.new
 
+            @reconnect_attempt = 0
+            # Use the same config as used by Redis conn
+            @reconnect_attempts = config_options.fetch(:reconnect_attempts, 1)
+            @reconnect_attempts = Array.new(@reconnect_attempts, 0) if @reconnect_attempts.is_a?(Integer)
+
             @subscribed_client = nil
 
             @when_connected = []
@@ -84,6 +93,7 @@ module ActionCable
                 on.subscribe do |chan, count|
                   @subscription_lock.synchronize do
                     if count == 1
+                      @reconnect_attempt = 0
                       @subscribed_client = original_client
 
                       until @when_connected.empty?
@@ -150,8 +160,16 @@ module ActionCable
               @thread ||= Thread.new do
                 Thread.current.abort_on_exception = true
 
-                conn = @adapter.redis_connection_for_subscriptions
-                listen conn
+                begin
+                  conn = @adapter.redis_connection_for_subscriptions
+                  listen conn
+                rescue ConnectionError
+                  reset
+                  if retry_connecting?
+                    when_connected { resubscribe }
+                    retry
+                  end
+                end
               end
             end
 
@@ -163,7 +181,36 @@ module ActionCable
               end
             end
 
+            def retry_connecting?
+              @reconnect_attempt += 1
+
+              return false if @reconnect_attempt > @reconnect_attempts.size
+
+              sleep_t = @reconnect_attempts[@reconnect_attempt - 1]
+
+              sleep(sleep_t) if sleep_t > 0
+
+              true
+            end
+
+            def resubscribe
+              channels = @sync.synchronize do
+                @subscribers.keys
+              end
+              @subscribed_client.subscribe(*channels) unless channels.empty?
+            end
+
+            def reset
+              @subscription_lock.synchronize do
+                @subscribed_client = nil
+                @subscribe_callbacks.clear
+                @when_connected.clear
+              end
+            end
+
             if ::Redis::VERSION < "5"
+              ConnectionError = ::Redis::ConnectionError
+
               class SubscribedClient
                 def initialize(raw_client)
                   @raw_client = raw_client
@@ -197,6 +244,8 @@ module ActionCable
                 SubscribedClient.new(raw_client)
               end
             else
+              ConnectionError = RedisClient::ConnectionError
+
               def extract_subscribed_client(conn)
                 conn
               end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actioncable
 version: !ruby/object:Gem::Version
-  version: 7.0.4.3
+  version: 7.0.7.2
 platform: ruby
 authors:
 - Pratik Naik
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-13 00:00:00.000000000 Z
+date: 2023-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.4.3
+        version: 7.0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.4.3
+        version: 7.0.7.2
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.4.3
+        version: 7.0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.4.3
+        version: 7.0.7.2
 - !ruby/object:Gem::Dependency
   name: nio4r
   requirement: !ruby/object:Gem::Requirement
@@ -142,10 +142,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.0.4.3/actioncable/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.0.4.3/
+  changelog_uri: https://github.com/rails/rails/blob/v7.0.7.2/actioncable/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.0.7.2/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.0.4.3/actioncable
+  source_code_uri: https://github.com/rails/rails/tree/v7.0.7.2/actioncable
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.3
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: WebSocket framework for Rails.