actioncable 7.0.4.3 → 7.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2622a0bda2ac4e21aef9acb2345a385ddcb76b9623b0880b81ebef1b135eb1d1
-  data.tar.gz: f0065045a66e532260bff962f925ae844b230160a1d1e07f33bcbc774941206d
+  metadata.gz: 0ad111921f6a4ec24d48066344c243f71246f073d036614075354cd332369c69
+  data.tar.gz: dbfddf4a0a3839c9f093dbb54b04038d3e805c00d06dc00b0716eb598d37dec8
 SHA512:
-  metadata.gz: 5f6d3cf4c904c9213e901235c310f12b416a2fcb7570f859463f932fc15b2831988cc8cddf0e4d45d19571143a3cddd19bf9683f35f092cf363f4dcc2eec2506
-  data.tar.gz: edf288bef934a10d639748750277edd2c8ecf1b4d4cee650bfd8bbd43517923417083f6cc2860f52acb2d0e99c3cb976118dc66e62b180f7cea61669d2503b2a
+  metadata.gz: 5b7ccdd8a695955ca21d16a49eaa369228e177bef683ecd159f51d94f3d8860e4bf6121561f5dc52b7e37b46e40714876d3326f51c20d604f67770ebd11e3665
+  data.tar.gz: 19d2b1d7c252454069a8002e61d06371ac518e043e00fef0e8effab28fea0d424c43968923670c06c569ef64fe2871bb912c22908d1fa027fb873f075456eb9d

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 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/lib/action_cable/gem_version.rb

@@ -9,8 +9,8 @@ module ActionCable
   module VERSION
     MAJOR = 7
     MINOR = 0
-    TINY  = 4
-    PRE   = "3"
+    TINY  = 5
+    PRE   = nil
 
     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.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,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: actioncable
 version: !ruby/object:Gem::Version
-  version: 7.0.4.3
+  version: 7.0.5
 platform: ruby
 authors:
 - Pratik Naik
 - David Heinemeier Hansson
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-13 00:00:00.000000000 Z
+date: 2023-05-24 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.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.4.3
+        version: 7.0.5
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.4.3
+        version: 7.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.4.3
+        version: 7.0.5
 - !ruby/object:Gem::Dependency
   name: nio4r
   requirement: !ruby/object:Gem::Requirement
@@ -142,12 +142,12 @@ 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.5/actioncable/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.0.5/
   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.5/actioncable
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -162,8 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.3
-signing_key:
+rubygems_version: 3.4.10
+signing_key: 
 specification_version: 4
 summary: WebSocket framework for Rails.
 test_files: []