ruby_rabbitmq_janus 2.5.0.pre.210 → 2.5.0.pre.213

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c915b9a02b58b280c212d94bac96e0cc8b7bac8752e0c728fa66658d63ea2191
-  data.tar.gz: 83d25b3aa52dacca03c7a45a9ea68261372f1a412340cadeba7049f7bdfbacaf
+  metadata.gz: 020d8174744036d661c515c3238626b5ae010e8cb5f720569bd5b9ed7eb1f0b2
+  data.tar.gz: e107eebc1d2c28ab8be3cb82b8fe5eeed8f887f6132bce3ad5b044515bd1e08d
 SHA512:
-  metadata.gz: bb73fd9007791fc59aa4cfbd3cb22a2bdbed762876f50f98567e2bfbbefa528fd55a89f21515838cdfcdcaad4d445dc843c8e880c00fecb5835b739ac891d623
-  data.tar.gz: 1c6abdd92e1b8ff36738955637add5df8266eadbed35957977962d842c2c3c9a8ea410b6b31aa7bc6d387061c28dbbffe7244d15a97ee5d862a84f8a6abe1a47
+  metadata.gz: 9da41b78b1d7bd8548885b1a9ed85822131450fe1f6b71e79fab75e3d1293c3e6b3a9e1202c90bf785a13f80bf7a086b9a2a5541de88a22fdede4e0b42ee3943
+  data.tar.gz: 121b9c5316bae6c8045a199fc853a276cab060fb378d033d4ff8f44f4294f3322d593d2430302a0e03aea0c816171e756b6a47e8934312a6f855cd99d664378e

data/config/requests/admin/set_libnice_debug.json

@@ -0,0 +1,6 @@
+{
+  "janus": "set_libnice_debug",
+  "transaction": "<transaction>",
+  "admin_secret": "<string>",
+  "debug": "<boolean>"
+}

data/config/requests/admin/set_locking_debug.json

@@ -1,6 +1,6 @@
 {
   "janus" : "set_locking_debug",
-  "debug" : "<boolean>",
   "transaction": "<transaction>",
-  "admin_secret": "<string>"
+  "admin_secret": "<string>",
+  "debug" : "<boolean>"
 }

data/config/requests/admin/set_log_colors.json

@@ -0,0 +1,6 @@
+{
+  "janus": "set_log_colors",
+  "transaction": "<transaction>",
+  "admin_secret": "<string>",
+  "colors": "<boolean>"
+}

data/config/requests/admin/set_log_level.json

@@ -1,6 +1,6 @@
 {
   "janus": "set_log_level",
-  "level": "<integer>",
   "transaction": "<transaction>",
-  "admin_secret": "<string>"
+  "admin_secret": "<string>",
+  "level": "<integer>"
 }

data/config/requests/admin/set_log_timestamps.json

@@ -0,0 +1,6 @@
+{
+  "janus": "set_log_timestamps",
+  "transaction": "<transaction>",
+  "admin_secret": "<string>",
+  "timestamps": "<boolean>"
+}

data/config/requests/admin/set_max_nack_queue.json

@@ -0,0 +1,6 @@
+{
+  "janus": "set_max_nack_queue",
+  "transaction": "<transaction>",
+  "admin_secret": "<string>",
+  "max_nack_queue": "<integer>"
+}

data/config/requests/admin/set_no_media_timer.json

@@ -0,0 +1,6 @@
+{
+  "janus": "set_no_media_timer",
+  "transaction": "<transaction>",
+  "admin_secret": "<string>",
+  "no_media_timer": "<integer>"
+}

data/config/requests/admin/set_session_timeout.json

@@ -0,0 +1,7 @@
+{
+  "janus": "set_log_level",
+  "transaction": "<transaction>",
+  "admin_secret": "<string>",
+  "session_timeout": "<integer>",
+  "level": "<integer>"
+}

data/config/requests/admin/start_pcap.json

@@ -1,8 +1,10 @@
 {
   "janus": "start_pcap",
+  "transaction": "<transaction>",
+  "session_id": "<number>",
+  "handle_id": "<number>",
+  "admin_secret": "<string>",
   "folder" : "<string>",
   "filename" : "<string>",
-  "truncate" : "<number>",
-  "transaction": "<transaction>",
-  "admin_secret": "<string>"
+  "truncate" : "<number>"
 }

data/config/requests/admin/stop_pcap.json

@@ -1,5 +1,7 @@
 {
   "janus": "stop_pcap",
   "transaction": "<transaction>",
+  "session_id": "<number>",
+  "handle_id": "<number>",
   "admin_secret": "<string>"
 }

data/config/requests/admin/stop_text2pcap.json

@@ -1,5 +1,5 @@
 {
-  "janus": "stop_pcap",
+  "janus": "stop_text2pcap",
   "transaction": "<transaction>",
   "session_id": "<number>",
   "handle_id": "<number>",

data/lib/generators/ruby_rabbitmq_janus/initializer_generator.rb

@@ -6,7 +6,7 @@ module RubyRabbitmqJanus
     class InitializerGenerator < Rails::Generators::Base
       desc 'Generate a initializer to this gem for rails application.'
 
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path('templates', __dir__)
 
       # Create an initializer
       def copy_initializer

data/lib/generators/ruby_rabbitmq_janus/install_generator.rb

@@ -11,7 +11,7 @@ module RubyRabbitmqJanus
   config.autoload_paths += Dir[Rails.root.join('app', 'ruby_rabbitmq_janus')]
       AUTOLOAD
 
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path('templates', __dir__)
 
       # Generate files with default code
       def add_actions

data/lib/generators/ruby_rabbitmq_janus/migration_generator.rb

@@ -14,7 +14,7 @@ module RubyRabbitmqJanus
 
         desc 'Add to rails project RubyRabbitmqJanus migration file.'
 
-        source_root File.expand_path('../templates', __FILE__)
+        source_root File.expand_path('templates', __dir__)
 
         def install
           migration_template 'migration.rb',

data/lib/rrj/info.rb

@@ -30,7 +30,7 @@ module RubyRabbitmqJanus
   RabbitMQ server in a queue for janus server. Janus processes a message and
   send to RabbitMQ server in a queue for gem. Once the received message is
   decoded and returned through the Rails API.
-    DESC
+  DESC
 
   # Define homepage
   HOMEPAGE = 'https://github.com/dazzl-tv/ruby-rabbitmq-janus'

data/lib/rrj/janus/processus/event.rb

@@ -14,7 +14,7 @@ module RubyRabbitmqJanus
       class Event < Concurrency
         include Singleton
 
-        NAME_VAR = :publish.freeze
+        NAME_VAR = :publish
 
         def initialize
           super

data/lib/rrj/janus/processus/event_admin.rb

@@ -1,12 +1,16 @@
 # frozen_string_literal: true
 
+# :reek:InstanceVariableAssumption
+
 module RubyRabbitmqJanus
   module Janus
     module Concurrencies
+      # Manage admin message in queue public
+      # Work In Progress
       class EventAdmin < Event
         include Singleton
 
-        NAME_VAR = :publish_adm.freeze
+        NAME_VAR = :publish_adm
 
         private
 

data/lib/rrj/janus/processus/keepalive/keepalive_thread.rb

@@ -55,7 +55,6 @@ module RubyRabbitmqJanus
 
         # Start a timer for TTL
         # rubocop:disable Metrics/AbcSize
-        # rubocop:disable Metrics/MethodLength
         # :reek:TooManyStatements
         def start
           @timer.loop_keepalive do
@@ -77,7 +76,6 @@ module RubyRabbitmqJanus
           raise Errors::Janus::KeepaliveThread::Start
         end
         # rubocop:enable Metrics/AbcSize
-        # rubocop:enable Metrics/MethodLength
 
         # Kill session and disable instance
         def kill
@@ -87,7 +85,6 @@ module RubyRabbitmqJanus
           raise Errors::Janus::KeepaliveThread::Kill
         end
 
-        # rubocop:disable Metrics/MethodLength
         # :reek:TooManyStatements
         def instance_is_down
           janus = find_model
@@ -105,7 +102,6 @@ module RubyRabbitmqJanus
         rescue
           raise Errors::Janus::KeepaliveThread::InstanceIsDown
         end
-        # rubocop:enable Metrics/MethodLength
 
         private
 

data/lib/rrj/janus/transactions/admin.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# :reek:UncommunicativeMethodName
+
 module RubyRabbitmqJanus
   module Janus
     module Transactions

data/lib/rrj/rabbit/propertie.rb

@@ -28,8 +28,8 @@ module RubyRabbitmqJanus
       end
 
       # Define option sending to rabbitmq for janus admin message
-      def options_admin(type_request)
-        base.merge(routing_key: Tools::Cluster.instance.queue_admin_to(@instance))
+      def options_admin(_type_request)
+        base.merge(routing_key: routing_key_admin)
       rescue
         raise Errors::Rabbit::Propertie::Options_admin
       end
@@ -49,6 +49,10 @@ module RubyRabbitmqJanus
       def base
         { correlation_id: @correlation, content_type: 'application/json' }
       end
+
+      def routing_key_admin
+        Tools::Cluster.instance.queue_admin_to(@instance)
+      end
     end
   end
 end

data/lib/rrj/rabbit/publish/listener_admin.rb

@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
+# :reek:InstanceVariableAssumption
+
 module RubyRabbitmqJanus
   module Rabbit
     module Publisher
+      # Listener to admin queue
       class ListenerAdmin < Listener
         private
 

data/lib/rrj/rabbit/publish/publisher_admin.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# :reek:InstanceVariableAssumption
+
 module RubyRabbitmqJanus
   module Rabbit
     module Publisher
@@ -10,7 +12,8 @@ module RubyRabbitmqJanus
         #
         # @param [String] exchange Exchange used for the transaction
         def initialize(exchange)
-          @reply = exchange.queue(Tools::Config.instance.queue_admin_from)
+          @reply = exchange.queue('', exclusive: true)
+          # @reply = exchange.queue(Tools::Config.instance.queue_admin_from)
           super(exchange)
           subscribe_to_queue
         rescue
@@ -21,15 +24,13 @@ module RubyRabbitmqJanus
         #
         # @param [String] request JSON request sending to rabbitmq queue
         #
-        # @return [Janus::Response::Standard] response for an request reading
+        # @return [Janus::Response::Admin] response for an request reading
         #   by janus instance
         def publish(request)
-          # super(request)
           @message = request
-          concat = request.options.merge!(reply_to: reply.name)
-          @exchange.publish(@message.to_json, concat)
-          # p "Waiting response ...."
-          # return_response
+          @exchange.publish(@message.to_json,
+                            request.options.merge!(reply_to: reply.name))
+          return_response
         rescue
           raise Errors::Rabbit::PublisherAdmin::Pusblish
         end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# rubocop:disable Naming/MemoizedInstanceVariableName
 module RubyRabbitmqJanus
   module Tools
     # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
@@ -134,3 +135,4 @@ module RubyRabbitmqJanus
     end
   end
 end
+# rubocop:enable Naming/MemoizedInstanceVariableName

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

@@ -10,6 +10,18 @@ module RubyRabbitmqJanus
       class Admin < Handle
         private
 
+        KEY_ACCEPTED = %w[colors
+                          debug
+                          level
+                          filename
+                          folder
+                          max_nack_queue
+                          no_media_timer
+                          timestamps
+                          token
+                          truncate
+                          session_timeout].freeze
+
         def replace_element_classic
           super
           replace_admins if request.key?('admin_secret')
@@ -23,47 +35,21 @@ module RubyRabbitmqJanus
 
         def replace_admins
           replace_admin
-          replace_level if request.key?('level')
-          replace_debug if request.key?('debug')
-          replace_folder if request.key?('folder')
-          replace_filename if request.key?('filename')
-          replace_truncate if request.key?('truncate')
-        end
-
-        def replace_admin
-          request['admin_secret'] = admin_pass
-        rescue => message
-          Tools::Log.instance.warn "Error replace admin_secret : #{message}"
-        end
-
-        def replace_level
-          request['level'] = type.convert('level', opts)
-        rescue => message
-          Tools::Log.instance.warn "Error replace level : #{message}"
+          KEY_ACCEPTED.each do |key|
+            replace_component(key) if request.key?(key)
+          end
         end
 
-        def replace_debug
-          request['debug'] = type.convert('debug', opts)
+        def replace_component(key)
+          request[key] = type.convert(key, opts)
         rescue => message
-          Tools::Log.instance.warn "Error replace debug : #{message}"
+          Tools::Log.instance.warn "Error replace #{key} : #{message}"
         end
 
-        def replace_folder
-          request['folder'] = type.convert('folder', opts)
-        rescue => message
-          Tools::Log.instance.warn "Error replace folder : #{message}"
-        end
-
-        def replace_filename
-          request['filename'] = type.convert('filename', opts)
-        rescue => message
-          Tools::Log.instance.warn "Error replace filename : #{message}"
-        end
-
-        def replace_truncate
-          request['truncate'] = type.convert('truncate', opts)
+        def replace_admin
+          request['admin_secret'] = admin_pass
         rescue => message
-          Tools::Log.instance.warn "Error replace truncate : #{message}"
+          Tools::Log.instance.warn "Error replace admin_secret : #{message}"
         end
 
         def admin_pass

data/spec/request/admin/request_add_token_spec.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+# Option token has disabled do response is automatically an error
+describe 'RubyRabbitmqJanus::RRJAdmin -- add_token', type: :request,
+                                                     level: :admin,
+                                                     name: :add_token do
+  before do
+    help_admin_prepare
+    help_admin_request_tested(parameter)
+  end
+
+  let(:type) { 'admin::add_token' }
+
+  context 'when no configured in Janus' do
+    let(:instance) { { 'instance' => RubyRabbitmqJanus::Models::JanusInstance.find('1').id.to_s } }
+    let(:parameter) { {} }
+
+    it { expect(@transaction.to_json).to match_json_schema('base::error') }
+  end
+
+  context 'when configured in janus' do
+    let(:instance) { { 'instance' => RubyRabbitmqJanus::Models::JanusInstance.find('2').id.to_s } }
+    let(:parameter) { { 'token' => [*('a'..'z'), *('0'..'9')].sample(24).join } }
+
+    it { expect(@transaction.to_json).to match_json_schema('base::error') }
+  end
+end

data/spec/request/admin/request_allow_token_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+# Option token has disabled do response is automatically an error
+describe 'RubyRabbitmqJanus::RRJAdmin -- allow_token', type: :request,
+                                                       level: :admin,
+                                                       name: :allow_token do
+  before do
+    help_admin_prepare
+    help_admin_create_session
+    help_admin_create_handler
+    help_admin_request_tested
+  end
+
+  let(:instance) { { 'instance' => RubyRabbitmqJanus::Models::JanusInstance.find('1').id.to_s } }
+  let(:type) { 'admin::allow_token' }
+
+  it { expect(@transaction.to_json).to match_json_schema('base::error') }
+end

data/spec/request/admin/request_disallow_token_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+# Option token has disabled do response is automatically an error
+describe 'RubyRabbitmqJanus::RRJAdmin -- disallow_token', type: :request,
+                                                          level: :admin,
+                                                          name: :disallow_token do
+  before do
+    help_admin_prepare
+    help_admin_create_session
+    help_admin_create_handler
+    help_admin_request_tested
+  end
+
+  let(:instance) { { 'instance' => RubyRabbitmqJanus::Models::JanusInstance.find('1').id.to_s } }
+  let(:type) { 'admin::disallow_token' }
+
+  it { expect(@transaction.to_json).to match_json_schema('base::error') }
+end

data/spec/request/admin/request_handle_info_spec.rb

@@ -1,21 +1,20 @@
 # frozen_string_literal: true
 
-# LCO: tagged broken 2018/01/26 for v2.3.0
-# see: https://travis-ci.org/dazzl-tv/ruby-rabbitmq-janus/builds/333359315
-
 require 'spec_helper'
 
-describe 'RubyRabbitmqJanus::RRJ -- message type handle info' do
-  before(:example) do
-    clear
-    attach_admin
-    @type = 'admin::handle_info'
+describe 'RubyRabbitmqJanus::RRJAdmin -- handle_info', type: :request,
+                                                       level: :admin,
+                                                       name: :handle_info do
+  before do
+    help_admin_prepare
+    help_admin_create_session
+    help_admin_create_handler
+    help_admin_request_tested
   end
 
-  describe '#start_transaction_admin', type: :request,
-                                       level: :admin,
-                                       broken: true,
-                                       name: :handle_info do
-    include_examples 'transaction admin should match json schema'
-  end
+  let(:instance) { { 'instance' => RubyRabbitmqJanus::Models::JanusInstance.find('1').id.to_s } }
+  let(:type) { 'admin::handle_info' }
+
+  it { expect(@transaction.to_json).to match_json_schema(type) }
+  it { expect(@transaction.info).to be_a(Hash) }
 end

data/spec/request/admin/request_list_handles_spec.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'RubyRabbitmqJanus::RRJAdmin -- list_handles', type: :request,
+                                                        level: :admin,
+                                                        name: :list_handles do
+  before do
+    help_admin_prepare
+    help_admin_create_session
+    help_admin_request_tested
+  end
+
+  let(:instance) { { 'instance' => RubyRabbitmqJanus::Models::JanusInstance.find('1').id.to_s } }
+  let(:type) { 'admin::list_handles' }
+
+  it { expect(@transaction.to_json).to match_json_schema(type) }
+  it { expect(@transaction.handles).to be_a(Array) }
+end

data/spec/request/admin/request_list_sessions_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'RubyRabbitmqJanus::RRJAdmin -- list_sessions', type: :request,
+                                                         level: :admin,
+                                                         name: :list_sessions do
+  before do
+    help_admin_prepare
+    help_admin_create_session
+    help_admin_create_handler
+    help_admin_request_tested
+  end
+
+  let(:instance) { { 'instance' => RubyRabbitmqJanus::Models::JanusInstance.find('1').id.to_s } }
+  let(:type) { 'admin::list_sessions' }
+
+  it { expect(@transaction.to_json).to match_json_schema(type) }
+  it { expect(@transaction.sessions).to be_a(Array) }
+end

data/spec/request/admin/request_list_tokens_spec.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+# Dont configured in Janus Instance so return automatically an error
+describe 'RubyRabbitmqJanus::RRJAdmin -- list_tokens', type: :request,
+                                                       level: :admin,
+                                                       name: :list_tokens do
+  before do
+    help_admin_prepare
+    help_admin_request_tested
+  end
+
+  let(:instance) { { 'instance' => RubyRabbitmqJanus::Models::JanusInstance.find('1').id.to_s } }
+  let(:type) { 'admin::list_tokens' }
+
+  it { expect(@transaction.to_json).to match_json_schema('base::error') }
+end

data/spec/request/admin/request_remove_token_spec.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+# Dont configured in Janus Instance so return automatically an error
+describe 'RubyRabbitmqJanus::RRJAdmin -- remove_tokens', type: :request,
+                                                         level: :admin,
+                                                         name: :remove_token do
+  before do
+    help_admin_prepare
+    help_admin_request_tested
+  end
+
+  let(:instance) { { 'instance' => RubyRabbitmqJanus::Models::JanusInstance.find('1').id.to_s } }
+  let(:type) { 'admin::remove_token' }
+
+  it { expect(@transaction.to_json).to match_json_schema('base::error') }
+end

data/spec/request/admin/request_set_libnice_debug_spec.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'RubyRabbitmqJanus::RRJAdmin -- set_libnice_debug', type: :request,
+                                                             level: :admin,
+                                                             name: :set_libnice_debug do
+  before do
+    help_admin_prepare
+    help_admin_request_tested(parameters)
+  end
+
+  let(:instance) { { 'instance' => RubyRabbitmqJanus::Models::JanusInstance.find('1').id.to_s } }
+  let(:type) { 'admin::set_libnice_debug' }
+  let(:parameters) { { 'debug' => debug } }
+
+  context 'when debug is true' do
+    let(:debug) { true }
+
+    it { expect(@transaction.to_json).to match_json_schema('base::success') }
+  end
+
+  context 'when debug is false' do
+    let(:debug) { false }
+
+    it { expect(@transaction.to_json).to match_json_schema('base::success') }
+  end
+end

data/spec/request/admin/request_set_locking_debug_spec.rb

@@ -2,17 +2,27 @@
 
 require 'spec_helper'
 
-describe 'RubyRabbitmqJanus::RRJ -- message type set locking debug' do
-  before(:example) do
-    clear
-    @type = 'admin::set_locking_debug'
-    @options = { 'debug' => [true, false].sample }
+describe 'RubyRabbitmqJanus::RRJAdmin -- set_locking_debug', type: :request,
+                                                             level: :admin,
+                                                             name: :set_locking_debug do
+  before do
+    help_admin_prepare
+    help_admin_request_tested(parameters)
   end
 
-  describe '#start_transaction_admin', type: :request,
-                                       level: :admin,
-                                       name: :set_locking_debug,
-                                       broken: true do
-    include_examples 'transaction admin should match json schema'
+  let(:instance) { { 'instance' => RubyRabbitmqJanus::Models::JanusInstance.find('1').id.to_s } }
+  let(:type) { 'admin::set_locking_debug' }
+  let(:parameters) { { 'debug' => debug } }
+
+  context 'when debug is true' do
+    let(:debug) { true }
+
+    it { expect(@transaction.to_json).to match_json_schema(type) }
+  end
+
+  context 'when debug is false' do
+    let(:debug) { false }
+
+    it { expect(@transaction.to_json).to match_json_schema(type) }
   end
 end