ruby_rabbitmq_janus 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffd08f2f0ae315d6330ae87407c249c8de25bb55
-  data.tar.gz: 12a22014d95a64e3231d1ac9de1c36b4eb4d263a
+  metadata.gz: e3153d60baafdf940b9b95b691e9a96db5ddbb14
+  data.tar.gz: d55879f82f8a52e4dd17834de27b70f19b6a371c
 SHA512:
-  metadata.gz: 619529b2da03ed8582cb91b4009894dbfbf5cf4f4d45f8d91fda3b7e392326ac33285dbf4df3b2bb45988695875085945ce9322ddcd77760a6cd0536c93499ca
-  data.tar.gz: 4e15f89cb74a0b0574ec06bc518fe5e8c6393d3c68b5aefaaeaee501369f2dc0c37ccbd9a0b6204d928aaa4aa24cfc21e10da5ff1498beb448a88a0b4ee56078
+  metadata.gz: cc3ff0b7f739fbc25f1a253940f67305ccb8faa8208f60456fb3643c4ab3fc0cb524c42adb81f6e7b4557c72f8e115edc750dea301b4fe76a8ec830765871397
+  data.tar.gz: 72925fdbfee645bd0666faf7ca86877afc9a5f8d7b7a0f280385cc43030672b7a7fa2f2a18fca4ed1eb71276dffdac932ce451d4d28ddfe2663da993931865c4

data/Rakefile

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = '--tag ~level:admin'
+end
+
+RSpec::Core::RakeTask.new(:no_request_spec) do |t|
+  t.rspec_opts = '--tag ~type:request'
+end
+
+task default: :spec

data/config/default.yml

@@ -1,7 +1,7 @@
 # Rabbit information connection
 rabbit:
   # Precise RabbitMQ host - Default 'localhost'
-  host: localhost
+  host: rabbit
   # Precise RabbitMQ port - Default '5672'
   port: 5672
   # Precise RabbitMQ vhost - Default '/'
@@ -19,9 +19,11 @@ queues:
   queue_from: from-janus
   # Queue sending a message for janus server
   queue_to: to-janus
-    # Queues for admin janus
+  # Queues for admin janus
   admin:
+    # Queue sending response to admin API janus
     queue_from: from-janus-admin
+    # Queue sending a message for admin API janus
     queue_to: to-janus-admin
 
 # Janus plugin used
@@ -36,7 +38,7 @@ gem:
   log:
     # Define level to log
     # UNKNOW, FATAL, ERROR, WARN, INFO, DEBUG
-    level: INFO
+    level: info
   # Option for sessions
   session:
     # Define time to send a keepalive message in seconds

data/config/requests/channel/README.md

@@ -0,0 +1,29 @@
+# Channel
+
+How to use gem for channels
+
+For each example initialize a gem with command : `t = RubyRabbitmqJanus::RRJ.new`
+
+## List channels
+
+```ruby
+# Create a session
+create = t.ask('create')
+session = t.response(create)
+
+# Attach a session to plugin
+attach = t.ask('attach', session)
+session = t.response(attach)
+
+# List a channels
+list = t.ask('channel::list', session)
+session = t.response(list)
+
+# Detach a session
+detach = t.ask('detach', session)
+session = t.response(detach)
+
+# Destroy a session
+destroy = t.ask('destroy', session)
+session = t.response(destroy)
+```

data/config/requests/channel/answer.json

@@ -0,0 +1,13 @@
+{
+  "janus": "message",
+  "session_id": "<number>",
+  "handle_id": "<number>",
+  "transaction": "<string>",
+  "body": {
+    "request": "configure",
+  },
+  "jsep": {
+    "type": "answer",
+    "sdp": "<string>"
+  }
+}

data/config/requests/channel/create.json

@@ -0,0 +1,9 @@
+{
+  "janus": "message",
+  "session_id": "<number>",
+  "handle_id": "<number>",
+  "transaction": "<string>",
+  "body": {
+    "request": "create"
+  }
+}

data/config/requests/channel/describe.json

@@ -0,0 +1,10 @@
+{
+  "janus": "message",
+  "session_id": "<number>",
+  "handle_id": "<number>",
+  "transaction": "<string>",
+  "body": {
+    "request": "describe",
+    "channel": "<number>"
+  }
+}

data/config/requests/channel/destroy.json

@@ -0,0 +1,10 @@
+{
+  "janus": "message",
+  "session_id": "<number>",
+  "handle_id": "<number>",
+  "transaction": "<string>",
+  "body": {
+    "request": "destroy",
+    "channel": "<number>"
+  }
+}

data/config/requests/channel/exists.json

@@ -0,0 +1,10 @@
+{
+  "janus": "message",
+  "session_id": "<number>",
+  "handle_id": "<number>",
+  "transaction": "<string>",
+  "body": {
+    "request": "exists",
+    "channel": "<number>"
+  }
+}

data/config/requests/channel/join.json

@@ -0,0 +1,11 @@
+{
+  "janus": "message",
+  "session_id": "<number>",
+  "handle_id": "<number>",
+  "transaction": "<string>",
+  "body": {
+    "request": "join",
+    "channel": "<number>",
+    "type": "<string>"
+  }
+}

data/config/requests/channel/leave.json

@@ -0,0 +1,11 @@
+{
+  "janus": "message",
+  "session_id": "<number>",
+  "handle_id": "<number>",
+  "transaction": "<string>",
+  "body": {
+    "request": "leave",
+    "videocast": "<number>",
+    "channel": "<number>"
+  }
+}

data/config/requests/channel/list.json

@@ -0,0 +1,9 @@
+{
+  "janus": "message",
+  "session_id": "<number>",
+  "handle_id": "<number>",
+  "transaction": "<string>",
+  "body": {
+    "request": "list"
+  }
+}

data/config/requests/channel/offer.json

@@ -0,0 +1,14 @@
+{
+  "janus": "message",
+  "session_id": "<number>",
+  "handle_id": "<number>",
+  "transaction": "<string>",
+  "body": {
+    "audio": "true",
+    "video": "true"
+  },
+  "jsep": {
+    "type": "offer",
+    "sdp": "<string>"
+  }
+}

data/config/requests/channel/select.json

@@ -0,0 +1,11 @@
+{
+  "janus": "message",
+  "session_id": "<number>",
+  "handle_id": "<number>",
+  "transaction": "<string>",
+  "body": {
+    "request": "select",
+    "channel": "<number>",
+    "videocast": "<number>"
+  }
+}

data/config/requests/channel/trickle.json

@@ -0,0 +1,10 @@
+{
+  "janus": "message",
+  "session_id": "<number>",
+  "handle_id": "<number>",
+  "transaction": "<string>",
+  "body": {
+    "request": "trickle",
+    "candidate": "<array>"
+  }
+}

data/config/requests/peer/trickle.json

@@ -0,0 +1,7 @@
+{
+  "janus": "trickle",
+  "session_id": "<number>",
+  "handle_id": "<number>",
+  "transaction": "<string>",
+  "candidate": "<array>"
+}

data/config/requests/videocast/join.json

@@ -0,0 +1,12 @@
+{
+  "janus": "message",
+  "session_id": "<number>",
+  "handle_id": "<number>",
+  "transaction": "<string>",
+  "body": {
+    "request": "join",
+    "channel": "<number>",
+    "videocast": "<number>",
+    "type": "<string>"
+  }
+}

data/config/requests/videocast/leave.json

@@ -0,0 +1,11 @@
+{
+  "janus": "message",
+  "session_id": "<number>",
+  "handle_id": "<number>",
+  "transaction": "<string>",
+  "body": {
+    "request": "leave",
+    "videocast": "<number>",
+    "channel": "<number>"
+  }
+}

data/config/ruby-rabbitmq-janus.yml

@@ -0,0 +1,27 @@
+rabbit:
+  host: localhost
+  port: 5672
+  vhost: /
+  user: dazzl_admin
+  pass: koMpmVU8
+  admin_pass: Guj9khoN
+
+queues:
+  queue_from: from-janus
+  queue_to: to-janus
+  admin:
+    queue_from: from-janus-admin
+    queue_to: to-janus-admin
+
+janus:
+  plugins:
+    - janus.plugin.dazzl.videocontrol
+
+gem:
+  log:
+    level: DEBUG
+  session:
+    keepalive: 59
+  thread:
+    enable: false
+    number: 1

data/lib/generators/ruby_rabbitmq_janus/initializer_generator.rb

@@ -5,37 +5,28 @@ module RubyRabbitmqJanus
     # Create an class for generate a initializer
     class InitializerGenerator < Rails::Generators::Base
       desc 'Generate a initializer to this gem for rails application.'
-
-      # Create an initializer
-      def copy_initializer
-        initializer 'ruby_rabbitmq_janus.rb' do
-          <<-INIT
+      INITIALIZER = <<-INIT
 # frozen_string_literal: true
 
+require 'actions'
+
+# Initialize a gem and create an session with a keepalive
+::RRJ = RubyRabbitmqJanus::RRJ.new
+
 # This test disable this gems execution when you running an task with rake
 unless File.basename($PROGRAM_NAME) == 'rake'
-  # Write your methods for listening standar queue here
-  #
-  # Example :
-  # action_events = lambda do |reason, data|
-  # logger.debug 'Execute block code with reason :'
-  # logger.debug reason
-  # logger.debug --
-  # logger.debug data
-  # end
-
   Rails.configuration.after_initialize do
-    # Initialize a gem and create an session with a keepalive
-    ::RRJ = RubyRabbitmqJanus::RRJ.new
-
-    # If you want listen a standard queue and execute an block code uncomment
-    # this line and craete an method sendind to run
-    # ::JEvents = RubyRabbitmqJanus::Janus::Concurrencies::Event.instance
-    # JEvents.run(&action_events)
+    # 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
-          INIT
-        end
+        INIT
+
+      # Create an initializer
+      def copy_initializer
+        initializer 'ruby_rabbitmq_janus.rb', INITIALIZER
       end
     end
   end

data/lib/generators/ruby_rabbitmq_janus/install_generator.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module RubyRabbitmqJanus
+  module Generators
+    # Create an class for generate a installing
+    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)
+        end
+      end
+    end
+
+    private
+
+    def case_events(data)
+      Rails.logger.debug "Event : \#{data}"
+    end
+  end
+end
+      BASE
+      APPLICATION = <<-AUTOLOAD
+# Load RubyRabbitmqJanus actions events code blocks
+config.autoload_paths += Dir[Rails.root.join('app', 'ruby_rabbitmq_janus')]
+      AUTOLOAD
+
+      def add_actions
+        # Create an class
+        create_file 'app/ruby_rabbitmq_janus/actions.rb', ACTION_CLASS
+
+        # Add to application.rb
+        application do
+          APPLICATION
+        end
+
+        # Add initializer
+        generate 'ruby_rabbitmq_janus:initializer'
+      end
+    end
+  end
+end

data/lib/rrj/info.rb

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

data/lib/rrj/init.rb

@@ -8,8 +8,6 @@ require 'bunny'
 require 'logger'
 require 'key_path'
 require 'active_support'
-require 'concurrent'
-require 'colorize'
 
 module RubyRabbitmqJanus
   # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>

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

@@ -4,20 +4,16 @@ 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.
+      # 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
         # Define an publisher
         def initialize(rabbit)
           super()
-          @response = nil
-          @count = 1
           @rabbit = rabbit.channel
-          @reply = @rabbit.queue(Tools::Config.instance.options['queues']['queue_from'])
-          Tools::Log.instance.debug "Waiting message from queue : #{@reply.name}"
-          @reply.subscribe do |_info_delivery, _propertie, payload|
-            synchronize_response(payload)
-          end
+          @response = nil
+          subscribe_queue
         end
 
         # Listen a queue and return a body response
@@ -31,11 +27,41 @@ module RubyRabbitmqJanus
 
         private
 
+        def queue_name
+          Tools::Config.instance.options['queues']['queue_from']
+        end
+
+        # Subscribe queue
+        def subscribe_queue
+          reply = @rabbit.queue(queue_name)
+          @rabbit.prefetch(1)
+          reply.bind(binding).subscribe(opts_subs) do |info, prop, payload|
+            log_message_id(prop)
+            synchronize_response(info, payload)
+          end
+        end
+
+        # Define type binding used for subscriber
+        def binding
+          @rabbit.direct('amq.direct')
+        end
+
+        # Options subscribe
+        def opts_subs
+          { 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(payload)
+        def synchronize_response(info, payload)
+          sleep 0.2
           @response = Janus::Responses::Event.new(JSON.parse(payload))
-          Tools::Log.instance.info "[X] Message number reading ##{@count}"
-          @count += 1
+          @rabbit.acknowledge(info.delivery_tag, false)
           lock.synchronize { condition.signal }
         end
       end