ruby_rabbitmq_janus 2.5.1 → 2.6.0.pre.226

data/lib/rrj/rabbit/listener/janus_instance.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'rrj/janus/responses/janus_instance'
+
+module RubyRabbitmqJanus
+  module Rabbit
+    module Listener
+      # Listener to admin queue
+      class JanusInstance < From
+        private
+
+        def subscribe_queue
+          reply = @rabbit.queue(Tools::Config.instance.queue_janus_instance)
+          @rabbit.prefetch(1)
+          reply.bind(binding).subscribe(opts_subs) do |info, prop, payload|
+            info_subscribe(info, prop, payload)
+            synchronize_response(info, payload)
+          end
+        rescue => exception
+          raise RubyRabbitmqJanus::Errors::Rabbit::Listener::
+                JanusInstance::ListenEvents, exception
+        end
+
+        # Sending an signal when an response is reading in queue
+        def synchronize_response(info, payload)
+          lock.synchronize do
+            response = Janus::Responses::JanusInstance.new(JSON.parse(payload))
+            @responses.push(response)
+          end
+          @rabbit.acknowledge(info.delivery_tag, false)
+          semaphore.signal
+        end
+      end
+    end
+  end
+end

data/lib/rrj/rabbit/{publish/publisher_admin.rb → publisher/admin.rb}

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
-# :reek:InstanceVariableAssumption
-
 module RubyRabbitmqJanus
   module Rabbit
     module Publisher
       # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
       # This publisher send and read an message in admin queues
-      class PublisherAdmin < Publisher
-        # Intialize an queue non eclusive for admin/monitor API with Janus
+      class Admin < Base
+        # Initialize an queue non eclusive for admin/monitor API with Janus
         #
         # @param [String] exchange Exchange used for the transaction
         def initialize(exchange)
@@ -17,11 +15,12 @@ module RubyRabbitmqJanus
           super(exchange)
           subscribe_to_queue
         rescue
-          raise Errors::Rabbit::PublisherAdmin::Initialize
+          raise Errors::Rabbit::Publisher::Admin::Initialize
         end
 
         # Send an message to queue and waiting a response
         #
+        #
         # @param [String] request JSON request sending to rabbitmq queue
         #
         # @return [Janus::Response::Admin] response for an request reading
@@ -32,12 +31,8 @@ module RubyRabbitmqJanus
                             request.options.merge!(reply_to: reply.name))
           return_response
         rescue
-          raise Errors::Rabbit::PublisherAdmin::Pusblish
+          raise Errors::Rabbit::Publisher::Admin::Pusblish
         end
-
-        private
-
-        attr_reader :reply
       end
     end
   end

data/lib/rrj/rabbit/{publish/publisher.rb → publisher/base.rb}

@@ -8,7 +8,7 @@ module RubyRabbitmqJanus
       # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
       #
       # This publisher send and read an message in queues
-      class Publisher < BasePublisher
+      class Base < RubyRabbitmqJanus::Rabbit::BaseEvent
         # Intialize a publisher for sending and reading a message
         #
         # @param [String] exchange Determine type exchange used for all
@@ -18,7 +18,7 @@ module RubyRabbitmqJanus
           @exchange = exchange.default_exchange
           @message = nil
         rescue
-          raise Errors::Rabbit::Publish::Initialize
+          raise Errors::Rabbit::Publisher::Base::Initialize
         end
 
         # Publish an message in queue
@@ -32,7 +32,7 @@ module RubyRabbitmqJanus
           @exchange.publish(@message.to_json,
                             request.options.merge!(reply_to: reply.name))
         rescue
-          raise Errors::Rabbit::Publish::Publish
+          raise Errors::Rabbit::Publisher::Base::Publish
         end
 
         private
@@ -57,7 +57,7 @@ module RubyRabbitmqJanus
           if m_cor.eql?(p_cor)
             yield
           else
-            raise Errors::Rabbit::Publish::TestCorrelation, m_cor, p_cor
+            raise Errors::Rabbit::Publisher::Base::TestCorrelation, m_cor, p_cor
           end
         end
 
@@ -69,13 +69,15 @@ module RubyRabbitmqJanus
         end
 
         attr_accessor :message
+        attr_reader :reply
       end
     end
   end
 end
 # rubocop:enable Style/GuardClause
 
-require 'rrj/rabbit/publish/publisher_admin'
-require 'rrj/rabbit/publish/exclusive'
-require 'rrj/rabbit/publish/keepalive'
-require 'rrj/rabbit/publish/non_exclusive'
+require 'rrj/rabbit/publisher/exclusive'
+require 'rrj/rabbit/publisher/admin'
+require 'rrj/rabbit/publisher/keepalive'
+require 'rrj/rabbit/publisher/non_exclusive'
+require 'rrj/rabbit/publisher/janus_instance'

data/lib/rrj/rabbit/{publish → publisher}/exclusive.rb

@@ -9,7 +9,7 @@ module RubyRabbitmqJanus
       #
       # Publish message in queue exclusive. Bunny create automaticaly a name for
       # this queue. The queue name like to 'amq.gen-1A456DGVHDVUS'.
-      class PublishExclusive < Publisher
+      class Exclusive < Base
         # Initialize an queue exclusive and generated automaticaly by bunny
         #
         # @param [String] exchange Exchange used for the transaction
@@ -19,7 +19,7 @@ module RubyRabbitmqJanus
           super(exchange)
           subscribe_to_queue
         rescue
-          raise Errors::Rabbit::PublishExclusive::Initialize
+          raise Errors::Rabbit::Publisher::Exclusive::Initialize
         end
 
         # Send an message to queue and waiting a response
@@ -32,7 +32,7 @@ module RubyRabbitmqJanus
           super(request)
           return_response
         rescue
-          raise Errors::Rabbit::PublishExclusive::Publish
+          raise Errors::Rabbit::Publisher::Exclusive::Publish
         end
 
         private

data/lib/rrj/rabbit/publisher/janus_instance.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module RubyRabbitmqJanus
+  module Rabbit
+    module Publisher
+      # Publisher to queue `janus-instance`
+      class JanusInstance
+        def initialize
+          @rabbit = RubyRabbitmqJanus::Rabbit::Connect.new
+        rescue
+          raise Errors::Rabbit::Publisher::JanusInstance::Initialize
+        end
+
+        def publish(data)
+          @rabbit.start
+          channel = @rabbit.channel
+          queue = channel.queue(Tools::Config.instance.queue_janus_instance)
+          channel.default_exchange.publish(data.to_json,
+                                           routing_key: queue.name)
+          @rabbit.close
+        rescue
+          raise Errors::Rabbit::Publisher::JanusInstance::Publish
+        end
+      end
+    end
+  end
+end

data/lib/rrj/rabbit/{publish → publisher}/keepalive.rb

@@ -10,18 +10,20 @@ module RubyRabbitmqJanus
       # The name to queue it's created automatically by Bunny GEM
       #
       # @see KeepaliveThread
-      class PublishKeepalive < Publisher
+      class Keepalive < Base
         def initialize(exchange)
           @reply = exchange.queue('', exclusive: true)
           super(exchange)
           subscribe_to_queue
+        rescue
+          raise Errors::Rabbit::Publisher::Keepalive::Initialize
         end
 
         def publish(request)
           super(request)
           return_response
         rescue
-          raise Errors::Rabbit::PublishExclusive::Publish
+          raise Errors::Rabbit::Publisher::Keepalive::Publish
         end
 
         private

data/lib/rrj/rabbit/{publish → publisher}/non_exclusive.rb

@@ -7,13 +7,13 @@ module RubyRabbitmqJanus
       #
       # Publish message in queue non exclusive. By default "to-janus".
       # This an option in config to this gem.
-      class PublishNonExclusive < Publisher
+      class NonExclusive < Base
         # Define an publisher for create non exclusive queue
         def initialize(exchange)
           @reply = exchange.queue(Tools::Config.instance.queue_from)
           super(exchange)
         rescue
-          raise Errors::Rabbit::PublishNonExclusive::Initialize
+          raise Errors::Rabbit::Publisher::NonExclusive::Initialize
         end
 
         # Send an message to queue
@@ -22,12 +22,8 @@ module RubyRabbitmqJanus
         def publish(request)
           super(request)
         rescue
-          raise Errors::Rabbit::PublishNonExclusive::Publish
+          raise Errors::Rabbit::Publisher::NonExclusive::Publish
         end
-
-        private
-
-        attr_reader :reply
       end
     end
   end

data/lib/rrj/rabbit/rabbit.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rrj/rabbit/connect'
-require 'rrj/rabbit/publish/base_publisher'
+require 'rrj/rabbit/base_event'
 require 'rrj/rabbit/propertie'
 
 module RubyRabbitmqJanus

data/lib/rrj/tools/gem/cluster.rb

@@ -13,23 +13,6 @@ module RubyRabbitmqJanus
         @current_instance = nil
       end
 
-      # Create session (just one Janus Instance)
-      def create_session
-        @current_instance = 1
-        Models::JanusInstance.create(instance: @current_instance)
-      rescue
-        raise Errors::Tools::Cluster::CreateSession
-      end
-
-      # Restart a thread keepalive for an instance
-      def restart_session
-        Models::JanusInstance.enabled.each do |ji|
-          ji.send(:create_a_session_in_janus_instance)
-        end
-      rescue
-        raise Errors::Tools::Cluster::RestartInstance
-      end
-
       # Specify a name to queue
       def queue_to(instance = nil)
         Tools::Config.instance.options['queues']['standard']['to'] + \

data/lib/rrj/tools/gem/config.rb

@@ -76,6 +76,15 @@ module RubyRabbitmqJanus
         raise Errors::Tools::Config::QueueAdminTo
       end
 
+      # Get to name queue JanusInstance
+      #
+      # @return [String] read configuration for queue janus instance
+      def queue_janus_instance
+        @options['queues']['instance'].to_s
+      rescue
+        raise Errors::Tools::Config::QueueJanusInstance
+      end
+
       # @return [Symbol] read configuration for log level used in this gem
       def log_level
         @options['gem']['log']['level'].upcase.to_sym || :INFO

data/lib/rrj/tools/gem/log.rb

@@ -23,7 +23,7 @@ module RubyRabbitmqJanus
         UNKNOWN: Logger::UNKNOWN
       }.freeze
 
-      # Sensitive data
+      # Sensitive data hiding to logger
       SENSITIVES = %i[admin_secret apisecret].freeze
 
       attr_reader :level
@@ -34,11 +34,10 @@ module RubyRabbitmqJanus
       # @see http://api.rubyonrails.org/classes/ActiveSupport/TaggedLogging.html
       def initialize
         logs = defined?(Rails) ? logger_rails : logger_develop
-        logs.progname = RubyRabbitmqJanus.name
+        logs.progname = 'RRJ' if ENV['PROGRAM_NAME'].eql?('ruby_rabbitmq_janus')
         logs.level = LEVELS[:DEBUG]
-        logs.info('### Start gem Rails Rabbit Janus ###')
+        logs.info('### Start gem Ruby Rabbit Janus ###')
         @level = logs.level
-        @progname = logs.progname
         @logs = ActiveSupport::TaggedLogging.new(logs)
       end
 

data/lib/rrj/tools/gem/option.rb

@@ -20,9 +20,8 @@ module RubyRabbitmqJanus
         Log.instance
         Config.instance
         Requests.instance
-        cluster_mode
-      rescue => error
-        raise Errors::Tools::Option::Initialize, error
+      rescue => exception
+        raise Errors::Tools::Option::Initialize, exception
       end
 
       # Determine session_id used
@@ -54,15 +53,6 @@ module RubyRabbitmqJanus
       rescue
         raise Errors::Tools::Option::UseCurrentHandle, options
       end
-
-      private
-
-      def cluster_mode
-        method = Config.instance.cluster ? :restart_session : :create_session
-        Cluster.instance.send(method)
-      rescue
-        raise Errors::Tools::Option::ClusterMode
-      end
     end
   end
 end

data/lib/rrj/tools/replaces/admin.rb

@@ -42,14 +42,14 @@ module RubyRabbitmqJanus
 
         def replace_component(key)
           request[key] = type.convert(key, opts)
-        rescue => message
-          Tools::Log.instance.warn "Error replace #{key} : #{message}"
+        rescue => exception
+          Tools::Log.instance.warn "Error replace #{key} : #{exception}"
         end
 
         def replace_admin
           request['admin_secret'] = admin_pass
-        rescue => message
-          Tools::Log.instance.warn "Error replace admin_secret : #{message}"
+        rescue => exception
+          Tools::Log.instance.warn "Error replace admin_secret : #{exception}"
         end
 
         def admin_pass

data/lib/rrj/tools/replaces/handle.rb

@@ -20,22 +20,22 @@ module RubyRabbitmqJanus
 
         def replace_handle
           request['handle_id'] = type.convert('handle_id', opts)
-        rescue => message
-          Tools::Log.instance.warn "Error handle replace : #{message}"
+        rescue => exception
+          Tools::Log.instance.warn "Error handle replace : #{exception}"
         end
 
         def replace_candidate
           cdn = type.convert(determine_key_candidate, opts)
           request[cdn[0]] = cdn[1]
           delete_key_unless
-        rescue => message
-          Tools::Log.instance.warn "Error candidate replace : #{message}"
+        rescue => exception
+          Tools::Log.instance.warn "Error candidate replace : #{exception}"
         end
 
         def replace_sdp
           request['jsep']['sdp'] = type.convert('sdp', opts)
-        rescue => message
-          Tools::Log.instance.warn "Error sdp replace : #{message}"
+        rescue => exception
+          Tools::Log.instance.warn "Error sdp replace : #{exception}"
         end
 
         def determine_key_candidate

data/lib/rrj/tools/replaces/replace.rb

@@ -50,15 +50,15 @@ module RubyRabbitmqJanus
         def replace_other
           values = @opts['replace']
           running_hash(rewrite_key_to_string(values))
-        rescue => message
-          Tools::Log.instance.warn "Error REPLACE other field : #{message}"
+        rescue => exception
+          Tools::Log.instance.warn "Error REPLACE other field : #{exception}"
         end
 
         def add_other
           values = @opts['add']
           @request['body'].merge!(values)
-        rescue => message
-          Tools::Log.instance.warn "Error ADD other field : #{message}"
+        rescue => exception
+          Tools::Log.instance.warn "Error ADD other field : #{exception}"
         end
 
         def rewrite_key_to_string(node)
@@ -93,8 +93,8 @@ module RubyRabbitmqJanus
 
         def replace_transaction
           @request['transaction'] = @type.convert('transaction')
-        rescue => message
-          Tools::Log.instance.warn "Error transaction replace : #{message}"
+        rescue => exception
+          Tools::Log.instance.warn "Error transaction replace : #{exception}"
         end
       end
     end

data/lib/rrj/tools/replaces/session.rb

@@ -19,14 +19,14 @@ module RubyRabbitmqJanus
 
         def replace_session
           request['session_id'] = type.convert('session_id', opts)
-        rescue => message
-          Tools::Log.instance.warn "Error session replace : #{message}"
+        rescue => exception
+          Tools::Log.instance.warn "Error session replace : #{exception}"
         end
 
         def replace_plugin
           request['plugin'] = type.convert('plugin')
-        rescue => message
-          Tools::Log.instance.warn "Error plugin replace : #{message}"
+        rescue => exception
+          Tools::Log.instance.warn "Error plugin replace : #{exception}"
         end
       end
     end