ruby_rabbitmq_janus 2.5.1 → 2.6.0.pre.226

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

@@ -11,12 +11,18 @@ module RubyRabbitmqJanus
   end
 end
 
+require 'rrj/errors/rabbit/base_event'
 require 'rrj/errors/rabbit/connect'
 require 'rrj/errors/rabbit/propertie'
 
-require 'rrj/errors/rabbit/publish/base_publisher'
-require 'rrj/errors/rabbit/publish/admin'
-require 'rrj/errors/rabbit/publish/exclusive'
-require 'rrj/errors/rabbit/publish/listener'
-require 'rrj/errors/rabbit/publish/non_exclusive'
-require 'rrj/errors/rabbit/publish/publisher'
+require 'rrj/errors/rabbit/listener/base'
+require 'rrj/errors/rabbit/listener/from'
+require 'rrj/errors/rabbit/listener/from_admin'
+require 'rrj/errors/rabbit/listener/janus_instance'
+
+require 'rrj/errors/rabbit/publisher/base'
+require 'rrj/errors/rabbit/publisher/admin'
+require 'rrj/errors/rabbit/publisher/exclusive'
+require 'rrj/errors/rabbit/publisher/janus_instance'
+require 'rrj/errors/rabbit/publisher/keepalive'
+require 'rrj/errors/rabbit/publisher/non_exclusive'

data/lib/rrj/info.rb

@@ -6,7 +6,7 @@
 # Define constant to gem.
 module RubyRabbitmqJanus
   # Define version to gem
-  VERSION = '2.5.1'
+  VERSION = '2.6.0'
 
   # Name to gem
   GEM_NAME = 'ruby_rabbitmq_janus'
@@ -35,11 +35,9 @@ module RubyRabbitmqJanus
   # Define homepage
   HOMEPAGE = 'https://github.com/dazzl-tv/ruby-rabbitmq-janus'
 
-  # Define a post install message
-  POST_INSTALL = \
+  # Banner dazzl
+  BANNER = \
     "# ====================================================== #\n" \
-    "# Thanks for installing RRJ !                            #\n" \
-    "# #{HOMEPAGE}.       #\n" \
     "# ;;;;;;;;;;;:.                                          #\n" \
     "# ;;;;;;;;;;;;;;;;;;                                     #\n" \
     "# ;;;;;;;;;;;:;;;;;;;;                                   #\n" \
@@ -54,4 +52,7 @@ module RubyRabbitmqJanus
     "# ;;;;;;;;;;;;;;;;;      AAAAA   ZZ      ZZ     LL       #\n" \
     "# ;;;;;;;;;;;;;,        A     A ZZZZZZZ ZZZZZZZ LLLLLLL  #\n" \
     '# ====================================================== #'
+
+  # Define a post install message
+  POST_INSTALL = "#{HOMEPAGE}\n#{BANNER}"
 end

data/lib/rrj/init.rb

@@ -39,8 +39,8 @@ module RubyRabbitmqJanus
     #   => #<RubyRabbitmqJanus::RRJ:0x007 @session=123>
     def initialize
       @option = Tools::Option.new
-    rescue => error
-      raise Errors::RRJ::InstanciateGem, error
+    rescue => exception
+      raise Errors::RRJ::InstanciateGem, exception
     end
 
     # Start a transaction with Janus. Request use session_id information.

data/lib/rrj/janus/messages/message.rb

@@ -54,7 +54,7 @@ module RubyRabbitmqJanus
         # Return request to json format
         #
         # @return [String] Request to JSON format
-        def to_json
+        def to_json(*_args)
           @request.to_json
         rescue
           raise Errors::Janus::Message::ToJson

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

@@ -44,7 +44,7 @@ module RubyRabbitmqJanus
         private
 
         def transaction_running
-          publisher = Rabbit::Publisher::Listener.new(rabbit)
+          publisher = Rabbit::Listener::From.new(rabbit)
           @thread.thread_variable_set(NAME_VAR, publisher)
         end
       end

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

@@ -125,7 +125,8 @@ module RubyRabbitmqJanus
               "Lookup Janus Instance model by session [#{@session}]"
             Models::JanusInstance.find_by_session(@session)
           end
-        rescue StandardError => e
+        rescue StandardError => exception
+          Tools::Log.debug exception
           Tools::Log.instance.warn \
             "find_model: rescuing from error #{e.message}"
           nil
@@ -137,7 +138,7 @@ module RubyRabbitmqJanus
         end
 
         def publisher
-          Rabbit::Publisher::PublishKeepalive.new(@rabbit.channel)
+          Rabbit::Publisher::Keepalive.new(@rabbit.channel)
         end
 
         def response_session

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'rrj/janus/responses/response'
+
+module RubyRabbitmqJanus
+  module Janus
+    module Responses
+      # Janus Instanece response.
+      class JanusInstance < Response
+        def event
+          'JanusInstance update'
+        end
+
+        def id
+          request['id']
+        end
+
+        def instance
+          JanusInstance.find(id)
+        end
+
+        def enable
+          request['enable']
+        end
+      end
+    end
+  end
+end

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

