janus_gateway 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fce95cd96c95938e04f2bfedfbbcd48468e094b9
-  data.tar.gz: f0c7dae8907a4dfddf7a98eecc9528056fd19971
+  metadata.gz: a505d780da55dec4b0015c3c39c9e0050bbbaff2
+  data.tar.gz: 61dcbf0f351f1874adf838d88654d9644e4eb93f
 SHA512:
-  metadata.gz: e29e73777a93e37f5d6deacc75c94757a433b37cfa9046d379fa3fbf441f574893e761c58f9a9d5753ba517df084edef1ecbd9a40e59b3e5f2f18dd8c53d8a1e
-  data.tar.gz: fd2a44196ef4f92892360a88cfcd1625dba18209330ea5d3d78c401fc392ff4ab4a66f5c00f02e1470af88bb36f6b59f6770c21e7d9d6d5cd5cbe2a09530dca2
+  metadata.gz: 662f22ce21939dc74b9bd37b9183ad375b30839ff423b66c56a81c25acaf3daa1859538f86684748a653bdbd632732275c0573d1af3c5bc7fe58a8d6a2e12f64
+  data.tar.gz: 31511cfbb51a84824a049f1c7a532f0402c1932a4166c80c8c83d519d8ae4d279d700f80bc40884695fa3b4dcc24dd2e5edd2e8058ca94f909567f73cbd8df63

data/lib/janus_gateway/client.rb

@@ -5,8 +5,13 @@ module JanusGateway
     attr_accessor :transport
 
     # @param [JanusGateway::Transport]
-    def initialize(transport)
+    # @param [Hash] options
+    def initialize(transport, options = {})
       @transport = transport
+      @options = {
+        :token => nil,
+        :admin_secret => nil
+      }.merge(options)
     end
 
     def run
@@ -24,7 +29,8 @@ module JanusGateway
     # @param [Hash] data
     # @return [Concurrent::Promise]
     def send_transaction(data)
-      @transport.send_transaction(data)
+      extra_fields = @options.delete_if { |k, v| v.nil? }
+      @transport.send_transaction(data.merge(extra_fields))
     end
 
     # @return [TrueClass, FalseClass]

data/lib/janus_gateway/plugin/rtpbroadcast/mountpoint.rb

@@ -6,9 +6,11 @@ module JanusGateway::Plugin
     # @param [JanusGateway::Plugin::Rtpbroadcast] plugin
     # @param [String] id
     # @param [Array] streams
-    def initialize(client, plugin, id, streams = nil)
+    # @param [String] channel_data
+    def initialize(client, plugin, id, streams = nil, channel_data = nil)
       @plugin = plugin
       @data = nil
+      @channel_data = channel_data
 
       @streams = streams || [
         {
@@ -39,7 +41,8 @@ module JanusGateway::Plugin
             :name => id,
             :description => id,
             :recorded => true,
-            :streams => @streams
+            :streams => @streams,
+            :channel_data => @channel_data
           }
         }
       ).then do |data|

data/lib/janus_gateway/transport/websocket.rb

@@ -79,11 +79,10 @@ module JanusGateway
         sleep(_transaction_timeout)
         error = JanusGateway::Error.new(0, "Transaction id `#{transaction}` has failed due to timeout!")
         promise.fail(error).execute
-        @transaction_queue.remove(transaction)
       end
 
-      promise.then { thread.exit }
-      promise.rescue { thread.exit }
+      promise.then { @transaction_queue.remove(transaction); thread.exit }
+      promise.rescue { @transaction_queue.remove(transaction); thread.exit }
 
       promise
     end

data/lib/janus_gateway/version.rb

@@ -1,3 +1,3 @@
 module JanusGateway
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: janus_gateway
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Cargo Media
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2015-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket