solid_cable 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c170646d1e8ca3c96edceaf9675ee554eb181229d3e61abff68746e07ecd061
-  data.tar.gz: ec9c141f177cb5e4c52b5ff8e2b0c915e048a892a47a8d50a854fe708a9a556e
+  metadata.gz: 5ff4e7b967cec58b0387f709a050e30db6a5d0223f070a63d878242877780c49
+  data.tar.gz: b3ff5a3c70b6594075e311b16ab165bce984a0eb41f1c9be2c2a34e23eccc738
 SHA512:
-  metadata.gz: 225dcdba255693a45f6c1e8fd33982b27a4a75fc70ba6da64275aecf3140c819d5a0ef49d88c37de92318483783dac0a9a19e77c7be79efdc8403d42a8413162
-  data.tar.gz: 32bec49c5542d5dff12a14b2ed041644dc6e73894618f85d45eaad6ae8dab1fa1177a9029abc37ec04a1c24285b4d39d7ebd6e1c58f60cdff03fa75fa7ab24d6
+  metadata.gz: 771044684f961dad0116e7769ac429d06ce613d5779809818a81146a585ef4ffeda081533031a7c90767e6e0cd913478b2ffb3117e1d9886bae48d6b9e6c9459
+  data.tar.gz: 18b65de8a357d40af82bbf0d749ca43dcd864fe8e06b074701c97cbdf37eef3e6aa5f36178b51c853612d14688d1d51d99c395ba894171d73f097a18112daeb0

data/lib/action_cable/subscription_adapter/solid_cable.rb

@@ -50,16 +50,22 @@ module ActionCable
           end
 
           def listen
-            while running?
+            loop do
+              break unless running?
+
               with_polling_volume { broadcast_messages }
 
-              sleep ::SolidCable.polling_interval
+              interruptible_sleep ::SolidCable.polling_interval
             end
           end
 
           def shutdown
             self.running = false
-            Thread.pass while thread.alive?
+            wake_up
+
+            ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
+              thread&.join
+            end
           end
 
           def add_channel(channel, on_success)
@@ -112,6 +118,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/solid_cable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidCable
-  VERSION = "3.0.4"
+  VERSION = "3.0.5"
 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.5
 platform: ruby
 authors:
 - Nick Pezza
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-06 00:00:00.000000000 Z
+date: 2024-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord