@reactoo/watchtogether-sdk-js 2.7.62 → 2.7.64

package/package.json

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

package/src/models/iot.js

@@ -7,6 +7,7 @@ let iot = function () {
     let shouldBeConnected = false;
     let isReconnecting = false;
     let interruptCount = 0;
+    let subscriptionFailureCount = 0;
 
     return {
         
@@ -15,6 +16,7 @@ let iot = function () {
         __updateCredentials: () => {
             this.__privates.iot.log('Updating Credentials...');
             interruptCount = 0;
+            subscriptionFailureCount = 0;
             isReconnecting = true;
             this.iot.$emit('isReconnecting', isReconnecting, true);
             return this.iot.getCredentials()
@@ -86,6 +88,7 @@ let iot = function () {
         iotLogin: (subscribeToSuggestedTopics = true) => {
 
             interruptCount = 0;
+            subscriptionFailureCount = 0;
             shouldBeConnected = true;
 
             this.iot.__promise = new Promise((resolve, reject) => {
@@ -149,6 +152,7 @@ let iot = function () {
             }
 
             interruptCount = 0;
+            subscriptionFailureCount = 0;
             shouldBeConnected = false;
 
             this.iot.disableVisibilityChangeListener();
@@ -181,9 +185,22 @@ let iot = function () {
                 // if subscription fails, remove the topic from the current topics
                 return this.iot.__promise
                     .then(() => this.__privates.iot.subscribe(topic))
-                    .catch(() => {
+                    .catch((error) => {
+
                         __currentTopics.delete(topic);
-                        return Promise.reject('subscription_failed');
+
+                        if(error?.cause === -1) {
+                            return Promise.reject('invalid_topic');
+                        }
+
+                        if(shouldBeConnected && !isReconnecting && subscriptionFailureCount > 5) {
+                            this.__privates.iot.log('Subscription failure exceeded, reconnecting...');
+                            this.iot.__updateCredentials();
+                            return Promise.reject('subscription_failed');
+                        }
+                        subscriptionFailureCount++;
+
+                        return this.subscribe(topic)
                     });
             }
         },

package/src/modules/wt-iot-worker.worker.js

@@ -22,10 +22,10 @@ self.onmessage = function(event) {
             // No action needed in the worker
             break;
         case 'subscribe':
-            subscribe(topic);
+            subscribe(topic, stamp);
             break;
         case 'unsubscribe':
-            unsubscribe(topic);
+            unsubscribe(topic, stamp);
             break;
         case 'send':
             send(topic, message);
@@ -97,31 +97,31 @@ function isConnected() {
     self.postMessage({ type: 'is_connected_result', data:{connected} });
 }
 
-function subscribe(topic) {
+function subscribe(topic, stamp) {
     if (connection && connection.currentState === 0 && connection.desiredState === 0) {
         connection.subscribe(topic, mqtt.QoS.AtLeastOnce)
             .then(() => {
-                self.postMessage({ type: 'subscribe_result', data: {success: true} });
+                self.postMessage({ type: 'subscribe_result', data: {success: true, stamp} });
             })
             .catch((error) => {
-                self.postMessage({ type: 'subscribe_result', data: {success: false, error: error.message} });
+                self.postMessage({ type: 'subscribe_result', data: {success: false, error: error.message, stamp} });
             });
     } else {
-        self.postMessage({ type: 'subscribe_result', data: {success: false, error: 'Not connected'} });
+        self.postMessage({ type: 'subscribe_result', data: {success: false, error: 'Not connected', stamp} });
     }
 }
 
-function unsubscribe(topic) {
+function unsubscribe(topic, stamp) {
     if (connection && connection.currentState === 0 && connection.desiredState === 0) {
         connection.unsubscribe(topic)
             .then(() => {
-                self.postMessage({ type: 'unsubscribe_result', data: {success: true} });
+                self.postMessage({ type: 'unsubscribe_result', data: {success: true, stamp} });
             })
             .catch((error) => {
-                self.postMessage({ type: 'unsubscribe_result', data: {success: false, error: error.message} });
+                self.postMessage({ type: 'unsubscribe_result', data: {success: false, error: error.message, stamp} });
             });
     } else {
-        self.postMessage({ type: 'unsubscribe_result', data: {success: false, error: 'Not connected'} });
+        self.postMessage({ type: 'unsubscribe_result', data: {success: false, error: 'Not connected', stamp} });
     }
 }
 

package/src/modules/wt-iot2.js

@@ -133,7 +133,15 @@ class Iot {
         this.log('iot subscribe', topic);
         if (typeof topic === 'string' && topic.trim() !== '') {
             return new Promise((resolve, reject) => {
+
+                const stamp = new Date().getTime();
                 const handleSubscribeResult = (event) => {
+
+                    if(event.stamp !== stamp) {
+                        this.log('subscribe event stamp mismatch', event.stamp, stamp);
+                        return;
+                    }
+
                     this.off('worker:subscribe_result', handleSubscribeResult);
                     if (event.success) {
                         this.subscribedTopics.add(topic);
@@ -144,11 +152,11 @@ class Iot {
                 };
 
                 this.on('worker:subscribe_result', handleSubscribeResult);
-                this.worker.postMessage({ type: 'subscribe', topic });
+                this.worker.postMessage({ type: 'subscribe', topic, stamp });
             });
         } else {
             this.log('Invalid topic:', topic);
-            return Promise.reject(new Error('Invalid topic'));
+            return Promise.reject(new Error('Invalid topic', {cause: -1}));
         }
     }
 
@@ -156,7 +164,16 @@ class Iot {
         this.log('iot unsubscribe', topic);
         if (typeof topic === 'string' && topic.trim() !== '') {
             return new Promise((resolve, reject) => {
+
+                const stamp = new Date().getTime();
+
                 const handleUnsubscribeResult = (event) => {
+
+                    if(event.stamp !== stamp) {
+                        this.log('unsubscribe event stamp mismatch', event.stamp, stamp);
+                        return;
+                    }
+
                     this.off('worker:unsubscribe_result', handleUnsubscribeResult);
                     if (event.success) {
                         this.subscribedTopics.delete(topic);
@@ -167,7 +184,7 @@ class Iot {
                 };
 
                 this.on('worker:unsubscribe_result', handleUnsubscribeResult);
-                this.worker.postMessage({ type: 'unsubscribe', topic });
+                this.worker.postMessage({ type: 'unsubscribe', topic, stamp });
             });
         } else {
             this.log('Invalid topic:', topic);