ruby_rabbitmq_janus 2.0.0.pre.101 → 2.0.0.pre.106

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4326ea9f67228a15eab4bbdeafa7cfafdcdd8824
-  data.tar.gz: c261394d14f1f74fa6c1e4e4800d3dd70dfe5d92
+  metadata.gz: 0cffbdeffff5f2b89552255ef1b160e416c6ca0f
+  data.tar.gz: d55adf89593d268bad4253c82a0c5fb3cfaa56a0
 SHA512:
-  metadata.gz: bbb4cd2a3dccbb4c454133d3d5164eccf68e99de5b04c0012734a1a7006a47d31f9a7d0f90dcbfa0cf2319d57766f59850a23d5f162cb96c58779c4c4fe78b11
-  data.tar.gz: 25f95b83cb62ae07afe2d39b704c8f3d32dbdde57c27d760ccf43d60a91907cf83678dfc41647c8a5f7693e8771b13668a72035e5851a594324e74215590d301
+  metadata.gz: 5244dfe48d06b33c1f5f712e3f41418e1e2e7b025f5ca7e19f134f5af3459e42eca201aad512ff607bb987a11d402eae9973cd9116a21c63e4a04147b4e493d6
+  data.tar.gz: 2b43484d9818339b2aad0a0cdf8568466272aca213d69870079ce194eecafc0f07ac84a231f04024599b13739cae7dd1986546efc5dbfbe712e5953ccbc298d8

data/lib/generators/ruby_rabbitmq_janus/initializer_generator.rb

@@ -6,25 +6,25 @@ module RubyRabbitmqJanus
     class InitializerGenerator < Rails::Generators::Base
       desc 'Generate a initializer to this gem for rails application.'
       INITIALIZER = <<-INIT
-# frozen_string_literal: true
+  # frozen_string_literal: true
 
-require 'actions'
+  require 'actions'
 
-# Initialize a gem and create an session with a keepalive
-::RRJ = RubyRabbitmqJanus::RRJ.new
+  # Initialize a gem and create an session with a keepalive
+  ::RRJ = RubyRabbitmqJanus::RRJ.new
 
-# For admin management
-# ::RRJ = RubyRabbitmqJanus::RRJAdmin.new
+  # For admin management
+  # ::RRJ = RubyRabbitmqJanus::RRJAdmin.new
 
-# This test disable this gems execution when you running an task with rake
-unless File.basename($PROGRAM_NAME) == 'rake'
-  Rails.configuration.after_initialize do
-    # If you don't want listen a standard queue, comment this lines and
-    # "require 'actions'"
-    actions = RubyRabbitmqJanus::ActionEvents.new.actions
-    RubyRabbitmqJanus::Janus::Concurrencies::Event.instance.run(&actions)
+  # This test disable this gems execution when you running an task with rake
+  unless File.basename($PROGRAM_NAME) == 'rake'
+    Rails.configuration.after_initialize do
+      # If you don't want listen a standard queue, comment this lines and
+      # "require 'actions'"
+      actions = RubyRabbitmqJanus::ActionEvents.new.actions
+      RubyRabbitmqJanus::Janus::Concurrencies::Event.instance.run(&actions)
+    end
   end
-end
         INIT
 
       # Create an initializer

data/lib/generators/ruby_rabbitmq_janus/install_generator.rb

@@ -6,30 +6,30 @@ module RubyRabbitmqJanus
     class InstallGenerator < Rails::Generators::Base
       desc 'Install RubyRabbitmqJanus in your Rails application'
       ACTION_CLASS = <<-BASE
-module RubyRabbitmqJanus
-  # Execute this code when janus return an events in standard queue
-  class ActionsEvents
-    # Default method using for sending a block of code
-    def actions
-      lambda do |reason, data|
-        Rails.logger.debug "Execute block code with reason : \#{reason}"
-        case reason
-        when event this case_events(data.to_hash)
+  module RubyRabbitmqJanus
+    # Execute this code when janus return an events in standard queue
+    class ActionsEvents
+      # Default method using for sending a block of code
+      def actions
+        lambda do |reason, data|
+          Rails.logger.debug "Execute block code with reason : \#{reason}"
+          case reason
+          when event this case_events(data.to_hash)
+          end
         end
       end
