ruby_rabbitmq_janus 1.1.12 → 1.2.0

data/spec/request/peer/request_answer_spec.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'RubyRabbitmqJanus::RRJ -- message type answer', broken: true do
+  before(:example) do
+    sdp = <<END
+v=0
+o=- 7041456084360858977 2 IN IP4 127.0.0.1
+s=-
+t=0 0
+a=group:BUNDLE audio video
+a=msid-semantic: WMS 2jKToeOlpzKTn7anwnHOJmzFyhvEYt1kpcMY
+m=audio 9 UDP/TLS/RTP/SAVPF 111
+c=IN IP4 0.0.0.0
+a=rtcp:9 IN IP4 0.0.0.0
+a=ice-ufrag:T9QI
+a=ice-pwd:s9YvfGuavTZN0Lqc53JNInEP
+a=fingerprint:sha-256 6D:ED:BC:93:AC:EC:C2:29:03:7D:6A:60:9F:D3:F5:A1:6D:1A:38:CE:F0:C0:EC:C8:5D:87:19:19:BE:0F:89:BB
+a=setup:actpass
+a=mid:audio
+a=extmap:1 urn:ietf:params:rtp-hdrext:ssrc-audio-level
+a=extmap:3 http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time
+a=sendonly
+a=rtcp-mux
+a=rtpmap:111 opus/48000/2
+a=rtcp-fb:111 transport-cc
+a=fmtp:111 minptime=10;useinbandfec=1
+m=video 9 UDP/TLS/RTP/SAVPF 100
+c=IN IP4 0.0.0.0
+a=rtcp:9 IN IP4 0.0.0.0
+a=ice-ufrag:T9QI
+a=ice-pwd:s9YvfGuavTZN0Lqc53JNInEP
+a=fingerprint:sha-256 6D:ED:BC:93:AC:EC:C2:29:03:7D:6A:60:9F:D3:F5:A1:6D:1A:38:CE:F0:C0:EC:C8:5D:87:19:19:BE:0F:89:BB
+a=setup:actpass
+a=mid:video
+a=extmap:2 urn:ietf:params:rtp-hdrext:toffset
+a=extmap:3 http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time
+a=extmap:4 urn:3gpp:video-orientation
+a=extmap:6 http://www.webrtc.org/experiments/rtp-hdrext/playout-delay
+a=sendonly
+a=rtcp-mux
+a=rtcp-rsize
+a=rtpmap:100 VP8/90000
+a=rtcp-fb:100 ccm fir
+a=rtcp-fb:100 nack
+a=rtcp-fb:100 nack pli
+a=rtcp-fb:100 goog-remb
+a=rtcp-fb:100 transport-cc
+END
+    @type = 'peer::answer'
+    @options = { 'replace' => { 'sdp' => sdp }, 'add' => {} }
+  end
+
+  describe '#message_handle', type: :request, level: :peer, name: :answer do
+    context 'when queue is exclusive' do
+      it_behaves_like 'message_handle should match json schema'
+    end
+
+    context 'when queue is not exclusive' do
+      it_behaves_like 'message_handle should match json empty'
+    end
+  end
+
+  after(:example) { @gateway.handle_message_simple('base::detach') }
+end

data/spec/request/peer/request_offer_spec.rb

@@ -0,0 +1,113 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'RubyRabbitmqJanus::RRJ -- message type offer', broken: true do
+  before(:example) do
+    sdp = <<END
+v=0
+o=- 7041456084360858977 2 IN IP4 127.0.0.1
+s=-
+  t=0 0
+a=group:BUNDLE audio video
+a=msid-semantic: WMS 2jKToeOlpzKTn7anwnHOJmzFyhvEYt1kpcMY
+m=audio 9 UDP/TLS/RTP/SAVPF 111 103 104 9 0 8 106 105 13 126
+c=IN IP4 0.0.0.0
+a=rtcp:9 IN IP4 0.0.0.0
+a=ice-ufrag:T9QI
+a=ice-pwd:s9YvfGuavTZN0Lqc53JNInEP
+a=fingerprint:sha-256 6D:ED:BC:93:AC:EC:C2:29:03:7D:6A:60:9F:D3:F5:A1:6D:1A:38:CE:F0:C0:EC:C8:5D:87:19:19:BE:0F:89:BB
+a=setup:actpass
+a=mid:audio
+a=extmap:1 urn:ietf:params:rtp-hdrext:ssrc-audio-level
+a=extmap:3 http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time
+a=sendonly
+a=rtcp-mux
+a=rtpmap:111 opus/48000/2
+a=rtcp-fb:111 transport-cc
+a=fmtp:111 minptime=10;useinbandfec=1
+a=rtpmap:103 ISAC/16000
+a=rtpmap:104 ISAC/32000
+a=rtpmap:9 G722/8000
+a=rtpmap:0 PCMU/8000
+a=rtpmap:8 PCMA/8000
+a=rtpmap:106 CN/32000
+a=rtpmap:105 CN/16000
+a=rtpmap:13 CN/8000
+a=rtpmap:126 telephone-event/8000
+a=ssrc:2786155512 cname:/+YL75rdcn+UKbf9
+a=ssrc:2786155512 msid:2jKToeOlpzKTn7anwnHOJmzFyhvEYt1kpcMY e0f2490b-468a-4abc-9770-a5f99b13c152
+a=ssrc:2786155512 mslabel:2jKToeOlpzKTn7anwnHOJmzFyhvEYt1kpcMY
+a=ssrc:2786155512 label:e0f2490b-468a-4abc-9770-a5f99b13c152
+m=video 9 UDP/TLS/RTP/SAVPF 100 101 107 116 117 96 97 99 98
+c=IN IP4 0.0.0.0
+a=rtcp:9 IN IP4 0.0.0.0
+a=ice-ufrag:T9QI
+a=ice-pwd:s9YvfGuavTZN0Lqc53JNInEP
+a=fingerprint:sha-256 6D:ED:BC:93:AC:EC:C2:29:03:7D:6A:60:9F:D3:F5:A1:6D:1A:38:CE:F0:C0:EC:C8:5D:87:19:19:BE:0F:89:BB
+a=setup:actpass
+a=mid:video
+a=extmap:2 urn:ietf:params:rtp-hdrext:toffset
+a=extmap:3 http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time
+a=extmap:4 urn:3gpp:video-orientation
+a=extmap:6 http://www.webrtc.org/experiments/rtp-hdrext/playout-delay
+a=sendonly
+a=rtcp-mux
+a=rtcp-rsize
+a=rtpmap:100 VP8/90000
+a=rtcp-fb:100 ccm fir
+a=rtcp-fb:100 nack
+a=rtcp-fb:100 nack pli
+a=rtcp-fb:100 goog-remb
+a=rtcp-fb:100 transport-cc
+a=rtpmap:101 VP9/90000
+a=rtcp-fb:101 ccm fir
+a=rtcp-fb:101 nack
+a=rtcp-fb:101 nack pli
+a=rtcp-fb:101 goog-remb
+a=rtcp-fb:101 transport-cc
+a=rtpmap:107 H264/90000
+a=rtcp-fb:107 ccm fir
+a=rtcp-fb:107 nack
+a=rtcp-fb:107 nack pli
+a=rtcp-fb:107 goog-remb
+a=rtcp-fb:107 transport-cc
+a=fmtp:107 level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=42e01f
+a=rtpmap:116 red/90000
+a=rtpmap:117 ulpfec/90000
+a=rtpmap:96 rtx/90000
+a=fmtp:96 apt=100
+a=rtpmap:97 rtx/90000
+a=fmtp:97 apt=101
+a=rtpmap:99 rtx/90000
+a=fmtp:99 apt=107
+a=rtpmap:98 rtx/90000
+a=fmtp:98 apt=116
+a=ssrc-group:FID 1022811670 258141567
+a=ssrc:1022811670 cname:/+YL75rdcn+UKbf9
+a=ssrc:1022811670 msid:2jKToeOlpzKTn7anwnHOJmzFyhvEYt1kpcMY 25d58816-114a-41d2-aa08-1039e09f942f
+a=ssrc:1022811670 mslabel:2jKToeOlpzKTn7anwnHOJmzFyhvEYt1kpcMY
+a=ssrc:1022811670 label:25d58816-114a-41d2-aa08-1039e09f942f
+a=ssrc:258141567 cname:/+YL75rdcn+UKbf9
+a=ssrc:258141567 msid:2jKToeOlpzKTn7anwnHOJmzFyhvEYt1kpcMY 25d58816-114a-41d2-aa08-1039e09f942f
+a=ssrc:258141567 mslabel:2jKToeOlpzKTn7anwnHOJmzFyhvEYt1kpcMY
+a=ssrc:258141567 label:25d58816-114a-41d2-aa08-1039e09f942f
+END
+    @type = 'peer::offer'
+    @options = { 'replace' => { 'sdp' => sdp }, 'add' => {} }
+  end
+
+  describe '#message_handle', type: :request, level: :peer, name: :offer do
+    let(:sdp) { 'v=0\r\no=[..more sdp stuff..]' }
+
+    context 'when queue is exclusive' do
+      it_behaves_like 'message_handle should match json schema'
+    end
+
+    context 'when queue is not exclusive' do
+      it_behaves_like 'message_handle should match json empty'
+    end
+  end
+
+  after(:example) { @gateway.handle_message_simple('base::detach') }
+end

