ruby_rabbitmq_janus 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e84f3c116610870506f8213232cf882aa0aad776
-  data.tar.gz: a1110cd51f6224d547de7590b6c22dd37f9396e4
+  metadata.gz: b347623ca38c99dcc403e14e1d0508ddd931d225
+  data.tar.gz: cf5d65fb6489a305c7ba933eec933ffdff2faa21
 SHA512:
-  metadata.gz: b6ab1a091ae05441689f106b6f40981e9c2ee45e3123ef053dab9b5034c539b290cf04d51755bd70f472d818da4c3d62166b0ae44044d19a482359e6626ed63e
-  data.tar.gz: 617a00b0eeb0853caded62f4d65543c8a812b7077831aaf5b0ebf0c930075a0e58304dd666f924940f669e21258f444a24b052b948d035b9ea7bbb81a137a53c
+  metadata.gz: 8e72b12fba3edea0af23521c9cfcdbbc57de4589841cc8c5c34c15c70e91de314a8e9a9daa26098f71aecba014dd5950b5e01cecc20adf1aef77cee053d3cfc3
+  data.tar.gz: ecac69d94e67405f13dbe5329280b1a9cbf06fcf9271ad03ced2cc4e69511bb26eec58e20c9ed87161e1768133d33be005cb0eb53b189e785d68ae818cf1a640

data/.rspec

@@ -1,2 +1,2 @@
---format Fuubar
+--format documentation
 --color

data/lib/rrj/info.rb

@@ -3,7 +3,7 @@
 # Define constant to gem.
 module RubyRabbitmqJanus
   # Define version to gem
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 
   # Define a summary description to gem
   SUMMARY = 'Ruby RabbitMQ Janus'

data/lib/rrj/init.rb

@@ -35,7 +35,10 @@ module RubyRabbitmqJanus
     #   Given a type to request. JSON request writing in 'config/requests/'
     # @param [Bollean] exclusive
     #   Use an exclusive queue or not
-    # @example Sending an message info
+    # @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]
@@ -57,7 +60,7 @@ module RubyRabbitmqJanus
     #   #=> {"janus":"server_info","name":"Janus WebRTC Gateway" ... }
     # @return [RubyRabbitmqJanus::Janus::Responses::Standard]
     # Give an object response to janus server
-    def message_session(type, options = {}, exclusive = false)
+    def message_session(type, options = {}, exclusive = true)
       Janus::Transactions::Session.new(@session).session_connect(exclusive) do
         Janus::Messages::Standard.new(type, use_current_session?(options))
       end

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

@@ -12,7 +12,7 @@ module RubyRabbitmqJanus
         def initialize(response_janus)
           @request = response_janus
         rescue => error
-          Tools::Log.instance.debug "Request error : #{@request}"
+          Tools::Log.instance.debug "Request error [initialize] : #{@request}"
           raise Errors::JanusResponseInit, error
         else
           Tools::Log.instance.debug "Response return : #{to_json}"
@@ -23,7 +23,7 @@ module RubyRabbitmqJanus
           analysis
           @request.to_json
         rescue => error
-          Tools::Log.instance.debug "Request error : #{@request}"
+          Tools::Log.instance.debug "Request error [to_json] : #{@request}"
           raise Errors::JanusResponseJson, [error, @request]
         end
 
@@ -31,7 +31,7 @@ module RubyRabbitmqJanus
         def to_nice_json
           JSON.pretty_generate to_hash
         rescue => error
-          Tools::Log.instance.debug "Request error : #{@request}"
+          Tools::Log.instance.debug "Request error [to_nice_json] : #{@request}"
           raise Errors::JanusResponsePrettyJson, error
         end
 
@@ -40,7 +40,7 @@ module RubyRabbitmqJanus
           analysis
           @request
         rescue => error
-          Tools::Log.instance.debug "Request error : #{@request}"
+          Tools::Log.instance.debug "Request error [to_hash] : #{@request}"
           raise Errors::JanusResponseHash, [error, @request]
         end
 

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

@@ -25,20 +25,34 @@ module RubyRabbitmqJanus
 
         # Publish an message in handle
         def publish_message_handle(type, options = {})
-          opts = { 'session_id' => session, 'handle_id' => handle }
-          msg = Janus::MessageAdmin.new(type, opts.merge!(options))
-          Janus::Responses::Standard.new(publish.send_a_message(msg))
+          opts = {
+            'session_id' => session,
+            'handle_id' => handle,
+            'add' => {
+              'admin_secret' => Tools::Config.instance.options['rabbit']['admin_pass']
+            }
+          }
+          msg = Janus::Messages::Admin.new(type, opts.merge!(options))
+          send_a_message { msg }
         end
 
         # Stop an handle running
         def handle_running_stop
-          secret = Tools::Config.instance.options['rabbit']['admin_pass']
-          publish_message_handle('base::detach', admin_secret: secret)
+          publish_message_handle('base::detach')
         end
 
         # Define queue used for admin message
         def choose_queue
-          @publish = Rabbit::Publisher::PublisherAdmin.new(rabbit.channel)
+          chan = rabbit.channel
+          @publish = Rabbit::Publisher::PublisherAdmin.new(chan)
+        end
+
+        private
+
+        # Override method for publishing an message and reading a response
+        def send_a_message
+          Tools::Log.instance.info 'Publish a message ...'
+          Janus::Responses::Standard.new(publish.send_a_message(yield))
         end
       end
     end

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

@@ -6,8 +6,15 @@ module RubyRabbitmqJanus
       # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
       # This class work with janus and send a series of message
       class Handle < Session
+        # Inistialize transaction handle
+        def initialize(session)
+          super(session)
+          @exclusive = nil
+        end
+
         # Initialize connection to Rabbit and Janus
         def handle_connect(exclusive)
+          @exclusive = exclusive
           rabbit.transaction_long do
             choose_queue(exclusive)
             create_handle
@@ -18,6 +25,7 @@ module RubyRabbitmqJanus
         # Initialize connection to Rabbit and Janus and close after sending an received
         # a response
         def handle_connect_and_stop(exclusive)
+          @exclusive = exclusive
           rabbit.transaction_short do
             choose_queue(exclusive)
             create_handle
@@ -34,7 +42,29 @@ module RubyRabbitmqJanus
         def publish_message_handle(type, options = {})
           opts = { 'session_id' => session, 'handle_id' => handle }
           msg = Janus::Messages::Standard.new(type, opts.merge!(options))
-          Janus::Responses::Standard.new(publish.send_a_message(msg))
+          publisher = publish.send_a_message(msg)
+          Janus::Responses::Standard.new(read_response(publisher, @exclusive))
+        end
+
+        private
+
+        # Associate handle to transaction
+        def create_handle
+          Tools::Log.instance.info 'Create an handle'
+          msg = Janus::Messages::Standard.new('base::attach', 'session_id' => session)
+          @handle = send_a_message_exclusive { msg }
+        end
+
+        # Send a messaeg in exclusive queue
+        def send_a_message_exclusive
+          Janus::Responses::Standard.new(read_response_exclusive { yield }).sender
+        end
+
+        # Read an response in queue exclusive
+        def read_response_exclusive
+          chan = rabbit.channel
+          tmp_publish = Rabbit::Publisher::PublishExclusive.new(chan, '')
+          tmp_publish.send_a_message(yield)
         end
       end
     end

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

@@ -10,7 +10,7 @@ module RubyRabbitmqJanus
         def session_connect(exclusive)
           rabbit.transaction_short do
             choose_queue(exclusive)
-            send_a_message { yield }
+            send_a_message(exclusive) { yield }
           end
         end
       end

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

@@ -21,7 +21,7 @@ module RubyRabbitmqJanus
         def connect(exclusive)
           @rabbit.transaction_short do
             choose_queue(exclusive)
-            send_a_message { yield }
+            send_a_message(exclusive) { yield }
           end
         end
 
@@ -31,28 +31,36 @@ module RubyRabbitmqJanus
 
         # determine queue used
         # :reek:ControlParameter and :reek:BooleanParameter