-    end
 
-    private
+      private
 
-    def case_events(data)
-      Rails.logger.debug "Event : \#{data}"
+      def case_events(data)
+        Rails.logger.debug "Event : \#{data}"
+      end
     end
   end
-end
       BASE
       APPLICATION = <<-AUTOLOAD
-# Load RubyRabbitmqJanus actions events code blocks
-config.autoload_paths += Dir[Rails.root.join('app', 'ruby_rabbitmq_janus')]
+  # Load RubyRabbitmqJanus actions events code blocks
+  config.autoload_paths += Dir[Rails.root.join('app', 'ruby_rabbitmq_janus')]
       AUTOLOAD
 
       # Generate initializer with default code

data/lib/rrj/errors/init.rb

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

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

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

data/lib/rrj/info.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # :reek:TooManyConstants
 
 # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
@@ -24,11 +25,11 @@ module RubyRabbitmqJanus
 
   # Define a long description to gem
   DESCRIPTION = <<-DESC
-This gem is used to communicate to a server Janus through RabbitMQ software
-(Message-oriented middleware). It waiting a messages to Rails API who send to
-RabbitMQ server in a queue for janus server. Janus processes a message and send
-to RabbitMQ server in a queue for gem. Once the received message is decoded and
-returned through the Rails API.
+  This gem is used to communicate to a server Janus through RabbitMQ software
+  (Message-oriented middleware). It waiting a messages to Rails API who send to
+  RabbitMQ server in a queue for janus server. Janus processes a message and
+  send to RabbitMQ server in a queue for gem. Once the received message is
+  decoded and returned through the Rails API.
     DESC
 
   # Define homepage

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'semaphore'
+
 module RubyRabbitmqJanus
   module Rabbit
     # Define an module for create an publisher
@@ -15,26 +17,27 @@ module RubyRabbitmqJanus
       #
       # @abstract Publish message in RabbitMQ
       class BasePublisher
-        attr_reader :response
+        attr_reader :responses
 
         # Define a base publisher
         def initialize
           Tools::Log.instance.debug 'Create an publisher'
-          @response = nil
-          @condition = ConditionVariable.new
+          @responses = []
+          @semaphore = Semaphore.new
           @lock = Mutex.new
         end
 
         private
 
-        attr_accessor :condition, :lock
+        attr_accessor :semaphore, :lock
 
         def return_response
+          @semaphore.wait
+          response = nil
           @lock.synchronize do
-            Tools::Log.instance.debug 'Response received'
-            @condition.wait(@lock)
-            @response
+            response = @responses.shift
           end
+          response
         end
       end
     end

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

@@ -14,18 +14,19 @@ module RubyRabbitmqJanus
         # @param [String] rabbit Information connection to rabbitmq server
         def initialize(rabbit)
           super()
+          @responses = []
           @rabbit = rabbit.channel
-          @response = nil
           subscribe_queue
         end
 
         # Listen a queue and return a body response
         def listen_events
+          semaphore.wait
+          response = nil
           lock.synchronize do
-            condition.wait(lock)
-            Tools::Log.instance.info 'Janus event received .. treatment ..'
-            yield @response.event, @response
+            response = @responses.shift
           end
+          yield response.event, response
         end
 
         private
@@ -48,10 +49,19 @@ module RubyRabbitmqJanus
           { block: false, manual_ack: true, arguments: { 'x-priority': 2 } }
         end
 
+        # Counts transmitted messages
+        def log_message_id(propertie)
+          message_id = propertie.message_id
+          Tools::Log.instance.info "[X] Message reading with ID #{message_id}"
+        end
+
+        # Sending an signal when an response is reading in queue
         def synchronize_response(info, payload)
-          @response = Janus::Responses::Event.new(JSON.parse(payload))
+          lock.synchronize do
+            @responses.push(Janus::Responses::Event.new(JSON.parse(payload)))
+          end
           @rabbit.acknowledge(info.delivery_tag, false)
-          lock.synchronize { condition.signal }
+          semaphore.signal
         end
       end
     end

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

