solid_cable 3.0.11 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fccedecff40c474f2882095d7d8dd3f79ed000fe852ec83a227a0c4ae53f8130
-  data.tar.gz: de880460edfb1524f09c8425079a2256ea3d420c5b5cdf9cf6f820cb3c012933
+  metadata.gz: 82d0f5f6a07f329cf8365e30926b72879b22300fab4c7520d18c865dc184156a
+  data.tar.gz: 7e9bd94004f0111b403b31b30f9aa6eb489173f523af656a2db76f771fc7a7c0
 SHA512:
-  metadata.gz: c35d6b76724809ce6b93bb206d95743409484f9726a9697ae5406521c4952d590661352c3f2292d2945dc0b7953e1a3ab1dd251517550e6b51089c7059fc144d
-  data.tar.gz: 32efff41d4eee4d79f34e20fe89475ea8131f2ceaf7da8da92e071eb00ebb0c7ae5388e73357112948ae6771ffede8cd7678a3fe1aca8250570e193d1213cf63
+  metadata.gz: adc3ddc71a3033b4bea6fdd5cc94cf54ca29c39d527d763c0476cd0a99639f94fea18f7a4dd43729da1a20bcb179f900cc95167ac3ea3b95e7186dcd9b048e30
+  data.tar.gz: 96ac0c12361e6a9e39a1f5fe0c33975d437e3f6dc1e9038ddda243eef49390bf7078a03d7da7901a4b286f1bd3fc50d9a5edb3caf3877ab887af3ee51d238b64

data/README.md

@@ -86,6 +86,8 @@ The options are:
 - `silence_polling` - whether to silence Active Record logs emitted when polling (Defaults to true)
 - `use_skip_locked` - whether to use `FOR UPDATE SKIP LOCKED` when performing trimming. This will be automatically detected in the future, and for now, you'd only need to set this to `false` if your database doesn't support it. For MySQL, that'd be versions < 8, and for PostgreSQL, versions < 9.5. If you use SQLite, this has no effect, as writes are sequential. (Defaults to true)
 - `trim_batch_size` - the batch size to use when deleting old records (default: `100`)
+- `reconnect_attempts` - Supports a number of connection attempts or an array of
+  durations to wait between attempts. (Defaults to 1 retry attempt)
 
 
 ## Trimming

data/Rakefile

@@ -1,5 +1,6 @@
-# frozen_string_literal: true
-
 require "bundler/setup"
 
+APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
+load "rails/tasks/engine.rake"
+
 require "bundler/gem_tasks"

data/lib/action_cable/subscription_adapter/solid_cable.rb

@@ -39,6 +39,11 @@ module ActionCable
         end
 
         class Listener < ::ActionCable::SubscriptionAdapter::SubscriberMap
+          CONNECTION_ERRORS = [
+            ActiveRecord::ConnectionFailed,
+            ActiveRecord::ConnectionTimeoutError,
+            ActiveRecord::ConnectionNotEstablished
+          ]
           Stop = Class.new(Exception)
 
           def initialize(event_loop)
@@ -51,8 +56,18 @@ module ActionCable
             # for specific sections of code, rather than acquired.
             @critical = Concurrent::Semaphore.new(0)
 
+            @reconnect_attempt = 0
+            @last_id = last_message_id
+
             @thread = Thread.new do
-              listen
+              Thread.current.name = "solid_cable_listener"
+              Thread.current.report_on_exception = true
+
+              begin
+                listen
+              rescue *CONNECTION_ERRORS
+                retry if retry_connecting?
+              end
             end
           end
 
@@ -103,6 +118,7 @@ module ActionCable
 
           private
             attr_reader :event_loop, :thread
+            attr_accessor :last_id, :reconnect_attempt
 
             def last_message_id
               ::SolidCable::Message.maximum(:id) || 0
@@ -116,14 +132,18 @@ module ActionCable
               current_channels = channels.dup
 
               ::SolidCable::Message.
-                broadcastable(current_channels.keys, current_channels.values.min).
+                broadcastable(current_channels.keys, last_id).
                 each do |message|
-                  channels.compute_if_present(message.channel) do |last_id|
-                    break if last_id >= message.id
+                  should_broadcast_message = false
+                  channels.compute_if_present(message.channel) do |channel_last_id|
+                    break if channel_last_id >= message.id
 
-                    broadcast(message.channel, message.payload)
+                    should_broadcast_message = true
                     message.id
                   end
+
+                  broadcast(message.channel, message.payload) if should_broadcast_message
+                  self.last_id = message.id
                 end
             end
 
@@ -134,6 +154,22 @@ module ActionCable
                 yield
               end
             end
+
+            def reconnect_attempts
+              @reconnect_attempts ||= ::SolidCable.reconnect_attempts
+            end
+
+            def retry_connecting?
+              self.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
         end
     end
   end

data/lib/solid_cable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidCable
-  VERSION = "3.0.11"
+  VERSION = "4.0.0"
 end

data/lib/solid_cable.rb

@@ -48,6 +48,12 @@ module SolidCable
       2
     end
 
+    def reconnect_attempts
+      attempts = cable_config.fetch(:reconnect_attempts, 1)
+      attempts = Array.new(attempts, 0) if attempts.is_a?(Integer)
+      attempts
+    end
+
     private
       def cable_config
         Rails.application.config_for("cable")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solid_cable
 version: !ruby/object:Gem::Version
-  version: 3.0.11
+  version: 4.0.0
 platform: ruby
 authors:
 - Nick Pezza
@@ -65,6 +65,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 description: Database-backed Action Cable backend.
 email:
 - pezza@hey.com
@@ -88,7 +102,6 @@ files:
 - lib/generators/solid_cable/update/update_generator.rb
 - lib/solid_cable.rb
 - lib/solid_cable/engine.rb
-- lib/solid_cable/railtie.rb
 - lib/solid_cable/version.rb
 - lib/tasks/solid_cable_tasks.rake
 homepage: https://github.com/rails/solid_cable
@@ -105,14 +118,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Database-backed Action Cable backend.
 test_files: []

data/lib/solid_cable/railtie.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module SolidCable
-  class Railtie < ::Rails::Railtie
-  end
-end