kurento_rails 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8dcfeecf35003641102a7b7fad6946972d90f73
-  data.tar.gz: 6cdf0bd799043fb6e029afca34b2be0e5af2c834
+  metadata.gz: 28a49fc77329e48dadd00ed81834c289ffd7e7b7
+  data.tar.gz: c818b3bc5ada7420c3e6bfc2624f9df42a14ad9b
 SHA512:
-  metadata.gz: 343ad1e03d3ababe00a7273d956c66a2a4955d48c7b37b59a131c5ef29159c1a7716ba42ce33fefb4f5cf97c1ae9e21723877f0867709729206d9d742f530116
-  data.tar.gz: cc61f729198cf610c3caa763ecda7ffd7884ec202fa9ebd961991f67ecbc79291f20c77fdc3a6171334a1d010891f7ab70a33ed9afae3100901016bb9ff9b3bf
+  metadata.gz: 468cef5a7b00449b9d6d20b613563403764b7614f30bcfbd697a62871704c45104a8cabe4ab2c01d37ad9b85458597a0cf820e9260a3acb91c27d59e3e5fe372
+  data.tar.gz: de11558b3b879b1319d5b5746b275609bc5ed37907050469a1b37aa546116de0a62331f67f99ed3cd3f03431eff2f6e6f234ae14613563352a0ec9e0b6fbf899

data/lib/generators/kurento_rails/templates/config/events.rb

@@ -17,6 +17,8 @@ WebsocketRails::EventMap.describe do
     subscribe :broadcast, to: KurentoWebsocketsController, with_method: :broadcast
     subscribe :stop_broadcasting, to: KurentoWebsocketsController, with_method: :stop_broadcasting
     subscribe :view, to: KurentoWebsocketsController, with_method: :view
+    subscribe :stop_viewing, to: KurentoWebsocketsController, with_method: :stop_viewing
+    subscribe :is_live?, to: KurentoWebsocketsController, with_method: :is_live?
   end
 
   subscribe :client_disconnected, to: KurentoWebsocketsController, with_method: :user_disconnect

data/lib/generators/kurento_rails/templates/controllers/kurento_websockets_controller.rb

@@ -1,62 +1,74 @@
 class KurentoWebsocketsController < WebsocketRails::BaseController
+  before_action :set_stream, only: [:stop_broadcasting, :view, :start_viewing, :stop_viewing]
 
   public
-    # just to see if this can make things work
-    # def process_action(method, event)
-    #   puts "Calling process action with method #{method} and event #{event}"
-    #   super(method, event)
-    # end
-
     def active_streams
-      search_params = message.merge streaming: true
-      streams = KurentoRailsVideoStream.where(search_params)
+      puts "Started a request for get active streams"
+      puts message
+      streams = KurentoRailsVideoStream.live.where(stream_params(message))
+      puts streams
       trigger_success streams
     end
 
     def recorded_streams
-      search_params = message.merge streaming: false
-      streams = KurentoRailsVideoStream.where(search_params)
+      streams = KurentoRailsVideoStream.recorded.where(stream_params(message))
       trigger_success streams
     end
 
     # tell all users that a new video is available
     def broadcast
-      stream = KurentoRailsVideoStream.new(stream_params(message))
-      if stream.save
+      puts "Starting broadcast"
+      puts message
+      @stream = KurentoRailsVideoStream.new(stream_params(message))
+      if @stream && @stream.save
         # notify any people watching active streams that this stream is available
-        WebsocketRails[:video_streams].trigger 'new', stream
+        WebsocketRails[:video_streams].trigger 'new', @stream
         # store the fact that this user was broadcasting
-        connection_store[:streaming] = stream.id
+        connection_store[:streaming] = @stream.id
         # and now trigger the success callback
-        trigger_success stream
+        trigger_success @stream
       else
-        trigger_failure stream
+        trigger_failure @stream
       end
     end
 
     # tell all users that this broadcast is no longer streaming
     def stop_broadcasting
-      stream = KurentoRailsVideoStream.find(connection_store[:streaming])
-      stream.streaming = false
-      if stream.save
+      @stream.streaming = false
+      if @stream.save
         # perform the relevant stop streaming actions
-        stop_streaming stream
+        stop_streaming @stream
         # and finally, trigger the success callback
-        trigger_success stream
+        trigger_success @stream
       else
-        trigger_failure stream
+        trigger_failure @stream
       end
     end
 
     # let a user know if a video is available for streaming or not
-    def view
-      stream = KurentoRailsVideoStream.find(stream_params(message)[:id])
+    def is_live?
       # if this stream is active, great
-      if stream.streaming
-        trigger_success stream
+      if @stream.streaming
+        trigger_success @stream
       else
-        trigger_failure stream
+        trigger_failure @stream
+      end
+    end
+
+    # increment the count
+    def view
+      if @stream.live?
+        @stream.current_viewers = (@stream.current_viewers || 0) + 1
+        WebsocketRails["stream-#{@stream.id}"].trigger 'viewer-connected'
       end
+      @stream.total_viewers = (@stream.total_viewers || 0) + 1
+      if @stream.save
+        connection_store[:viewing] = @stream.id
+      end
+    end
+
+    def stop_viewing
+      on_viewer_stop @stream
     end
 
     # handle a user disconnecting from rails. 
@@ -64,32 +76,28 @@ class KurentoWebsocketsController < WebsocketRails::BaseController
     def user_disconnect
       # check to see if the user was broadcasting video. If they were, then we need
       # to notify all users viewing their channel that they're no longer broadcasting
+      # If they were viewing video, then we need to decrement our number of active viewers
       if connection_store[:streaming]
-        stream = KurentoRailsVideoStream.find(connection_store[:streaming])
-        stop_streaming stream
+        stop_streaming @stream
+      elsif connection_store[:viewing]
+        on_viewer_stop @stream
       end
     end
 
   private
     def stream_params(params)
-      new_params = {}
-      new_params[:id] = params[:id]
-      new_params[:pipeline] = params[:pipeline]
-      new_params[:file_url] = params[:file_url]
-      new_params[:sender_rtc] = params
-
-      permit params, :id, :pipeline, :file_url, :sender_rtc, :streaming, :name
+      permit params, :id, :pipeline, :file_url, :sender_rtc, :streaming, :name, :meeting_id
     end
 
     def permit(original_hash, *allowed_fields)
       new_hash = {}
-      if allowed_fields.nil?
+      if allowed_fields.nil? || !original_hash.is_a?(Hash)
         return {}
       end
       allowed_fields.each do |field|
-        new_hash[field] = original_hash[field]
+        new_hash[field] = original_hash[field] if original_hash[field]
       end 
-      new_hash
+      return new_hash
     end
 
     def stop_streaming(stream)
@@ -100,4 +108,25 @@ class KurentoWebsocketsController < WebsocketRails::BaseController
       # remove the stream from the connection store
       connection_store[:streaming] = nil      
     end
+
+    def on_viewer_stop(stream)
+      if stream && stream.live?
+        stream.current_viewers -= 1
+        stream.save
+        WebsocketRails["stream-#{stream.id}"].trigger 'viewer-disconnected'
+      end
+      connection_store[:viewing] = nil
+    end
+
+    def set_stream
+      if message && stream_params(message).has_key?(:id)
+        @stream = KurentoRailsVideoStream.find(stream_params(message)[:id])
+      elsif connection_store
+        if connection_store.has_key?(:streaming)
+          @stream = KurentoRailsVideoStream.find(connection_store[:streaming])
+        elsif connection_store.has_key?(:viewing)
+          @stream = KurentoRailsVideoStream.find(connection_store[:viewing])
+        end
+      end
+    end
 end

data/lib/generators/kurento_rails/templates/javascript/kurento-rails-js/kurento-rails.js