data/spec/request/peer/request_trickle_spec.rb

@@ -2,9 +2,11 @@
 
 require 'spec_helper'
 
-# describe 'RubyRabbitmqJanus::RRJ -- message type trickle' do
-describe 'RubyRabbitmqJanus::RRJ -- message type trickle', broken: true do
-  before(:example) { @type = 'peer::trickle' }
+describe 'RubyRabbitmqJanus::RRJ -- message type trickle' do
+  before(:example) do
+    @type = 'peer::trickle'
+    @options = { 'replace' => {}, 'add' => {} }
+  end
 
   describe '#message_handle', type: :request, level: :peer, name: :trickle do
     let(:cdd) do
@@ -15,29 +17,25 @@ describe 'RubyRabbitmqJanus::RRJ -- message type trickle', broken: true do
 
     context 'when queue is exclusive and send 1 candidate' do
       it_behaves_like 'message_handle should match json schema' do
-        let(:replace) { candidate }
-        let(:add) { {} }
+        let(:options) { { replace: { candidates: candidate } } }
       end
     end
 
     context 'when queue is not exclusive and send 1 candidate' do
       it_behaves_like 'message_handle should match json empty' do
-        let(:replace) { candidate }
-        let(:add) { {} }
+        let(:options) { { replace: { candidates: candidate } } }
       end
     end
 
     context 'when queue is exclusive and send 1 candidate' do
       it_behaves_like 'message_handle should match json schema' do
-        let(:replace) { candidates }
-        let(:add) { {} }
+        let(:options) { { replace: { candidates: candidates } } }
       end
     end
 
     context 'when queue is exclusive and send many candidates' do
       it_behaves_like 'message_handle should match json empty' do
-        let(:replace) { candidates }
-        let(:add) { {} }
+        let(:options) { { replace: { candidates: candidates } } }
       end
     end
   end

data/spec/rrj/rrj_log_spec.rb

@@ -7,15 +7,10 @@ describe 'RubyRabbitmqJanus::Log', type: :config, name: :log do
     expect(RubyRabbitmqJanus::Tools::Log.instance).not_to be nil
   end
 
-  it 'Default level log is DEBUG' do
+  it 'Default level log is INFO' do
     # 0 = debug
     # ...
     # 5 = unknown
     expect(RubyRabbitmqJanus::Tools::Log.instance.level).to eq 1
   end
-
-  it 'Default progname is RubyRabbitmqJanus' do
-    expect(RubyRabbitmqJanus::Tools::Log.instance.progname).to \
-      eq RubyRabbitmqJanus.name
-  end
 end

data/spec/spec_helper.rb

@@ -40,7 +40,6 @@ RSpec.configure do |config|
 
   # Configure requests test before sending request
   config.before(:example) do
-    Singleton.__init__(RubyRabbitmqJanus::Tools::Env)
     Singleton.__init__(RubyRabbitmqJanus::Tools::Log)
     Singleton.__init__(RubyRabbitmqJanus::Tools::Config)
     Singleton.__init__(RubyRabbitmqJanus::Tools::Requests)

data/spec/support/examples.rb

@@ -36,9 +36,7 @@ end
 
 # Handle request
 shared_examples 'message_handle should match json schema' do
-  let(:replace) { replace }
-  let(:add) { add }
-  let(:message) { @gateway.message_handle(@type, replace, add) }
+  let(:message) { @gateway.message_handle(@type, @options) }
 
   it do
     @gateway.start_handle(true) do
@@ -48,9 +46,10 @@ shared_examples 'message_handle should match json schema' do
 end
 
 shared_examples 'message_handle should match json empty' do
-  let(:replace) { replace }
-  let(:add) { add }
-  let(:message) { @gateway.message_handle(@type, replace, add) }
+  let(:message) do
+    options = options.nil? ? { replace: {}, add: {} } : options
+    @gateway.message_handle(@type, options)
+  end
 
   it do
     @gateway.start_handle(false) do
@@ -62,9 +61,7 @@ end
 # Handle admin
 shared_examples 'message_handle_admin should match json schema' do
   let(:message) do
-    @gateway.start_handle_admin do
-      @gateway.message_handle(@type)
-    end
+    @gateway.message_admin(@type)
   end
 
   it do

data/spec/support/schemas/config/config.json

@@ -23,32 +23,42 @@
     "queues": {
       "type": "hash",
       "properties": {
-        "queue_from": { "type": "string" },
-        "queue_to": { "type": "string" },
+        "standard": {
+          "type": "hash",
+          "properties": {
+            "from": { "type": "string" },
+            "to": { "type": "string" }
+          },
+          "required": [
+            "from",
+            "to"
+          ]
+        },
         "admin": {
           "type": "hash",
           "properties": {
-            "queue_from": { "type": "string" },
-            "queue_to": { "type": "string" }
+            "from": { "type": "string" },
+            "to": { "type": "string" }
           },
           "required": [
-            "queue_from",
-            "queue_to"
+            "from",
+            "to"
           ]
         }
       },
       "required": [
-        "queue_from",
-        "queue_to",
+        "standard",
         "admin"
       ]
     },
     "janus": {
       "type": "hash",
       "properties": {
-        "plugins": { "type": "hash" }
+        "plugins": { "type": "hash" },
+        "session": { "type": "hash" }
       },
       "required": [
+        "session",
         "plugins"
       ]
     },
@@ -63,32 +73,10 @@
           "required": [
             "level"
           ]
-        },
-        "session": {
-          "type": "hash",
-          "properties": {
-            "keepalive": { "type": "integer" }
-          },
-          "required": [
-            "keepalive"
-          ]
-        },
-        "thread": {
-          "type": "hash",
-          "properties": {
-            "enable": { "type" : "boolean" },
-            "number": { "type": "integer" }
-          },
-          "required": [
-            "enable",
-            "number"
-          ]
         }
       },
       "required": [
-        "log",
-        "session",
-        "thread"
+        "log"
       ]
     }
   },

data/spec/support/schemas/request/peer/answer.json

@@ -0,0 +1,15 @@
+{
+  "type": "object",
+  "properties": {
+    "janus": { "type": "string", "pattern": "ack" },
+    "transaction": { "type": "string" },
+    "session_id": { "type": "integer" },
+    "handle_id": { "type": "integer" }
+  },
+  "required": [
+    "janus",
+    "transaction",
+    "session_id",
+    "handle_id"
+  ]
+}

data/spec/support/schemas/request/peer/offer.json

@@ -0,0 +1,15 @@
+{
+  "type": "object",
+  "properties": {
+    "janus": { "type": "string", "pattern": "ack" },
+    "transaction": { "type": "string" },
+    "session_id": { "type": "integer" },
+    "handle_id": { "type": "integer" }
+  },
+  "required": [
+    "janus",
+    "transaction",
+    "session_id",
+    "handle_id"
+  ]
+}

data/spec/support/schemas/request/peer/trickle.json

@@ -1,21 +1,13 @@
 {
   "type": "object",
   "properties": {
-    "janus": { "type": "string", "pattern": "trickle" },
-    "transaction": { "type":  "string" },
-    "candidate": {
-      "type": "hash",
-      "properties": {
-        "completed": { "type": "boolean" }
-      },
-      "required": [
-        "completed"
-      ]
-    }
+    "janus": { "type": "string", "pattern": "ack" },
+    "transaction": { "type": "string" },
+    "session_id": { "type": "integer" }
   },
   "required": [
     "janus",
     "transaction",
-    "candidate"
+    "session_id"
   ]
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 1.1.12
+  version: 1.2.0
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2016-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -292,9 +292,11 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - LICENSE
+- README.md
 - Rakefile
 - config/default.md
 - config/default.yml
+- config/requests.md
 - config/requests/admin/handle_info.json
 - config/requests/admin/handles.json
 - config/requests/admin/log_level.json
@@ -305,22 +307,9 @@ files:
 - config/requests/base/detach.json
 - config/requests/base/info.json
 - config/requests/base/keepalive.json
-- config/requests/channel/README.md
-- config/requests/channel/answer.json
-- config/requests/channel/create.json
-- config/requests/channel/describe.json
-- config/requests/channel/destroy.json
-- config/requests/channel/exists.json
-- config/requests/channel/join.json
-- config/requests/channel/leave.json
-- config/requests/channel/list.json
-- config/requests/channel/offer.json
-- config/requests/channel/select.json
-- config/requests/channel/trickle.json
+- config/requests/peer/answer.json
+- config/requests/peer/offer.json
 - config/requests/peer/trickle.json
-- config/requests/videocast/join.json
-- config/requests/videocast/leave.json
-- config/ruby-rabbitmq-janus.yml
 - lib/generators/ruby_rabbitmq_janus/configuration_generator.rb
 - lib/generators/ruby_rabbitmq_janus/create_request_generator.rb
 - lib/generators/ruby_rabbitmq_janus/default_request_generator.rb
@@ -333,7 +322,6 @@ files:
 - lib/rrj/errors/janus_response.rb
 - lib/rrj/errors/janus_transaction.rb
 - lib/rrj/errors/rabbit.rb
-- lib/rrj/errors/request.rb
 - lib/rrj/info.rb
 - lib/rrj/init.rb
 - lib/rrj/janus/janus.rb
@@ -360,7 +348,6 @@ files:
 - lib/rrj/rabbit/publish/publisher.rb
 - lib/rrj/rabbit/rabbit.rb
 - lib/rrj/tools/config.rb
-- lib/rrj/tools/env.rb
 - lib/rrj/tools/log.rb
 - lib/rrj/tools/replaces/admin.rb
 - lib/rrj/tools/replaces/replace.rb
@@ -377,6 +364,8 @@ files:
 - spec/request/base/request_detach_spec.rb
 - spec/request/base/request_info_spec.rb
 - spec/request/base/request_keepalive_spec.rb
+- spec/request/peer/request_answer_spec.rb
+- spec/request/peer/request_offer_spec.rb
 - spec/request/peer/request_trickle_spec.rb
 - spec/rrj/rrj_config_spec.rb
 - spec/rrj/rrj_log_spec.rb
@@ -400,6 +389,8 @@ files:
 - spec/support/schemas/request/channel/destroy.json
 - spec/support/schemas/request/channel/exist.json
 - spec/support/schemas/request/channel/list.json
+- spec/support/schemas/request/peer/answer.json
+- spec/support/schemas/request/peer/offer.json
 - spec/support/schemas/request/peer/trickle.json
 homepage: https://github.com/dazzl-tv/ruby-rabbitmq-janus
 licenses: