ruby_rabbitmq_janus 2.2.0.pre.170 → 2.2.0.pre.173

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1c4ad646df955dcba29567bc0040c4655268c02
-  data.tar.gz: 4bd4bc2b5057724cd9cb7a6282b95ee9ac4b6da0
+  metadata.gz: a1a3ff1ce8aa3114b1460ae38c996f1f6b1ff448
+  data.tar.gz: 8fcd100ec3e8a2b63e9c5a9f336692387aec9578
 SHA512:
-  metadata.gz: a17d8376cce526d6dd9f222db2b9dc75905d8c8be912246a28b87767a3a39e878e988b5ed0fd991e6b180f1333ffbd348453edc47b360240452b895ea74c2829
-  data.tar.gz: 7862d117dc70656388faf2524c6c57b5e97e27fec825bffcd510648c195b8a2753ac9e855d8f0993438843513615b682e096e96ef5fc4adb9231de3c8b4dacb1
+  metadata.gz: 6af6ba692c3978495df2c4ed85a577c781dcece26f97bcd299d66027fa1abe3e1a388f28eb74f63ef300c46253e0b045fd6004c939c186c513a92478aed2c4b3
+  data.tar.gz: 7206fd1211726ade7c54c211427da91de8de09b751126648130e1df1c7af101e62bd1da93ed33b867e678180e416c692c7e541621b8dcfabacfe687a879b9919

data/Rakefile

@@ -3,6 +3,16 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec)
+# Exclude all spec with type :thread
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = '--tag ~type:thread'
+end
+
+# Include just spec with type :thread
+RSpec::Core::RakeTask.new(:concurrency) do |t|
+  t.rspec_opts = '--tag type:thread'
+end
 
 task default: :spec
+
+task thread: :concurrency

data/lib/rrj/errors/janus/janus.rb

@@ -17,7 +17,6 @@ module RubyRabbitmqJanus
 end
 
 require 'rrj/errors/janus/processus/concurency'
-require 'rrj/errors/janus/processus/event'
 
 require 'rrj/errors/janus/messages/message'
 require 'rrj/errors/janus/messages/admin'

data/lib/rrj/errors/janus/processus/concurency.rb

@@ -6,7 +6,7 @@ module RubyRabbitmqJanus
       # Define a super class for all error in Janus::Concurency class
       class BaseConcurency < RubyRabbitmqJanus::Errors::BaseJanus
         def initialize(message)
-          super "[Concurency] #{message}"
+          super "[Concurency]#{message}", :fatal
         end
       end
 
@@ -21,3 +21,6 @@ module RubyRabbitmqJanus
     end
   end
 end
+
+require 'rrj/errors/janus/processus/keepalive'
+require 'rrj/errors/janus/processus/event'

data/lib/rrj/errors/janus/processus/keepalive/initializer.rb

@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
 # :reek:IrresponsibleModule
-#
-# rubocop:disable Metrics/LineLength
-# rubocop:disable Style/Documentation
 
 module RubyRabbitmqJanus
   module Errors
     module Janus
-      # Define a super class for all error in Janus::Concurency::Keepalive
       class BaseKeepaliveInitializer < BaseKeepalive
         def initialize(message)
           super "[Initializer] #{message}"
@@ -16,40 +12,38 @@ module RubyRabbitmqJanus
       end
 
       module KeepaliveInitializer
-        # Error for Janus::Concurency::Keepalive#initialize
         class Initializer < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveInitializer
-          def initializer
+          def initialize
             super 'Error keepalive initializer'
           end
         end
 
-        # Error for Janus::Concurency::Keepalive#session
         class Session < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveInitializer
-          def initializer
+          def initialize
             super 'Error return session number'
           end
         end
 
         class Thread < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveInitializer
-          def initializer
+          def initialize
             super 'Error for get Object Thread ID'
           end
         end
 
         class ThreadStart < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveInitializer
-          def initializer
+          def initialize
             super 'Error for starting timer in thread'
           end
         end
 
         class ThreadStop < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveInitializer
-          def initializer
+          def initialize
             super 'Error for stoping timer in thread'
           end
         end
 
         class ThreadDelete < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveInitializer
-          def initializer
+          def initialize
             super 'Error for destroy thread'
           end
         end
@@ -57,5 +51,3 @@ module RubyRabbitmqJanus
     end
   end
 end
-# rubocop:enable Style/Documentation
-# rubocop:enable Metrics/LineLength

data/lib/rrj/errors/janus/processus/keepalive/thread.rb

@@ -11,6 +11,44 @@ module RubyRabbitmqJanus
           super "[Thread] #{message}"
         end
       end
+
+      module KeepaliveThread
+        class Initializer < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveThread
+          def initialize
+            super 'Error for initialize Keepalive Thread'
+          end
+        end
+
+        class InitializeJanusSession < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveThread
+          def initialize
+            super 'Error when initialize message in keepalive thread'
+          end
+        end
+
+        class RestartSession < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveThread
+          def initialize
+            super 'Error when restart session'
+          end
+        end
+
+        class Start < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveThread
+          def initialize
+            super 'Error when start a loop for sending keepalive message'
+          end
+        end
+
+        class Kill < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveThread
+          def initialize
+            super 'Error when killing thread'
+          end
+        end
+
+        class InstanceIsDown < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveThread
+          def initialize
+            super 'Error when instance is down'
+          end
+        end
+      end
     end
   end
 end

data/lib/rrj/errors/janus/processus/keepalive/timer.rb

@@ -5,12 +5,43 @@
 module RubyRabbitmqJanus
   module Errors
     module Janus
-      # Define a super class for all error in Janus::Concurency::Keepalive
       class BaseKeepaliveTimer < BaseKeepalive
         def initialize(message)
           super "[Timer] #{message}"
         end
       end
+
+      module KeepaliveTimer
+        class Initializer < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveTimer
+          def initialize
+            super 'Error for initialize Keepalive Timer'
+          end
+        end
+
+        class LoopKeepalive < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveTimer
+          def initialize
+            super 'Loop for create timer in Keepalive Thread is failed'
+          end
+        end
+
+        class Session < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveTimer
+          def initialize
+            super 'Timeout for get session number in keepalive request'
+          end
+        end
+
+        class StopTimer < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveTimer
+          def initialize
+            super 'Error when timer to Keepalive Thread stop'
+          end
+        end
+
+        class StartTimer < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveTimer
+          def initialize
+            super 'Error when timer to Keepalive Thread start'
+          end
+        end
+      end
     end
   end
 end

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

@@ -26,7 +26,7 @@ module RubyRabbitmqJanus
         def self.thread(thread)
           ObjectSpace._id2ref(thread)
         rescue RangeError
-          puts "No thread with ID : #{thread}"
+          Tools::Log.instance.fatal "No thread with ID : #{thread}"
         end
 
         # Give a session Integer  his gem is instantiate.

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

@@ -6,7 +6,12 @@ module RubyRabbitmqJanus
   module Janus
     module Concurrencies
       # Manage message used for keepalive thread
+      #
+      # @attribute [r] instance
+      #   @return [String] ID to Janus Instance
       class KeepaliveMessage
+        attr_reader :instance
+
         def initialize(instance)
           @instance = instance
         end

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

@@ -5,9 +5,12 @@
 module RubyRabbitmqJanus
   module Janus
     module Concurrencies
-      # Object thread
+      # Object thread for manage keep a live with Janus Instance
+      #
+      # @!attribute [r] session
+      #   @return [Integer] Number to session linked to Janus Instance
       class KeepaliveThread < Thread
-        attr_reader :timer, :instance, :session
+        attr_reader :timer, :session
 
         def initialize(instance, rabbit, &block)
           @publisher = @session = nil
@@ -15,6 +18,8 @@ module RubyRabbitmqJanus
           @timer = KeepaliveTimer.new
           @message = KeepaliveMessage.new(instance)
           super(&block)
+        rescue
+          raise Errors::Janus::KeepaliveThread::Initializer
         end
 
         # Initialize a transaction with Janus Instance.
@@ -22,41 +27,66 @@ module RubyRabbitmqJanus
         def initialize_janus_session
           @publisher = publisher
           @session = response_session
+        rescue
+          raise Errors::Janus::KeepaliveThread::InitializeJanusSession
         end
 
         # Restart session
         def restart_session
           Tools::Log.instance.warn 'Restart session ...'
-          janus = find_model
           @session = response_session
           response_keepalive
-          janus.set(session: @session)
+          find_model.set(session: @session)
+        rescue
+          raise Errors::Janus::KeepaliveThread::RestartSession
         end
 
         # Start a timer for TTL
         def start
