@reactoo/watchtogether-sdk-js 2.7.36 → 2.7.37

package/package.json

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

package/src/models/iot.js

@@ -5,12 +5,14 @@ let iot = function () {
     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, 
@@ -22,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;
                 });
         },
         
@@ -36,7 +41,7 @@ let iot = function () {
         },
         onClosed: () => {
             this.__privates.iot.log('MQTT client closed');
-            if(shouldBeConnected) {
+            if(shouldBeConnected && !isReconnecting) {
                 this.iot.__updateCredentials();
             }
         },

package/src/modules/wt-iot.js

@@ -252,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);
         })
     }