@reactoo/watchtogether-sdk-js 2.7.43 → 2.7.44-beta.1

package/package.json

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

package/src/models/iot.js

@@ -107,12 +107,9 @@ let iot = function () {
                     .then(resolve)
                     .catch(reject)
             });
-            
-            let __currentTopicsCopy = new Set(__currentTopics); // Keep this line
+
             __currentTopics.clear();
 
-            this.iot.setupVisibilityChangeListener();
-            this.iot.setupKeepAliveInterval();
             this.iot.$on('connect', this.iot.onConnect, this);
             this.iot.$on('closed', this.iot.onClosed, this);
             this.iot.$on('error', this.iot.onError, this);
@@ -128,9 +125,14 @@ let iot = function () {
                     if(!subscribeToSuggestedTopics) {
                         return  Promise.resolve(instance)
                     }
-                    let topics = new Set([...suggestedTopic, ...__currentTopicsCopy]); // Filter out any undefined or null topics
+                    let topics = new Set([...suggestedTopic]); // Filter out any undefined or null topics
                     return Promise.all(Array.from(topics).map(topic => this.iot.subscribe(topic))).then(() => instance)
                 })
+                .then((instance) => {
+                    this.iot.setupVisibilityChangeListener();
+                    this.iot.setupKeepAliveInterval();
+                    return instance;
+                })
                 .catch((error) => {
                     this.__privates.iot.log('MQTT Login Error:', error);
                     throw error;
@@ -148,10 +150,11 @@ let iot = function () {
             interruptCount = 0;
             shouldBeConnected = false;
 
+            this.iot.disableVisibilityChangeListener();
+            this.iot.disableKeepAliveInterval();
+
             return this.__privates.iot.disconnect()
                 .then(() => {
-                    this.iot.disableVisibilityChangeListener();
-                    this.iot.disableKeepAliveInterval();
                     this.iot.$off('connect', this.iot.onConnect, this);
                     this.iot.$off('closed', this.iot.onClosed, this);
                     this.iot.$off('error', this.iot.onError, this);
@@ -174,17 +177,27 @@ let iot = function () {
         subscribe: (topic) => {
             if(!__currentTopics.has(topic)) {
                 __currentTopics.add(topic);
-                if(!this.iot.__promise) return Promise.resolve('not_connected');
+                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) && __currentTopics.delete(topic));
+                return this.iot.__promise
+                    .then(() => this.__privates.iot.subscribe(topic))
+                    .catch(() => {
+                        __currentTopics.delete(topic);
+                        return Promise.reject('subscription_failed');
+                    });
             }
         },
         
         unsubscribe: (topic) => {
             __currentTopics.delete(topic);
-            if(!this.iot.__promise) return Promise.resolve('not_connected');
+            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) && __currentTopics.add(topic));
+            return this.iot.__promise
+                .then(() => this.__privates.iot.unsubscribe(topic))
+                .catch(() => {
+                    __currentTopics.add(topic);
+                    return Promise.reject('unsubscription_failed');
+                });
         },
         
         send: (topic, message) => {

package/src/modules/wt-iot.js

@@ -104,24 +104,32 @@ class Iot {
     subscribe(topic) {
         this.log('iot subscribe', topic);
         if (this.connection && this.connection.currentState === 0 && this.connection.desiredState === 0 && typeof topic === 'string' && topic.trim() !== '') {
-            this.connection.subscribe(topic, mqtt.QoS.AtLeastOnce);
             this.subscribedTopics.add(topic);
-            return true;
+            return this.connection.subscribe(topic, mqtt.QoS.AtLeastOnce)
+                .catch(err => {
+                    this.log('Error subscribing to topic:', err);
+                    this.subscribedTopics.delete(topic);
+                    return Promise.reject(err);
+                });
         } else {
             this.log('Invalid topic or not connected:', topic);
-            return false;
+            return Promise.reject(new Error('Invalid topic or not connected'));
         }
     }
 
     unsubscribe(topic) {
         this.log('iot unsubscribe', topic);
         if (this.connection && this.connection.currentState === 0 && this.connection.desiredState === 0 && typeof topic === 'string' && topic.trim() !== '') {
-            this.connection.unsubscribe(topic);
             this.subscribedTopics.delete(topic);
-            return true;
+            return this.connection.unsubscribe(topic)
+                .catch(err => {
+                    this.log('Error unsubscribing from topic:', err);
+                    this.subscribedTopics.add(topic);
+                    return Promise.reject(err);
+                });
         } else {
             this.log('Invalid topic or not connected:', topic);
-            return false;
+            return Promise.reject(new Error('Invalid topic or not connected'));
         }
     }