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

package/package.json

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

package/src/models/iot.js

@@ -10,10 +10,11 @@ let iot = function () {
     let subscriptionFailureCount = 0;
 
     return {
-        
+
         __promise: null,
 
         __createNewWorker: () => {
+            this.__privates.iot.log('Creating new worker...');
             this.__privates.iot.terminateWorker();
             this.__privates.iot.initWorker();
         },
@@ -44,11 +45,11 @@ let iot = function () {
                     return Promise.reject(error);
                 });
         },
-        
+
         getCredentials: () => {
             return this.__privates.auth.__client
                 .then(client => client.apis.auth.iotSignIn({}, {requestBody: {suggestedTopics:true, domain: location.hostname}}))
-            
+
         },
 
         onConnect: (data, connectionId) => {
@@ -92,7 +93,7 @@ let iot = function () {
             interruptCount++;
             this.__privates.iot.log('MQTT client connection_failure');
         },
-        
+
         iotLogin: (subscribeToSuggestedTopics = true) => {
 
             interruptCount = 0;
@@ -151,13 +152,12 @@ let iot = function () {
 
             return this.iot.__promise;
         },
-        
+
         iotLogout: (keepCurrentTopics = false) => {
 
             if(!keepCurrentTopics) {
                 __currentTopics.clear();
                 this.__privates.iot.clearTopics();
-                this.__privates.iot.terminateWorker();
             }
 
             interruptCount = 0;
@@ -169,6 +169,7 @@ let iot = function () {
 
             return this.__privates.iot.disconnect()
                 .finally(() => {
+                    this.__privates.iot.terminateWorker();
                     this.iot.$off('connect', this.iot.onConnect, this);
                     this.iot.$off('closed', this.iot.onClosed, this);
                     this.iot.$off('error', this.iot.onError, this);
@@ -182,11 +183,11 @@ let iot = function () {
                     return true;
                 });
         },
-        
+
         isConnected: () => {
             return this.__privates.iot.isConnected();
         },
-        
+
         subscribe: (topic) => {
             if(!__currentTopics.has(topic)) {
                 __currentTopics.add(topic);
@@ -218,7 +219,7 @@ let iot = function () {
                     });
             }
         },
-        
+
         unsubscribe: (topic) => {
             __currentTopics.delete(topic);
             if(!this.iot.__promise) return Promise.reject('not_connected');
@@ -230,19 +231,19 @@ let iot = function () {
                     return Promise.reject('unsubscription_failed');
                 });
         },
-        
+
         send: (topic, message) => {
             return this.iot.__promise.then(() => this.__privates.iot.send(topic,message));
         },
-        
+
         $once: (key, callback, that) => {
             return this.__privates.iot.once(key, callback, that || this);
         },
-        
+
         $on: (key, callback, that) => {
             return this.__privates.iot.on(key, callback, that || this);
         },
-        
+
         $off: (key, callback, that) => {
             return this.__privates.iot.off(key, callback, that || this);
         },
@@ -252,7 +253,7 @@ let iot = function () {
         $emit: (key, ...args) => {
             return this.__privates.iot.emit(key, ...args);
         },
-        
+
         checkConnection: () => {
             return this.__privates.iot.checkConnection()
                 .catch(error => {

package/src/modules/wt-iot2.js

@@ -26,11 +26,13 @@ class Iot {
     }
 
     initWorker() {
+        this.log('iot initWorker');
         this.worker = new Worker();
         this.worker.onmessage = this.handleWorkerMessage.bind(this);
     }
 
     terminateWorker() {
+        this.log('iot terminateWorker');
         this.worker.terminate();
     }
 
@@ -407,4 +409,4 @@ class Iot {
     }
 }
 
-export default Iot;
+export default Iot;