@reactoo/watchtogether-sdk-js 2.7.66 → 2.7.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactoo/watchtogether-sdk-js",
-  "version": "2.7.66",
+  "version": "2.7.67",
   "description": "Javascript SDK for Reactoo",
   "main": "dist/watchtogether-sdk.min.js",
   "module": "dist/watchtogether-sdk.min.js",

package/src/models/iot.js

@@ -10,10 +10,11 @@ let iot = function () {
     let subscriptionFailureCount = 0;
 
     return {
-        
+
         __promise: null,
 
         __createNewWorker: () => {
+            this.__privates.iot.log('Creating new worker...');
             this.__privates.iot.terminateWorker();
             this.__privates.iot.initWorker();
         },
@@ -44,11 +45,11 @@ let iot = function () {
                     return Promise.reject(error);
                 });
         },
-        
+
         getCredentials: () => {
             return this.__privates.auth.__client
                 .then(client => client.apis.auth.iotSignIn({}, {requestBody: {suggestedTopics:true, domain: location.hostname}}))
-            
+
         },
 
         onConnect: (data, connectionId) => {
@@ -58,6 +59,7 @@ let iot = function () {
             this.__privates.iot.log('MQTT client closed');
             if(shouldBeConnected && !isReconnecting) {
                 this.__privates.iot.log('Connection unexpectedly closed, reconnecting...');
+                this.iot.__createNewWorker();
                 this.iot.__updateCredentials();
             }
         },
@@ -91,7 +93,7 @@ let iot = function () {
             interruptCount++;
             this.__privates.iot.log('MQTT client connection_failure');
         },
-        
+
         iotLogin: (subscribeToSuggestedTopics = true) => {
 
             interruptCount = 0;
@@ -150,12 +152,13 @@ let iot = function () {
 
             return this.iot.__promise;
         },
-        
+
         iotLogout: (keepCurrentTopics = false) => {
 
             if(!keepCurrentTopics) {
                 __currentTopics.clear();
                 this.__privates.iot.clearTopics();
+                this.__privates.iot.terminateWorker();
             }
 
             interruptCount = 0;
@@ -180,11 +183,11 @@ let iot = function () {
                     return true;
                 });
         },
-        
+
         isConnected: () => {
             return this.__privates.iot.isConnected();
         },
-        
+
         subscribe: (topic) => {
             if(!__currentTopics.has(topic)) {
                 __currentTopics.add(topic);
@@ -216,7 +219,7 @@ let iot = function () {
                     });
             }
         },
-        
+
         unsubscribe: (topic) => {
             __currentTopics.delete(topic);
             if(!this.iot.__promise) return Promise.reject('not_connected');
@@ -228,19 +231,19 @@ let iot = function () {
                     return Promise.reject('unsubscription_failed');
                 });
         },
-        
+
         send: (topic, message) => {
             return this.iot.__promise.then(() => this.__privates.iot.send(topic,message));
         },
-        
+
         $once: (key, callback, that) => {
             return this.__privates.iot.once(key, callback, that || this);
         },
-        
+
         $on: (key, callback, that) => {
             return this.__privates.iot.on(key, callback, that || this);
         },
-        
+
         $off: (key, callback, that) => {
             return this.__privates.iot.off(key, callback, that || this);
         },
@@ -250,7 +253,7 @@ let iot = function () {
         $emit: (key, ...args) => {
             return this.__privates.iot.emit(key, ...args);
         },
-        
+
         checkConnection: () => {
             return this.__privates.iot.checkConnection()
                 .catch(error => {
@@ -271,6 +274,7 @@ let iot = function () {
                     }
 
                     this.__privates.iot.log('Connection check failed:', error);
+                    this.iot.__createNewWorker();
                     return this.iot.__updateCredentials();
                 });
         },
@@ -285,12 +289,13 @@ let iot = function () {
                     .catch(error => {
 
                         if(error?.cause === -1) {
-                            this.__privates.iot.log("We don't have a topic to check connection with");
+                            this.__privates.iot.log("We don't have a topic to check connection with or check was aborted");
                             return;
                         }
 
-                        if(!document.hidden && shouldBeConnected && !isReconnecting) {
+                        if(shouldBeConnected && !isReconnecting) {
                             this.__privates.iot.log('Keepalive failed:', error);
+                            this.iot.__createNewWorker();
                             this.iot.__updateCredentials();
                         }
                     });

package/src/modules/wt-iot2.js

@@ -11,7 +11,7 @@ class Iot {
         this.currentCredentialsExpirationStamp = null;
         this.lastConnectParams = null;
         this.subscribedTopics = new Set();
-        this.currentConnectionId = null;
+        this.abortController = null;
         this.initWorker();
 
         if (enableDebugFlag) {
@@ -26,11 +26,13 @@ class Iot {
     }
 
     initWorker() {
+        this.log('iot initWorker');
         this.worker = new Worker();
         this.worker.onmessage = this.handleWorkerMessage.bind(this);
     }
 
     terminateWorker() {
+        this.log('iot terminateWorker');
         this.worker.terminate();
     }
 
@@ -43,6 +45,7 @@ class Iot {
             })
             .then(() => {
                 this.log('iot connect');
+                this.abortController = new AbortController();
                 this.startCredentialsExpirationCheck(expiration);
                 this.lastConnectParams = { apiMqttUrl, apiMqttClientId, region, accessKeyId, secretAccessKey, sessionToken, expiration };
 
@@ -60,7 +63,6 @@ class Iot {
                         clearTimeout(timeoutId);
                         this.off('worker:connect_result', handleConnectResult);
                         if (event.success) {
-                            this.currentConnectionId = event.connectionId;
                             resolve();
                         } else {
                             reject(new Error(event.error));
@@ -86,6 +88,7 @@ class Iot {
     disconnect() {
         this.log('iot disconnect');
         this.stopCredentialsExpirationCheck();
+        this.abortController?.abort();
         return new Promise((resolve, reject) => {
 
             const stamp = new Date().getTime();
@@ -377,12 +380,23 @@ class Iot {
 
             const timeoutId = setTimeout(() => {
                 this.off('message', checkMessageHandler);
+                this.abortController.signal.removeEventListener('abort', abort);
                 reject(new Error('Connection check timeout'));
             }, 5000);
 
+            const abort = () => {
+                clearTimeout(timeoutId);
+                this.off('message', checkMessageHandler);
+                this.abortController.signal.removeEventListener('abort', abort);
+                reject(new Error('Connection check aborted', {cause: -1}));
+            };
+
+            this.abortController.signal.addEventListener('abort', abort);
+
             const checkMessageHandler = (message) => {
                 if (message.type === 'keep_alive' && message.timestamp === testMessage.timestamp) {
                     clearTimeout(timeoutId);
+                    this.abortController.signal.removeEventListener('abort', abort);
                     this.off('message', checkMessageHandler);
                     resolve();
                 }
@@ -395,4 +409,4 @@ class Iot {
     }
 }
 
-export default Iot;
+export default Iot;