ruby_rabbitmq_janus 3.0.0.pre.352 → 3.0.0.pre.382

data/lib/rrj/rabbit/connect.rb

@@ -14,10 +14,10 @@ module RubyRabbitmqJanus
       end
 
       # Create an transaction with rabbitmq and close after response is received
-      def transaction_short
-        raise Errors::Rabbit::Connect::MissingAction unless block_given?
+      def transaction_short(&block)
+        raise Errors::Rabbit::Connect::MissingAction unless block
 
-        response = transaction_long { yield }
+        response = transaction_long(&block)
         close
         response
       end
@@ -50,7 +50,15 @@ module RubyRabbitmqJanus
       private
 
       def bunny_conf
-        Tools::Config.instance.server_settings.merge(connection_timeout: 5)
+        Tools::Config.instance.server_settings.merge(bunny_conf_static)
+      end
+
+      def bunny_conf_static
+        {
+          connection_timeout: 5,
+          connection_name: "[#{rand(999)}] backend",
+          recover_from_connection_close: false
+        }
       end
     end
   end

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

@@ -36,7 +36,7 @@ module RubyRabbitmqJanus
         end
 
         def opts_subs
-          { block: false, manual_ack: true, arguments: { 'x-priority': 2 } }
+          { block: false, manual_ack: false, arguments: { 'x-priority': 2 } }
         end
 
         def info_subscribe(info, _prop, payload)
@@ -51,6 +51,22 @@ module RubyRabbitmqJanus
           raise Errors::Rabbit::Listener::ResponseEmpty, response \
             if response.to_hash.size.zero?
         end
+
+        def subscribe_queue
+          rabbit.prefetch(1)
+          reply.bind(binding).subscribe(opts_subs) do |info, prop, payload|
+            info_subscribe(info, prop, payload)
+            synchronize_response(payload)
+          end
+        end
+
+        def synchronize_response(payload)
+          lock.synchronize do
+            response = response_class(payload)
+            responses.push(response)
+          end
+          semaphore.signal
+        end
       end
     end
   end

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

@@ -15,21 +15,8 @@ module RubyRabbitmqJanus
           rabbit.queue(Tools::Config.instance.queue_from)
         end
 
-        def subscribe_queue
-          rabbit.prefetch(1)
-          reply.bind(binding).subscribe(opts_subs) do |info, prop, payload|
-            info_subscribe(info, prop, payload)
-            synchronize_response(info, payload)
-          end
-        end
-
-        def synchronize_response(info, payload)
-          lock.synchronize do
-            response = Janus::Responses::Event.new(JSON.parse(payload))
-            responses.push(response)
-          end
-          rabbit.acknowledge(info.delivery_tag, false)
-          semaphore.signal
+        def response_class(payload)
+          Janus::Responses::Event.new(JSON.parse(payload))
         end
       end
     end

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

@@ -15,21 +15,8 @@ module RubyRabbitmqJanus
           rabbit.queue(Tools::Config.instance.queue_admin_from)
         end
 
-        def subscribe_queue
-          rabbit.prefetch(1)
-          reply.bind(binding).subscribe(opts_subs) do |info, prop, payload|
-            info_subscribe(info, prop, payload)
-            synchronize_response(info, payload)
-          end
-        end
-
-        def synchronize_response(info, payload)
-          lock.synchronize do
-            response = Janus::Responses::Admin.new(JSON.parse(payload))
-            responses.push(response)
-          end
-          rabbit.acknowledge(info.delivery_tag, false)
-          semaphore.signal
+        def response_class(payload)
+          Janus::Responses::Admin.new(JSON.parse(payload))
         end
       end
     end

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

@@ -17,9 +17,12 @@ module RubyRabbitmqJanus
         # Send an message to queue
         #
         # @param [String] request JSON request sending to rabbitmq queue
+        #
+        # rubocop:disable Lint/UselessMethodDefinition
         def publish(request)
           super(request)
         end
+        # rubocop:enable Lint/UselessMethodDefinition
       end
     end
   end

data/lib/rrj/rails.rb

@@ -25,11 +25,15 @@ module RubyRabbitmqJanus
       actions = RubyRabbitmqJanus::ActionEvents.new.actions
       admin_actions = RubyRabbitmqJanus::ActionAdminEvents.new.actions
 
-      Parallel.map([
-                     process::Event.new.run(&actions),
-                     process::EventAdmin.new.run(&admin_actions)
-                   ], in_processes: number) do |listener|
-        "Item: #{listener}, Worker: #{Parallel.worker_number}"
+      listeners = []
+      (1..number).each do
+        listeners.push process::Event.new.run(&actions)
+        listeners.push process::EventAdmin.new.run(&admin_actions)
+      end
+
+      Parallel.each(listeners, in_processes: number) do |listener|
+        item = "[Item##{listener}]"
+        Log.warn "#{item}, Worker : #{Parallel.worker_number + 1} / #{number}"
       end
     end
   end

data/lib/rrj/rspec.rb

@@ -9,20 +9,25 @@ module RubyRabbitmqJanus
   #
   # Initializer to use with RSpec execution
   class RRJRSpec < RRJTaskAdmin
+    # rubocop:disable Lint/MissingSuper
     def initialize
       RubyRabbitmqJanus::Tools::Config.instance
     end
+    # rubocop:enable Lint/MissingSuper
 
+    # @see RubyRabbitmqJanus::RRJ::session_endpoint_public
     def session_endpoint_public(_options)
       yield(RubyRabbitmqJanus::Janus::Transactions::RSpec.new)
     end
 
+    # @see RubyRabbitmqJanus::RRJ::session_endpoint_private
     def handle_endpoint_public(_options)
       transaction = RubyRabbitmqJanus::Janus::Transactions::RSpec.new
       yield(transaction)
       transaction.response
     end
 
+    # @see RubyRabbitmqJanus::RRJAdmin::admin_endpoint
     def admin_endpoint(_options)
       yield(RubyRabbitmqJanus::Janus::Transactions::RSpec.new)
     end

data/lib/rrj/task.rb

@@ -9,10 +9,12 @@ module RubyRabbitmqJanus
   #
   # This class is used with rake task.
   class RRJTask < RRJ
+    # rubocop:disable Lint/MissingSuper
     def initialize
       Tools::Config.instance
       Tools::Requests.instance
     end
+    # rubocop:enable Lint/MissingSuper
 
     # Create a transaction between Apps and Janus in queue private
     #

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

@@ -12,7 +12,7 @@ module RubyRabbitmqJanus
     module ConfigGem
       # @return [Boolean] Read option file for a janus cluster section
       def cluster
-        @options['gem']['cluster']['enabled'].to_s.match?('true') ? true : false
+        @options['gem']['cluster']['enabled'].to_s.match?('true')
       end
 
       # @return [Symbol] read configuration for log level used in this gem

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

@@ -41,7 +41,6 @@ module RubyRabbitmqJanus
       # Choose type logger used in application instance
       def self.initialize_logger
         case @config.log_type
-        when :stdout  then logger_stdout
         when :file    then logger_file
         when :remote  then logger_remote
         else
@@ -51,7 +50,7 @@ module RubyRabbitmqJanus
 
       # Configure logger with output SDTOUT
       def self.logger_stdout
-        ::Logger.new(STDOUT)
+        ::Logger.new($stdout)
       end
 
       # Configure logger with output file

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

@@ -32,9 +32,9 @@ module RubyRabbitmqJanus
       def each_folder(subfolder)
         Dir[File.join(PATH_REQUEST + subfolder, '*')].count do |file|
           if File.file?(file)
-            read_folder(subfolder.gsub('/', '::') + '::', file)
+            read_folder("#{subfolder.gsub('/', '::')}::", file)
           elsif File.directory?(file)
-            each_folder(subfolder + '/' + File.basename(file))
+            each_folder("#{subfolder}/#{File.basename(file)}")
           end
         end
       end

data/spec/config/database.rb

@@ -16,6 +16,7 @@ def migrate
   ActiveRecord::Base.connection.create_table(:janus_instances) do |table|
     table.integer :session, limit: 8
     table.boolean :enable
+    table.string :name
   end
 end
 

data/spec/factories/janus_instance.rb

@@ -3,5 +3,7 @@
 FactoryBot.define do
   factory :janus_instance, class: 'RubyRabbitmqJanus::Models::JanusInstance' do
     enable { true }
+    session_id { (rand * 10_000_000_000).to_i }
+    name { [*('a'..'z'), *('0'..'9')].sample(12).join }
   end
 end

data/spec/ruby_rabbitmq_janus/janus/responses/errors_spec.rb

@@ -0,0 +1,175 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe RubyRabbitmqJanus::Janus::Responses::Errors, type: :responses,
+                                                      name: :errors do
+  let(:message) do
+    {
+      'janus' => 'error',
+      'error' => {
+        'code' => number,
+        'reason' => reason
+      }
+    }
+  end
+  let(:response) { RubyRabbitmqJanus::Janus::Responses::Response.new(message) }
+  let(:error) { described_class.new }
+  let(:reason) { [*('a'..'z'), *('0'..'9')].sample(12).join }
+
+  context 'when 403' do
+    let(:number) { 403 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::Unauthorized) }
+  end
+
+  context 'when 405' do
+    let(:number) { 405 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::UnauthorizedPlugin) }
+  end
+
+  context 'when 450' do
+    let(:number) { 450 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::TransportSpecific) }
+  end
+
+  context 'when 452' do
+    let(:number) { 452 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::MissingRequest) }
+  end
+
+  context 'when 453' do
+    let(:number) { 453 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::UnknownRequest) }
+  end
+
+  context 'when 454' do
+    let(:number) { 454 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::InvalidJSON) }
+  end
+
+  context 'when 455' do
+    let(:number) { 455 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::InvalidJSONObject) }
+  end
+
+  context 'when 456' do
+    let(:number) { 456 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::MissingMandatoryElement) }
+  end
+
+  context 'when 457' do
+    let(:number) { 457 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::InvalidRequestPath) }
+  end
+
+  context 'when 458' do
+    let(:number) { 458 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::SessionNotFound) }
+  end
+
+  context 'when 459' do
+    let(:number) { 459 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::HandleNotFound) }
+  end
+
+  context 'when 460' do
+    let(:number) { 460 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::PluginNotFound) }
+  end
+
+  context 'when 461' do
+    let(:number) { 461 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::PluginAttach) }
+  end
+
+  context 'when 462' do
+    let(:number) { 462 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::PluginMessage) }
+  end
+
+  context 'when 463' do
+    let(:number) { 463 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::PluginDetach) }
+  end
+
+  context 'when 464' do
+    let(:number) { 464 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::JSEPUnknownType) }
+  end
+
+  context 'when 465' do
+    let(:number) { 465 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::JSEPInvalidSDP) }
+  end
+
+  context 'when 466' do
+    let(:number) { 466 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::TrickleInvalidStream) }
+  end
+
+  context 'when 467' do
+    let(:number) { 467 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::InvalidElementType) }
+  end
+
+  context 'when 468' do
+    let(:number) { 468 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::SessionConflit) }
+  end
+
+  context 'when 469' do
+    let(:number) { 469 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::UnexpectedAnswer) }
+  end
+
+  context 'when 470' do
+    let(:number) { 470 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::TokenNotFound) }
+  end
+
+  context 'when 471' do
+    let(:number) { 471 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::WebRTCState) }
+  end
+
+  context 'when 472' do
+    let(:number) { 472 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::NotAcceptingSession) }
+  end
+
+  context 'when 490' do
+    let(:number) { 490 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::Unknown) }
+  end
+
+  context 'when error missing' do
+    let(:number) { 418 }
+
+    it { expect { error.send(:"_#{number}", response) }.to raise_error(RubyRabbitmqJanus::Errors::Janus::Responses::Nok) }
+  end
+end

data/spec/ruby_rabbitmq_janus/janus/responses/response_spec.rb

@@ -14,7 +14,7 @@ describe RubyRabbitmqJanus::Janus::Responses::Response, type: :responses,
   context 'when ask nice json response' do
     let(:message) { { 'data' => { 'id' => (rand * 10_000).to_i } } }
 
-    it { expect(response.to_json).to be_kind_of(String) }
+    it { expect(response.to_nice_json).to be_kind_of(String) }
   end
 
   context 'when ask hash response' do

data/spec/ruby_rabbitmq_janus/models/janus_instance_instance_spec.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe RubyRabbitmqJanus::Models::JanusInstance, type: :model,
+                                                   name: :janus_instance do
+  before do
+    instances
+    first
+  end
+
+  let(:model) { described_class }
+  let(:size) { (rand * 5).to_i + 1 }
+  let(:first) { model.first }
+  let(:session_id) { first.session_id }
+  let(:id) { first.id }
+
+  context 'when Janus instances are activated.' do
+    let(:instances) { FactoryBot.create_list(:janus_instance, size) }
+    let(:count_enabled) { size }
+    let(:count_destroyed) { 0 }
+    let(:count_disabled) { 0 }
+
+    include_examples 'when disable an instance'
+    include_examples 'when enable an instance not change'
+    include_examples 'when destroys all disable instance'
+    include_examples 'when search by instance'
+    include_examples 'when search by session'
+    include_examples 'when search instance enabled'
+    include_examples 'when search instance disabled'
+  end
+
+  context 'when Janus instances are disabled.' do
+    let(:instances) { FactoryBot.create_list(:janus_instance, size, enable: false) }
+    let(:count_enabled) { 0 }
+    let(:count_destroyed) { size }
+    let(:count_disabled) { size }
+
+    include_examples 'when disable an instance not change'
+    include_examples 'when enable an instance'
+    include_examples 'when destroys all disable instance'
+    include_examples 'when search by instance'
+    include_examples 'when search by session'
+    include_examples 'when search instance enabled'
+    include_examples 'when search instance disabled'
+  end
+end