ruby_rabbitmq_janus 3.0.0.pre.354 → 3.0.0.pre.384

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c734f054b82c7313cc2f700856897005589fc8cd85083b21562ee2574ad038eb
-  data.tar.gz: 617e6caa75c5cad2280d07c6056161a25ed549d825fb9524ae6cc3c098132085
+  metadata.gz: e3f09817fed0214a2ce8a776ea6cb6c7c3ea893c24f56af5c2cec9855883d5f5
+  data.tar.gz: 108b9f75fbb86c4698ada11ff575568e5e80d7ee42c46a05da9713b375414868
 SHA512:
-  metadata.gz: 9ec5a373c987a2bf9c18d2ea1b1478a6a4814967af89d73cdc7a04cd0cd79922d8f9e7ad6d5d4da555e64f1f23c13598da1ba403d7f84741da424154e92ff22a
-  data.tar.gz: 74ab344770f32f388f0fcb009dd90e82388b74b1dd8732903ef6c658a0b714b084f7595bee353419510ef08f65f2fc41499e09a2a12c1ef6f050802bf2d28918
+  metadata.gz: fbfce5a5a397afbfcb3e25a4f435f7149382584146099ab6f0e8eb73e4f64095e38401a74b38c581765e3c6592f5b7807f88007bdd2b91ca172e7241528b0fea
+  data.tar.gz: 32d45c9f76089d812d71ca10b2c085f160cabe3f85ffbe54d56075cc9db81eaaf83a111d05c8536d3d63cc40084fffc5bb52241ab853b4988a9636eb6d042a9d

data/Rakefile

@@ -4,8 +4,7 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 # Exclude all spec with type :thread
-RSpec::Core::RakeTask.new(:spec) do |_t|
-end
+RSpec::Core::RakeTask.new(:spec)
 
 # Exclude all spec with type :thread
 RSpec::Core::RakeTask.new(:classic) do |t|

data/lib/generators/ruby_rabbitmq_janus/migration_generator.rb

@@ -16,11 +16,13 @@ module RubyRabbitmqJanus
 
         source_root File.expand_path('templates', __dir__)
 
+        # Prepare files for migration.
         def install
           migration_template 'migration.rb',
                              'db/migrate/create_ruby_rabbitmq_janus_tables.rb'
         end
 
+        # Determines the version number of the next migration.
         def self.next_migration_number(dirname)
           ActiveRecord::Generators::Base.next_migration_number(dirname)
         end

data/lib/rrj/errors/error.rb

@@ -20,7 +20,7 @@ module RubyRabbitmqJanus
 
       def write_error(message, level = :unknown)
         if defined?(::Log)
-          ::Log.send(level.class.eql?(Symbol) ? level : int_to_level(level),
+          ::Log.send(level.instance_of?(Symbol) ? level : int_to_level(level),
                      message)
         else
           p "#{level}, #{message}"

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

@@ -7,55 +7,59 @@ module RubyRabbitmqJanus
       #
       # @see Example request response https://janus.conf.meetecho.com/docs/admin.html
       class Admin < Standard
-        # List of sessions running in Janus Instance.
-        #
-        # @return [Array] List of sessions
+        # @return [Array] List of sessions running in Janus Instance.
         def sessions
           read_data(__method__.to_s)
         end
 
-        # List of handles running in one session in Janus Instance.
-        #
-        # @return [Array] List of handles
+        # @return [Array] List of handles running
+        #   in one session in Janus Instance.
         def handles
           read_data(__method__.to_s)
         end
 
-        # Info to session or handle in Janus Instance
-        #
-        # @return [Hash] Information to session/handle
+        # @return [Hash] Information to session/handle in Janus Instance.
         def info
           read_data(__method__.to_s)
         end
 
+        # @return [Boolean] Information status to debug  mode for libnice.
         def libnice_debug
           read_data(__method__.to_s)
         end
 
+        # @return [Boolean] Information status to debug mode
+        #   in Janus Intance on the fly.
         def locking_debug
           read_data(__method__.to_s)
         end
 
+        # @return [Boolean] Information about color in log messages.
         def log_colors
           read_data(__method__.to_s)
         end
 
+        # @return [Integer] Level to debug mode to Janus Instance.
         def level
           read_data(__method__.to_s)
         end
 
+        # @return [Boolean] Status to timestampping for log messages.
         def log_timestamps
           read_data(__method__.to_s)
         end
 
+        # @return [Integer] Level to max nack queue configured.
         def max_nack_queue
           read_data(__method__.to_s)
         end
 
+        # @return [Integer] No-media timer property.
         def no_media_timer
           read_data(__method__.to_s)
         end
 
+        # @return [Integer] Timeout for session.
         def timeout
           read_data(__method__.to_s)
         end

data/lib/rrj/janus/responses/error.rb

@@ -143,11 +143,9 @@ module RubyRabbitmqJanus
 
         def respond_to_missing?(name, include_private); end
 
-        # rubocop:disable Style/MethodMissingSuper
         def method_missing(_method, request)
           default_error(request)
         end
-        # rubocop:enable Style/MethodMissingSuper
 
         def default_error(request)
           raise RubyRabbitmqJanus::Errors::Janus::Responses::Nok, request

data/lib/rrj/janus/responses/rspec.rb

@@ -7,6 +7,8 @@ module RubyRabbitmqJanus
     module Responses
       # Response for RSpec initializer
       class RSpec
+        # Constructor to RSpec response.
+        # Create a fake response for testing library.
         def initialize(type)
           path = RubyRabbitmqJanus::Tools::Config.instance.rspec_response
           @json = File.join(Dir.pwd,

data/lib/rrj/janus/responses/standard.rb

@@ -18,6 +18,7 @@ module RubyRabbitmqJanus
           data_id
         end
 
+        # Read value created by janus for session/handle message
         def sender
           raise_data
 

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

@@ -70,11 +70,13 @@ module RubyRabbitmqJanus
           @handle = send_a_message_exclusive { msg }
         end
 
+        # rubocop:disable Style/ExplicitBlockArgument
         def send_a_message_exclusive
           Janus::Responses::Standard.new(read_response_exclusive do
             yield
           end).sender
         end
+        # rubocop:enable Style/ExplicitBlockArgument
 
         def read_response_exclusive
           chan = rabbit.channel

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

@@ -4,6 +4,8 @@ module RubyRabbitmqJanus
   module Janus
     module Transactions
       # Transaction for RSpec initializer
+      # @!attribute [r] response
+      #     Given a Janus response
       class RSpec
         attr_reader :response
 

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

@@ -28,6 +28,7 @@ module RubyRabbitmqJanus
           end
         end
 
+        # Publish a message to "standard" RabbitMQ queue.
         def publish_message(type, options = {})
           msg = Janus::Messages::Standard.new(type, opts.merge!(options))
           response = read_response(publisher.publish(msg))

data/lib/rrj/models/active_record.rb

@@ -31,9 +31,12 @@ module RubyRabbitmqJanus
       # @param attributes [Array] List to attribute to delete in document
       #
       # @return [Hash] Current model
+      #
+      # rubocop:disable Style/HashTransformValues
       def unset(attributes)
         Hash[attributes.map { |key, _value| [key, nil] }]
       end
+      # rubocop:enable Style/HashTransformValues
     end
   end
 end

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

@@ -12,32 +12,37 @@ module RubyRabbitmqJanus
       module ClassMethods
         # Disable an instance
         def disable(session_id)
-          JanusInstance.find_by(session: session_id).set(enable: false)
+          find_by_session(session_id).set(enable: false)
+        end
+
+        # Enable an instance
+        def enable(session_id)
+          find_by_session(session_id).set(enable: true)
         end
 
         # Clean all instance disabled
         def destroys
-          JanusInstance.where(enable: false).delete_all
+          where(enable: false).delete_all
         end
 
         # Search a record by instance number
         def find_by_instance(instance_search)
-          JanusInstance.find_by(instance: instance_search)
+          find_by(instance: instance_search)
         end
 
         # Search a record by session number
         def find_by_session(session_search)
-          JanusInstance.find_by(session: session_search)
+          find_by(session_id: session_search)
         end
 
         # Get all instance active
         def enabled
-          JanusInstance.where(enable: true)
+          where(enable: true)
         end
 
         # Get all instance not active
         def disabled
-          JanusInstance.where(enable: false)
+          where(enable: false)
         end
       end
     end

data/lib/rrj/process/concurrency.rb

@@ -27,19 +27,29 @@ module RubyRabbitmqJanus
         def initialize_thread
           @rabbit.transaction_long { transaction_running }
         rescue Interrupt
-          ::Log.warn \
-            "Close a connection with RabbitMQ instance for #{self.class.name}"
-          @rabbit.close
+          ::Log.warn "This process has been interupted #{class_name}"
+          close
+        else
+          close
         end
 
         def info_thread
-          "Create an thread -- #{self.class.name}"
+          "Create an thread -- #{class_name}"
+        end
+
+        def class_name
+          self.class.name
+        end
+
+        def close
+          ::Log.warn \
+            "Close a connection with RabbitMQ instance for #{class_name}"
+          @rabbit.close
         end
       end
     end
   end
 end
 
-require 'rrj/process/thread_runner_concern'
 require 'rrj/process/event'
 require 'rrj/process/event_admin'

data/lib/rrj/process/event.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rrj/process/thread_runner_concern'
+
 module RubyRabbitmqJanus
   module Process
     module Concurrencies
@@ -16,17 +18,17 @@ module RubyRabbitmqJanus
 
         private
 
-        def raise_nil_block
-          raise RubyRabbitmqJanus::Errors::Process::Event::Run
-        end
-
         def name_publisher
-          :publish
+          :pub_classic
         end
 
         def publisher
           Rabbit::Listener::From.new(rabbit)
         end
+
+        def raise_nil_block
+          raise RubyRabbitmqJanus::Errors::Process::Event::Run
+        end
       end
     end
   end

data/lib/rrj/process/event_admin.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rrj/process/thread_runner_concern'
+
 module RubyRabbitmqJanus
   module Process
     module Concurrencies
@@ -16,17 +18,17 @@ module RubyRabbitmqJanus
 
         private
 
-        def raise_nil_block
-          raise RubyRabbitmqJanus::Errors::Process::EventAdmin::Run
-        end
-
         def name_publisher
-          :publish_adm
+          :pub_admin
         end
 
         def publisher
           Rabbit::Listener::FromAdmin.new(rabbit)
         end
+
+        def raise_nil_block
+          raise RubyRabbitmqJanus::Errors::Process::EventAdmin::Run
+        end
       end
     end
   end

data/lib/rrj/process/thread_runner_concern.rb

@@ -13,41 +13,42 @@ module RubyRabbitmqJanus
       module ThreadRunnerConcern
         extend ActiveSupport::Concern
 
-        # Initialize an process (event/event_admin) and configure
-        # the life cycle to thread.
-        def initialize
-          super
-          @thread = Thread.new { initialize_thread }
-          @thread.abort_on_exception = true
-        end
+        included do
+          # Initialize an process (event/event_admin) and configure
+          # the life cycle to thread.
+          def initialize
+            super
+            @thread = Thread.new { initialize_thread }
+          end
 
-        # Create a thread for execute a block code in a thread.
-        # This code is outside to `RRJ` gem so is very important
-        # to be sure this code execution is not fail.
-        #
-        # @param [Proc] block Block code for execute action when queue
-        #   standard 'from-janus' receive a message.This block is sending to
-        #   publisher created for this thread.
-        #
-        # @return [Thread] It's a thread who listen queue and execute action
-        def run(&block)
-          raise_nil_block unless block_given?
+          # Create a thread for execute a block code in a thread.
+          # This code is outside to `RRJ` gem so is very important
+          # to be sure this code execution is not fail.
+          #
+          # @param [Proc] block Block code for execute action when queue
+          #   standard 'from-janus' receive a message.This block is sending to
+          #   publisher created for this thread.
+          #
+          # @return [Thread] It's a thread who listen queue and execute action
+          def run(&block)
+            raise_nil_block unless block
 
-          @thread.join
-          Thread.new do
-            loop do
-              @thread.thread_variable_get(name_publisher).listen_events(&block)
-            rescue => exception
-              ::Log.warn 'An exception to was encountered in the thread !'
-              ::Log.warn exception
+            @thread.join
+            Thread.new do
+              loop do
+                @thread.thread_variable_get(name_publisher)
+                       .listen_events(&block)
+              rescue => exception
+                ::Log.warn exception
+              end
             end
           end
-        end
 
-        private
+          private
 
-        def transaction_running
-          @thread.thread_variable_set(name_publisher, publisher)
+          def transaction_running
+            @thread.thread_variable_set(name_publisher, publisher)
+          end
         end
       end
     end

data/lib/rrj/rabbit/base_event.rb

@@ -10,9 +10,9 @@ module RubyRabbitmqJanus
     # # Parent class for all publisher
     # This element send and read a message in rabbitmq Queue
     #
-    # @!attribute [r] response
+    # @!attribute [r] responses
     #   @return [RubyRabbitmqJanus::Janus::Responses::Response]
-    #     Given a Janus response
+    #     Given an array of Janus response
     #
     # @abstract Publish message in RabbitMQ
     class BaseEvent

data/lib/rrj/rabbit/connect.rb

@@ -14,10 +14,17 @@ 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 = nil
 
-        response = transaction_long { yield }
+        Timeout.timeout(5) do
+          response = transaction_long(&block)
+        end
+      rescue Timeout::Error
+        ::Log.error 'The "Short transaction" have raised Timeout exception.'
+      ensure
         close
         response
       end
@@ -30,6 +37,8 @@ module RubyRabbitmqJanus
           start
           yield
         end
+      rescue Timeout::Error
+        ::Log.error 'The "Long transaction" have raised Timeout exception.'
       end
 
       # Opening a connection with RabbitMQ
@@ -50,7 +59,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