ruby_rabbitmq_janus 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb6b179f8eb2d1d0f17269da3861f0d128100a3e
-  data.tar.gz: e4dae7a3f07f17a4d92cf10b537830bc7e74b9a7
+  metadata.gz: 140c1b43d9ba2409e0b80b35e19d48f6a04fd56e
+  data.tar.gz: 808fbef0a6edb0cd92f5ed0b9f4abb134e8b899d
 SHA512:
-  metadata.gz: 95f5ed36b90f240b1c42b36785826795a501a4d7f4c7b57a342dcb55007d1a795d5102efdcd35c49df5571d1188ae12d3c0b7409fa8ee51a7e73dc79b0131e20
-  data.tar.gz: 7e352cabebf3d24213768e49466588205c7557d95c6be73e9e31089aa8c73a8331dda52cc2682f2502a7e18bdd01e9be97dff60399e6121e6f3b13f8f2dcabb8
+  metadata.gz: 4ac7f253fd46569ddc326b40e5e2e47b6aef05986be23a6b0016d2016f3d49e317d40507ffcadaaa11bd4a690d57c3cf457374fec7f9287766cb5e0e036cd76b
+  data.tar.gz: b312ac04662450523558cf049e9bb8dec3ce659422824ac4b1b3cac164f2ae5fe08da472721d04df0b9451e9b09ad8ec9f4c1ab8c393665e0942b19eb619760d

data/lib/rrj/info.rb

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

data/lib/rrj/init.rb

@@ -25,19 +25,9 @@ module RubyRabbitmqJanus
       start_instances_tools
 
       # Create an session while time opening
-      @session = Janus::Keepalive.instance.session
+      @session = Janus::Concurrencies::Keepalive.instance.session
 
       @transaction = nil
-    rescue => error
-      raise Errors::RRJErrorInit, error
-    end
-
-    # Listen a standar queue and working if necesary
-    def listen(&block)
-      # Send a processus to background
-      # fork do
-      Janus::Event.instance.listen(&block)
-      # end
     end
 
     # Send an simple message to janus. No options in request with this method.
@@ -142,7 +132,6 @@ module RubyRabbitmqJanus
       Tools::Log.instance
       Tools::Config.instance
       Tools::Requests.instance
-      Janus::Event.instance
     end
 
     # Return a current session if not specified

data/lib/rrj/janus/janus.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'rrj/janus/threads/thread'
+require 'rrj/janus/processus/concurrency'
 require 'rrj/janus/message'
 require 'rrj/janus/admin'
 require 'rrj/janus/response'

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module RubyRabbitmqJanus
+  module Janus
+    # Modules for create autonomous processus
+    module Concurrencies
+      # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+      # Abstract class for janus Event and Keepalive
+      class Concurrency
+        # Initialize class with elements for thread communication
+        def initialize
+          Tools::Log.instance.info "Create an thread -- #{self.class.name}"
+          @rabbit = Rabbit::Connect.new
+          @lock = Mutex.new
+          @condition = ConditionVariable.new
+          @thread = Thread.new { initialize_thread }
+          @thread.abort_on_exception = true
+        end
+
+        private
+
+        # Initialize a thread
+        def initialize_thread
+          rabbit.transaction_long { transaction_running }
+        rescue Interrupt
+          Tools::Log.instance.info "Stop transaction #{self.class.name}"
+          rabbit.close
+        end
+
+        # Wait an signal
+        def wait
+          @lock.synchronize do
+            @condition.wait(@lock)
+            Tools::Log.instance.info 'Waitting signal'
+            yield
+          end
+        end
+
+        # Send and signal
+        def signal
+          @lock.synchronize do
+            Tools::Log.instance.info 'Sending signal'
+            @condition.signal
+          end
+        end
+
+        attr_accessor :rabbit, :publish
+      end
+    end
+  end
+end
+
+require 'rrj/janus/processus/keepalive'
+require 'rrj/janus/processus/event'

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module RubyRabbitmqJanus
+  # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+  module Janus
+    module Concurrencies
+      # For listen standard queue ("from-janus" by default)
+      class Event < Concurrency
+        include Singleton
+
+        # Initialize Event object. Is used for listen an standard out queue to Janus
+        def initialize
+          @publish = @response = nil
+          super
+        end
+
+        # Start listen queue and work with each message reading
+        def listen(&block)
+          wait do
+            Tools::Log.instance.info 'Action !!!'.red
+            @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
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module RubyRabbitmqJanus
+  module Janus
+    module Concurrencies
+      # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+      # Manage sending keepalive message
+      class Keepalive < Concurrency
+        include Singleton
+
+        # Initalize a keepalive message
+        def initialize
+          @publish = @response = nil
+          super
+        end
+
+        # Return an number session created
+        def session
+          wait { @response.session }
+        end
+
+        private
+
+        # Star an session with janus and waiting an signal for saving session_id
+        def transaction_running
+          @response = Janus::Response.new(create_session)
+          signal
+          session_keepalive(ttl)
+        end
+
+        # Create an loop for sending a keepalive message
+        def session_keepalive(time_to_live)
+          loop do
+            sleep time_to_live
+            @publish.send_a_message(Janus::Message.new('base::keepalive',
+                                                       'session_id' => running_session))
+          end
+        rescue => message
+          Tools::Log.instance.debug "Error keepalive : #{message}"
+        end
+
+        # Define a Time To Live between each request sending to janus
+        def ttl
+          Tools::Config.instance.options['gem']['session']['keepalive'].to_i
+        rescue => error
+          Tools::Log.instance.debug "TTL Not loading - #{error}"
+        end
+
+        # Create an message and publish for create session in Janus
+        def create_session
+          @publish = Rabbit::Publisher::PublishExclusive.new(rabbit.channel, '')
+          @publish.send_a_message(Janus::Message.new('base::create'))
+        end
+
+        # Return session_id
+        def running_session
+          @response.session
+        end
+      end
+    end
+  end
+end

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

@@ -26,9 +26,8 @@ module RubyRabbitmqJanus
 
         # Execute an action for each response received in queue
         def event_received
-          Tools::Log.instance.debug 'Response received'
-          lock.synchronize do
-            condition.wait(lock)
+          loop do
+            return_response
             yield @response.event, @response.data, @response.jsep
           end
         end
@@ -40,7 +39,7 @@ module RubyRabbitmqJanus
           @response = Janus::Response.new(JSON.parse(payload))
           Tools::Log.instance.info \
             "[X] Message number reading : #{@count} --\n\r" \
-            "type : #{@response}"
+            "#{@response.to_hash}"
           @count += 1
           lock.synchronize { condition.signal }
         end

data/listen.rb

@@ -0,0 +1,55 @@
+#!/usr/bin/env ruby
+
+# :reek:NilCheck and :reek:TooManyStatements
+
+require 'ruby_rabbitmq_janus'
+
+@t = RubyRabbitmqJanus::RRJ.new
+
+def case_event(data, jsep)
+  puts "Event : #{data.class} -- #{data}"
+  case data['videocontrol']
+  when 'joined'
+    puts 'Joined request ...'
+    @t.handle_message_simple('channel::offer', jsep)
+  when 'selected' then puts 'Selected request ...'
+  when 'unselected' then puts 'Unselected request ...'
+  when 'left' then puts 'Left request ...'
+  end
+  update_jsep(jsep) unless jsep.nil?
+end
+
+def update_jsep(jsep)
+  puts "JSEP : #{jsep}"
+end
+
+def case_hangup
+  puts 'Hangup'
+  Thread.stop
+end
+
+def case_stop
+  puts 'Stop'
+  Thread.stop
+end
+
+def case_error
+  puts 'Error ...'
+end
+
+puts "## Start listen Block"
+RubyRabbitmqJanus::Janus::Concurrencies::Event.instance.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}"
+  end
+end
+puts "## End listen block"
+
+#puts "apps running"
+#loop do
+#end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -343,10 +343,10 @@ files:
 - lib/rrj/janus/admin.rb
 - lib/rrj/janus/janus.rb
 - lib/rrj/janus/message.rb
+- lib/rrj/janus/processus/concurrency.rb
+- lib/rrj/janus/processus/event.rb
+- lib/rrj/janus/processus/keepalive.rb
 - lib/rrj/janus/response.rb
-- lib/rrj/janus/threads/event.rb
-- lib/rrj/janus/threads/keepalive.rb
-- lib/rrj/janus/threads/thread.rb
 - lib/rrj/janus/transactions/admin.rb
 - lib/rrj/janus/transactions/handle.rb
 - lib/rrj/janus/transactions/session.rb
