ruby_rabbitmq_janus 1.2.9 → 2.0.0.pre.42

data/lib/rrj/errors/error.rb

@@ -4,10 +4,11 @@ module RubyRabbitmqJanus
   # Define all error in gem
   module Errors
     # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
-
+    #
     # Define errors to gems
     class RRJError < StandardError
       # Initialize a error standard in this gem
+      #
       # @param [String] message Text returning in raise
       # @param [Symbol] level Important to error
       def initialize(message, level)

data/lib/rrj/errors/init.rb

@@ -7,6 +7,7 @@ module RubyRabbitmqJanus
     # Define a super class for all errors in RRJ Class
     class RRJ < RRJError
       # Define a message error and level
+      #
       # @param [String] message Text returning in raise
       # @param [Symbol] level Level to message in log
       def initalize(message, level)
@@ -17,6 +18,7 @@ module RubyRabbitmqJanus
     # Define an exception if gem dont initialize correctly
     class InstanciateGemFailed < RRJ
       # Initialize a error for instanciate class. It's a fatal error
+      #
       # @param [String] message Text returning in raise
       def initialize(message)
         super "Gem is not instanciate correctly : #{message}", :fatal
@@ -26,6 +28,7 @@ module RubyRabbitmqJanus
     # Define an error if method message_post given an exception
     class TransactionSessionFailed < RRJ
       # Initialize a error for message posting. It's a fatal error
+      #
       # @param [String] message Text returning in raise
       def initialize(message)
         super "Transaction SESSION failed : #{message}", :fatal
@@ -35,6 +38,7 @@ module RubyRabbitmqJanus
     # Define a error if method transaction given an exception
     class TransactionMessageFailed < RRJ
       # Initialize a error for transaction failed. It's a fatal error
+      #
       # @param [String] message Text returning in raise
       def initialize(message)
         super "Message in a transaction HANDLE failed : #{message}", :fatal
@@ -44,6 +48,7 @@ module RubyRabbitmqJanus
     # Define a error if method start_handle given an exception
     class TransactionHandleFailed < RRJ
       # Initialize a error for transaction with a handle. It's a fatal error
+      #
       # @param [String] message Text returning in raise
       def initialize(message)
         super "Transaction HANDLE failed : #{message}", :fatal
@@ -53,6 +58,7 @@ module RubyRabbitmqJanus
     # define a error for Admin Transaction
     class TransactionAdminFailed < RRJ
       # Initialize a error for transaction admin
+      #
       # @param [String] message Text returning in raise
       def initialize(message)
         super "Transaction ADMIN failed : #{message}", :fatal

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

@@ -6,6 +6,7 @@ module RubyRabbitmqJanus
     # Define errors to message sending and response to janus
     class Janus < RRJError
       # Initialize a error standard for janus module
+      #
       # @param [String] message Text returning in raise
       def initialize(message)
         super "[JANUS]#{message}", :fatal

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

@@ -3,10 +3,11 @@
 module RubyRabbitmqJanus
   module Errors
     # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
-
+    #
     # Define an exception for janus message class
     class JanusMessage < Janus
       # Initialize a error for janus message module
+      #
       # @param [String] message Text returning in raise
       def initialize(message)
         super "[Message] #{message}"
@@ -14,10 +15,11 @@ module RubyRabbitmqJanus
     end
 
     # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
-
+    #
     # Define an exception for janus message to_json
     class JanusMessageJson < JanusMessage
       # Initialize a error for janus message in to_json
+      #
       # @param [String] message Text returning in raise
       def initialize(message)
         super "Error transform to json : #{message}"
@@ -25,10 +27,11 @@ module RubyRabbitmqJanus
     end
 
     # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
-
+    #
     # Define an exception for janus message to_nice_json
     class JanusMessagePrettyJson < JanusMessage
       # Initialize a error for janus message in to_nice_json
+      #
       # @param [String] message Text returning in raise
       def initialize(message)
         super "Error transform to pretty json : #{message}"
@@ -36,10 +39,11 @@ module RubyRabbitmqJanus
     end
 
     # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
-
+    #
     # Define an exception for janus message to_hash
     class JanusMessageHash < JanusMessage
       # Initialize a error for janus message in to_hash
+      #
       # @param [String] message Text returning in raise
       def initialize(message)
         super "Error transform to hash : #{message}"

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
 # @see RubyRabbitmqJanus::Janus::Keepalive Keepalive thread
 

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# :reek:FeatureEnvy
+
 module RubyRabbitmqJanus
   module Errors
     # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
