@reactoo/watchtogether-sdk-js 2.5.10 → 2.5.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactoo/watchtogether-sdk-js",
-  "version": "2.5.10",
+  "version": "2.5.14",
   "description": "Javascript SDK for Reactoo",
   "main": "src/index.js",
   "unpkg": "dist/watchtogether-sdk.min.js",

package/src/index.js

@@ -41,9 +41,9 @@ function WatchTogether(modules = {}, instanceType, debug, playerFactory, provide
     this.utils = utils;
 }
 
-let watchTogether = function ({debug = true, isProduction = true, language = 'en-GB', storagePrefix = "reactoo_", apiUrl = null} = {}) {
+let watchTogether = function ({debug = true, language = 'en-GB', storagePrefix = "reactoo_", apiUrl = null} = {}) {
     let room = new Room(debug);
-    let auth = new Auth(debug, isProduction, language, storagePrefix, apiUrl);
+    let auth = new Auth(debug, language, storagePrefix, apiUrl);
     let iot = new Iot(debug);
 
     return ({instanceType = 'reactooDemo', playerFactory = null, providerAuth = null} = {}) => {

package/src/models/room-session.js

@@ -132,7 +132,7 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 				.then(() => this.connect({reactooRoomId}))
 				.then(() => {
 					if (isObserver) {
-						return this.publishLocal(null, {getStreamIfEmpty: false, unpublishFirst: true});
+						return this.publishLocal(null);
 					} else if (stream) {
 						return this.publishLocal(stream);
 					} else
@@ -302,15 +302,8 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 				});
 		},
 
-		publishLocal: function (stream = null, {
-			keepAudio = false,
-			keepVideo = false,
-			getStreamIfEmpty = true,
-			askVideo = true
-		} = {}) {
-			return (stream || !getStreamIfEmpty
-				? room.publishLocal(stream, {keepAudio, keepVideo})
-				: wt.utils.getUserStream(askVideo).then(stream => room.publishLocal(stream)))
+		publishLocal: function (stream = null, {keepAudio = false, keepVideo = false} = {}) {
+			return room.publishLocal(stream, {keepAudio, keepVideo})
 		},
 
 		unpublishLocal: () => {

package/src/models/utils.js

@@ -1,7 +1,7 @@
 'use strict';
 
 export default {
-    getUserStream(hasVideo, isHd, aDeviceId, vDeviceId, lfps, simpleConstraints) {
+    getUserStream(hasVideo, isHd, aDeviceId, vDeviceId, lfps, simpleConstraints, muteAudio = false, muteVideo = false) {
         let fullConstraints, audioOnlyConstraints;
         if(simpleConstraints) {
             fullConstraints = {
@@ -41,5 +41,16 @@ export default {
         }
         
         return navigator.mediaDevices.getUserMedia(hasVideo ? fullConstraints : audioOnlyConstraints)
+            .then(stream => {
+                if (muteAudio) {
+                    stream.getAudioTracks().forEach(track => track.enabled = false);
+                }
+                
+                if (muteVideo) {
+                    stream.getVideoTracks().forEach(track => track.enabled = false);
+                }
+                
+                return stream;
+            });
     }
 }

package/src/modules/wt-auth.js

@@ -4,7 +4,7 @@ import emitter from './wt-emitter';
 
 class Auth {
 	
-	constructor(enableDebugFlag, isProduction = true, language = 'en-GB', storagePrefix = "", apiUrl = null) {
+	constructor(enableDebugFlag, language = 'en-GB', storagePrefix = "", apiUrl = null) {
 		
 		this.ID_TOKEN = `${storagePrefix !== "" ? storagePrefix+'_':''}rwt_idToken`;
 		this.ACCESS_TOKEN = `${storagePrefix !== "" ? storagePrefix+'_':''}rwt_accessToken`;
@@ -22,7 +22,7 @@ class Auth {
 		this.__isRefreshing = false;
 		this.__isLogged = null;
 		this.__parsedJwt = null;
-		this.__specUrl = apiUrl ? apiUrl : (isProduction === true ? config.apiUrl : config.devApiUrl);
+		this.__specUrl = apiUrl ? apiUrl : config.apiUrl;
 		this.__client = this.initialize(true);
 	}