@@ -25,7 +25,7 @@ module RubyRabbitmqJanus
         # Return request to json format
         #
         # @return [String] Response to JSON format
-        def to_json
+        def to_json(*_args)
           @request.to_json
         rescue
           raise Errors::Janus::Response::ToJson

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

@@ -18,7 +18,7 @@ module RubyRabbitmqJanus
         # Begin connection with RabbitMQ
         def connect
           rabbit.transaction_short do
-            @publisher = Rabbit::Publisher::PublisherAdmin.new(rabbit.channel)
+            @publisher = Rabbit::Publisher::Admin.new(rabbit.channel)
             yield
           end
         rescue

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

@@ -88,7 +88,7 @@ module RubyRabbitmqJanus
 
         def read_response_exclusive
           chan = rabbit.channel
-          tmp_publish = Rabbit::Publisher::PublishExclusive.new(chan, '')
+          tmp_publish = Rabbit::Publisher::Exclusive.new(chan, '')
           tmp_publish.publish(yield)
         end
 

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

@@ -32,11 +32,11 @@ module RubyRabbitmqJanus
           @publisher = if @exclusive
                          Tools::Log.instance.debug \
                            'Choose an queue Exclusive : ampq.gen-xxx'
-                         Rabbit::Publisher::PublishExclusive.new(chan, '')
+                         Rabbit::Publisher::Exclusive.new(chan, '')
                        else
                          Tools::Log.instance.debug \
                            'Choose an queue non Exclusive : to-janus'
-                         Rabbit::Publisher::PublishNonExclusive.new(chan)
+                         Rabbit::Publisher::NonExclusive.new(chan)
                        end
         end
 

data/lib/rrj/models/concerns/janus_instance_callbacks.rb

@@ -34,14 +34,11 @@ module RubyRabbitmqJanus
       private
 
       def create_a_session_in_janus_instance
-        info_instance('Create session')
-        janus_instance = keepalive_object_new
-        set(session: janus_instance.session)
+        RubyRabbitmqJanus::Rabbit::Publisher::JanusInstance.new.publish(message)
       end
 
       def destroy_a_session_in_janus_instance
-        info_instance('Detaching session')
-        unset(%I[thread thread_adm session])
+        RubyRabbitmqJanus::Rabbit::Publisher::JanusInstance.new.publish(message)
       end
 
       def keepalive_object
@@ -59,6 +56,13 @@ module RubyRabbitmqJanus
       def info_instance(text)
         Tools::Log.instance.debug "#{text} in Janus Instance [##{instance}]"
       end
+
+      def message
+        {
+          id: id.to_s,
+          enable: enable
+        }
+      end
     end
   end
 end

data/lib/rrj/models/concerns/janus_instance_methods.rb

@@ -45,6 +45,18 @@ module RubyRabbitmqJanus
         end
       end
 
+      def create_keepalive
+        ::Log.info 'Create session'
+        janus_instance = keepalive_object_new
+        set(session: janus_instance.session, enable: true)
+      end
+
+      def stop_keepalive
+        ::Log.info 'Destroy session'
+        unset(%I[thread thread_adm session])
+        set(enable: false)
+      end
+
       private
 
       def search_initializer(options)

data/lib/rrj/rabbit/base_event.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'semaphore'
+
+module RubyRabbitmqJanus
+  module Rabbit
+    # Define an module for create an publisher
+    # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+
+    # # Parent class for all publisher
+    # This element send and read a message in rabbitmq Queue
+    #
+    # @!attribute [r] response
+    #   @return [RubyRabbitmqJanus::Janus::Responses::Response]
+    #     Given a Janus response
+    #
+    # @abstract Publish message in RabbitMQ
+    class BaseEvent
+      attr_reader :responses
+
+      # Define a base publisher
+      def initialize
+        @responses = []
+        @semaphore = Semaphore.new
+        @lock = Mutex.new
+      rescue
+        raise Errors::Rabbit::BaseEvent::Initialize
+      end
+
+      private
+
+      attr_accessor :semaphore, :lock
+
+      def return_response
+        @semaphore.wait
+        response = nil
+        @lock.synchronize do
+          response = @responses.shift
+        end
+        response
+      end
+    end
+  end
+end
+
+require 'rrj/rabbit/publisher/base'
+require 'rrj/rabbit/listener/base'

data/lib/rrj/rabbit/connect.rb

@@ -11,8 +11,8 @@ module RubyRabbitmqJanus
       # Initialize connection to server RabbitMQ
       def initialize
         @rabbit = Bunny.new(read_options_server.merge!(option_log_rabbit))
-      rescue => error
-        raise Errors::Rabbit::Connect::Initialize, error
+      rescue => exception
+        raise Errors::Rabbit::Connect::Initialize, exception
       end
 
       # Create an transaction with rabbitmq and close after response is received
