@reactoo/watchtogether-sdk-js 2.6.11 → 2.6.13

package/package.json

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

package/src/models/iot.js

@@ -49,10 +49,16 @@ let iot = function () {
             __currentTopics.length = 0;
             
             this.iot.__promise
-                .then(([suggestedTopic, instance]) => (subscribeToSuggestedTopics ?
-                        Promise.all([...suggestedTopic, ...__currentTopicsCopy].map(topic => this.iot.subscribe(topic))).then(() => instance) :
-                        Promise.resolve(instance)
-                ))
+                .then(([suggestedTopic, instance]) => {
+                    if(!subscribeToSuggestedTopics) {
+                        return  Promise.resolve(instance)
+                    }
+                    const topics = [...suggestedTopic, ...__currentTopicsCopy];
+                    __currentTopics = topics.filter((c, index) => {
+                        return topics.indexOf(c) !== index;
+                    });
+                    return Promise.all(__currentTopics.map(topic => this.iot.subscribe(topic))).then(() => instance)
+                })
                 .then((instance) => {
                     this.iot.$on('error', this.iot.__reconnect, this);
                     this.iot.$on('updateCredentials', this.iot.__updateCredentials, this);

package/src/models/utils.js

@@ -119,5 +119,37 @@ export default {
                 stream.getVideoTracks().forEach(track => track.enabled = !muteVideo);
                 return stream;
             });
+    },
+
+    getHostStream({
+                      hasAudio,
+                      hasVideo,
+                      aDeviceId,
+                      vDeviceId,
+                      channelCount = 1} = {}
+    ) {
+
+        let audioOnlyConstraints = {
+            audio: {
+                ...(aDeviceId && {deviceId: {exact:aDeviceId}}),
+                channelCount
+            }
+        };
+
+        let videoOnlyConstraints = {
+            video: {
+                ...(vDeviceId && {deviceId: {exact:vDeviceId}}),
+                frameRate: {ideal: 30, max: 30},
+                width: {min: 1280, ideal: 1920},
+                height: {min: 720, ideal: 1080},
+            }
+        };
+
+        let fullConstraints = {
+            ...(hasAudio ? audioOnlyConstraints : {audio: false}),
+            ...(hasVideo ? videoOnlyConstraints : {video: false})
+        };
+
+        return navigator.mediaDevices.getUserMedia(fullConstraints);
     }
 }

package/src/modules/wt-iot.js

@@ -42,6 +42,7 @@ class Iot {
     }
     
     updateWebSocketCredentials(accessKeyId, secretAccessKey, sessionToken, expiration) {
+        this.log('iot updateWebSocketCredentials');
         if(this.device) {
             this.device.updateWebSocketCredentials(accessKeyId, secretAccessKey, sessionToken);
             this.startCredentialsExpirationCheck(expiration);
@@ -49,6 +50,7 @@ class Iot {
     }
     
     connect(apiMqttUrl, apiMqttClientId, region, accessKeyId, secretAccessKey, sessionToken, expiration, forceDisconnect = false) {
+        this.log('iot connect');
         return this.disconnect(forceDisconnect).then(() => {
             return new Promise((resolve, reject) => {
                 this.device = device({
@@ -59,7 +61,7 @@ class Iot {
                     accessKeyId: accessKeyId,
                     secretKey: secretAccessKey,
                     sessionToken: sessionToken,
-                    keepalive: 15,
+                    keepalive: 30,
                     maximumReconnectTimeMs: 8000,
                     enableMetrics: false,
                     debug: this.debugFlag,
@@ -126,33 +128,41 @@ class Iot {
     }
     
     subscribe(topic) {
+        this.log('iot subscribe', topic);
         return this.device && this.device.subscribe(topic);
     }
     
     unsubscribe(topic) {
+        this.log('iot unsubscribe', topic);
         return this.device && this.device.unsubscribe(topic);
     }
     
     send(topic, message) {
+        this.log('iot send', topic, message);
         let msg = typeof message === 'object' ? JSON.stringify(message) : message;
         return this.device && this.device.publish(topic, msg);
     }
     
     __reconnectCb() {
+        this.log('iot reconnect');
         this.emit('reconnect');
     }
     __connectCb() {
+        this.log('iot connect');
         this.connectionActive = true;
         this.emit('connect');
     }
     __failureCb(err) {
+        this.log('iot failure');
         this.emit('error', err);
     }
     __closeCb(responseObject) {
+        this.log('iot close');
         this.connectionActive = false;
         this.emit('close');
     }
     __offlineCb(responseObject) {
+        this.log('iot offline');
         this.emit('offline');
     }
     

package/src/modules/wt-room.js

@@ -1370,6 +1370,7 @@ class RoomSession {
 
 							let transceiver = config.pc?.getTransceivers()?.find(
 								t => t.receiver.track === ev.target);
+
 							let mid = transceiver?.mid || ev.target.id;
 
 							if (config.stream) {
@@ -1850,9 +1851,9 @@ class RoomSession {
 							direction: 'sendonly',
 							streams: [config.stream],
 							sendEncodings: [
-								{ rid: 'h', active: true, maxBitrate: bitRates.high },
-								{ rid: 'm', active: true, maxBitrate: bitRates.medium, scaleResolutionDownBy: 2 },
-								{ rid: 'l', active: true, maxBitrate: bitRates.low, scaleResolutionDownBy: 4 }
+								{ rid: 'h', active: true, scalabilityMode: 'L1T2', maxBitrate: bitRates.high },
+								{ rid: 'm', active: true, scalabilityMode: 'L1T2', maxBitrate: bitRates.medium, scaleResolutionDownBy: 2 },
+								{ rid: 'l', active: true, scalabilityMode: 'L1T2', maxBitrate: bitRates.low, scaleResolutionDownBy: 4 }
 							]
 						})
 					}