@reactoo/watchtogether-sdk-js 2.7.34 → 2.7.35

package/dist/watchtogether-sdk.js

@@ -1,6 +1,6 @@
 /*!
  *  @reactoo/watchtogether-sdk-js
- *  @version 2.7.32
+ *  @version 2.7.34
  */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
@@ -16725,11 +16725,9 @@ 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();
     },
     onError: () => {
       this.__privates.iot.log('MQTT client error');
@@ -16758,6 +16756,7 @@ let iot = function () {
       });
       let __currentTopicsCopy = new Set(__currentTopics); // Keep this line
       __currentTopics.clear();
+      _this.iot.setupVisibilityChangeListener();
       _this.iot.$on('connect', _this.iot.onConnect, _this);
       _this.iot.$on('closed', _this.iot.onClosed, _this);
       _this.iot.$on('error', _this.iot.onError, _this);
@@ -16788,6 +16787,7 @@ let iot = function () {
         __currentTopics.clear();
       }
       return _this.__privates.iot.disconnect().then(() => {
+        _this.iot.disableVisibilityChangeListener();
         _this.iot.$off('connect', _this.iot.onConnect, _this);
         _this.iot.$off('closed', _this.iot.onClosed, _this);
         _this.iot.$off('error', _this.iot.onError, _this);
@@ -25213,7 +25213,6 @@ class Iot {
   constructor(enableDebugFlag) {
     Object.assign(this, (0,_wt_emitter__WEBPACK_IMPORTED_MODULE_0__["default"])());
     this.decoder = new TextDecoder('utf-8');
-    this.connectionActive = false;
     this.log = Iot.noop;
     // Remove: this.debugFlag = enableDebugFlag;
     this.credentialsExpirationCheckIntervalId = null;
@@ -25229,41 +25228,6 @@ class Iot {
   enableDebug() {
     this.log = console.log.bind(console);
   }
-  onConnect() {
-    this.connectionActive = true;
-    this.emit('connect');
-  }
-  onClosed(error) {
-    this.connectionActive = false;
-    this.emit('closed', error);
-  }
-  onDisconnect() {
-    this.connectionActive = false;
-    this.emit('disconnect');
-  }
-  onError(error) {
-    this.connectionActive = false;
-    this.emit('error', error);
-  }
-  onInterrupt(error) {
-    this.connectionActive = false;
-    this.emit('interrupt', error);
-  }
-  onResume(r) {
-    this.connectionActive = true;
-    this.emit('resume', r);
-  }
-  onMessage(topic, payload) {
-    this.handleMessage(topic, new Uint8Array(payload));
-  }
-  onConnectionSuccess(r) {
-    this.connectionActive = true;
-    this.emit('connection_success', r);
-  }
-  onConnectionFailure(error) {
-    this.connectionActive = false;
-    this.emit('connection_failure', error);
-  }
   connect(apiMqttUrl, apiMqttClientId, region, accessKeyId, secretAccessKey, sessionToken, expiration) {
     this.log('iot connect called, we disconnect first just to be sure');
     return this.disconnect().finally(() => {
@@ -25289,15 +25253,33 @@ class Iot {
       const config = configBuilder.build();
       const client = new aws_iot_device_sdk_v2__WEBPACK_IMPORTED_MODULE_2__.mqtt.MqttClient();
       this.connection = client.new_connection(config);
-      this.connection.on('connect', this.onConnect, this);
-      this.connection.on('closed', this.onClosed, this);
-      this.connection.on('disconnect', this.onDisconnect, this);
-      this.connection.on('error', this.onError, this);
-      this.connection.on('interrupt', this.onInterrupt, this);
-      this.connection.on('resume', this.onResume, this);
-      this.connection.on('message', this.onMessage, this);
-      this.connection.on('connection_success', this.onConnectionSuccess, this);
-      this.connection.on('connection_failure', this.onConnectionFailure, this);
+      this.connection.on('connect', () => {
+        this.emit('connect');
+      });
+      this.connection.on('closed', error => {
+        this.emit('closed', error);
+      });
+      this.connection.on('disconnect', () => {
+        this.emit('disconnect');
+      });
+      this.connection.on('error', error => {
+        this.emit('error', error);
+      });
+      this.connection.on('interrupt', error => {
+        this.emit('interrupt', error);
+      });
+      this.connection.on('resume', error => {
+        this.emit('resume', error);
+      });
+      this.connection.on('message', (topic, payload) => {
+        this.handleMessage(topic, new Uint8Array(payload));
+      });
+      this.connection.on('connection_success', error => {
+        this.emit('connection_success', error);
+      });
+      this.connection.on('connection_failure', error => {
+        this.emit('connection_failure', error);
+      });
       return this.connection.connect().then(() => {
         this.startCredentialsExpirationCheck(expiration);
       });
@@ -25307,12 +25289,11 @@ 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) {
     this.log('iot subscribe', topic);
@@ -25441,7 +25422,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);
@@ -25468,7 +25450,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;
       }