@reactoo/watchtogether-sdk-js 2.7.34 → 2.7.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactoo/watchtogether-sdk-js",
-  "version": "2.7.34",
+  "version": "2.7.36",
   "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,6 +3,8 @@
 let iot = function () {
     let __currentTopics = new Set();
     let visibilityChangeHandler = null;
+    let keepAliveIntervalId = null;
+    let shouldBeConnected = false;
 
     return {
         
@@ -31,11 +33,12 @@ let iot = function () {
 
         onConnect: () => {
             this.__privates.iot.log('MQTT client connected');
-            this.iot.setupVisibilityChangeListener();
         },
         onClosed: () => {
             this.__privates.iot.log('MQTT client closed');
-            this.iot.disableVisibilityChangeListener();
+            if(shouldBeConnected) {
+                this.iot.__updateCredentials();
+            }
         },
         onError: () => {
             this.__privates.iot.log('MQTT client error');
@@ -80,6 +83,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);
@@ -116,6 +123,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 +188,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

@@ -6,7 +6,6 @@ class Iot {
     constructor(enableDebugFlag) {
         Object.assign(this, emitter());
         this.decoder = new TextDecoder('utf-8');
-        this.connectionActive = false;
         this.log = Iot.noop;
         // Remove: this.debugFlag = enableDebugFlag;
         this.credentialsExpirationCheckIntervalId = null;
@@ -50,32 +49,26 @@ class Iot {
                 this.connection = client.new_connection(config);
 
                 this.connection.on('connect', () => {
-                    this.connectionActive = true;
                     this.emit('connect');
                 });
 
                 this.connection.on('closed', (error) => {
-                    this.connectionActive = false;
                     this.emit('closed', error);
                 });
 
                 this.connection.on('disconnect', () => {
-                    this.connectionActive = false;
                     this.emit('disconnect');
                 });
 
                 this.connection.on('error', (error) => {
-                    this.connectionActive = false;
                     this.emit('error', error);
                 });
 
                 this.connection.on('interrupt', (error) => {
-                    this.connectionActive = false;
                     this.emit('interrupt', error);
                 });
 
                 this.connection.on('resume', (error) => {
-                    this.connectionActive = true;
                     this.emit('resume', error);
                 });
 
@@ -84,12 +77,10 @@ class Iot {
                 });
 
                 this.connection.on('connection_success', (error) => {
-                    this.connectionActive = true;
                     this.emit('connection_success', error);
                 });
 
                 this.connection.on('connection_failure', (error) => {
-                    this.connectionActive = false;
                     this.emit('connection_failure', error);
                 });
 
@@ -106,13 +97,12 @@ class Iot {
         this.log('iot disconnect');
         this.stopCredentialsExpirationCheck();
         if (this.connection) {
-            this.connectionActive = false;
             return this.connection.disconnect();
         } else return Promise.resolve();
     }
 
     isConnected() {
-        return this.connectionActive;
+        return this.connection && this.connection.currentState === 0 && this.connection.desiredState === 0;
     }
 
     subscribe(topic) {
@@ -208,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})
                 }
@@ -245,7 +236,8 @@ class Iot {
         this.currentCredentialsExpirationStamp = new Date(expiration).getTime();
         this.credentialsExpirationCheckIntervalId = setInterval(() => {
             const currentTimeStamp = new Date().getTime();
-            if(this.currentCredentialsExpirationStamp - currentTimeStamp <= 300000) {
+            // update 15 minutes before expiration
+            if(this.currentCredentialsExpirationStamp - currentTimeStamp <= 900000) {
                 this.emit('updateCredentials');
             }
         }, 5000);
@@ -279,7 +271,7 @@ class Iot {
 
     checkConnection() {
         return new Promise((resolve, reject) => {
-            if (!this.connection || !this.connectionActive) {
+            if (!this.connection || !(this.connection.currentState === 0 && this.connection.desiredState === 0)) {
                 reject(new Error('Not connected'));
                 return;
             }