-          @timer.loop_keepalive { response_keepalive }
+          @timer.loop_keepalive do
+            Tools::Log.instance.info 'Send keepalive to instance ' \
+              "#{@message.instance} with TTL #{@timer.time_to_live}"
+            response_keepalive
+          end
+        rescue
+          raise Errors::Janus::KeepaliveThread::Start
         end
 
         # Kill session and disable instance
         def kill
-          response_destroy
+          if @session.present? && @message.present?
+            response_destroy if find_model.enable
+          end
           super
+        rescue
+          raise Errors::Janus::KeepaliveThread::Kill
         end
 
         def instance_is_down
           janus = find_model
-          janus.set(enable: false)
-
+          janus.set(enable: false).unset(%I[thread session])
           Tools::Log.instance.fatal \
             "Janus Instance [#{janus.instance}] is down, kill thread."
-          Thread.instance_method(:kill).bind(self).call
+          prepare_kill_thread
+        rescue
+          raise Errors::Janus::KeepaliveThread::InstanceIsDown
         end
 
         private
 
+        attr_reader :instance
+
+        def prepare_kill_thread
+          @session = @message = nil
+          KeepaliveThread.instance_method(:kill).bind(self).call
+        end
+
         def find_model
-          Models::JanusInstance.find_by_session(@session)
+          if @session.blank?
+            Models::JanusInstance.find(@message.instance)
+          else
+            Models::JanusInstance.find_by_session(@session)
+          end
         end
 
         def publisher

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

@@ -3,6 +3,8 @@
 require 'timeout'
 require 'timers'
 
+# :reek:DuplicateMethodCall
+
 module RubyRabbitmqJanus
   module Janus
     module Concurrencies
@@ -11,16 +13,21 @@ module RubyRabbitmqJanus
       # # Manage time for thread
       #
       # Configure all timer used in keepalive class
+      #
+      # @!attribute [r] time_to_live
+      #   @return [Integer] Time for interval between keepalive message
+      # @!attribute [r] time_to_die
+      #   @return [Integer] Time before timer stop it
       class KeepaliveTimer
+        attr_reader :time_to_live, :time_to_die
+
         # Initialize timer to keeaplive thread.
-        # Configure timer with :
-        #   - interval for each keepalive message
-        #   - timeout for session response
-        #   - timeout for publish message
         def initialize
           @time_to_live = Tools::Config.instance.ttl
-          @time_publish = @time_to_live + 5
+          @time_to_die = test_time_to_die >= 60 ? 59 : test_time_to_die
           @timer = Timers::Group.new
+        rescue
+          raise Errors::Janus::KeepaliveTimer::Initializer
         end
 
         # Execute a loop with timer for sending keepalive message
@@ -28,36 +35,48 @@ module RubyRabbitmqJanus
         def loop_keepalive(&block)
           @timer.now_and_every(@time_to_live) { prepare_loop(&block) }
           loop { @timer.wait }
+        rescue
+          raise Errors::Janus::KeepaliveTimer::LoopKeepalive
         end
 
         # Test if session is present/exist in Janus Instance
         def session(&block)
-          Timeout.timeout(@time_publish) { yield }
+          Timeout.timeout(@time_to_die) { yield }
         rescue Timeout::Error
           stop_timer
           block.binding.receiver.instance_is_down
+        rescue
+          raise Errors::Janus::KeepaliveTimer::Session
         end
 
         # Stop timer to keepalive thread
         def stop_timer
           @timer.pause
+        rescue
+          raise Errors::Janus::KeepaliveTimer::StopTimer
         end
 
         # Start timer to keepalive thread
         def start_timer
           @timer.resume
+        rescue
+          raise Errors::Janus::KeepaliveTimer::StartTimer
         end
 
         private
 
         def prepare_loop(&block)
-          Timeout.timeout(@time_publish) do
+          Timeout.timeout(@time_to_die) do
             block.binding.receiver.restart_session if yield
           end
         rescue Timeout::Error
           stop_timer
           block.binding.receiver.instance_is_down
         end
+
+        def test_time_to_die
+          @time_to_live + 5
+        end
       end
     end
   end

data/lib/rrj/models/active_record.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# :reek:UtilityFunction
+
 module RubyRabbitmqJanus
   module Models
     # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
@@ -26,6 +28,13 @@ module RubyRabbitmqJanus
       def set(attributes)
         update_columns(attributes)
       end
+
+      # Destroy data to column
+      #
+      # @param [Array] List to attribute to delete in document
+      def unset(attributes)
+        Hash[attributes.map { |key, _value| [key, nil] }]
+      end
     end
   end
 end

