@reactoo/watchtogether-sdk-js 2.7.38-beta.1 → 2.7.38-beta.4

package/package.json

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

package/src/models/iot.js

@@ -6,13 +6,14 @@ let iot = function () {
     let keepAliveIntervalId = null;
     let shouldBeConnected = false;
     let isReconnecting = false;
-    let failureCount = 0;
+    let interruptCount = 0;
 
     return {
         
         __promise: null,
 
         __updateCredentials: () => {
+            interruptCount = 0;
             isReconnecting = true;
             return this.iot.getCredentials()
                 .then(response => this.__privates.iot.updateWebSocketCredentials(
@@ -56,6 +57,10 @@ let iot = function () {
             this.__privates.iot.log('MQTT client disconnect');
         },
         onInterrupt: () => {
+            if(shouldBeConnected && !isReconnecting && !document.hidden && interruptCount > 10) {
+                this.iot.__updateCredentials();
+            }
+            interruptCount++;
             console.log('MQTT client interrupt');
             this.__privates.iot.log('MQTT client interrupt');
         },
@@ -69,11 +74,7 @@ let iot = function () {
         },
         onConnectionFailure: () => {
 
-            if(shouldBeConnected && !isReconnecting && failureCount > 10) {
-                this.iot.__updateCredentials();
-            }
 
-            //failureCount++;
 
             console.log('MQTT client connection_failure');
 
@@ -81,6 +82,10 @@ let iot = function () {
         },
         
         iotLogin: (subscribeToSuggestedTopics = true) => {
+
+            interruptCount = 0;
+            shouldBeConnected = true;
+
             this.iot.__promise = new Promise((resolve, reject) => {
                 this.iot.getCredentials()
                     .then(response => {
@@ -104,10 +109,8 @@ let iot = function () {
             let __currentTopicsCopy = new Set(__currentTopics); // Keep this line
             __currentTopics.clear();
 
-            shouldBeConnected = true;
-
             this.iot.setupVisibilityChangeListener();
-            //this.iot.setupKeepAliveInterval();
+            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);
@@ -138,16 +141,18 @@ let iot = function () {
         },
         
         iotLogout: (keepCurrentTopics = false) => {
+
             if(!keepCurrentTopics) {
                 __currentTopics.clear();
             }
 
+            interruptCount = 0;
             shouldBeConnected = false;
 
             return this.__privates.iot.disconnect()
                 .then(() => {
                     this.iot.disableVisibilityChangeListener();
-                    //this.iot.disableKeepAliveInterval();
+                    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);
@@ -212,7 +217,9 @@ let iot = function () {
 
         setupKeepAliveInterval: () => {
             clearInterval(keepAliveIntervalId);
-            keepAliveIntervalId = setInterval(this.iot.checkConnection, 30000);
+            keepAliveIntervalId = setInterval(() => {
+                this.__privates.iot.keepAliveMessage();
+            }, 30000);
         },
 
         disableKeepAliveInterval: () => {

package/src/modules/wt-iot.js

@@ -7,7 +7,6 @@ class Iot {
         Object.assign(this, emitter());
         this.decoder = new TextDecoder('utf-8');
         this.log = Iot.noop;
-        // Remove: this.debugFlag = enableDebugFlag;
         this.credentialsExpirationCheckIntervalId = null;
         this.currentCredentialsExpirationStamp = null;
         this.lastConnectParams = null;
@@ -252,9 +251,7 @@ class Iot {
         this.log('iot updateWebSocketCredentials');
         this.lastConnectParams = {...this.lastConnectParams, accessKeyId, secretAccessKey, sessionToken, expiration };
         const currentTopics = new Set(this.subscribedTopics);
-
         // disconnect is part of connect process
-
         return this.connect(
             this.lastConnectParams.apiMqttUrl,
             this.lastConnectParams.apiMqttClientId,
@@ -319,6 +316,24 @@ class Iot {
             }
         });
     }
+
+    keepAliveMessage() {
+        if (this.subscribedTopics.size === 0) {
+            this.log('No subscribed topics available for keep alive message');
+            return;
+        }
+        // Find a suitable topic for the connection check
+        const suitableTopic = Array.from(this.subscribedTopics).find(topic => topic.indexOf('user') > -1);
+        if (!suitableTopic) {
+            this.log('No suitable topic found for keep alive message');
+            return;
+        }
+        const testMessage = {
+            type: 'keep_alive',
+            timestamp: Date.now()
+        };
+        this.send(suitableTopic, testMessage);
+    }
 }
 
 export default Iot;