@reactoo/watchtogether-sdk-js 2.7.35 → 2.7.37

package/package.json

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

package/src/models/asset.js

@@ -47,11 +47,11 @@ let asset =  function() {
 				.then(client => client.apis.asset.initiateAssetUpload())
 		},
 
-		uploadAsset: (file, roomIds, id = null, initiationData = null) => {
+		uploadAsset: (file, roomIds, id = null, initiationData = null, assetData = null) => {
 			return this.__privates.auth.__client
 				.then(client => Promise.all([client, initiationData ? Promise.resolve(initiationData) : client.apis.asset.initiateAssetUpload({id: id || generateUUID()})]))
 				.then(([client, response]) => Promise.all([client, client.http({url: response.data.signedUrl, method: response.data.httpMethod, headers: {"Content-Type":file.type}, body:file}), response.data.id]))
-				.then(([client, response, idn]) => Promise.all([client.apis.asset.publishAsset({id:idn}, {requestBody: {title: file.name, ...(roomIds ? {roomIds} : {})}}), idn]))
+				.then(([client, response, idn]) => Promise.all([client.apis.asset.publishAsset({id:idn}, {requestBody: {title: file.name, ...(roomIds ? {roomIds} : {}), ...(assetData ? assetData : {})}}), idn]))
 				;
 		},
 	    downloadAsset: (url, options = {}) => {

package/src/models/iot.js

@@ -3,12 +3,16 @@
 let iot = function () {
     let __currentTopics = new Set();
     let visibilityChangeHandler = null;
+    let keepAliveIntervalId = null;
+    let shouldBeConnected = false;
+    let isReconnecting = false;
 
     return {
         
         __promise: null,
 
         __updateCredentials: () => {
+            isReconnecting = true;
             return this.iot.getCredentials()
                 .then(response => this.__privates.iot.updateWebSocketCredentials(
                     response.data.credentials.accessKeyId, 
@@ -20,6 +24,9 @@ let iot = function () {
                     this.__privates.iot.log('Failed to update credentials:', error);
                     // Let the error propagate to be handled by the Iot class
                     throw error;
+                })
+                .finally(() => {
+                    isReconnecting = false;
                 });
         },
         
@@ -34,6 +41,9 @@ let iot = function () {
         },
         onClosed: () => {
             this.__privates.iot.log('MQTT client closed');
+            if(shouldBeConnected && !isReconnecting) {
+                this.iot.__updateCredentials();
+            }
         },
         onError: () => {
             this.__privates.iot.log('MQTT client error');
@@ -78,7 +88,10 @@ let iot = function () {
             let __currentTopicsCopy = new Set(__currentTopics); // Keep this line
             __currentTopics.clear();
 
+            shouldBeConnected = true;
+
             this.iot.setupVisibilityChangeListener();
+            //this.iot.setupKeepAliveInterval();
             this.iot.$on('connect', this.iot.onConnect, this);
             this.iot.$on('closed', this.iot.onClosed, this);
             this.iot.$on('error', this.iot.onError, this);
@@ -115,7 +128,10 @@ let iot = function () {
             return this.__privates.iot.disconnect()
                 .then(() => {
 
+                    shouldBeConnected = false;
+
                     this.iot.disableVisibilityChangeListener();
+                    //this.iot.disableKeepAliveInterval();
                     this.iot.$off('connect', this.iot.onConnect, this);
                     this.iot.$off('closed', this.iot.onClosed, this);
                     this.iot.$off('error', this.iot.onError, this);
@@ -177,7 +193,17 @@ let iot = function () {
                     return this.iot.__updateCredentials();
                 });
         },
-        
+
+        setupKeepAliveInterval: () => {
+            clearInterval(keepAliveIntervalId);
+            keepAliveIntervalId = setInterval(this.iot.checkConnection, 30000);
+        },
+
+        disableKeepAliveInterval: () => {
+            clearInterval(keepAliveIntervalId);
+            keepAliveIntervalId = null;
+        },
+
         setupVisibilityChangeListener: () => {
             if (visibilityChangeHandler) {
                 // Listener is already set up

package/src/modules/wt-iot.js

@@ -198,7 +198,8 @@ class Iot {
                     event === 'handRaised' ||
                     event === 'handLowered' ||
                     event === 'handsCleared' ||
-                    event === 'volume_set'
+                    event === 'volume_set' ||
+                    event === 'asset_created'
                 ) {
                     this.emit('message', {event, ...message, roomId})
                 }
@@ -251,20 +252,21 @@ class Iot {
         this.log('iot updateWebSocketCredentials');
         this.lastConnectParams = {...this.lastConnectParams, accessKeyId, secretAccessKey, sessionToken, expiration };
         const currentTopics = new Set(this.subscribedTopics);
-        return this.disconnect()
-            .then(() => this.connect(
-                this.lastConnectParams.apiMqttUrl,
-                this.lastConnectParams.apiMqttClientId,
-                this.lastConnectParams.region,
-                accessKeyId,
-                secretAccessKey,
-                sessionToken,
-                expiration
-            ))
-            .then(() => {
-                // Resubscribe to topics
-                currentTopics.forEach(topic => this.subscribe(topic));
-                this.startCredentialsExpirationCheck(expiration);
+
+        // disconnect is part of connect process
+
+        return this.connect(
+            this.lastConnectParams.apiMqttUrl,
+            this.lastConnectParams.apiMqttClientId,
+            this.lastConnectParams.region,
+            accessKeyId,
+            secretAccessKey,
+            sessionToken,
+            expiration
+        ).then(() => {
+            // Resubscribe to topics
+            currentTopics.forEach(topic => this.subscribe(topic));
+            this.startCredentialsExpirationCheck(expiration);
         })
     }