ruby_rabbitmq_janus 2.0.0 → 2.1.0.pre.128

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

@@ -12,19 +12,20 @@ module RubyRabbitmqJanus
       #
       # @see https://ruby-doc.org/stdlib-2.4.0/libdoc/singleton/rdoc/Singleton.html
       class Keepalive < Concurrency
-        include Singleton
-
         # Initialize a singleton object for sending keepalive to janus
-        def initialize
+        def initialize(instance)
           @pub = @session = nil
-          super
+          @instance = instance
+          super()
+        rescue
+          raise Errors::Janus::Keepalive::Initializer
         end
 
         # Give a session Integer created when this gem is intanciate.
         # Is waiting a thread return a response to message created sending.
         #
         # @example Ask session
-        #   Keepalive.instance.session
+        #   Keepalive.session
         #   => 852803383803249
         #
         # @return [Fixnum] Identifier to session created by Janus
@@ -33,23 +34,15 @@ module RubyRabbitmqJanus
             condition.wait(lock)
             @session
           end
+        rescue
+          raise Errors::Janus::Keepalive::Session
         end
 
         private
 
         def transaction_running
           @session = find_session
-          synchronize
-          create_loop_session
-        rescue => error
-          raise Errors::KeepaliveLoopSession, error
-        end
-
-        def synchronize
           lock.synchronize { condition.signal }
-        end
-
-        def create_loop_session
           loop { loop_session(Tools::Config.instance.ttl) }
         end
 
@@ -57,29 +50,28 @@ module RubyRabbitmqJanus
           sleep time_to_live
           @pub.publish(message_keepalive)
           Tools::Log.instance.info "Keepalive for #{@session}"
-        rescue => error
-          raise Errors::KeepaliveMessage, error
         end
 
         def create_session
           @pub = Rabbit::Publisher::PublishExclusive.new(rabbit.channel, '')
-          @pub.publish(Janus::Messages::Standard.new('base::create'))
-        rescue => error
-          raise Errors::KeepaliveCreateSession, error
+          msg = Janus::Messages::Standard.new('base::create', param_instance)
+          @pub.publish(msg)
         end
 
         def message_keepalive
           Janus::Messages::Standard.new('base::keepalive', param_session)
-        rescue => error
-          raise Errors::KeepaliveMessage, error
         end
 
         def find_session
           Janus::Responses::Standard.new(create_session).session
         end
 
+        def param_instance
+          { 'instance' => @instance }
+        end
+
         def param_session
-          { 'session_id' => @session }
+          { 'session_id' => @session }.merge(param_instance)
         end
       end
     end

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

@@ -10,6 +10,8 @@ module RubyRabbitmqJanus
         # @return [Array] List of sessions
         def sessions
           request['sessions']
+        rescue
+          raise Errors::Janus::ResponseAdmin::Sessions
         end
 
         # List of handles running in one session in Janus Instance.
@@ -17,6 +19,8 @@ module RubyRabbitmqJanus
         # @return [Array] List of handles
         def handles
           request['handles']
+        rescue
+          raise Errors::Janus::ResponseAdmin::Handles
         end
 
         # Info to session or handle in Janus Instance
@@ -24,6 +28,8 @@ module RubyRabbitmqJanus
         # @return [Hash] Information to session/handle
         def info
           request['info']
+        rescue
+          raise Errors::Janus::ResponseAdmin::Info
         end
       end
     end

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

@@ -14,6 +14,8 @@ module RubyRabbitmqJanus
         # @return [String] result to request
         def event
           request['janus']
+        rescue
+          raise Errors::Janus::ResponseEvent::Event
         end
 
         # Read plugindata data
@@ -24,6 +26,8 @@ module RubyRabbitmqJanus
         # @return [Hash] body data
         def data
           request['plugindata']['data'] if plugin_response?
+        rescue
+          raise Errors::Janus::ResponseEvent::Data
         end
 
         # Read jsep data
@@ -34,6 +38,8 @@ module RubyRabbitmqJanus
         # @return [Hash] jsep data
         def jsep
           request['jsep'] if contains_jsep?
+        rescue
+          raise Errors::Janus::ResponseEvent::Jsep
         end
 
         # session_id and handle_id
@@ -44,6 +50,8 @@ module RubyRabbitmqJanus
         # @return [Array] Contains session_id and handle_id
         def keys
           [request['session_id'], request['sender']]
+        rescue
+          raise Errors::Janus::ResponseEvent::Keys
         end
 
         private

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

@@ -18,11 +18,8 @@ module RubyRabbitmqJanus
         #   sending by user
         def initialize(response_janus)
           @request = response_janus
-        rescue => error
-          Tools::Log.instance.debug "Request error [initialize] : #{@request}"
-          raise Errors::JanusResponseInit, error
-        else
-          Tools::Log.instance.debug "Response return : #{to_json}"
+        rescue
+          raise Errors::Janus::Response::Initializer
         end
 
         # Return request to json format
@@ -30,8 +27,8 @@ module RubyRabbitmqJanus
         # @return [String] Response to JSON format
         def to_json
           @request.to_json
-        rescue => error
-          raise Errors::JanusResponseJson, [error, @request]
+        rescue
+          raise Errors::Janus::Response::ToJson
         end
 
         # Return request to json format with nice format
@@ -39,8 +36,8 @@ module RubyRabbitmqJanus
         # @return [String] Response to JSON format with indent
         def to_nice_json
           JSON.pretty_generate to_hash
-        rescue => error
-          raise Errors::JanusResponsePrettyJson, error
+        rescue
+          raise Errors::Janus::Response::ToNiceJson
         end
 
         # Return request to hash format
@@ -48,8 +45,8 @@ module RubyRabbitmqJanus
         # @return [Hash] Response to Hash foramt
         def to_hash
           @request
-        rescue => error
-          raise Errors::JanusResponseHash, [error, @request]
+        rescue
+          raise Errors::Janus::Response::ToHash
         end
 
         private

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

@@ -9,6 +9,8 @@ module RubyRabbitmqJanus
         # Return a integer to session
         def session
           data_id
+        rescue
+          raise Errors::Janus::ResponseStandard::Session
         end
 
         alias sender session
@@ -16,26 +18,36 @@ module RubyRabbitmqJanus
         # Return session used in request
         def session_id
           request['session_id']
+        rescue
+          raise Errors::Janus::ResponseStandard::Session_id
         end
 
         # Read response for plugin request
         def plugin
           request['plugindata']
+        rescue
+          raise Errors::Janus::ResponseStandard::Plugin
         end
 
         # Read data response for plugin request
         def plugin_data
           plugin['data']
+        rescue
+          raise Errors::Janus::ResponseStandard::PluginData
         end
 
         # Read data response for normal request
         def data
           request['data']
+        rescue
+          raise Errors::Janus::ResponseStandard::Data
         end
 
         # Read SDP response
         def sdp
           request['jsep']['sdp']
+        rescue
+          raise Errors::Janus::ResponseStandard::SDP
         end
 
         private

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

@@ -9,6 +9,8 @@ module RubyRabbitmqJanus
       class Admin < Session
         def initialize(session)
           super(true, session)
+        rescue
+          raise Errors::Janus::TransactionAdmin::Initialize
         end
 
         # Begin connection with RabbitMQ
@@ -17,6 +19,8 @@ module RubyRabbitmqJanus
             @publisher = Rabbit::Publisher::PublisherAdmin.new(rabbit.channel)
             yield
           end
+        rescue
+          raise Errors::Janus::TransactionAdmin::Connect
         end
 
         # Write a message in queue in RabbitMQ
@@ -24,6 +28,8 @@ module RubyRabbitmqJanus
           msg = Janus::Messages::Admin.new(type, opts.merge(options))
           response = read_response(publisher.publish(msg))
           Janus::Responses::Admin.new(response)
+        rescue
+          raise Errors::Janus::TransactionAdmin::PublishMessage
         end
 
         private

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# :reek:TooManyStatements
+
 module RubyRabbitmqJanus
   module Janus
     module Transactions
@@ -11,10 +13,13 @@ module RubyRabbitmqJanus
         #
         # @param [Fixnum] session
         #   Use a session identifier for created message
-        def initialize(exclusive, session, handle = 0)
+        def initialize(exclusive, session, handle = 0, instance = 1)
           super(session)
           @exclusive = exclusive
           @handle = handle
+          @instance = instance
+        rescue
+          raise Errors::Janus::TransactionHandle::Initialize
         end
 
         # Opening a long transaction with rabbitmq and is ending closing
@@ -30,6 +35,8 @@ module RubyRabbitmqJanus
             yield
           end
           handle
+        rescue
+          raise Errors::Janus::TransactionHandle::Connect
         end
 
         # Publish an message in handle
@@ -39,23 +46,38 @@ module RubyRabbitmqJanus
         #
         # @return [Janus::Responses::Standard] Response to message sending
         def publish_message(type, options = {})
-          msg = Janus::Messages::Standard.new(type, opts.merge!(options))
+          msg = Janus::Messages::Standard.new(type, options.merge(opts))
           response = read_response(publisher.publish(msg))
           Janus::Responses::Standard.new(response)
+        rescue
+          raise Errors::Janus::TransactionHandle::PublishMessage
         end
 
         # Send a message detach
         def detach
           publisher.publish(Janus::Messages::Standard.new('base::detach', opts))
+        rescue
+          raise Errors::Janus::TransactionHandle::Detach
+        end
+
+        # Send a message detach and disable session for deleting in
+        # Janus Instance
+        def detach_for_deleting
+          detach
+          Models::JanusInstance.disable(opts['session_id'])
+        rescue
+          raise Errors::Janus::TransactionHandle::DetachForDeleting
         end
 
         private
 
         def create_handle
           Tools::Log.instance.info 'Create an handle'
-          opt = { 'session_id' => session }
+          opt = { 'session_id' => session, 'instance' => @instance }
           msg = Janus::Messages::Standard.new('base::attach', opt)
+          Tools::Log.instance.info "Send message attach -- #{@handle}"
           @handle = send_a_message_exclusive { msg }
+          Tools::Log.instance.info "Message attach is sending -- #{@handle}"
         end
 
         def send_a_message_exclusive

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

@@ -16,6 +16,8 @@ module RubyRabbitmqJanus
         def initialize(exclusive, session)
           super(session)
           @exclusive = exclusive
+        rescue
+          raise Errors::Janus::TransactionSession::Initialize
         end
 
         # Opening a short transaction with rabbitmq and close when is ending
@@ -26,12 +28,16 @@ module RubyRabbitmqJanus
             choose_queue
             yield
           end
+        rescue
+          raise Errors::Janus::TransactionSession::Connect
         end
 
         def publish_message(type, options = {})
           msg = Janus::Messages::Standard.new(type, opts.merge!(options))
           response = read_response(publisher.publish(msg))
           Janus::Responses::Standard.new(response)
+        rescue
+          raise Errors::Janus::TransactionSession::PublishMessage
         end
 
         private

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

@@ -18,8 +18,8 @@ module RubyRabbitmqJanus
           @rabbit = Rabbit::Connect.new
           @session = session
           @publisher = @exclusive = nil
-        rescue => error
-          raise Errors::JanusTransaction, error
+        rescue
+          raise Errors::Janus::Transaction::Initialize
         end
 
         private
@@ -47,13 +47,7 @@ module RubyRabbitmqJanus
         end
 
         def read_response(publish)
-          if @exclusive
-            Tools::Log.instance.info '... and read a janus response'
-            publish
-          else
-            Tools::Log.instance.info '... and return an empty response'
-            {}
-          end
+          @exclusive ? publish : {}
         end
       end
     end

data/lib/rrj/models/active_record.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module RubyRabbitmqJanus
+  module Models
+    # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+    #
+    # Store instance information for MongoID database
+    class JanusInstance < ::ActiveRecord::Base
+      include RubyRabbitmqJanus::Models::JanusInstanceConcern
+
+      before_destroy { destroy_before_action }
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+# :reek:UtilityFunction
+
+module RubyRabbitmqJanus
+  module Models
+    # Add method for JanusInstance model
+    module JanusInstanceConcern
+      extend ActiveSupport::Concern
+
+      # Send an action for destroying a session in Janus Gateway instance
+      def destroy_before_action
+        options = { 'session_id' => session, 'instance' => instance }
+        ::RRJ.start_transaction(options) do |transaction|
+          transaction.publish_message('base::destroy', options)
+        end
+      end
+
+      # Class methods for JanusInstance model
+      module ClassMethods
+        # Disable an instance
+        def disable(session_id)
+          JanusInstance.find_by(session: session_id).set(enable: false)
+        end
+
+        # Delete all instance disabled
+        def destroys
+          JanusInstance.where(enable: false).delete_all
+        end
+
+        # Search a record by instance number
+        def find_by_instance(instance_search)
+          JanusInstance.find_by(instance: instance_search)
+        rescue
+          false
+        end
+
+        # Search a record by session number
+        def find_by_session(session_search)
+          JanusInstance.find_by(session: session_search)
+        rescue
+          nil
+        end
+      end
+    end
+  end
+end