@@ -7,6 +9,7 @@ module RubyRabbitmqJanus
     # Define an error primary for response
     class JanusResponse < Janus
       # Initialize a error for janus response module
+      #
       # @param [String] message Text returning in raise
       def initialize(message)
         super "[Response] #{message}"
@@ -14,9 +17,21 @@ module RubyRabbitmqJanus
     end
 
     # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+    #
+    # Define an error for request return
+    class JanusResponseRequest < JanusResponse
+      # Initialize error
+      def initialize(type_rqe, type_msg, message)
+        "Error transform to #{type_rqe} : #{type_msg} -- message : #{message}"
+      end
+    end
+
+    # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+    #
     # Define an error for response initalize
     class JanusResponseInit < JanusResponse
       # Initialize a error for janus response module in initializer
+      #
       # @param [String] message Text returning in raise
       def initialize(message)
         super "Error create object : #{message}"
@@ -24,20 +39,23 @@ module RubyRabbitmqJanus
     end
 
     # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+    #
     # Define an exception for json
-    class JanusResponseJson < JanusResponse
+    class JanusResponseJson < JanusResponseRequest
       # Initialize a error for janus response module in to_json
+      #
       # @param [String] message Text returning in raise
       def initialize(message)
-        super \
-          "Error transform to JSON : #{message[0]} -- message : #{message[1]}"
+        super('JSON', message[0], message[1])
       end
     end
 
     # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+    #
     # Define an exception for nice_json
     class JanusResponsePrettyJson < JanusResponse
       # Initialize a error for janus response module in to_nice_json
+      #
       # @param [String] message Text returning in raise
       def initialize(message)
         super "Error transform to Pretty JSON : #{message}"
@@ -45,20 +63,23 @@ module RubyRabbitmqJanus
     end
 
     # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+    #
     # Define an exception for hash
-    class JanusResponseHash < JanusResponse
+    class JanusResponseHash < JanusResponseRequest
       # Initialize a error for janus response module in to_hash
+      #
       # @param [String] message Text returning in raise
       def initialize(message)
-        super \
-          "Error transform to Hash : #{message[0]} -- message : #{message[1]}"
+        super('HASH', message[0], message[1])
       end
     end
 
     # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+    #
     # Define an error for response data
     class JanusResponseDataId < JanusResponse
       # Initialize a error for janus response module in data_id
+      #
       # @param [String] message Text returning in raise
       def initialize(message)
         super "Error Data : #{message}"

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

@@ -3,9 +3,11 @@
 module RubyRabbitmqJanus
   module Errors
     # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+    #
     # Define an exception for initalizer transaction
     class JanusTransaction < Janus
       # Initialize a error for janus transaction class
+      #
       # @param [String] message Text returning in raise
       def initialize(message)
         super "[Transaction]#{message}"
@@ -13,9 +15,11 @@ module RubyRabbitmqJanus
     end
 
     # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+    #
     # Define an exception for running_handle
     class JanusTransactionHandle < JanusTransaction
       # Initialize a error for janus transaction handle class
+      #
       # @param [String] message Text returning in raise
       def initialize(message)
         super "[Handle] #{message}"

data/lib/rrj/errors/rabbit/rabbit.rb

@@ -3,16 +3,18 @@
 module RubyRabbitmqJanus
   module Errors
     # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+    #
     # Define errors if connection to rabbitmq is failed
     class ConnectionRabbitmqFailed < RRJError
       # Initialize a error for rabbit module. It's a fatal error
+      #
       # @param [String] message Text returning in raise
       def initialize(message)
         super message, :fatal
       end
     end
 
-    # Execpetion primary for Rabbit class
+    # Excepetion primary for Rabbit class
     class Rabbit < RRJError
       def initialize(message)
         super "[Rabbit]#{message}", :fatal

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
 
 module RubyRabbitmqJanus

data/lib/rrj/info.rb

@@ -5,7 +5,7 @@
 # Define constant to gem.
 module RubyRabbitmqJanus
   # Define version to gem
-  VERSION = '1.2.9'
+  VERSION = '2.0.0'
 
   # Name to gem
   GEM_NAME = 'ruby_rabbitmq_janus'

data/lib/rrj/init.rb

@@ -36,196 +36,64 @@ module RubyRabbitmqJanus
     #   @rrj = RubyRabbitmqJanus::RRJ.new
     #   => #<RubyRabbitmqJanus::RRJ:0x007 @session=123>
     def initialize
