@reactoo/watchtogether-sdk-js 2.7.65 → 2.7.67-beta.0

package/package.json

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

package/src/models/iot.js

@@ -13,6 +13,11 @@ let iot = function () {
         
         __promise: null,
 
+        __createNewWorker: () => {
+            this.__privates.iot.terminateWorker();
+            this.__privates.iot.initWorker();
+        },
+
         __updateCredentials: () => {
             this.__privates.iot.log('Updating Credentials...');
             interruptCount = 0;
@@ -53,6 +58,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();
             }
         },
@@ -65,6 +71,7 @@ let iot = function () {
         onInterrupt: (data, connectionId) => {
             if(shouldBeConnected && !isReconnecting && interruptCount > 10) {
                 this.__privates.iot.log('Interrupt count exceeded, reconnecting...');
+                this.iot.__createNewWorker();
                 this.iot.__updateCredentials();
             }
             interruptCount++;
@@ -79,6 +86,7 @@ let iot = function () {
         onConnectionFailure: (data, connectionId) => {
             if(shouldBeConnected && !isReconnecting && interruptCount > 10) {
                 this.__privates.iot.log('Interrupt count exceeded, reconnecting...');
+                this.iot.__createNewWorker();
                 this.iot.__updateCredentials();
             }
             interruptCount++;
@@ -149,6 +157,7 @@ let iot = function () {
             if(!keepCurrentTopics) {
                 __currentTopics.clear();
                 this.__privates.iot.clearTopics();
+                this.__privates.iot.terminateWorker();
             }
 
             interruptCount = 0;
@@ -199,6 +208,7 @@ let iot = function () {
 
                         if(shouldBeConnected && !isReconnecting && subscriptionFailureCount > 5) {
                             this.__privates.iot.log('Subscription failure exceeded, reconnecting...');
+                            this.iot.__createNewWorker();
                             this.iot.__updateCredentials();
                             return Promise.reject('subscription_failed');
                         }
@@ -263,6 +273,7 @@ let iot = function () {
                     }
 
                     this.__privates.iot.log('Connection check failed:', error);
+                    this.iot.__createNewWorker();
                     return this.iot.__updateCredentials();
                 });
         },
@@ -277,12 +288,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) {
@@ -30,6 +30,10 @@ class Iot {
         this.worker.onmessage = this.handleWorkerMessage.bind(this);
     }
 
+    terminateWorker() {
+        this.worker.terminate();
+    }
+
     connect(apiMqttUrl, apiMqttClientId, region, accessKeyId, secretAccessKey, sessionToken, expiration) {
         this.log('iot connect called, we disconnect first just to be sure');
         return this.disconnect()
@@ -39,6 +43,7 @@ class Iot {
             })
             .then(() => {
                 this.log('iot connect');
+                this.abortController = new AbortController();
                 this.startCredentialsExpirationCheck(expiration);
                 this.lastConnectParams = { apiMqttUrl, apiMqttClientId, region, accessKeyId, secretAccessKey, sessionToken, expiration };
 
@@ -56,7 +61,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));
@@ -82,6 +86,7 @@ class Iot {
     disconnect() {
         this.log('iot disconnect');
         this.stopCredentialsExpirationCheck();
+        this.abortController?.abort();
         return new Promise((resolve, reject) => {
 
             const stamp = new Date().getTime();
@@ -373,12 +378,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();
                 }