solid_cable 3.0.4 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c170646d1e8ca3c96edceaf9675ee554eb181229d3e61abff68746e07ecd061
-  data.tar.gz: ec9c141f177cb5e4c52b5ff8e2b0c915e048a892a47a8d50a854fe708a9a556e
+  metadata.gz: 807dfe75fdc4577c47485b8af3a296eddc6655f53d2294bc831fc1862127214e
+  data.tar.gz: 48b1b21d6e60e0532f6a7ea542e3cda8384d4178256c81cffa184c4bebaee721
 SHA512:
-  metadata.gz: 225dcdba255693a45f6c1e8fd33982b27a4a75fc70ba6da64275aecf3140c819d5a0ef49d88c37de92318483783dac0a9a19e77c7be79efdc8403d42a8413162
-  data.tar.gz: 32bec49c5542d5dff12a14b2ed041644dc6e73894618f85d45eaad6ae8dab1fa1177a9029abc37ec04a1c24285b4d39d7ebd6e1c58f60cdff03fa75fa7ab24d6
+  metadata.gz: '099db3f19f50a76ea75881f3a01efc73a0ae1a60aee20cce9f8be0e06dc9cfe3de5beb574a212cc34d2eca33103e367d4d09a649340b49777c76bda09bb04320'
+  data.tar.gz: e519ed0fcd86350fd107db0d90717466676029f9471f26b9544bd970684d39993b0585b8d4c848b482bca21aa2924de4f8790655f7a36c4cb0d7bc10c5f91610

data/lib/action_cable/subscription_adapter/solid_cable.rb

@@ -3,6 +3,7 @@
 require "action_cable/subscription_adapter/base"
 require "action_cable/subscription_adapter/channel_prefix"
 require "action_cable/subscription_adapter/subscriber_map"
+require "concurrent/atomic/semaphore"
 
 module ActionCable
   module SubscriptionAdapter
@@ -38,28 +39,53 @@ module ActionCable
         end
 
         class Listener < ::ActionCable::SubscriptionAdapter::SubscriberMap
+          Stop = Class.new(Exception)
+
           def initialize(event_loop)
             super()
 
             @event_loop = event_loop
 
+            # Critical section begins with 0 permits. It can be understood as
+            # being "normally held" by the listener thread. It is released
+            # for specific sections of code, rather than acquired.
+            @critical = Concurrent::Semaphore.new(0)
+
             @thread = Thread.new do
-              Thread.current.abort_on_exception = true
               listen
             end
           end
 
           def listen
-            while running?
-              with_polling_volume { broadcast_messages }
+            loop do
+              begin
+                instance = interruptible { Rails.application.executor.run! }
+                with_polling_volume { broadcast_messages }
+              ensure
+                instance.complete! if instance
+              end
 
-              sleep ::SolidCable.polling_interval
+              interruptible { sleep ::SolidCable.polling_interval }
             end
+          rescue Stop
+          ensure
+            @critical.release
+          end
+
+          def interruptible
+            @critical.release
+            yield
+          ensure
+            @critical.acquire
           end
 
           def shutdown
-            self.running = false
-            Thread.pass while thread.alive?
+            @critical.acquire
+            # We have the critical permit, and so the listen thread must be
+            # safe to interrupt.
+            thread.raise(Stop)
+            @critical.release
+            thread.join
           end
 
           def add_channel(channel, on_success)
@@ -77,15 +103,7 @@ module ActionCable
 
           private
             attr_reader :event_loop, :thread
-            attr_writer :running, :last_id
-
-            def running?
-              if defined?(@running)
-                @running
-              else
-                self.running = true
-              end
-            end
+            attr_writer :last_id
 
             def last_id
               @last_id ||= ::SolidCable::Message.maximum(:id) || 0
@@ -96,12 +114,10 @@ module ActionCable
             end
 
             def broadcast_messages
-              Rails.application.executor.wrap do
-                ::SolidCable::Message.broadcastable(channels, last_id).
-                  each do |message|
-                    broadcast(message.channel, message.payload)
-                    self.last_id = message.id
-                end
+              ::SolidCable::Message.broadcastable(channels, last_id).
+                each do |message|
+                broadcast(message.channel, message.payload)
+                self.last_id = message.id
               end
             end
 
@@ -112,6 +128,37 @@ module ActionCable
                 yield
               end
             end
+
+            def wake_up
+              interrupt
+            end
+
+            SELF_PIPE_BLOCK_SIZE = 11
+
+            def interrupt
+              self_pipe[:writer].write_nonblock(".")
+            rescue Errno::EAGAIN, Errno::EINTR
+              # Ignore writes that would block and retry
+              # if another signal arrived while writing
+              retry
+            end
+
+            def interruptible_sleep(time)
+              if time > 0 && self_pipe[:reader].wait_readable(time)
+                loop { self_pipe[:reader].read_nonblock(SELF_PIPE_BLOCK_SIZE) }
+              end
+            rescue Errno::EAGAIN, Errno::EINTR
+            end
+
+            # Self-pipe for signal-handling (http://cr.yp.to/docs/selfpipe.html)
+            def self_pipe
+              @self_pipe ||= create_self_pipe
+            end
+
+            def create_self_pipe
+              reader, writer = IO.pipe
+              { reader: reader, writer: writer }
+            end
         end
     end
   end

data/lib/generators/solid_cable/install/install_generator.rb

@@ -5,6 +5,6 @@ class SolidCable::InstallGenerator < Rails::Generators::Base
 
   def copy_files
     template "db/cable_schema.rb"
-    template "config/cable.yml", force: true
+    template "config/cable.yml"
   end
 end

data/lib/solid_cable/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solid_cable
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.6
 platform: ruby
 authors:
 - Nick Pezza
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-06 00:00:00.000000000 Z
+date: 2025-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord