cable_room 0.6.2.beta7 → 0.6.2.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7309c58f5b1c28f703935326e40e13194a1e57c57ddd184cfa100ee7c23351d1
-  data.tar.gz: d666029a14ac41eb3b422edc7de2eaf1ce2cef8c95854f4116052c5bff8b447f
+  metadata.gz: cf9bc187f61f47429b4f6d19591ae11f9ce5adc4f3e631a386543c5a4be3d31f
+  data.tar.gz: 7ea623c7bce5023f7eef8e9f70c7fd723dd6d4c83ffdff6e0e636bcf4a0c2085
 SHA512:
-  metadata.gz: d252055f0b2e4062f01865a6f1ba482e555e3c8325eac88d29b0e0d34673aafccdab72fea916fda0fb6b36dbab4f8e7340ad120d90b463752d79d5c071dc9468
-  data.tar.gz: 2352b8d4315b7d3fff5389e6c6c9783b3314329cef0233500fd6a26fb91c8343f2244094ce0faa4a1b28f5e0868cef2932a27364ecfe2c9d7cfb66bb5377a2f4
+  metadata.gz: 3ea7801344b227a3db243d32aa569427a2e721adb2c4e8894ff803834a6e60392a064cac0b9f2bf21257936109b472d99f994bb82eec3387aa490d1cf7260c1b
+  data.tar.gz: b0d7b8b7b054d5a45290df64691e919a9ac8d951beb06df38edf799e3c81bb955ca5444b490293fb4d20d0a09759dc4b8122334d2d041ebf52e6bbd23486d8cf

data/lib/cable_room/room/port_management.rb

@@ -118,10 +118,7 @@ module CableRoom
       def handle_received_message(message)
         case message['type']
         when 'port_connected'
-          mo = @_port_clients[@current_message_origin]
-          return if mo
-
-          mo = @_port_clients[@current_message_origin] = PortClient.new(self, @current_message_origin)
+          mo = @_port_clients[@current_message_origin] ||= PortClient.new(self, @current_message_origin)
 
           mo.touch_activity!
           mo.tag!(message['tags'])

data/lib/cable_room/room_member.rb

@@ -51,7 +51,13 @@ module CableRoom
 
     def transmit_subscription_confirmation(...)
       super
-      _room_memberships.each(&:transmit_port_connected)
+      # 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) }
     end
   end
 
@@ -78,6 +84,7 @@ module CableRoom
 
       @has_left = false
       @has_established = false
+      @streams_live = false
 
       @cable_channel = cable_channel
       @room_class = room_class
@@ -146,6 +153,11 @@ module CableRoom
 
     def key; @room_key; end
 
+    # @internal
+    def streams_live!
+      @streams_live = true
+    end
+
     # @internal
     def transmit_port_connected
       msg = {
@@ -196,7 +208,10 @@ module CableRoom
         @has_established = true
         @on_joined&.call(self) if first_acknowledgement
       when 'room_opened'
-        transmit_port_connected
+        # Only safe once our own streams are confirmed; otherwise the room may acknowledge on the
+        # private port before anyone is listening. If we are not live yet, the subscription
+        # confirmation hook will announce for us.
+        transmit_port_connected if @streams_live
         @on_room_opened&.call(self)
       when 'room_closed'
         leave!
@@ -243,7 +258,9 @@ module CableRoom
 
         @preconfigure&.call(self)
 
-        # transmit_port_connected
+        # Announcing here races the async stream subscriptions: the room can acknowledge on the
+        # private port before it is live and the ack is lost. transmit_subscription_confirmation
+        # announces instead, once every stream is confirmed.
 
         maybe_provision_room
       end

data/lib/cable_room/version.rb

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

metadata

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