@reactoo/watchtogether-sdk-js 2.7.58 → 2.7.60

package/package.json

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

package/src/models/iot.js

@@ -235,6 +235,12 @@ let iot = function () {
                         this.__privates.iot.log('Ignoring connection check failure, not connected');
                         return Promise.resolve();
                     }
+
+                    if(isReconnecting) {
+                        this.__privates.iot.log('Connection check failed, but we are already reconnecting...');
+                        return Promise.resolve();
+                    }
+
                     this.__privates.iot.log('Connection check failed:', error);
                     return this.iot.__updateCredentials();
                 });

package/src/models/room.js

@@ -87,10 +87,6 @@ let room = function () {
 				}))
 		},
 
-		updateAttribute: () => {
-
-		},
-
 		updateRoom: ({roomId, title, description, isPublic, isRouter, recordings, slug, password, maxParticipants, setInstanceType = false, wtChannelId, isHd, isStudioLayout, hasStudioChat, reduceRoomControls, chatRoomId, linkedRoomId, type, disableSync, defaultRegion, isSimulcast, videoCodec, customAttributes, dotAttribute} = {}) => {
 			let _da = dotAttribute
 				? (Array.isArray(dotAttribute)
@@ -154,6 +150,19 @@ let room = function () {
 				}))
 		},
 
