ruby_rabbitmq_janus 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 140c1b43d9ba2409e0b80b35e19d48f6a04fd56e
-  data.tar.gz: 808fbef0a6edb0cd92f5ed0b9f4abb134e8b899d
+  metadata.gz: 315daf05da37138a7cbd49ee535669ade8fba813
+  data.tar.gz: 00bf29601cb4f70693875466db4a52f5aa488188
 SHA512:
-  metadata.gz: 4ac7f253fd46569ddc326b40e5e2e47b6aef05986be23a6b0016d2016f3d49e317d40507ffcadaaa11bd4a690d57c3cf457374fec7f9287766cb5e0e036cd76b
-  data.tar.gz: b312ac04662450523558cf049e9bb8dec3ce659422824ac4b1b3cac164f2ae5fe08da472721d04df0b9451e9b09ad8ec9f4c1ab8c393665e0942b19eb619760d
+  metadata.gz: 3d931cd33d7c2a7ceac9fb2ed395f188fc9fb7d41637462f02c3e5afffa2493e3cb431701c5036f26f25ac61b7beb1a83eedf47a561604be8b7c6e725a07af4f
+  data.tar.gz: 256f28e5db381ad148dc8c2ab7c8a8a558e97e6a60666b2775b0d865bc73e261caf66bc0d2776310dc3d8d4f3f5206fd30b4c4f57d08c2871b80e4e8d17aa70c

data/lib/generators/ruby_rabbitmq_janus/initializer_generator.rb

@@ -9,7 +9,9 @@ module RubyRabbitmqJanus
       # Create an initializer
       def copy_initializer
         initializer 'ruby_rabbitmq_janus.rb' do
-          "# frozen_string_literal: true\n\n::RRJ = RubyRabbitmqJanus::RRJ.new"
+          "# frozen_string_literal: true\n\n" \
+            "::RRJ = RubyRabbitmqJanus::RRJ.new\n"\
+            '::Events = RubyRabbitmqJanus::Janus::Concurrencies::Event.instance'
         end
       end
     end

data/lib/rrj/info.rb

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

data/lib/rrj/init.rb

@@ -93,7 +93,7 @@ module RubyRabbitmqJanus
 
     # Define an handle transaction and establish connection with janus
     def start_handle(exclusive = false)
-      @transaction ||= Janus::Transactions::Handle.new(@session)
+      @transaction = Janus::Transactions::Handle.new(@session)
       @transaction.handle_connect(exclusive) { yield }
     rescue => error
       raise Errors::RRJErrorHandle, error
@@ -101,7 +101,7 @@ module RubyRabbitmqJanus
 
     # Define an handle admin transaction and establish connection with janus
     def start_handle_admin
-      @transaction ||= Janus::Transactions::Admin.new(@session)
+      @transaction = Janus::Transactions::Admin.new(@session)
       @transaction.handle_connect { yield }
     rescue => error
       raise Errors::RRJErrorHandle, error
@@ -114,7 +114,7 @@ module RubyRabbitmqJanus
 
     # Start an short transaction, this queue is not exclusive
     def handle_message_simple(type, replace = {}, add = {})
-      @transaction ||= Janus::Transactions::Handle.new(@session)
+      @transaction = Janus::Transactions::Handle.new(@session)
       @transaction.handle_connect_and_stop(false) do
         message_handle(type, replace, add).for_plugin
       end

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

@@ -5,30 +5,45 @@ module RubyRabbitmqJanus
   module Janus
     module Concurrencies
       # For listen standard queue ("from-janus" by default)
-      class Event < Concurrency
+      # :reek:InstanceVariableAssumption and :reek:NilCheck
+      # :reek:TooManyInstanceVariables and :reek:TooManyStatements
+      class Event
         include Singleton
 
         # Initialize Event object. Is used for listen an standard out queue to Janus
         def initialize
           @publish = @response = nil
-          super
+          Tools::Log.instance.info "Create an thread -- #{self.class.name}"
+          @rabbit = Rabbit::Connect.new
+          @lock = Mutex.new
+          @condition = ConditionVariable.new
+          @thread_subscribe = Thread.new { initialize_thread }
         end
 
         # Start listen queue and work with each message reading
         def listen(&block)
-          wait do
-            Tools::Log.instance.info 'Action !!!'.red
+          @thread_subscribe.join
+          puts 'LISTEN !!'
+          @thread_listen = Thread.new do
+            puts 'LISTEN in thread !!'
+            Thread.pass
             @publish.event_received(&block)
           end
         end
 
         private
 
-        # Start a transaction with Rabbit an Janus
-        def transaction_running
-          @publish = Rabbit::Publisher::Listener.new(rabbit)
-          @response = @publish.listen_events
-          signal
+        # Initialize a thread
+        def initialize_thread
+          Thread.pass
+          @rabbit.transaction_long do
+            @publish = Rabbit::Publisher::Listener.new(@rabbit)
+            @response = @publish.listen_events
+            @thread_listen&.join # Call if not nil
+          end
+        rescue Interrupt
+          Tools::Log.instance.info "Stop transaction #{self.class.name}"
+          @rabbit.close
         end
       end
     end

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

@@ -38,7 +38,7 @@ module RubyRabbitmqJanus
 
         # Define queue used for admin message
         def choose_queue
-          @publish = Rabbit::PublisherPublishAdmin.new(rabbit.channel)
+          @publish = Rabbit::Publisher::PublisherAdmin.new(rabbit.channel)
         end
       end
     end

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

@@ -8,8 +8,8 @@ module RubyRabbitmqJanus
       class PublisherAdmin < Publisher
         # Intialize an queue non eclusive for admin/monitor API with Janus
         def initialize(exchange)
-          super(exchange)
           @reply = exchange.queue(queue_from)
+          super(exchange)
         end
 
         private

data/listen.rb

@@ -1,13 +1,14 @@
 #!/usr/bin/env ruby
-
-# :reek:NilCheck and :reek:TooManyStatements
+# frozen_string_literal: true
 
 require 'ruby_rabbitmq_janus'
 
 @t = RubyRabbitmqJanus::RRJ.new
+@events = RubyRabbitmqJanus::Janus::Concurrencies::Event.instance
 
+# :reek:NilCheck and :reek:TooManyStatements
 def case_event(data, jsep)
-  puts "Event : #{data.class} -- #{data}"
+  puts "REASON : Event : #{data.class} -- #{data}"
   case data['videocontrol']
   when 'joined'
     puts 'Joined request ...'
@@ -24,32 +25,32 @@ def update_jsep(jsep)
 end
 
 def case_hangup
-  puts 'Hangup'
-  Thread.stop
+  puts 'REASON : Hangup'
+  Thread.current.stop
 end
 
 def case_stop
-  puts 'Stop'
-  Thread.stop
+  puts 'REASON : Stop'
+  Thread.current.stop
 end
 
 def case_error
-  puts 'Error ...'
+  puts 'REASON : Error ...'
 end
 
-puts "## Start listen Block"
-RubyRabbitmqJanus::Janus::Concurrencies::Event.instance.listen do |reason, data, jsep|
+puts '## Start listen Block'
+@events.listen do |reason, data, jsep|
   case reason
   when 'event' then case_event(data, jsep)
   when 'hangup' then case_hangup
   when 'stop' then case_stop
   when 'error' then case_error
   else
-    puts "REASON default : #{reason}"
+    puts 'REASON default'
   end
 end
-puts "## End listen block"
+puts '## End listen block'
 
-#puts "apps running"
-#loop do
-#end
+puts 'apps running'
+loop do
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - VAILLANT Jeremy