@reactoo/watchtogether-sdk-js 2.7.40 → 2.7.41

package/dist/watchtogether-sdk.js

@@ -1,6 +1,6 @@
 /*!
  *  @reactoo/watchtogether-sdk-js
- *  @version 2.7.39
+ *  @version 2.7.40
  */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
@@ -16715,13 +16715,11 @@ let iot = function () {
   return {
     __promise: null,
     __updateCredentials: () => {
+      this.__privates.iot.log('Updating Credentials...');
       interruptCount = 0;
       isReconnecting = true;
       return this.iot.getCredentials().then(response => this.__privates.iot.updateWebSocketCredentials(response.data.credentials.accessKeyId, response.data.credentials.secretAccessKey, response.data.credentials.sessionToken, 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;
       });
@@ -16740,6 +16738,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();
       }
     },
@@ -16751,6 +16750,7 @@ let iot = function () {
     },
     onInterrupt: () => {
       if (shouldBeConnected && !isReconnecting && !document.hidden && interruptCount > 10) {
+        this.__privates.iot.log('Interrupt count exceeded, reconnecting...');
         this.iot.__updateCredentials();
       }
       interruptCount++;
@@ -16786,6 +16786,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(_ref => {
         let [suggestedTopic, instance] = _ref;
         if (!subscribeToSuggestedTopics) {
@@ -16793,9 +16794,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;
@@ -16820,6 +16818,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;
       });
@@ -16858,6 +16857,10 @@ 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();
       });
@@ -16865,8 +16868,13 @@ 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: () => {
       clearInterval(keepAliveIntervalId);
@@ -25265,6 +25273,7 @@ class Iot {
     this.log('iot connect called, we disconnect first just to be sure');
     return this.disconnect().finally(() => {
       this.log('iot connect');
+      this.startCredentialsExpirationCheck(expiration);
       this.lastConnectParams = {
         apiMqttUrl,
         apiMqttClientId,
@@ -25313,9 +25322,7 @@ class Iot {
       this.connection.on('connection_failure', error => {
         this.emit('connection_failure', error);
       });
-      return this.connection.connect().then(() => {
-        this.startCredentialsExpirationCheck(expiration);
-      });
+      return this.connection.connect();
     });
   }
   disconnect() {
@@ -25457,6 +25464,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);
@@ -25479,7 +25487,6 @@ class Iot {
     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);
     });
   }
   checkConnection() {
@@ -25503,7 +25510,7 @@ class Iot {
         return;
       }
       const testMessage = {
-        type: 'connection_check',
+        type: 'keep_alive',
         timestamp: Date.now()
       };
       const timeoutId = setTimeout(() => {
@@ -25512,7 +25519,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();
@@ -25528,30 +25535,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}`);
-    }
-  }
 }
 /* harmony default export */ __webpack_exports__["default"] = (Iot);