data/lib/rrj/models/concerns/janus_instance_callbacks.rb

@@ -20,7 +20,7 @@ module RubyRabbitmqJanus
         if enable && enable_changed?
           create_a_session_in_janus_instance
         elsif !enable && enable_changed?
-          disable_a_session_in_janus_instance
+          destroy_a_session_in_janus_instance
         end
       end
 
@@ -38,15 +38,11 @@ module RubyRabbitmqJanus
         set(session: janus_instance.session, thread: janus_instance.thread_id)
       end
 
-      def disable_a_session_in_janus_instance
-        info_instance('Destroy session')
-        keepalive_object_thread.kill
-        unset(%I[thread session])
-      end
-
       def destroy_a_session_in_janus_instance
         info_instance('Destroy session')
+        keepalive_object_thread.send(:response_destroy)
         keepalive_object_thread.kill
+        unset(%I[thread session])
       end
 
       def keepalive_object

data/lib/rrj/rabbit/connect.rb

@@ -56,12 +56,9 @@ module RubyRabbitmqJanus
       private
 
       def read_options_server
+        conn = %w[host port pass user vhost]
         cfg = Tools::Config.instance.options['rabbit']
-        opts = {}
-        %w[host port pass user vhost].each do |val|
-          opts.merge!(val.to_sym => cfg[val])
-        end
-        opts
+        Hash[conn.map { |value| [value.to_sym, cfg[value]] }]
       end
 
       def option_log_rabbit

data/lib/rrj/rabbit/propertie.rb

@@ -22,22 +22,14 @@ module RubyRabbitmqJanus
 
       # Define options sending to rabbitmq
       def options
-        {
-          routing_key: Tools::Cluster.instance.queue_to(@instance),
-          correlation_id: @correlation,
-          content_type: 'application/json'
-        }
+        base.merge(routing_key: Tools::Cluster.instance.queue_to(@instance))
       rescue
         raise Errors::Rabbit::Propertie::Options
       end
 
       # Define option sending to rabbitmq for janus admin message
       def options_admin(type_request)
-        {
-          routing_key: determine_routing_key(type_request),
-          correlation_id: @correlation,
-          content_type: 'application/json'
-        }
+        base.merge(routing_key: determine_routing_key(type_request))
       rescue
         raise Errors::Rabbit::Propertie::Options_admin
       end
@@ -53,6 +45,10 @@ module RubyRabbitmqJanus
           cluster.queue_to(@instance)
         end
       end
+
+      def base
+        { correlation_id: @correlation, content_type: 'application/json' }
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ require 'json-schema-rspec'
 require 'rails'
 require 'factory_girl'
 require 'database_cleaner'
-ENV['MONGO']='true' if ENV['MONGO'].nil?
+ENV['MONGO'] = 'true' if ENV['MONGO'].nil?
 require ENV['MONGO'].match?('true') ? 'mongoid' : 'active_record'
 
 require 'ruby_rabbitmq_janus'
@@ -28,7 +28,6 @@ end
 RSpec.configure do |config|
   DatabaseCleaner.strategy = :truncation
   ENV['MONGO'].match?('true') ? load_mongo : load_active_record
-  after_load_database
 
   config.expect_with :rspec do |c|
     c.syntax = :expect
@@ -60,8 +59,11 @@ RSpec.configure do |config|
 
   # Configure Initializer RRJ and create session with Janus Instance
   config.before(:example) do |example|
-    initializer_rrj(example.metadata)
-    clear
-    find_instance
+    unless example.metadata[:type].match?(/thread/) || example.metadata[:type].match?(/tools/)
+      after_load_database
+      initializer_rrj(example.metadata)
+      clear
+      find_instance
+    end
   end
 end

data/spec/thread/concurencies_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe RubyRabbitmqJanus::Janus::Concurrencies::Concurrency, type: :thread, name: :concurrency do
+  let(:concurrency) { RubyRabbitmqJanus::Janus::Concurrencies::Concurrency.new }
+
+  it { expect(concurrency.send(:rabbit)).to be_a(RubyRabbitmqJanus::Rabbit::Connect) }
+  it { expect(concurrency.send(:lock)).to be_a(Mutex) }
+  it { expect(concurrency.send(:condition)).to be_a(ConditionVariable) }
+end

