cable_room 0.4.5 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57e1433d4d4cc345377d621c6c1ce693280625909eeab0da36a2d1c43dca13de
-  data.tar.gz: d7f1de1afa7a9d527f6682bc1c109f6ee4dd9979399c369bc0bf4a1903f0b4f5
+  metadata.gz: dd7b86ca05c74f92261902e8842dbc4f2945e15e8f3f05848e376b6cdd7869a6
+  data.tar.gz: 15389fd9a02ac2afe13161d0321ac8938521039db8b56e1d7c610a3a17d88d2e
 SHA512:
-  metadata.gz: 723a2bca5fccb0d7254f0e255b5e1221e73293365af63a56fe17453eb37aa90f8be3ddc20c248c75df3472a89d0802a85b641db971f99446ef692bfb593a25b0
-  data.tar.gz: f3c985570d1d8c9361351850da19b4a0371e14268354acb79f3f5fb1bf50246360c7c20a960d7622a53646a0e71d090798587056194079cb62ecf1f47885ea65
+  metadata.gz: 2e619af9f847afff84afa5f60f37b90b825fc8e1151d7d93641a4cb16ff8bc79e092059f70b1df7d0943442b4d03e13d942eea39b2b61444cfd4a7b361055d95
+  data.tar.gz: 4e5be487299bba472b4d594409d2ee4d5b1c12dd1fb4b0eab67125d22ce338ad228ed7f0b06e1b236b21ed42b0c29fbc55e2a574b5746b9ccc223b8024c3c8a4

data/lib/cable_room/railtie.rb

@@ -20,7 +20,6 @@ module CableRoom
           CableRoom::ChannelTracker.instance.each_room_channel do |chan|
             chan.unsubscribe_from_channel
           end
-          # CableRoom::ChannelTracker.instance.shutdown_rooms!
           super
         end
       end

data/lib/cable_room/room/port_management.rb

@@ -25,6 +25,8 @@ module CableRoom
 
         define_callbacks :port_connected, :port_disconnected
 
+        on_port_connected { reply({type: 'port_acknowledged' }) }
+
         set_callback(:receive_message, :around) do |_, blk|
           previous_mtok = @current_message_origin
           begin
@@ -56,7 +58,7 @@ module CableRoom
       def _apply_port_scope(client_port: nil, tag: nil, **kwargs)
         if client_port && tag
           client_port = resolve_client_port(client_port)
-          throw :abort unless client_port && client_port[:tags]&.include?(tag)
+          throw :abort unless client_port && client_port[:tags]&.include?(tag) || client_port[:as] == tag
         end
 
         { client_port: client_port || tag, **kwargs }

data/lib/cable_room/room/port_scoping.rb

@@ -22,13 +22,19 @@ module CableRoom
         Room.current_port_scope = prev
       end
 
+      def simplify_port_scope(**kwargs)
+        catch :abort do
+          remaining = _apply_port_scope(**kwargs)
+          return remaining
+        end
+        nil
+      end
+
       # Similar to with_port_scope, but won't call the block if no ports match
       def with_port_scope!(**kwargs, &blk)
         if kwargs.empty?
-          catch :abort do
-            remaining = _apply_port_scope(**Room.current_port_scope || {})
-            blk.call(**remaining)
-          end
+          reduced_scope = simplify_port_scope(**Room.current_port_scope || {})
+          blk.call(**reduced_scope) unless reduced_scope.nil?
         else
           with_port_scope(**kwargs) do
             with_port_scope!(&blk)

data/lib/cable_room/room/reaping.rb

@@ -52,7 +52,7 @@ module CableRoom
             false
           }
 
-          reaper_checkers << cfg
+          self.reaper_checkers = reaper_checkers + [cfg]
         end
       end
 

data/lib/cable_room/room_member.rb

@@ -53,58 +53,36 @@ module CableRoom
       room_class,
       room_key,
       create: false,
-      on_closed: nil,
-      on_opened: nil,
+      on_room_opened: nil, # Not guaranteed (Only given if the Room Opens while we are trying to connect to it)
+      on_joined: nil,
       on_message: nil,
+      on_room_closed: nil, # Not guaranteed (Only given if the Room Closes while we are connected to it)
+      on_left: nil,
       tags: [],
       extra: nil,
       &preconfigure
     )
-      @token = SecureRandom.hex(16)
+      @mutex = Monitor.new
+
       @has_left = false
+      @has_established = false
 
       @cable_channel = cable_channel
       @room_class = room_class
       @room_key = room_key
       @allow_create = create
 
-      @on_opened = on_opened
-      @on_closed = on_closed
+      @on_room_opened = on_room_opened
+      @on_joined = on_joined
       @on_message = on_message
+      @on_room_closed = on_room_closed
+      @on_left = on_left
+      @preconfigure = preconfigure
 
       @tags = Array(tags).map(&:to_sym)
       @extra = extra
 