@@ -320,7 +320,10 @@
                     return onLiveViewError(error);
                   }
                   if (_this.view.live.kurentoObjects.callback) {
-                    return _this.view.live.kurentoObjects.callback(null, "Successfully started stream!");
+                    _this.view.live.kurentoObjects.callback(null, "Successfully started stream!");
+                  }
+                  if (_this.view.live.kurentoObjects.stream) {
+                    return _this.rails_websocket_dispatcher.trigger('streams.view', _this.view.live.kurentoObjects.stream);
                   }
                 });
               });
@@ -335,6 +338,7 @@
           }
           _this.view.live.kurentoObjects.callback = callback;
           _this.view.live.kurentoObjects.videoElement = videoElement;
+          _this.view.live.kurentoObjects.stream = stream;
           if (videoElement === null || $(videoElement).prop("tagName").toLowerCase().trim() === !"video") {
             return onLiveViewError("You must pass in a valid video tag");
           }
@@ -383,6 +387,10 @@
             _this.view.live.kurentoObjects.videoElement.src = '';
             _this.view.live.kurentoObjects.videoElement = null;
           }
+          if (_this.view.live.kurentoObjects.stream) {
+            _this.rails_websocket_dispatcher.trigger('streams.stop_viewing', _this.view.live.kurentoObjects.stream);
+            _this.view.live.kurentoObjects.stream = null;
+          }
           if (_this.view.live.kurentoObjects.pipeline) {
             _this.view.live.kurentoObjects.pipeline = null;
           }
@@ -565,7 +573,7 @@
           recorded = function() {
             return _this.view.recorded.startViewing(stream, videoElement, callback);
           };