@@ -37,13 +37,31 @@ module RubyRabbitmqJanus
 
         def subscribe_to_queue
           reply.subscribe do |_delivery_info, propertie, payload|
-            if @message.correlation.eql?(propertie.correlation_id)
-              @response = JSON.parse payload
-              lock.synchronize { condition.signal }
+            propertie_correlation = p_correlation(propertie)
+            if m_correlation.eql?(propertie_correlation)
+              synchronize(payload)
+            else
+              Tools::Log.instance.error 'Response correlation ID mismatch (' \
+                "#{m_correlation}!=#{propertie_correlation})"
             end
           end
         end
 
+        def m_correlation
+          @message.correlation
+        end
+
+        def p_correlation(propertie)
+          propertie.correlation_id
+        end
+
+        def synchronize(payload)
+          lock.synchronize do
+            responses.push(JSON.parse(payload))
+          end
+          semaphore.signal
+        end
+
         attr_accessor :message
       end
     end

data/spec/request/peer/request_offer_spec.rb

@@ -6,19 +6,19 @@ describe 'RubyRabbitmqJanus::RRJ -- message type offer', broken: true do
   before(:example) do
     @type = 'peer::offer'
     @options = {
-      'sdp' => <<SDP
-v=0
-o=alice 2890844526 2890844526 IN IP4 host.atlanta.example.com
-s=
-c=IN IP4 host.atlanta.example.com
-t=0 0
-m=audio 49170 RTP/AVP 0 8 97
-a=rtpmap:0 PCMU/8000
-a=rtpmap:8 PCMA/8000
-a=rtpmap:97 iLBC/8000
-m=video 51372 RTP/AVP 31 32
-a=rtpmap:31 H261/90000
-a=rtpmap:32 MPV/90000
+      'sdp' => <<-SDP
+  v=0
+  o=alice 2890844526 2890844526 IN IP4 host.atlanta.example.com
+  s=
+  c=IN IP4 host.atlanta.example.com
+  t=0 0
+  m=audio 49170 RTP/AVP 0 8 97
+  a=rtpmap:0 PCMU/8000
+  a=rtpmap:8 PCMA/8000
+  a=rtpmap:97 iLBC/8000
+  m=video 51372 RTP/AVP 31 32
+  a=rtpmap:31 H261/90000
+  a=rtpmap:32 MPV/90000
 SDP
     }
   end

data/spec/rrj/rabbit/publish/base_publisher_spec.rb

@@ -8,7 +8,7 @@ describe RubyRabbitmqJanus::Rabbit::Publisher, type: :rabbit,
 
   describe 'BasePublisher' do
     describe '#new' do
-      it { expect(publish).to have_attributes(response: nil) }
+      it { expect(publish).to have_attributes(responses: []) }
     end
   end
 end

data/spec/support/examples_message.rb

@@ -4,8 +4,10 @@ shared_examples 'message is' do |type|
   it { expect(message).to be_kind_of(type) }
 end
 
+# rubocop:disable Style/MixinGrouping
 shared_examples 'message options keys is' do
   it do
     expect(message).to include(:routing_key, :correlation_id, :content_type)
   end
 end
+# rubocop:enable Style/MixinGrouping

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.101
+  version: 2.0.0.pre.106
 platform: ruby
 authors:
 - VAILLANT Jeremy
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: 0.48.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: 0.48.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -248,12 +248,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.2
-description: |
-  This gem is used to communicate to a server Janus through RabbitMQ software
-  (Message-oriented middleware). It waiting a messages to Rails API who send to
-  RabbitMQ server in a queue for janus server. Janus processes a message and send
-  to RabbitMQ server in a queue for gem. Once the received message is decoded and
-  returned through the Rails API.
+- !ruby/object:Gem::Dependency
+  name: semaphore
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+description: |2
+    This gem is used to communicate to a server Janus through RabbitMQ software
+    (Message-oriented middleware). It waiting a messages to Rails API who send to
+    RabbitMQ server in a queue for janus server. Janus processes a message and
+    send to RabbitMQ server in a queue for gem. Once the received message is
+    decoded and returned through the Rails API.
 email:
 - jeremy@dazzl.tv
 executables: []