-      @cable_channel._room_memberships << self
-
-      # Listen to public/broadcast channel
-      stream_port(room_class::ROOM_OUT_CHANNEL) do |message|
-        handle_received_message(message)
-      end
-
-      # Listen to private channel
-      stream_port(@token) do |message|
-        handle_received_message(message)
-      end
-
-      # Listen to user-specific channel
-      if extra && extra[:as]
-        stream_port(extra[:as]) do |message|
-          handle_received_message(message)
-        end
-      end
-
-      @tags.each do |tag|
-        stream_port(tag) do |message|
-          handle_received_message(message)
-        end
-      end
-
-      preconfigure&.call(self)
-
-      transmit_port_connected
-
-      maybe_provision_room
+      initiate_connection
     end
 
     delegate :logger, to: :@cable_channel
@@ -113,25 +91,41 @@ module CableRoom
       port_transmit(room_class::ROOM_IN_CHANNEL, data)
     end
 
+    def connected?
+      !left? && @has_established
+    end
+
     def left?
-      @has_left
+      @mutex.synchronize { @has_left }
     end
 
     def ping!
       return if left?
-
       port_transmit(room_class::ROOM_IN_CHANNEL, { type: 'port_ping' }, secure_context: true)
-      maybe_provision_room
+      @mutex.synchronize do
+        maybe_provision_room
+      end
     end
 
     def leave!
-      return if left?
+      @mutex.synchronize do
+        return if left?
 
-      close_streamed_ports!
-      @cable_channel._room_memberships.delete(self)
-      port_transmit(room_class::ROOM_IN_CHANNEL, { type: 'port_disconnected' }, secure_context: true)
-      @has_left = true
-      @on_closed&.call(self)
+        close_streamed_ports!
+        @cable_channel._room_memberships.delete(self)
+        port_transmit(room_class::ROOM_IN_CHANNEL, { type: 'port_disconnected' }, secure_context: true)
+        @has_left = true
+      end
+      @on_left&.call(self)
+    end
+
+    def rejoin!
+      @mutex.synchronize do
+        return unless left?
+
+        @has_left = false
+        initiate_connection
+      end
     end
 
     def key; @room_key; end
@@ -160,12 +154,15 @@ module CableRoom
       return leave! if message == "KILL"
 
       case message['type']
+      when 'port_acknowledged'
+        @has_established = true
+        @on_joined&.call(self)
       when 'room_opened'
         transmit_port_connected
-        @on_opened&.call(self)
+        @on_room_opened&.call(self)
       when 'room_closed'
-        @on_closed&.call(self)
-        maybe_provision_room
+        leave!
+        @on_room_closed&.call(self)
       else
         logger.warn "Unknown room message type: #{message['type'].inspect}" unless @on_message
       end
@@ -175,6 +172,45 @@ module CableRoom
 
     private
 
+    def initiate_connection
+      @mutex.synchronize do
+        return if left?
+
+        @token = SecureRandom.hex(16)
+        @has_established = false
+        @cable_channel._room_memberships << self
+
+        # Listen to public/broadcast channel
+        stream_port(room_class::ROOM_OUT_CHANNEL) do |message|
+          handle_received_message(message)
+        end
+
+        # Listen to private channel
+        stream_port(@token) do |message|
+          handle_received_message(message)
+        end
+
+        # Listen to user-specific channel
+        if @extra && @extra[:as]
+          stream_port(@extra[:as]) do |message|
+            handle_received_message(message)
+          end
+        end
+
+        @tags.each do |tag|
+          stream_port(tag) do |message|
+            handle_received_message(message)
+          end
+        end
+
+        @preconfigure&.call(self)
+
+        transmit_port_connected
+
+        maybe_provision_room
+      end
+    end
+
     def transmit_port_connected
       msg = {
         type: 'port_connected',

data/lib/cable_room/room_proxy_channel.rb

@@ -0,0 +1,35 @@
+module CableRoom
+  module RoomProxyChannel
+    extend ActiveSupport::Concern
+    include CableRoom::RoomMember
+
+    class_methods do
+      def subscribe_to_room(&blk)
+        define_method(:subscribe_to_room, &blk)
+      end
+    end
+
+    def subscribed
+      @room_membership = subscribe_to_room
+    end
+
+    def receive(data)
+      @room_membership << data if @room_membership&.connected?
+    end
+
+    def unsubscribed
+      @room_membership&.leave!
+    end
+
+    protected
+
+    def subscribe_to_room
+      raise NotImplementedError
+    end
+
+    def join_room(*args, **kwargs, &blk)
+      kwargs[:forward] = true
+      super
+    end
+  end
+end

data/lib/cable_room/version.rb

@@ -1,3 +1,3 @@
 module CableRoom
-  VERSION = "0.4.5".freeze
+  VERSION = "0.5.1".freeze
 end

data/lib/cable_room.rb

@@ -13,6 +13,7 @@ require_relative 'cable_room/channel_base'
 require_relative 'cable_room/channel_tracker'
 require_relative 'cable_room/ports'
 require_relative 'cable_room/room_member'
+require_relative 'cable_room/room_proxy_channel'
 require_relative 'cable_room/room/'
 require_relative 'cable_room/version'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cable_room
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.1
 platform: ruby
 authors:
 - Ethan Knapp
@@ -126,6 +126,7 @@ files:
 - lib/cable_room/room/threading.rb
 - lib/cable_room/room/user_management.rb
 - lib/cable_room/room_member.rb
+- lib/cable_room/room_proxy_channel.rb
 - lib/cable_room/version.rb
 - spec/cable_room/room_member_spec.rb
 - spec/internal/config/cable.yml