@reactoo/watchtogether-sdk-js 2.7.26 → 2.7.31

package/example/index.html

@@ -185,6 +185,18 @@
             Instance.room.getSessionByConstructId(constructId).setRestrictSubscribeToUserIds(userIds)
         }
 
+        function iotLogout() {
+            return Instance.iot.iotLogout()
+        }
+
+        function itoLogin() {
+            return Instance.iot.iotLogin()
+        }
+
+        function iotSubscribe(topic) {
+            return Instance.iot.subscribe(topic)
+        }
+
         let Instance = WatchTogetherSDK({debug:true})({instanceType:'reactooDemo'});
 
         Instance.auth.$on('login', (r) => {

package/package.json

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

package/src/models/iot.js

@@ -114,6 +114,7 @@ let iot = function () {
             return this.__privates.iot.disconnect()
                 .then(() => {
                     this.iot.__promise = null;
+                    this.iot.$clear();
                     return true;
                 });
         },
@@ -126,14 +127,16 @@ let iot = function () {
             if(!__currentTopics.has(topic)) {
                 __currentTopics.add(topic);
                 if(!this.iot.__promise) return Promise.resolve('not_connected');
-                return this.iot.__promise.then(() => this.__privates.iot.subscribe(topic));
+                // if subscription fails, remove the topic from the current topics
+                return this.iot.__promise.then(() => !this.__privates.iot.subscribe(topic) && __currentTopics.delete(topic));
             }
         },
         
         unsubscribe: (topic) => {
             __currentTopics.delete(topic);
             if(!this.iot.__promise) return Promise.resolve('not_connected');
-            return this.iot.__promise.then(() => this.__privates.iot.unsubscribe(topic));
+            // if unsubscription fails add the topic back to the current topics
+            return this.iot.__promise.then(() => !this.__privates.iot.unsubscribe(topic) && __currentTopics.add(topic));
         },
         
         send: (topic, message) => {

package/src/modules/wt-iot.js

@@ -117,21 +117,25 @@ class Iot {
 
     subscribe(topic) {
         this.log('iot subscribe', topic);
-        if (this.connection && typeof topic === 'string' && topic.trim() !== '') {
+        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;
         } else {
             this.log('Invalid topic or not connected:', topic);
+            return false;
         }
     }
 
     unsubscribe(topic) {
         this.log('iot unsubscribe', topic);
-        if (this.connection && typeof topic === 'string' && topic.trim() !== '') {
+        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;
         } else {
             this.log('Invalid topic or not connected:', topic);
+            return false;
         }
     }
 
@@ -284,7 +288,7 @@ class Iot {
             }
 
             // Find a suitable topic for the connection check
-            const suitableTopic = Array.from(this.subscribedTopics).find(topic => topic.indexOf('user') === -1);
+            const suitableTopic = Array.from(this.subscribedTopics).find(topic => topic.indexOf('user') > -1);
 
             if (!suitableTopic) {
                 reject(new Error('No suitable topic found for connection check'));