-        def choose_queue(exclusive = false)
+        def choose_queue(exclusive)
           chan = @rabbit.channel
           @publish = if exclusive
-                       Tools::Log.instance.debug \
-                         'Choose an queue non Exclusive : to-janus'
-                       Rabbit::Publisher::PublishNonExclusive.new(chan)
-                     else
                        Tools::Log.instance.debug \
                          'Choose an queue Exclusive : ampq.gen-xxx'
                        Rabbit::Publisher::PublishExclusive.new(chan, '')
+                     else
+                       Tools::Log.instance.debug \
+                         'Choose an queue non Exclusive : to-janus'
+                       Rabbit::Publisher::PublishNonExclusive.new(chan)
                      end
         end
 
         # Send a message to queue
-        def send_a_message
-          Janus::Responses::Standard.new(@publish.send_a_message(yield))
+        def send_a_message(exclusive)
+          Tools::Log.instance.info 'Publish a message ...'
+          publish = @publish.send_a_message(yield)
+          Janus::Responses::Standard.new(read_response(publish, exclusive))
         end
 
-        # Associate handle to transaction
-        def create_handle
-          msg = Janus::Messages::Standard.new('base::attach', 'session_id' => @session)
-          @handle = send_a_message { msg }.sender
+        # Read a response if is a exclusive message
+        # :reek:ControlParameter
+        def read_response(publish, exclusive)
+          if exclusive
+            Tools::Log.instance.info '... and read a janus response'
+            publish
+          else
+            Tools::Log.instance.info '... and return an empty response'
+            {}
+          end
         end
       end
     end

data/lib/rrj/rabbit/publish/admin.rb

@@ -10,6 +10,12 @@ module RubyRabbitmqJanus
         def initialize(exchange)
           @reply = exchange.queue(queue_from)
           super(exchange)
+          subscribe_to_queue
+        end
+
+        def send_a_message(request)
+          super(request)
+          return_response
         end
 
         private

data/lib/rrj/rabbit/publish/base_publisher.rb

@@ -23,8 +23,8 @@ module RubyRabbitmqJanus
 
         # return an response when signal is trigger
         def return_response
-          Tools::Log.instance.debug 'Response received'
           @lock.synchronize do
+            Tools::Log.instance.debug 'Response received'
             @condition.wait(@lock)
             @response
           end

data/lib/rrj/rabbit/publish/exclusive.rb

@@ -9,7 +9,12 @@ module RubyRabbitmqJanus
         def initialize(exchange, name_queue)
           @reply = exchange.queue(name_queue, exclusive: true)
           super(exchange)
-          Tools::Log.instance.debug 'Create/Connect to queue exclusive'
+          subscribe_to_queue
+        end
+
+        def send_a_message(request)
+          super(request)
+          return_response
         end
 
         private

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

@@ -11,7 +11,10 @@ module RubyRabbitmqJanus
         def initialize(exchange)
           @reply = exchange.queue(queue_from)
           super(exchange)
-          Tools::Log.instance.debug 'Create/Connect to queue non exclusive'
+        end
+
+        def send_a_message(request)
+          super(request)
         end
 
         private

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

@@ -11,7 +11,7 @@ module RubyRabbitmqJanus
           super()
           @exchange = exchange.default_exchange
           @message = nil
-          subscribe_to_queue
+          Tools::Log.instance.info "Create/Connect to queue -- #{reply.name}"
         end
 
         # Publish an message in queue
@@ -20,7 +20,6 @@ module RubyRabbitmqJanus
           @message = request
           @exchange.publish(@message.to_json,
                             request.options.merge!(reply_to: queue_name))
-          return_response
         end
 
         private

data/lib/rrj/tools/replaces_admin.rb

@@ -11,6 +11,14 @@ module RubyRabbitmqJanus
       def replace_classic
         super
         replace_admins if request.key?('admin_secret')
+        add_secret if opts.key?('add')
+      end
+
+      # Add string secret for admin request
+      def add_secret
+        values = opts['add']
+        Tools::Log.instance.debug "Values add : #{values}"
+        request.merge!(values)
       end
 
       # Replace elements admins if present

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler