@reactoo/watchtogether-sdk-js 2.7.40 → 2.7.41

package/package.json

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

package/src/models/iot.js

@@ -13,6 +13,7 @@ let iot = function () {
         __promise: null,
 
         __updateCredentials: () => {
+            this.__privates.iot.log('Updating Credentials...');
             interruptCount = 0;
             isReconnecting = true;
             return this.iot.getCredentials()
@@ -23,10 +24,7 @@ let iot = function () {
                     response.data.credentials.expiration
                 ))
                 .catch(error => {
-                    console.log('Failed to update credentials:', error);
                     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;
@@ -45,6 +43,7 @@ let iot = function () {
         onClosed: () => {
             this.__privates.iot.log('MQTT client closed');
             if(shouldBeConnected && !isReconnecting) {
+                this.__privates.iot.log('Connection unexpectedly closed, reconnecting...');
                 this.iot.__updateCredentials();
             }
         },
@@ -56,6 +55,7 @@ let iot = function () {
         },
         onInterrupt: () => {
             if(shouldBeConnected && !isReconnecting && !document.hidden && interruptCount > 10) {
+                this.__privates.iot.log('Interrupt count exceeded, reconnecting...');
                 this.iot.__updateCredentials();
             }
             interruptCount++;
@@ -109,6 +109,7 @@ let iot = function () {
             this.iot.$on('resume', this.iot.onResume, this);
             this.iot.$on('connection_success', this.iot.onConnectionSuccess, this);
             this.iot.$on('connection_failure', this.iot.onConnectionFailure, this);
+            this.iot.$on('updateCredentials', this.iot.__updateCredentials, this);
 
             this.iot.__promise
                 .then(([suggestedTopic, instance]) => {
@@ -118,10 +119,6 @@ let iot = function () {
                     let topics = new Set([...suggestedTopic, ...__currentTopicsCopy]); // Filter out any undefined or null topics
                     return Promise.all(Array.from(topics).map(topic => this.iot.subscribe(topic))).then(() => instance)
                 })
-                .then((instance) => {
-                    this.iot.$on('updateCredentials', this.iot.__updateCredentials, this);
-                    return instance;
-                })
                 .catch((error) => {
                     this.__privates.iot.log('MQTT Login Error:', error);
                     throw error;
@@ -151,6 +148,7 @@ let iot = function () {
                     this.iot.$off('resume', this.iot.onResume, this);
                     this.iot.$off('connection_success', this.iot.onConnectionSuccess, this);
                     this.iot.$off('connection_failure', this.iot.onConnectionFailure, this);
+                    this.iot.$off('updateCredentials', this.iot.__updateCredentials, this);
 
                     this.iot.__promise = null;
                     return true;
@@ -200,6 +198,12 @@ let iot = function () {
         checkConnection: () => {
             return this.__privates.iot.checkConnection()
                 .catch(error => {
+
+                    if(!shouldBeConnected || isReconnecting) {
+                        this.__privates.iot.log('Ignoring connection check failure, not connected');
+                        return Promise.resolve();
+                    }
+
                     this.__privates.iot.log('Connection check failed:', error);
                     return this.iot.__updateCredentials();
                 });
@@ -208,8 +212,14 @@ let iot = function () {
         setupKeepAliveInterval: () => {
             clearInterval(keepAliveIntervalId);
             keepAliveIntervalId = setInterval(() => {
-                this.__privates.iot.keepAliveMessage();
-            }, 30000);
+                this.__privates.iot.checkConnection()
+                    .catch(error => {
+                        if(!document.hidden && shouldBeConnected && !isReconnecting) {
+                            this.__privates.iot.log('Keepalive failed:', error);
+                            this.iot.__updateCredentials();
+                        }
+                    });
+            }, 15000);
         },
 
         disableKeepAliveInterval: () => {

package/src/modules/wt-iot.js

@@ -29,6 +29,7 @@ class Iot {
         return this.disconnect()
             .finally(() => {
                 this.log('iot connect');
+                this.startCredentialsExpirationCheck(expiration);
                 this.lastConnectParams = { apiMqttUrl, apiMqttClientId, region, accessKeyId, secretAccessKey, sessionToken, expiration };
 
                 const configBuilder = iot.AwsIotMqttConnectionConfigBuilder.new_with_websockets();
@@ -83,11 +84,7 @@ class Iot {
                     this.emit('connection_failure', error);
                 });
 
-                return this.connection.connect()
-                    .then(() => {
-                        this.startCredentialsExpirationCheck(expiration);
-                    });
-
+                return this.connection.connect();
             });
     }
 
@@ -237,6 +234,7 @@ class Iot {
             const currentTimeStamp = new Date().getTime();
             // update 15 minutes before expiration
             if(this.currentCredentialsExpirationStamp - currentTimeStamp <= 900000) {
+                this.log('iot credentials expired, updating');
                 this.emit('updateCredentials');
             }
         }, 5000);
@@ -263,7 +261,6 @@ class Iot {
         ).then(() => {
             // Resubscribe to topics
             currentTopics.forEach(topic => this.subscribe(topic));
-            this.startCredentialsExpirationCheck(expiration);
         })
     }
 
@@ -292,7 +289,7 @@ class Iot {
             }
 
             const testMessage = {
-                type: 'connection_check',
+                type: 'keep_alive',
                 timestamp: Date.now()
             };
 
@@ -302,7 +299,7 @@ class Iot {
             }, 5000); // 5 seconds timeout
 
             const checkMessageHandler = (message) => {
-                if (message.type === 'connection_check' && message.timestamp === testMessage.timestamp) {
+                if (message.type === 'keep_alive' && message.timestamp === testMessage.timestamp) {
                     clearTimeout(timeoutId);
                     this.off('message', checkMessageHandler);
                     resolve();
@@ -320,34 +317,6 @@ 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
-        let suitableTopic = Array.from(this.subscribedTopics).find(topic => topic.indexOf('user') > -1);
-
-        if(!suitableTopic) {
-            suitableTopic = Array.from(this.subscribedTopics).find(topic => topic.indexOf('room') > -1 && topic !== 'wt/instanceroom/reactooDemo');
-        }
-
-        if (!suitableTopic) {
-            this.log('No suitable topic found for keep alive message');
-            return;
-        }
-        const testMessage = {
-            type: 'keep_alive',
-            timestamp: Date.now()
-        };
-        try {
-            this.send(suitableTopic, testMessage);
-        }
-        catch (error) {
-            this.log(`Keep-alive error: ${error.message}`);
-        }
-    }
 }
 
 export default Iot;