-      Tools::Log.instance
-      Tools::Config.instance
-      Tools::Requests.instance
-
-      # Create an session while time opening
-      @session = Janus::Concurrencies::Keepalive.instance.session
+      @option = Tools::Option.new
+      @session = @option.keepalive
       Tools::Log.instance.info "Create an session janus with id : #{@session}"
     rescue => error
       raise Errors::InstanciateGemFailed, error
     end
 
-    # Send an simple message to janus.
-    #
-    # @param [String] type
-    #   Given a type to request. JSON request writing in 'config/requests/'
-    # @param [Bollean] exclusive
-    #   Use an exclusive queue or not
-    # @param [Hash] options Options update in request
-    #
-    # @example Sending an message info in queue 'to-janus'
-    #   RubyRabbitmqJanus::RRJ.new.message_simple('base::info', true)
-    #   #=> {}
-    # @example Sending an message info in queue exclusive 'ampq.gen-xxxxx'
-    #   RubyRabbitmqJanus::RRJ.new.message_simple('base::info')
-    #   #=> {"janus":"server_info","name":"Janus WebRTC Gateway" ... }
-    #
-    # @return [RubyRabbitmqJanus::Janus::Responses::Standard]
-    #   Give an object response to janus server
-    #
-    # @since 1.0.0
-    def message_simple(type = 'base::info', exclusive = false,
-                       options = { 'replace' => {}, 'add' => {} })
-      Janus::Transactions::Session.new(@session).connect(exclusive) do
-        Janus::Messages::Standard.new(type, options)
-      end
-    rescue => error
-      raise Errors::TransactionSessionFailed, error
-    end
-
-    # Send an message simple in current session.
-    #
-    # @param [String] type
-    #   Given a type to request. JSON request writing in 'config/requests/'
-    # @param [Hash] options Options update in request
-    # @param [Bollean] exclusive
-    #   Use an exclusive queue or not
-    #
-    # @example Sending an message create
-    #   RubyRabbitmqJanus::RRJ.new.message_session('base::create')
-    #   #=> {"janus":"server_info","name":"Janus WebRTC Gateway" ... }
-    #
-    # @return [RubyRabbitmqJanus::Janus::Responses::Standard]
-    #   Give an object response to janus server
-    #
-    # @since 1.0.0
-    def message_session(type, options = { 'replace' => {}, 'add' => {} },
-                        exclusive = true)
-      Janus::Transactions::Session.new(@session).connect(exclusive) do
-        Janus::Messages::Standard.new(type, use_current_session?(options))
-      end
-    rescue => error
-      raise Errors::TransactionSessionFailed, error
-    end
-
-    # Send a message simple for admin Janus.
-    # **Is used just for sending a message to Janus Monitor/Admin API**. The
-    # queue is exclusive for not transmitting data to anyone.
+    # Start a transaction with Janus. Request use session_id information.
     #
-    # @param [String] type
-    #   Given a type to request. JSON request writing in `config/requests/`
-    # @param [Hash] options Fields updating in request sending to janus.
-    #   **This hash must imperatively contains the key `replace`**
-    # @option options [Hash] :replace Contains all fields who be replaced in
-    #   request sending to janus.
-    # @option options [Hash] :add Contains all fields adding to request.
+    # @param [Boolean] exclusive Choose if message is storage in exclusive queue
+    # @param [Hash] options
+    #   Give a session number for use another session in Janus
     #
-    # @example Sending an message create
-    #   RubyRabbitmqJanus::RRJ.new.message_admin('admin::sessions')
-    #   #=> {"janus":"success","sessions": [12345, 8786567465465, ...] }
-    #
-    # @return [RubyRabbitmqJanus::Janus::Responses::Standard]
-    #   Give an object response to janus server
+    # @example Get Janus information
+    #   @rrj.start_transaction do |transaction|
+    #     response = transaction.publish_message('base::info').to_hash
+    #   end
     #
-    # @since 1.0.0
-    def message_admin(type, options = { 'replace' => {}, 'add' => {} })
-      Janus::Transactions::Admin.new(@session,
-                                     true,
-                                     handle?(options)).connect do
-                                       Janus::Messages::Admin.new(type, options)
-                                     end
-    rescue => error
-      raise Errors::TransactionAdminFailed, error
+    # @since 2.0.0
+    def start_transaction(exclusive = true, options = {})
+      session = @option.use_current_session?(options)
+      transaction = Janus::Transactions::Session.new(exclusive, session)
+      transaction.connect { yield(transaction) }
     end
 