@@ -368,6 +368,7 @@ files:
 - lib/rrj/tools/requests.rb
 - lib/rrj/tools/tools.rb
 - lib/ruby_rabbitmq_janus.rb
+- listen.rb
 - rrj.gemspec
 homepage: https://github.com/dazzl-tv/ruby-rabbitmq-janus
 licenses:

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

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-module RubyRabbitmqJanus
-  # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
-  module Janus
-    # For listen standard queue ("from-janus" by default)
-    class Event < Concurrency
-      include Singleton
-
-      # Initialize Event object. Is used for listen an standard out queue to Janus
-      def initialize
-        Tools::Log.instance.debug 'Start listen events in from-janus queue'
-        @publish = @response = nil
-        super
-        start_thread
-      end
-
-      # Start listen queue and work with each message reading
-      def listen(&block)
-        loop { @publish.event_received(&block) }
-      end
-
-      private
-
-      # Intialize an listen to queue
-      def initialize_thread
-        start_transaction
-      rescue Interrupt
-        Tools::Log.instance.info 'Stop to listen standard queue'
-        rabbit.close
-      end
-
-      # Start a transaction with Rabbit an Janus
-      def start_transaction
-        rabbit.transaction_long do
-          @publish = Rabbit::Publisher::Listener.new(rabbit)
-          @publish.listen_events
-        end
-      end
-    end
-  end
-end

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

@@ -1,70 +0,0 @@
-# frozen_string_literal: true
-
-module RubyRabbitmqJanus
-  module Janus
-    # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
-    # Manage sending keepalive message
-    class Keepalive < Concurrency
-      include Singleton
-
-      # Initalize a keepalive message
-      def initialize
-        Tools::Log.instance.debug 'Create an session for keepalive'
-        @publish = @response = nil
-        super
-        start_thread
-      end
-
-      # Return an number session created
-      def session
-        wait { @response.session }
-      end
-
-      private
-
-      # Initialize an session with janus and start a keepalive transaction
-      def initialize_thread
-        rabbit.transaction_long { transaction_keepalive }
-      rescue Interrupt
-        Tools::Log.instance.info 'Stop to sending keepalive'
-        rabbit.close
-      end
-
-      # Star an session with janus and waiting an signal for saving session_id
-      def transaction_keepalive
-        @response = Janus::Response.new(create_session)
-        signal
-        session_keepalive(ttl)
-      end
-
-      # Create an loop for sending a keepalive message
-      def session_keepalive(time_to_live)
-        loop do
-          sleep time_to_live
-          @publish.send_a_message(Janus::Message.new('base::keepalive',
-                                                     'session_id' => running_session))
-        end
-      rescue => message
-        Tools::Log.instance.debug "Error keepalive : #{message}"
-      end
-
-      # Define a Time To Live between each request sending to janus
-      def ttl
-        Tools::Config.instance.options['gem']['session']['keepalive'].to_i
-      rescue => error
-        Tools::Log.instance.debug "TTL Not loading - #{error}"
-      end
-
-      # Create an message and publish for create session in Janus
-      def create_session
-        @publish = Rabbit::Publisher::PublishExclusive.new(rabbit.channel, '')
-        @publish.send_a_message(Janus::Message.new('base::create'))
-      end
-
-      # Return session_id
-      def running_session
-        @response.session
-      end
-    end
-  end
-end

data/lib/rrj/janus/threads/thread.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-module RubyRabbitmqJanus
-  module Janus
-    # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
-    # Abstract class for janus Event and Keepalive
-    class Concurrency
-      # Initialize class with elements for thread communication
-      def initialize
-        Tools::Log.instance.info 'Create an subprocess'
-        @rabbit = Rabbit::Connect.new
-        @lock = Mutex.new
-        @condition = ConditionVariable.new
-      end
-
-      private
-
-      # Start a new thread
-      def start_thread
-        Thread.new { initialize_thread }
-        # pid = fork { initialize_thread }
-        # Tools::Log.instance.info "Process IDentifier : #{pid}"
-        # initialize_thread
-      end
-
-      # Wait an signal
-      def wait
-        @lock.synchronize do
-          @condition.wait(@lock)
-          yield
-        end
-      end
-
-      # Send and signal
-      def signal
-        @lock.synchronize { @condition.signal }
-      end
-
-      attr_accessor :rabbit, :publish
-    end
-  end
-end
-
-require 'rrj/janus/threads/keepalive'
-require 'rrj/janus/threads/event'