+		updateAttribute: ({roomId, id, operation, attributeName, value}) => {
+			return this.__privates.auth.__client
+				.then(client => client.apis.wt.updateAttribute({}, {
+					requestBody: {
+						id,
+						roomId,
+						operation,
+						attributeName,
+						value,
+					}
+				}))
+		},
+
 		getInviteUrl: ({roomId, domain, url, autologin}) => {
 			return this.__privates.auth.__client
 				.then(client => client.apis.wt.invite({}, {

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

@@ -2,7 +2,7 @@ import { mqtt, iot } from 'aws-iot-device-sdk-v2';
 console.log('Worker: Starting up');
 
 let connection = null;
-let currentConnectionId = null;
+let currentConnectionId = 1;
 
 self.onmessage = function(event) {
     const { type, params, topic, message } = event.data;
@@ -52,8 +52,8 @@ function connect(params) {
     const client = new mqtt.MqttClient();
 
     connection = client.new_connection(config);
-    // generate random connection id
-    currentConnectionId = Math.floor(Math.random() * 1000000);
+    // increment connection id
+    currentConnectionId++;
 
     setupConnectionListeners(currentConnectionId);
 
@@ -74,14 +74,14 @@ function disconnect() {
         connection.disconnect()
             .then(() => {
                 if(connectionId !== currentConnectionId) {
-                    console.log('Worker: Connection Id mismatch, ignoring disconnect result');
+                    console.log('Worker: Connection Id mismatch, ignoring disconnect result', connectionId, currentConnectionId);
                     return;
                 }
                 self.postMessage({ type: 'disconnect_result', data: {success: true} });
             })
             .catch((error) => {
                 if(connectionId !== currentConnectionId) {
-                    console.log('Worker: Connection Id mismatch, ignoring disconnect result');
+                    console.log('Worker: Connection Id mismatch, ignoring disconnect result', connectionId, currentConnectionId);
                     return;
                 }
                 self.postMessage({ type: 'disconnect_result', data: { success: false, error: error.message} });
@@ -136,7 +136,7 @@ function send(topic, message) {
 function setupConnectionListeners(connectionId) {
     connection.on('connect', () => {
         if(connectionId !== currentConnectionId) {
-            console.log('Worker: Connection Id mismatch, ignoring connect event');
+            console.log('Worker: Connection Id mismatch, ignoring connect event', connectionId, currentConnectionId);
             return;
         }
         self.postMessage({ type: 'connect', connectionId: connectionId});
@@ -144,7 +144,7 @@ function setupConnectionListeners(connectionId) {
 
     connection.on('disconnect', () => {
         if(connectionId !== currentConnectionId) {
-            console.log('Worker: Connection Id mismatch, ignoring disconnect event');
+            console.log('Worker: Connection Id mismatch, ignoring disconnect event', connectionId, currentConnectionId);
             return;
         }
         self.postMessage({ type: 'disconnect', connectionId: connectionId });
@@ -152,7 +152,7 @@ function setupConnectionListeners(connectionId) {
 
     connection.on('error', (error) => {
         if(connectionId !== currentConnectionId) {
-            console.log('Worker: Connection Id mismatch, ignoring error event');
+            console.log('Worker: Connection Id mismatch, ignoring error event', connectionId, currentConnectionId);
             return;
         }
         self.postMessage({ type: 'error', data: error });
@@ -160,7 +160,7 @@ function setupConnectionListeners(connectionId) {
 
     connection.on('interrupt', (error) => {
         if(connectionId !== currentConnectionId) {
-            console.log('Worker: Connection Id mismatch, ignoring interrupt event');
+            console.log('Worker: Connection Id mismatch, ignoring interrupt event', connectionId, currentConnectionId);
             return;
         }
         self.postMessage({ type: 'interrupt', data: error, connectionId: connectionId });
@@ -168,7 +168,7 @@ function setupConnectionListeners(connectionId) {
 
     connection.on('resume', (error) => {
         if(connectionId !== currentConnectionId) {
-            console.log('Worker: Connection Id mismatch, ignoring resume event');
+            console.log('Worker: Connection Id mismatch, ignoring resume event', connectionId, currentConnectionId);
             return;
         }
         self.postMessage({ type: 'resume', data: error, connectionId: connectionId });
@@ -176,7 +176,7 @@ function setupConnectionListeners(connectionId) {
 
     connection.on('message', (topic, payload) => {
         if(connectionId !== currentConnectionId) {
-            console.log('Worker: Connection Id mismatch, ignoring message event');
+            console.log('Worker: Connection Id mismatch, ignoring message event', connectionId, currentConnectionId);
             return;
         }
         self.postMessage({ type: 'message', data: { topic, payload }, connectionId: connectionId });
@@ -184,7 +184,7 @@ function setupConnectionListeners(connectionId) {
 
     connection.on('connection_success', (error) => {
         if(connectionId !== currentConnectionId) {
-            console.log('Worker: Connection Id mismatch, ignoring connection_success event');
+            console.log('Worker: Connection Id mismatch, ignoring connection_success event', connectionId, currentConnectionId);
             return;
         }
         self.postMessage({ type: 'connection_success', data: error, connectionId: connectionId });
@@ -192,7 +192,7 @@ function setupConnectionListeners(connectionId) {
 
     connection.on('connection_failure', (error) => {
         if(connectionId !== currentConnectionId) {
-            console.log('Worker: Connection Id mismatch, ignoring connection_failure event');
+            console.log('Worker: Connection Id mismatch, ignoring connection_failure event', connectionId, currentConnectionId);
             return;
         }
         self.postMessage({ type: 'connection_failure', data: error, connectionId: connectionId });

package/src/modules/wt-iot2.js

@@ -43,10 +43,6 @@ class Iot {
                 this.lastConnectParams = { apiMqttUrl, apiMqttClientId, region, accessKeyId, secretAccessKey, sessionToken, expiration };
 
                 return new Promise((resolve, reject) => {
-                    const timeoutId = setTimeout(() => {
-                        this.off('worker:connect_result');
-                        reject(new Error('Connection timeout'));
-                    }, 5000);
 
                     const handleConnectResult = (event) => {
                         clearTimeout(timeoutId);
@@ -59,6 +55,11 @@ class Iot {
                         }
                     };
 
+                    const timeoutId = setTimeout(() => {
+                        this.off('worker:connect_result', handleConnectResult);
+                        reject(new Error('Connection timeout'));
+                    }, 10000);
+
                     this.on('worker:connect_result', handleConnectResult);
 
                     this.worker.postMessage({
@@ -73,10 +74,6 @@ class Iot {
         this.log('iot disconnect');
         this.stopCredentialsExpirationCheck();
         return new Promise((resolve, reject) => {
-            const timeoutId = setTimeout(() => {
-                this.off('worker:disconnect_result');
-                reject(new Error('Disconnect timeout'));
-            }, 5000);
 
             const handleDisconnectResult = (event) => {
                 clearTimeout(timeoutId);
@@ -87,6 +84,12 @@ class Iot {
                     reject(new Error(event.error));
                 }
             };
+
+            const timeoutId = setTimeout(() => {
+                this.off('worker:disconnect_result', handleDisconnectResult);
+                reject(new Error('Disconnect timeout'));
+            }, 5000);
+
             this.on('worker:disconnect_result', handleDisconnectResult);
             this.worker.postMessage({ type: 'disconnect' });
         });