@@ -20,37 +20,37 @@ module RubyRabbitmqJanus
         response = transaction_long { yield }
         close
         response
-      rescue => error
-        raise Errors::Rabbit::Connect::TransactionShort, error
+      rescue => exception
+        raise Errors::Rabbit::Connect::TransactionShort, exception
       end
 
       # Create an transaction with rabbitmq and not close
       def transaction_long
         start
         yield
-      rescue => error
-        raise Errors::Rabbit::Connect::TransactionLong, error
+      rescue => exception
+        raise Errors::Rabbit::Connect::TransactionLong, exception
       end
 
       # Openning a connection with Rabbitmq
       def start
         @rabbit.start
-      rescue => error
-        raise Errors::Rabbit::Connect::Start, error
+      rescue => exception
+        raise Errors::Rabbit::Connect::Start, exception
       end
 
       # Close connection to server RabbitMQ
       def close
         @rabbit.close
-      rescue => error
-        raise Errors::Rabbit::Connect::Close, error
+      rescue => exception
+        raise Errors::Rabbit::Connect::Close, exception
       end
 
       # Create an channel
       def channel
         @rabbit.create_channel
-      rescue => error
-        raise Errors::Rabbit::Connect::Channel, error
+      rescue => exception
+        raise Errors::Rabbit::Connect::Channel, exception
       end
 
       private

data/lib/rrj/rabbit/{publish/listener.rb → listener/base.rb}

@@ -4,13 +4,9 @@
 
 module RubyRabbitmqJanus
   module Rabbit
-    module Publisher
-      # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
-      #
-      # This publisher don't post message. Is listen just an standard queue to
-      # Janus. By default is "from-janus". It's a parameter in config to this
-      # gem.
-      class Listener < BasePublisher
+    module Listener
+      # Base for listeners
+      class Base < RubyRabbitmqJanus::Rabbit::BaseEvent
         # Define an publisher
         #
         # @param [String] rabbit Information connection to rabbitmq server
@@ -31,22 +27,13 @@ module RubyRabbitmqJanus
             response = @responses.shift
           end
           yield response.event, response
-        rescue
+        rescue => exception
+          p exception
           raise Errors::Rabbit::Listener::ListenEvents
         end
 
         private
 
-        def subscribe_queue
-          reply = @rabbit.queue(Tools::Config.instance.queue_from)
-          @rabbit.prefetch(1)
-          reply.bind(binding).subscribe(opts_subs) do |info, prop, payload|
-            Tools::Log.instance.info \
-              "[X] Message reading ##{prop['correlation_id']}"
-            synchronize_response(info, payload)
-          end
-        end
-
         def binding
           @rabbit.direct('amq.direct')
         end
@@ -69,7 +56,18 @@ module RubyRabbitmqJanus
           @rabbit.acknowledge(info.delivery_tag, false)
           semaphore.signal
         end
+
+        def info_subscribe(info, prop, payload)
+          Tools::Log.instance.debug info
+          Tools::Log.instance.info \
+            "[X] Message reading ##{prop['correlation_id']}"
+          Tools::Log.instance.debug payload
+        end
       end
     end
   end
 end
+
+require 'rrj/rabbit/listener/from'
+require 'rrj/rabbit/listener/from_admin'
+require 'rrj/rabbit/listener/janus_instance'

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+# :reek:TooManyStatements
+
+module RubyRabbitmqJanus
+  module Rabbit
+    module Listener
+      # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+      #
+      # This publisher don't post message. Is listen just an standard queue to
+      # Janus. By default is "from-janus". It's a parameter in config to this
+      # gem.
+      class From < Base
+        private
+
+        def subscribe_queue
+          reply = @rabbit.queue(Tools::Config.instance.queue_from)
+          @rabbit.prefetch(1)
+          reply.bind(binding).subscribe(opts_subs) do |info, prop, payload|
+            info_subscribe(info, prop, payload)
+            synchronize_response(info, payload)
+          end
+        rescue => exception
+          raise RubyRabbitmqJanus::Errors::Rabbit::Listener::From::ListenEvents,
+                exception
+        end
+      end
+    end
+  end
+end

data/lib/rrj/rabbit/{publish/listener_admin.rb → listener/from_admin.rb}

@@ -4,19 +4,21 @@
 
 module RubyRabbitmqJanus
   module Rabbit
-    module Publisher
+    module Listener
       # Listener to admin queue
-      class ListenerAdmin < Listener
+      class FromAdmin < From
         private
 
         def subscribe_queue
           reply = @rabbit.queue(Tools::Config.instance.queue_admin_from)
           @rabbit.prefetch(1)
           reply.bind(binding).subscribe(opts_subs) do |info, prop, payload|
-            Tools::Log.instance.info \
-              "[X] Message ADMIN reading ##{prop['correlation_id']}"
+            info_subscribe(info, prop, payload)
             synchronize_response(info, payload)
           end
+        rescue => exception
+          raise RubyRabbitmqJanus::Errors::Rabbit::Listener::From::ListenEvents,
+                exception
         end
       end
     end