cable_room 0.4.3 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aec4300c2501be5b03552fb3ee2aa096dfeeae41203f85ad1d9715084f209e2e
-  data.tar.gz: 13b6d7062eb049b8235948d80fc121defffd571054cbaf64403ca5adda0c77b4
+  metadata.gz: 57e1433d4d4cc345377d621c6c1ce693280625909eeab0da36a2d1c43dca13de
+  data.tar.gz: d7f1de1afa7a9d527f6682bc1c109f6ee4dd9979399c369bc0bf4a1903f0b4f5
 SHA512:
-  metadata.gz: 58db3c0ae21e9844c810c124241911dcf4414ca068b90f72f7fb9bb734ba3a301f59ae6d73efc787d01144b023fcb6b69aa0ffc842f889a5306349dbab1b8b76
-  data.tar.gz: b2fd75650ced68cbb4e071e77e9d81e2f2fa61502d8164eda4f9a0bfaa5360471f4ed2ae0a4840be40aa6a4cd9c8ef53759b3198021fa7eb105c7740c22e1294
+  metadata.gz: 723a2bca5fccb0d7254f0e255b5e1221e73293365af63a56fe17453eb37aa90f8be3ddc20c248c75df3472a89d0802a85b641db971f99446ef692bfb593a25b0
+  data.tar.gz: f3c985570d1d8c9361351850da19b4a0371e14268354acb79f3f5fb1bf50246360c7c20a960d7622a53646a0e71d090798587056194079cb62ecf1f47885ea65

data/lib/cable_room/channel_base.rb

@@ -105,6 +105,8 @@ module CableRoom
       @mutex.synchronize do
         return if @current_state == :dead || @current_state == :shutting_down
 
+        logger.info "Initiating shutdown: #{reason}"
+
         # Stop streams immediately to prevent further messages from being added
         stop_all_streams
 

data/lib/cable_room/channel_tracker.rb

@@ -75,8 +75,6 @@ module CableRoom
       end
     end
 
-    protected
-
     def each_room_channel(&blk)
       @room_channels.dup.each(&blk)
     end

data/lib/cable_room/railtie.rb

@@ -14,9 +14,19 @@ module CableRoom
     runner do
     end
 
-    initializer "cable_room.shutdown" do
-      Rails.application.reloader.before_class_unload do
-        CableRoom::ChannelTracker.instance.shutdown_rooms!
+    initializer "cable_room.hook_action_cable_restart" do
+      module ActionCableServerExtensions
+        def restart
+          CableRoom::ChannelTracker.instance.each_room_channel do |chan|
+            chan.unsubscribe_from_channel
+          end
+          # CableRoom::ChannelTracker.instance.shutdown_rooms!
+          super
+        end
+      end
+
+      ActiveSupport.on_load(:action_cable) do
+        ActionCable::Server::Base.prepend(ActionCableServerExtensions)
       end
     end
 

data/lib/cable_room/room/base.rb

@@ -25,6 +25,9 @@ module CableRoom
           vchannel.subscribe_to_channel
 
           true
+        rescue => e
+          CableRoom.lock_manager.unlock(lock_info) if lock_info
+          raise e
         end
 
         def room_port_key(room_key, port = nil)

data/lib/cable_room/room/input_handling.rb

@@ -28,11 +28,20 @@ module CableRoom
             end
           end
         end
+
+        # Prevent certain message types being forwarded from clients
+        def system_message_types(*types)
+          ([self] + ActiveSupport::DescendantsTracker.descendants(self)).reverse_each do |target|
+            target._system_message_types = target._system_message_types | Set.new(types.map(&:to_sym))
+          end
+        end
       end
 
       included do
         define_callbacks :receive_message
 
+        class_attribute :_system_message_types, instance_writer: false, default: Set.new
+
         set_callback(:receive_message, :before) do
           logger.debug "Received message: #{message.inspect}"
         end

data/lib/cable_room/room/port_management.rb

@@ -36,8 +36,16 @@ module CableRoom
           end
         end
 
+        system_message_types(:port_connected, :port_disconnected, :port_ping)
+
         require_relative 'port_policies'
         include PortPolicies
+
+        PortPolicies::TagPolicy.define_tag_alias :connect, [:port_connected, :port_ping, :port_disconnected]
+
+        inbound_tag_policy(priority: -10) do
+          allow :*, :connect
+        end
       end
 
       def initialize(...)

data/lib/cable_room/room/port_policies.rb

@@ -36,10 +36,6 @@ module CableRoom
           next true if %i[port_connected port_disconnected].include?(msg_type)
           policy_allows?(msg_type)
         end
-
-        inbound_tag_policy(priority: -10) do
-          allow :*, :connect
-        end
       end
 
       protected
@@ -58,8 +54,6 @@ module CableRoom
           end
         end
 
-        define_tag_alias :connect, [:port_connected, :port_ping, :port_disconnected]
-
         def initialize()
           @policy_rules = []
           @fallback_rule = { action: :allow, priority: -100, tag: :*, methods: :* }

data/lib/cable_room/room/user_management.rb

@@ -25,11 +25,13 @@ module CableRoom
           end
         end
 
+        system_message_types(:user_joined, :user_left)
+
+        PortPolicies::TagPolicy.define_tag_alias :join, [:connect, :user_joined, :user_left]
+
         inbound_tag_policy(priority: -10) do
           allow :*, :join
         end
-
-        PortPolicies::TagPolicy.define_tag_alias :join, [:connect, :user_joined, :user_left]
       end
 
       def initialize(...)

data/lib/cable_room/room_member.rb

@@ -120,7 +120,7 @@ module CableRoom
     def ping!
       return if left?
 
-      self << { type: 'port_ping' }
+      port_transmit(room_class::ROOM_IN_CHANNEL, { type: 'port_ping' }, secure_context: true)
       maybe_provision_room
     end
 
@@ -129,7 +129,7 @@ module CableRoom
 
       close_streamed_ports!
       @cable_channel._room_memberships.delete(self)
-      self << { type: 'port_disconnected' }
+      port_transmit(room_class::ROOM_IN_CHANNEL, { type: 'port_disconnected' }, secure_context: true)
       @has_left = true
       @on_closed&.call(self)
     end
@@ -138,9 +138,18 @@ module CableRoom
 
     protected
 
-    def port_transmit(port, data)
+    def port_transmit(port, data, secure_context: false)
       data[:mtok] = @token
-      super
+
+      unless secure_context
+        t = (data[:type] || data['type']).to_sym
+        if room_class._system_message_types.include?(t)
+          logger.warn "Dropping attempt to send system message type: #{t.inspect}"
+          return
+        end
+      end
+
+      super(port, data)
     end
 
     def room_port_key(port)
@@ -172,7 +181,7 @@ module CableRoom
         tags: @tags,
       }
       msg[:extra] = ::ActiveJob::Arguments.serialize([@extra]) if @extra
-      self << msg
+      port_transmit(room_class::ROOM_IN_CHANNEL, msg, secure_context: true)
     end
 
     def maybe_provision_room

data/lib/cable_room/version.rb

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

metadata

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