data/spec/thread/keepalive_initializer_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe RubyRabbitmqJanus::Janus::Concurrencies::KeepaliveThread, type: :thread, name: :keepalive_initializer do
+  let(:instance) { [1, 2].sample }
+  let(:concurrency) { RubyRabbitmqJanus::Janus::Concurrencies::KeepaliveInitializer.new(instance) }
+
+  it { expect(concurrency.send(:rabbit)).to be_a(RubyRabbitmqJanus::Rabbit::Connect) }
+  it { expect(concurrency.send(:lock)).to be_a(Mutex) }
+  it { expect(concurrency.send(:condition)).to be_a(ConditionVariable) }
+  it { expect(concurrency.instance_variable_get(:@thread)).to be_a(RubyRabbitmqJanus::Janus::Concurrencies::KeepaliveThread) }
+end

data/spec/thread/keepalive_thread_spec.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe RubyRabbitmqJanus::Janus::Concurrencies::KeepaliveThread, type: :thread, name: :keepalive_thread do
+  let(:instance) { [1, 2].sample }
+  let(:rabbit) { RubyRabbitmqJanus::Janus::Concurrencies::Concurrency.new.send(:rabbit) }
+  let(:concurrency) { RubyRabbitmqJanus::Janus::Concurrencies::KeepaliveThread.new(instance, rabbit) { nil } }
+
+  it { expect(concurrency.instance_variable_get(:@session)).to eql(nil) }
+  it { expect(concurrency.instance_variable_get(:@publisher)).to eql(nil) }
+  it { expect(concurrency.instance_variable_get(:@rabbit)).to be_a(RubyRabbitmqJanus::Rabbit::Connect) }
+  it { expect(concurrency.instance_variable_get(:@timer)).to be_a(RubyRabbitmqJanus::Janus::Concurrencies::KeepaliveTimer) }
+  it { expect(concurrency.instance_variable_get(:@message)).to be_a(RubyRabbitmqJanus::Janus::Concurrencies::KeepaliveMessage) }
+end

data/spec/thread/keepalive_timer_spec.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe RubyRabbitmqJanus::Janus::Concurrencies::KeepaliveTimer, type: :thread, name: :keepalive_timer do
+  let(:concurrency) { RubyRabbitmqJanus::Janus::Concurrencies::KeepaliveTimer.new }
+
+  it { expect(concurrency.send(:time_to_live)).to be_a(Integer) }
+  it { expect(concurrency.send(:time_to_die)).to be_a(Integer) }
+  it { expect(concurrency.instance_variable_get(:@timer)).to be_a(Timers::Group) }
+  it { expect(concurrency.instance_variable_get(:@time_to_live)).to eql(RubyRabbitmqJanus::Tools::Config.instance.options['janus']['session']['keepalive']) }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 2.2.0.pre.170
+  version: 2.2.0.pre.173
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -398,7 +398,6 @@ files:
 - config/requests/peer/answer.json
 - config/requests/peer/offer.json
 - config/requests/peer/trickle.json
-- lib/config/default.yml
 - lib/generators/ruby_rabbitmq_janus/configuration_generator.rb
 - lib/generators/ruby_rabbitmq_janus/create_request_generator.rb
 - lib/generators/ruby_rabbitmq_janus/default_request_generator.rb
@@ -577,6 +576,10 @@ files:
 - spec/support/schemas/request/peer/trickle.json
 - spec/support/sdp.rb
 - spec/support/type.rb
+- spec/thread/concurencies_spec.rb
+- spec/thread/keepalive_initializer_spec.rb
+- spec/thread/keepalive_thread_spec.rb
+- spec/thread/keepalive_timer_spec.rb
 homepage: https://github.com/dazzl-tv/ruby-rabbitmq-janus
 licenses:
 - MIT
@@ -614,7 +617,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby RabbitMQ Janus

data/lib/config/default.yml

@@ -1,28 +0,0 @@
-rabbit:
-  host: rabbit.dazzl.local
-  port: 5672
-  vhost: /
-  user: dazzl_api
-  pass: SuWYeg2d
-  admin_pass: Guj9khoN
-  level: info
-
-queues:
-  standard:
-    from: from-janus
-    to: to-janus
-  admin:
-    from: from-janus-admin
-    to: to-janus-admin
-
-janus:
-  session:
-    keepalive: 55
-  plugins:
-    - janus.plugin.dazzl.videocontrol
-
-gem:
-  cluster:
-    enabled: true
-  log:
-    level: debug