cable_room 0.6.2.beta8 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf9bc187f61f47429b4f6d19591ae11f9ce5adc4f3e631a386543c5a4be3d31f
-  data.tar.gz: 7ea623c7bce5023f7eef8e9f70c7fd723dd6d4c83ffdff6e0e636bcf4a0c2085
+  metadata.gz: dd8691b68a1e9615764de3fb3a736a70d8c64f3ac5b78366e33e9fa996fa71b4
+  data.tar.gz: ab1d8f9027f2dc832fdc5e336f56d87c33231431813c7e579ba8399433e5a18c
 SHA512:
-  metadata.gz: 3ea7801344b227a3db243d32aa569427a2e721adb2c4e8894ff803834a6e60392a064cac0b9f2bf21257936109b472d99f994bb82eec3387aa490d1cf7260c1b
-  data.tar.gz: b0d7b8b7b054d5a45290df64691e919a9ac8d951beb06df38edf799e3c81bb955ca5444b490293fb4d20d0a09759dc4b8122334d2d041ebf52e6bbd23486d8cf
+  metadata.gz: 151dad25868518619f54fe1fe33e70f737742acc58f7a7f3b56dc02088e30b4b0713e74e0ca17aaba86769a4fb57007b5a9f9e60d18b5b131a27af4d6cdc54e8
+  data.tar.gz: 85f6190c18f1273e5b13c20fa7a33979bb6618f8544f6a40241d632e7248779f8df5176eb9643493e1297ba4c9a9690f9d04f192909421160af53935ca771296

data/lib/cable_room/room_member.rb

@@ -9,6 +9,14 @@ module CableRoom
     # ~30% of all room messages at 10 s with no skipping.
     PING_INTERVAL = 15.seconds
 
+    # A dropped announcement is invisible to the port. The room's inbound subscription is
+    # registered asynchronously — and the room may live in another process entirely — so a
+    # port_connected sent before the room is listening is discarded with no error. Re-announce on
+    # a doubling backoff from here until the room acknowledges, rather than waiting out a whole
+    # PING_INTERVAL. port_connected is idempotent on the room side (the port is merged,
+    # user_joined fires only once), so a redundant re-announcement costs one message.
+    REANNOUNCE_INITIAL_DELAY = 0.1.seconds
+
     included do
       periodically :ping_room_memberships, every: PING_INTERVAL
 
@@ -51,13 +59,11 @@ module CableRoom
 
     def transmit_subscription_confirmation(...)
       super
-      # Rails invokes this from the pubsub adapter's subscribe success callback, which runs while
-      # SubscriberMap holds its (non-reentrant) @sync mutex. Broadcasting from that stack raises
-      # ThreadError: deadlock; recursive locking, and the adapter swallows it. Defer onto the event
-      # loop so the announce still happens after every stream is confirmed live, but off the lock.
       memberships = _room_memberships.to_a
       memberships.each(&:streams_live!)
-      connection.server.event_loop.post { memberships.each(&:transmit_port_connected) }
+      connection.worker_pool.async_exec(self, connection: connection) do
+        memberships.each(&:transmit_port_connected)
+      end
     end
   end
 
@@ -85,6 +91,8 @@ module CableRoom
       @has_left = false
       @has_established = false
       @streams_live = false
+      @reannounce_delay = nil
+      @reannounce_job = nil
 
       @cable_channel = cable_channel
       @room_class = room_class
@@ -134,6 +142,7 @@ module CableRoom
       @mutex.synchronize do
         return if left?
 
+        stop_reannouncing
         close_streamed_ports!
         @cable_channel._room_memberships.delete(self)
         port_transmit(room_class::ROOM_IN_CHANNEL, { type: 'port_disconnected' }, secure_context: true)
@@ -166,6 +175,7 @@ module CableRoom
       }
       msg[:extra] = ::ActiveJob::Arguments.serialize([@extra]) if @extra
       port_transmit(room_class::ROOM_IN_CHANNEL, msg, secure_context: true)
+      schedule_reannounce
     end
 
     protected
@@ -186,6 +196,45 @@ module CableRoom
       @last_transmit_at = monotonic_now unless type == :port_ping
     end
 
+    # Re-announce until the room acknowledges the port, doubling the wait each time. Handing off
+    # to ping! at PING_INTERVAL keeps a stuck membership from holding a timer open forever.
+    def schedule_reannounce
+      @mutex.synchronize do
+        cancel_reannounce
+        return if @has_established || @has_left
+        return if ChannelTracker.instance.shutdown?
+
+        next_delay = @reannounce_delay ? @reannounce_delay * 2 : RoomMember::REANNOUNCE_INITIAL_DELAY
+        return if next_delay > RoomMember::PING_INTERVAL
+
+        @reannounce_delay = next_delay
+
+        # async_exec runs the block with `instance_exec` against the channel, so hold onto the
+        # membership rather than relying on `self`.
+        membership = self
+        channel = @cable_channel
+        @reannounce_job = ChannelTracker.instance.scheduler.schedule_in(@reannounce_delay.to_f) do
+          channel.connection.worker_pool.async_exec(channel, connection: channel.connection) do
+            membership.transmit_port_connected unless membership.connected? || membership.left?
+          end
+        end
+      end
+    end
+
+    def cancel_reannounce
+      @mutex.synchronize do
+        @reannounce_job&.unschedule
+        @reannounce_job = nil
+      end
+    end
+
+    def stop_reannouncing
+      @mutex.synchronize do
+        cancel_reannounce
+        @reannounce_delay = nil
+      end
+    end
+
     def recently_transmitted?
       @last_transmit_at && (monotonic_now - @last_transmit_at) < RoomMember::PING_INTERVAL
     end
@@ -206,6 +255,7 @@ module CableRoom
         # A re-announced port (see ping!) is re-acknowledged; only the first one is a join.
         first_acknowledgement = !@has_established
         @has_established = true
+        stop_reannouncing
         @on_joined&.call(self) if first_acknowledgement
       when 'room_opened'
         # Only safe once our own streams are confirmed; otherwise the room may acknowledge on the
@@ -231,6 +281,7 @@ module CableRoom
 
         @token = SecureRandom.hex(16)
         @has_established = false
+        stop_reannouncing
         @cable_channel._room_memberships << self
 
         # Listen to public/broadcast channel

data/lib/cable_room/version.rb

@@ -1,3 +1,3 @@
 module CableRoom
-  VERSION = "0.6.2.beta8".freeze
+  VERSION = "0.6.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cable_room
 version: !ruby/object:Gem::Version
-  version: 0.6.2.beta8
+  version: 0.6.2
 platform: ruby
 authors:
 - Ethan Knapp