-          return _this.rails_websocket_dispatcher.trigger('streams.view', '', live, recorded);
+          return _this.rails_websocket_dispatcher.trigger('streams.is_live?', '', live, recorded);
         };
       })(this);
       this.view.stopViewing = (function(_this) {
@@ -586,7 +594,7 @@
           recorded = function() {
             return _this.view.recorded.onEndOfStream(stream, endOfStreamHandler);
           };
-          return _this.rails_websocket_dispatcher.trigger('streams.view', '', live, recorded);
+          return _this.rails_websocket_dispatcher.trigger('streams.is_live?', '', live, recorded);
         };
       })(this);
       this.view.currentlyViewing = (function(_this) {

data/lib/kurento_rails/version.rb

@@ -1,3 +1,3 @@
 module KurentoRails
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/src/events.rb

@@ -17,6 +17,8 @@ WebsocketRails::EventMap.describe do
     subscribe :broadcast, to: KurentoWebsocketsController, with_method: :broadcast
     subscribe :stop_broadcasting, to: KurentoWebsocketsController, with_method: :stop_broadcasting
     subscribe :view, to: KurentoWebsocketsController, with_method: :view
+    subscribe :stop_viewing, to: KurentoWebsocketsController, with_method: :stop_viewing
+    subscribe :is_live?, to: KurentoWebsocketsController, with_method: :is_live?
   end
 
   subscribe :client_disconnected, to: KurentoWebsocketsController, with_method: :user_disconnect

data/src/kurento-rails.coffee

@@ -208,6 +208,7 @@ class StreamingHelper
 						@view.live.kurentoObjects.presenterWebRtcEndpoint.connect endpoint, (error) =>
 							return onLiveViewError(error) if error or not @view.live.kurentoObjects.pipeline
 							@view.live.kurentoObjects.callback(null, "Successfully started stream!") if @view.live.kurentoObjects.callback
+							@rails_websocket_dispatcher.trigger 'streams.view', @view.live.kurentoObjects.stream if @view.live.kurentoObjects.stream
 
 		#### Start Viewing (view.live.startViewing)
 		# This function accesses a live stream and starts it viewing. There is no error checking for if the stream is actually live, so make sure you know that it is before you start it viewing.
@@ -219,6 +220,7 @@ class StreamingHelper
 		@view.live.startViewing = (stream, videoElement, callback = null) =>
 			@view.live.kurentoObjects.callback = callback
 			@view.live.kurentoObjects.videoElement = videoElement
+			@view.live.kurentoObjects.stream = stream
 			return onLiveViewError("You must pass in a valid video tag") if videoElement is null or $(videoElement).prop("tagName").toLowerCase().trim() is not "video"
 			videoElement = $(videoElement)[0]
 			@kurento.getMediaobjectById stream.sender_rtc, (error, webRtcEndpoint) =>
@@ -247,6 +249,9 @@ class StreamingHelper
 			if @view.live.kurentoObjects.videoElement
 				@view.live.kurentoObjects.videoElement.src = ''
 				@view.live.kurentoObjects.videoElement = null
+			if @view.live.kurentoObjects.stream
+				@rails_websocket_dispatcher.trigger 'streams.stop_viewing', @view.live.kurentoObjects.stream
+				@view.live.kurentoObjects.stream = null				
 			@view.live.kurentoObjects.pipeline = null if @view.live.kurentoObjects.pipeline
 			@view.live.kurentoObjects.presenterWebRtcEndpoint = null if @view.live.kurentoObjects.presenterWebRtcEndpoint
 			callback() if callback
@@ -346,7 +351,7 @@ class StreamingHelper
 		@view.startViewing = (stream, videoElement, callback = null) =>
 			live = => @view.live.startViewing(stream, videoElement, callback)
 			recorded = => @view.recorded.startViewing(stream, videoElement, callback)
-			@rails_websocket_dispatcher.trigger 'streams.view', '', live, recorded
+			@rails_websocket_dispatcher.trigger 'streams.is_live?', '', live, recorded
 
 		#### Stop Viewing (view.stopViewing)
 		# This is a helper function that makes no distinction about whether the currently playing stream is live or recorded (or even if you have one of each playing). It will stop the streams either way.
@@ -359,7 +364,7 @@ class StreamingHelper
 		@view.onEndOfStream = (stream, endOfStreamHandler) =>
 			live = => @view.live.onEndOfStream(stream, endOfStreamHandler)
 			recorded = => @view.recorded.onEndOfStream(stream, endOfStreamHandler)
-			@rails_websocket_dispatcher.trigger 'streams.view', '', live, recorded
+			@rails_websocket_dispatcher.trigger 'streams.is_live?', '', live, recorded
 
 		#### Currently Viewing
 		# This is just a simple boolean function to determine if something is currently playing

data/src/kurento_websockets_controller.rb

@@ -1,62 +1,74 @@
 class KurentoWebsocketsController < WebsocketRails::BaseController
+  before_action :set_stream, only: [:stop_broadcasting, :view, :start_viewing, :stop_viewing]
 
   public
-    # just to see if this can make things work
-    # def process_action(method, event)
-    #   puts "Calling process action with method #{method} and event #{event}"
-    #   super(method, event)
-    # end
-
     def active_streams
-      search_params = message.merge streaming: true
-      streams = KurentoRailsVideoStream.where(search_params)
+      puts "Started a request for get active streams"
+      puts message
+      streams = KurentoRailsVideoStream.live.where(stream_params(message))
+      puts streams
       trigger_success streams
     end
 
     def recorded_streams
-      search_params = message.merge streaming: false
-      streams = KurentoRailsVideoStream.where(search_params)
+      streams = KurentoRailsVideoStream.recorded.where(stream_params(message))
       trigger_success streams
     end
 
     # tell all users that a new video is available
     def broadcast
-      stream = KurentoRailsVideoStream.new(stream_params(message))
-      if stream.save
+      puts "Starting broadcast"
+      puts message
+      @stream = KurentoRailsVideoStream.new(stream_params(message))
+      if @stream && @stream.save
         # notify any people watching active streams that this stream is available
-        WebsocketRails[:video_streams].trigger 'new', stream
+        WebsocketRails[:video_streams].trigger 'new', @stream
         # store the fact that this user was broadcasting
-        connection_store[:streaming] = stream.id
+        connection_store[:streaming] = @stream.id
         # and now trigger the success callback
-        trigger_success stream
+        trigger_success @stream
       else
-        trigger_failure stream
+        trigger_failure @stream
       end
     end
 
     # tell all users that this broadcast is no longer streaming
     def stop_broadcasting
-      stream = KurentoRailsVideoStream.find(connection_store[:streaming])
-      stream.streaming = false
-      if stream.save
+      @stream.streaming = false
+      if @stream.save
         # perform the relevant stop streaming actions
-        stop_streaming stream
+        stop_streaming @stream
         # and finally, trigger the success callback
-        trigger_success stream
+        trigger_success @stream
       else
-        trigger_failure stream
+        trigger_failure @stream
       end
     end
 
     # let a user know if a video is available for streaming or not
-    def view
-      stream = KurentoRailsVideoStream.find(stream_params(message)[:id])
+    def is_live?
       # if this stream is active, great
-      if stream.streaming
-        trigger_success stream
+      if @stream.streaming
+        trigger_success @stream
       else
-        trigger_failure stream
+        trigger_failure @stream
+      end
+    end
+
+    # increment the count
+    def view
+      if @stream.live?
+        @stream.current_viewers = (@stream.current_viewers || 0) + 1
+        WebsocketRails["stream-#{@stream.id}"].trigger 'viewer-connected'
       end
+      @stream.total_viewers = (@stream.total_viewers || 0) + 1
+      if @stream.save
+        connection_store[:viewing] = @stream.id
+      end
+    end
+
+    def stop_viewing
+      on_viewer_stop @stream
     end
 
     # handle a user disconnecting from rails. 
@@ -64,32 +76,28 @@ class KurentoWebsocketsController < WebsocketRails::BaseController
     def user_disconnect
       # check to see if the user was broadcasting video. If they were, then we need
       # to notify all users viewing their channel that they're no longer broadcasting
+      # If they were viewing video, then we need to decrement our number of active viewers
       if connection_store[:streaming]
-        stream = KurentoRailsVideoStream.find(connection_store[:streaming])
-        stop_streaming stream
+        stop_streaming @stream
+      elsif connection_store[:viewing]
+        on_viewer_stop @stream
       end
     end
 
   private
     def stream_params(params)
-      new_params = {}
-      new_params[:id] = params[:id]
-      new_params[:pipeline] = params[:pipeline]
-      new_params[:file_url] = params[:file_url]
-      new_params[:sender_rtc] = params
-
-      permit params, :id, :pipeline, :file_url, :sender_rtc, :streaming, :name
+      permit params, :id, :pipeline, :file_url, :sender_rtc, :streaming, :name, :meeting_id
     end
 
     def permit(original_hash, *allowed_fields)
       new_hash = {}
-      if allowed_fields.nil?
+      if allowed_fields.nil? || !original_hash.is_a?(Hash)
         return {}
       end
       allowed_fields.each do |field|
-        new_hash[field] = original_hash[field]
+        new_hash[field] = original_hash[field] if original_hash[field]
       end 
-      new_hash
+      return new_hash
     end
 
     def stop_streaming(stream)
@@ -100,4 +108,25 @@ class KurentoWebsocketsController < WebsocketRails::BaseController
       # remove the stream from the connection store
       connection_store[:streaming] = nil      
     end
+
+    def on_viewer_stop(stream)
+      if stream && stream.live?
+        stream.current_viewers -= 1
+        stream.save
+        WebsocketRails["stream-#{stream.id}"].trigger 'viewer-disconnected'
+      end
+      connection_store[:viewing] = nil
+    end
+
+    def set_stream
+      if message && stream_params(message).has_key?(:id)
+        @stream = KurentoRailsVideoStream.find(stream_params(message)[:id])
+      elsif connection_store
+        if connection_store.has_key?(:streaming)
+          @stream = KurentoRailsVideoStream.find(connection_store[:streaming])
+        elsif connection_store.has_key?(:viewing)
+          @stream = KurentoRailsVideoStream.find(connection_store[:viewing])
+        end
+      end
+    end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kurento_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Andrew Stephenson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler