@reactoo/watchtogether-sdk-js 2.7.64 → 2.7.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactoo/watchtogether-sdk-js",
-  "version": "2.7.64",
+  "version": "2.7.66",
   "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;
@@ -65,6 +70,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 +85,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++;
@@ -182,24 +189,29 @@ let iot = function () {
             if(!__currentTopics.has(topic)) {
                 __currentTopics.add(topic);
                 if(!this.iot.__promise) return Promise.reject('not_connected');
-                // if subscription fails, remove the topic from the current topics
                 return this.iot.__promise
                     .then(() => this.__privates.iot.subscribe(topic))
                     .catch((error) => {
 
+                        // if subscription fails, remove the topic from the current topics
                         __currentTopics.delete(topic);
 
                         if(error?.cause === -1) {
                             return Promise.reject('invalid_topic');
                         }
 
+                        if(!shouldBeConnected || isReconnecting) {
+                            return Promise.reject('subscription_failed');
+                        }
+
                         if(shouldBeConnected && !isReconnecting && subscriptionFailureCount > 5) {
                             this.__privates.iot.log('Subscription failure exceeded, reconnecting...');
+                            this.iot.__createNewWorker();
                             this.iot.__updateCredentials();
                             return Promise.reject('subscription_failed');
                         }
-                        subscriptionFailureCount++;
 
+                        subscriptionFailureCount++;
                         return this.subscribe(topic)
                     });
             }
@@ -208,10 +220,10 @@ let iot = function () {
         unsubscribe: (topic) => {
             __currentTopics.delete(topic);
             if(!this.iot.__promise) return Promise.reject('not_connected');
-            // if unsubscription fails add the topic back to the current topics
             return this.iot.__promise
                 .then(() => this.__privates.iot.unsubscribe(topic))
                 .catch(() => {
+                    // if unsubscription fails add the topic back to the current topics
                     __currentTopics.add(topic);
                     return Promise.reject('unsubscription_failed');
                 });

package/src/modules/wt-iot2.js

@@ -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()