kurento-utils - npm Package Compare versions

Comparing version 5.0.3 to 5.0.4

Gruntfile.js

@@ -69,3 +69,3 @@ /*
         {
-          bundleOptions: {
+          browserifyOptions: {
             standalone: '<%= pkg.name %>'
@@ -101,4 +101,4 @@ }
         {
-          debug: true,
-          bundleOptions: {
+          browserifyOptions: {
+            debug: true,
             standalone: '<%= pkg.name %>'
@@ -105,0 +105,0 @@ },

lib/WebRtcPeer.js

@@ -16,2 +16,4 @@ /*
 
+var freeice = require('freeice');
+
 /**
@@ -56,8 +58,13 @@ * @description Default handler for error callbacks. The error messaged passed
  * @param videoStream -
- *            {Object} MediaStream to be used as source for localVideo and to be
- *            added as stream to the RTCPeerConnection
+ *            {Object} MediaStream to be used as primary source (typically video
+ *            and audio, or only video if combined with audioStream) for
+ *            localVideo and to be added as stream to the RTCPeerConnection
+ * @param audioStream -
+ *            {Object} MediaStream to be used as second source (typically for
+ *            audio) for localVideo and to be added as stream to the
+ *            RTCPeerConnection
  * 
  */
 function WebRtcPeer(mode, localVideo, remoteVideo, onsdpoffer, onerror,
-		videoStream) {
+		videoStream, audioStream) {
 
@@ -72,2 +79,3 @@ Object.defineProperty(this, 'pc', {
 	this.stream = videoStream;
+	this.audioStream = audioStream;
 	this.mode = mode;
@@ -106,2 +114,6 @@ this.onsdpoffer = onsdpoffer || noop;
 
+	if (this.audioStream) {
+		pc.addStream(this.audioStream);
+	}
+
 	this.constraints = {
@@ -122,7 +134,14 @@ mandatory : {
 
+	var ended = false;
 	pc.onicecandidate = function(e) {
 		// candidate exists in e.candidate
-		if (e.candidate)
+		if (e.candidate) {
+			ended = false;
 			return;
+		}
 
+		if (ended) {
+			return;
+		}
+
 		var offerSdp = pc.localDescription.sdp;
@@ -133,4 +152,5 @@ console.log('ICE negotiation completed');
 		// self.emit('sdpoffer', offerSdp);
+
+		ended = true;
 	};
-
 }
@@ -149,3 +169,7 @@
 	// if (this.stream) this.pc.removeStream(this.stream);
-	if (this.pc)
+
+	// For old browsers, PeerConnection.close() is NOT idempotent and raise
+	// error. We check its signaling state and don't close it if it's already
+	// closed
+	if (this.pc && this.pc.signalingState != 'closed')
 		this.pc.close();
@@ -160,6 +184,6 @@
 		this.stream.getAudioTracks().forEach(function(track) {
-			track.stop()
+			track.stop && track.stop()
 		})
 		this.stream.getVideoTracks().forEach(function(track) {
-			track.stop()
+			track.stop && track.stop()
 		})
@@ -222,5 +246,3 @@ }
 WebRtcPeer.prototype.server = {
-	iceServers : [ {
-		url : 'stun:stun.l.google.com:19302'
-	} ]
+	iceServers : freeice()
 };
@@ -262,4 +284,13 @@
  * @param videoStream -
- *            {Object} MediaStream to be used as source for localVideo and to be
- *            added as stream to the RTCPeerConnection
+ *            {Object} MediaStream to be used as primary source (typically video
+ *            and audio, or only video if combined with audioStream) for
+ *            localVideo and to be added as stream to the RTCPeerConnection
+ * @param videoStream -
+ *            {Object} MediaStream to be used as primary source (typically video
+ *            and audio, or only video if combined with audioStream) for
+ *            localVideo and to be added as stream to the RTCPeerConnection
+ * @param audioStream -
+ *            {Object} MediaStream to be used as second source (typically for
+ *            audio) for localVideo and to be added as stream to the
+ *            RTCPeerConnection
  * 
@@ -269,5 +300,5 @@ * @return {module:kurentoUtils.WebRtcPeer}
 WebRtcPeer.start = function(mode, localVideo, remoteVideo, onSdp, onerror,
-		mediaConstraints, videoStream) {
+		mediaConstraints, videoStream, audioStream) {
 	var wp = new WebRtcPeer(mode, localVideo, remoteVideo, onSdp, onerror,
-			videoStream);
+			videoStream, audioStream);
 
@@ -274,0 +305,0 @@ if (wp.mode !== 'recv' && !wp.stream) {

package.json

 {
   "name": "kurento-utils",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "description": "Kurento Utilities",
@@ -27,13 +27,16 @@ "homepage": "http://www.kurento.org",
   "devDependencies": {
-    "bower": "~1.3.8",
+    "bower": "~1.3.12",
     "grunt": "~0.4.5",
-    "grunt-browserify": "~2.1.3",
+    "grunt-browserify": "~3.0.1",
     "grunt-npm2bower-sync": "^0.4.0",
-    "grunt-jsdoc": "^0.5.6",
-    "grunt-shell": "^0.7.0",
+    "grunt-jsdoc": "^0.5.7",
+    "grunt-shell": "^1.1.1",
     "grunt-cli": "~0.1.13",
-    "grunt-contrib-clean": "~0.5.0",
-    "minifyify": "~3.0.12",
-    "browserify": "~4.2.3"
+    "grunt-contrib-clean": "~0.6.0",
+    "minifyify": "~4.4.0",
+    "browserify": "~6.0.2"
+  },
+  "dependencies": {
+    "freeice": "^2.1.0"
   }
 }

No alert changes

Improved metrics

Total package byte prevSize

57117

3.7%

Lines of code

504

5.66%

Worsened metrics

Dependency count

1

Infinity%

Dependency changes

• + Added

  freeice@^2.1.0

• + Added

  freeice@2.2.2
  (transitive)

• + Added

  normalice@1.0.1
  (transitive)