-    # Send an message in handle session in current session.
-    #
-    # @param [String] type
-    #   Given a type to request. JSON request writing in 'config/requests/'
-    # @param [Hash] options Fields updating in request sending to janus.
-    #   **This hash must imperatively contains the key `replace`**
-    # @option options [Hash] :replace Contains all fields who be replaced in
-    #   request sending to janus.
-    # @option options [Hash] :add Contains all fields adding to request.
+    # Start a transaction with Janus. Request used session_id/handle_id
+    # information.
     #
-    # @example Sending an message create
-    #   RubyRabbitmqJanus::RRJ.new.message_session('base::create')
-    #   #=> {"janus":"server_info","name":"Janus WebRTC Gateway" ... }
+    # @param [Boolean] exclusive Choose if message is storage in exclusive queue
+    # @param [Hash] options
+    #   Give a session number for use another session in Janus
     #
-    # @return [RubyRabbitmqJanus::Janus::Responses::Standard]
-    #   Give a object response to janus server
+    # @note Use transaction.detach for closing handle in Janus
     #
-    # @since 1.0.0
-    def message_handle(type, transaction,
-                       options = { 'replace' => {}, 'add' => {} })
-      transaction.publish_message_handle(type, options)
-    rescue => error
-      raise Errors::TransactionMessageFailed, error
-    end
-
-    # Define an handle transaction and establish connection with janus
-    #
-    # @param [Bollean] exclusive
-    #   Use an exclusive queue or not
-    #
-    # @yield Sending requests to Janus.
+    # @example Send request trickles for exclusive queue
+    #   @cde = { 'sdpMid' => '...', sdpMLineIndex => 0, 'candidate' => '...' }
+    #   @rrj.start_transaction_handle do |transaction|
+    #     transaction.publish_message('base::trickle', @cde)
+    #   end
     #
-    # @example Start a transaction with janus with a exclusive queue
-    #   @rrj.start_handle(true) do |transaction|
-    #     @rrj.message_handle('peer:trickle', transaction)
+    # @example Send request trickles for non exclusive queue
+    #   @cde = { 'sdpMid' => '...', sdpMLineIndex => 0, 'candidate' => '...' }
+    #   @rrj.start_transaction_handle(false) do |transaction|
+    #     transaction.publish_message('base::trickle', @cde)
     #   end
     #
-    # @see #message_handle
+    # @return [Fixnum] Handle used for transaction
     #
-    # @since 1.0.0
-    def start_handle(exclusive = false)
-      transaction = Janus::Transactions::Handle.new(@session, exclusive)
+    # @since 2.0.0
+    def start_transaction_handle(exclusive = true, options = {})
+      session = @option.use_current_session?(options)
+      handle = @option.use_current_handle?(options)
+      transaction = Janus::Transactions::Handle.new(exclusive, session, handle)
       transaction.connect { yield(transaction) }
-    rescue => error
-      raise Errors::TransactionHandleFailed, error
-    end
-
-    # Start an short transaction. Create an handle and send one message to
-    # queue. **This queue is not exclusive**, so this message is sending in
-    # queue 'to-janus' and a response is return in queue 'from-janus'.
-    #
-    # @param [String] type
-    #   Given a type to request. JSON request writing in 'config/requests/'
-    # @param [Hash] options Fields updating in request sending to janus.
-    #   **This hash must imperatively contains the key `replace`**
-    # @option options [Hash] :replace Contains all fields who be replaced in
-    #   request sending to janus.
-    # @option options [Hash] :add Contains all fields adding to request.
-    #
-    # @example Send an request trickle
-    #   cdn = {
-    #     'candidate' => {
-    #       'sdpMid' => 'video',
-    #       'sdpMLineIndex' => 1,
-    #       'candidate' => '...'
-    #     }
-    #   }
-    #   RubyRabbitmqJanus::RRJ.new.handle_message_simple('peer::trickle', cdn)
-    #   #=> { 'janus' => 'trickle', ..., 'candidate' => { ... } }
-    #
-    # @since 1.0.0
-    def handle_message_simple(type, options = { 'replace' => {}, 'add' => {} })
-      transaction = Janus::Transactions::Handle.new(session?(options),
-                                                    false, handle?(options))
-      transaction.connect { message_handle(type, transaction, options) }
-    rescue => error
-      raise Errors::TransactionHandleFailed, error
     end
 
     private
 
-    def use_current_session?(option)
-      { 'session_id' => @session } unless option.key?('session_id')
-    end
-
-    def session?(options)
-      return_value(options, 'session_id', @session)
-    end
-
-    def handle?(options)
-      return_value(options, 'handle_id', 0)
-    end
-
-    def return_value(opt, key, value)
-      replace = opt['replace']
-      replace.key?(key) ? replace[key] : value
-    end
+    attr_reader :option
   end
 end