@reactoo/watchtogether-sdk-js 2.7.33 → 2.7.35

package/package.json

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

package/src/models/iot.js

@@ -31,11 +31,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');
@@ -80,6 +78,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);
@@ -116,6 +115,7 @@ let iot = function () {
             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);

package/src/modules/wt-iot.js

@@ -6,7 +6,6 @@ class Iot {
     constructor(enableDebugFlag) {
         Object.assign(this, emitter());
         this.decoder = new TextDecoder('utf-8');
-        this.connectionActive = false;
         this.log = Iot.noop;
         // Remove: this.debugFlag = enableDebugFlag;
         this.credentialsExpirationCheckIntervalId = null;
@@ -26,46 +25,6 @@ class Iot {
         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()
@@ -88,15 +47,42 @@ class Iot {
 
                 const client = new 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(() => {
@@ -111,13 +97,12 @@ 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) {
@@ -250,7 +235,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);
@@ -284,7 +270,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;
             }