@reactoo/watchtogether-sdk-js 2.7.69 → 2.7.71

package/package.json

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

package/src/models/iot.js

@@ -99,7 +99,7 @@ let iot = function () {
             interruptCount = 0;
             subscriptionFailureCount = 0;
             shouldBeConnected = true;
-
+            this.__privates.iot.initWorker();
             this.iot.__promise = new Promise((resolve, reject) => {
                 this.iot.getCredentials()
                     .then(response => {

package/src/modules/wt-iot2.js

@@ -32,7 +32,7 @@ class Iot {
 
     terminateWorker() {
         this.log('iot terminateWorker');
-        this.worker.terminate();
+        this.worker?.terminate();
     }
 
     connect(apiMqttUrl, apiMqttClientId, region, accessKeyId, secretAccessKey, sessionToken, expiration) {
@@ -44,13 +44,16 @@ class Iot {
             })
             .then(() => {
                 this.log('iot connect');
+
+                if(!this.worker) {
+                    this.log('Worker not initialized');
+                    return Promise.reject(new Error('Worker not initialized', {cause: -1}));
+                }
+
                 this.abortController = new AbortController();
-                this.initWorker();
                 this.startCredentialsExpirationCheck(expiration);
                 this.lastConnectParams = { apiMqttUrl, apiMqttClientId, region, accessKeyId, secretAccessKey, sessionToken, expiration };
-
                 return new Promise((resolve, reject) => {
-
                     const stamp = new Date().getTime();
 
                     const handleConnectResult = (event) => {
@@ -76,7 +79,7 @@ class Iot {
 
                     this.on('worker:connect_result', handleConnectResult);
 
-                    this.worker.postMessage({
+                    this.worker?.postMessage({
                         type: 'connect',
                         params: this.lastConnectParams,
                         stamp: stamp
@@ -89,6 +92,12 @@ class Iot {
         this.log('iot disconnect');
         this.stopCredentialsExpirationCheck();
         this.abortController?.abort();
+
+        if(!this.worker) {
+            this.log('Worker not initialized');
+            return Promise.reject(new Error('Worker not initialized', {cause: -1}));
+        }
+
         return new Promise((resolve, reject) => {
 
             const stamp = new Date().getTime();
@@ -115,11 +124,17 @@ class Iot {
             }, 5000);
 
             this.on('worker:disconnect_result', handleDisconnectResult);
-            this.worker.postMessage({ type: 'disconnect', stamp: stamp });
+            this.worker?.postMessage({ type: 'disconnect', stamp: stamp });
         });
     }
 
     isConnected() {
+
+        if(!this.worker) {
+            this.log('Worker not initialized');
+            return Promise.reject(new Error('Worker not initialized', {cause: -1}));
+        }
+
         return new Promise((resolve) => {
             const handleIsConnectedResult = (event) => {
                 this.off('worker:is_connected_result', handleIsConnectedResult);
@@ -127,20 +142,25 @@ class Iot {
             };
 
             this.on('worker:is_connected_result', handleIsConnectedResult);
-            this.worker.postMessage({ type: 'is_connected' });
+            this.worker?.postMessage({ type: 'is_connected' });
         });
     }
 
     clearTopics() {
         this.subscribedTopics.clear();
-        this.worker.postMessage({ type: 'clear_topics' });
+        this.worker?.postMessage({ type: 'clear_topics' });
     }
 
     subscribe(topic) {
         this.log('iot subscribe', topic);
         if (typeof topic === 'string' && topic.trim() !== '') {
-            return new Promise((resolve, reject) => {
 
+            if(!this.worker) {
+                this.log('Worker not initialized');
+                return Promise.reject(new Error('Worker not initialized', {cause: -1}));
+            }
+
+            return new Promise((resolve, reject) => {
                 const stamp = new Date().getTime();
                 const handleSubscribeResult = (event) => {
 
@@ -159,7 +179,7 @@ class Iot {
                 };
 
                 this.on('worker:subscribe_result', handleSubscribeResult);
-                this.worker.postMessage({ type: 'subscribe', topic, stamp });
+                this.worker?.postMessage({ type: 'subscribe', topic, stamp });
             });
         } else {
             this.log('Invalid topic:', topic);
@@ -170,6 +190,12 @@ class Iot {
     unsubscribe(topic) {
         this.log('iot unsubscribe', topic);
         if (typeof topic === 'string' && topic.trim() !== '') {
+
+            if(!this.worker) {
+                this.log('Worker not initialized');
+                return Promise.reject(new Error('Worker not initialized', {cause: -1}));
+            }
+
             return new Promise((resolve, reject) => {
 
                 const stamp = new Date().getTime();
@@ -191,7 +217,7 @@ class Iot {
                 };
 
                 this.on('worker:unsubscribe_result', handleUnsubscribeResult);
-                this.worker.postMessage({ type: 'unsubscribe', topic, stamp });
+                this.worker?.postMessage({ type: 'unsubscribe', topic, stamp });
             });
         } else {
             this.log('Invalid topic:', topic);
@@ -202,7 +228,7 @@ class Iot {
     send(topic, message) {
         this.log('iot send', topic, message);
         let msg = typeof message === 'object' ? JSON.stringify(message) : message;
-        this.worker.postMessage({ type: 'send', topic, message: msg });
+        this.worker?.postMessage({ type: 'send', topic, message: msg });
     }
 
     handleWorkerMessage(event) {