@reactoo/watchtogether-sdk-js 2.4.15 → 2.4.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactoo/watchtogether-sdk-js",
-  "version": "2.4.15",
+  "version": "2.4.19",
   "description": "Javascript SDK for Reactoo",
   "main": "src/index.js",
   "unpkg": "dist/watchtogether-sdk.min.js",
@@ -25,11 +25,11 @@
   },
   "homepage": "https://github.com/picitujeromanov/WR-SDK",
   "devDependencies": {
-    "@babel/core": "^7.15.0",
+    "@babel/core": "^7.15.8",
     "@babel/plugin-proposal-class-properties": "^7.14.5",
     "@babel/plugin-proposal-optional-chaining": "^7.14.5",
-    "@babel/plugin-proposal-private-property-in-object": "^7.14.5",
-    "@babel/preset-env": "^7.15.0",
+    "@babel/plugin-proposal-private-property-in-object": "^7.15.4",
+    "@babel/preset-env": "^7.15.8",
     "acorn": "^6.4.2",
     "babel-core": "^6.26.3",
     "babel-loader": "^8.2.2",
@@ -46,7 +46,7 @@
     "aws-iot-device-sdk": "^2.2.11",
     "paho-mqtt": "^1.1.0",
     "serialize-error": "^7.0.1",
-    "swagger-client": "^3.16.0",
+    "swagger-client": "^3.16.1",
     "webrtc-adapter": "^7.7.1"
   },
   "browserslist": [

package/src/models/auth.js

@@ -14,14 +14,14 @@ let auth = function () {
                 })
         },
 
-        providerLogin: (domain, token, displayname) => {
+        providerLogin: (domain, token, displayname, deviceId) => {
             
             if(!token && typeof this.__privates.providerAuth === 'function') {
                 ({token, displayname} = this.__privates.providerAuth());
             }
             
             return this.__privates.auth.__client
-                .then(client => client.apis.auth.providerSignIn({},{requestBody:{domain, token, ...(displayname !== null && {displayname})}}))
+                .then(client => client.apis.auth.providerSignIn({},{requestBody:{domain, token, ...(displayname && {displayname}), ...(deviceId !== null && {deviceId})}}))
                 .then(response => {
                     this.userId = response.data.userId;
                     this.username = response.data.username;

package/src/models/room-session.js

@@ -83,7 +83,7 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 				isInstructor
 			}), wt.user.getUserSelf()])
 				.then(([roomData, userData]) => Promise.all([roomData, userData, this.setRoomVars()]))
-				.then(([roomData, userData, _]) => room.connect(roomData.data.roomId, roomData.data.pin, roomData.data.href, roomData.data.iceServers, roomData.data.accessToken, (isMonitor || isInstructor) ? roomData.data.userId : userData.data._id, roomData.data.webrtcVersion, (roomData.data.bitrate ? parseInt(roomData.data.bitrate) : 0), isMonitor, roomData.data.recordingFilename))
+				.then(([roomData, userData, _]) => room.connect(roomData.data.roomId, roomData.data.pin, roomData.data.href, roomData.data.iceServers, roomData.data.accessToken, (isMonitor || isInstructor || isTalkback) ? roomData.data.userId : userData.data._id, roomData.data.webrtcVersion, (roomData.data.bitrate ? parseInt(roomData.data.bitrate) : 0), isMonitor, roomData.data.recordingFilename))
 				.finally(() => {
 					emitter.emit('connecting', false);
 				})
@@ -351,11 +351,11 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 		},
 		
 		unpublishLocal: () => {
-			return room.unpublishLocal()
+			return room.unpublishLocal();
 		},
 		
-		toggleAudio: () => {
-			return room.toggleAudio()
+		toggleAudio: (value) => {
+			return room.toggleAudio(value);
 		},
 		
 		toggleVideo: () => {

package/src/modules/sync-modules/sync-dash-vod.js

@@ -207,19 +207,32 @@ const syncVodDashJs = function ({room, wt, roomSession, emitter} = {}) {
 		}
 	};
 	
-	const parseIotEvents = (data) => {
+	const executePlayerIotEvents = (data) => {
 		let rid = _roomId || room.roomId;
+		if(data.attributeName === 'playerReplay' && (!rid || data?.roomId === rid)) {
+			seekTo(0).then(() => playMedia());
+		}
+		
+		if(data.attributeName === 'playerPlay' && (!rid || data?.roomId === rid)) {
+			playMedia();
+		}
+		
+		if(data.attributeName === 'playerPause' && (!rid || data?.roomId === rid)) {
+			pauseMedia();
+		}
+	};
+	
+	const parseIotEvents = (data) => {
 		if(data.event === 'template_updated') {
-			if(data.operation === 'sendMessage' && data.attributeName === 'playerReplay' && (!rid || data?.roomId === rid)) {
-				seekTo(0).then(() => playMedia());
-			}
-			
-			if(data.operation === 'sendMessage' && data.attributeName === 'playerPlay' && (!rid || data?.roomId === rid)) {
-				playMedia();
+			if(data.operation === 'multi') {
+				(data.value || []).forEach(event => {
+					if (event.operation === 'sendMessage') {
+						executePlayerIotEvents({...data, roomId: data.roomId, userId: data.userId});
+					}
+				})
 			}
-			
-			if(data.operation === 'sendMessage' && data.attributeName === 'playerPause' && (!rid || data?.roomId === rid)) {
-				pauseMedia();
+			if(data.operation === 'sendMessage') {
+				executePlayerIotEvents(data);
 			}
 		}
 	};

package/src/modules/sync-modules/sync-hls-vod.js

@@ -207,19 +207,32 @@ const syncVodHlsJs = function ({room, wt, roomSession, emitter} = {}) {
         }
     };
     
-    const parseIotEvents = (data) => {
+    const executePlayerIotEvents = (data) => {
         let rid = _roomId || room.roomId;
+        if(data.attributeName === 'playerReplay' && (!rid || data?.roomId === rid)) {
+            seekTo(0).then(() => playMedia());
+        }
+    
+        if(data.attributeName === 'playerPlay' && (!rid || data?.roomId === rid)) {
+            playMedia();
+        }
+    
+        if(data.attributeName === 'playerPause' && (!rid || data?.roomId === rid)) {
+            pauseMedia();
+        }
+    };
+    
+    const parseIotEvents = (data) => {
         if(data.event === 'template_updated') {
-            if(data.operation === 'sendMessage' && data.attributeName === 'playerReplay' && (!rid || data?.roomId === rid)) {
-                seekTo(0).then(() => playMedia());
-            }
-            
-            if(data.operation === 'sendMessage' && data.attributeName === 'playerPlay' && (!rid || data?.roomId === rid)) {
-                playMedia();
+            if(data.operation === 'multi') {
+                (data.value || []).forEach(event => {
+                    if (event.operation === 'sendMessage') {
+                        executePlayerIotEvents({...data, roomId: data.roomId, userId: data.userId});
+                    }
+                })
             }
-            
-            if(data.operation === 'sendMessage' && data.attributeName === 'playerPause' && (!rid || data?.roomId === rid)) {
-                pauseMedia();
+            if(data.operation === 'sendMessage') {
+                executePlayerIotEvents(data);
             }
         }
     };

package/src/modules/sync-modules/sync-native-hls-vod.js

@@ -199,19 +199,32 @@ const syncVodHlsJs = function ({room, wt, roomSession, emitter} = {}) {
         return room._isDataChannelOpen && room._hasJoined;
     };
     
-    const parseIotEvents = (data) => {
+    const executePlayerIotEvents = (data) => {
         let rid = _roomId || room.roomId;
+        if(data.attributeName === 'playerReplay' && (!rid || data?.roomId === rid)) {
+            seekTo(0).then(() => playMedia());
+        }
+        
+        if(data.attributeName === 'playerPlay' && (!rid || data?.roomId === rid)) {
+            playMedia();
+        }
+        
+        if(data.attributeName === 'playerPause' && (!rid || data?.roomId === rid)) {
+            pauseMedia();
+        }
+    };
+    
+    const parseIotEvents = (data) => {
         if(data.event === 'template_updated') {
-            if(data.operation === 'sendMessage' && data.attributeName === 'playerReplay' && (!rid || data?.roomId === rid)) {
-                seekTo(0).then(() => playMedia());
-            }
-            
-            if(data.operation === 'sendMessage' && data.attributeName === 'playerPlay' && (!rid || data?.roomId === rid)) {
-                playMedia();
+            if(data.operation === 'multi') {
+                (data.value || []).forEach(event => {
+                    if (event.operation === 'sendMessage') {
+                        executePlayerIotEvents({...data, roomId: data.roomId, userId: data.userId});
+                    }
+                })
             }
-            
-            if(data.operation === 'sendMessage' && data.attributeName === 'playerPause' && (!rid || data?.roomId === rid)) {
-                pauseMedia();
+            if(data.operation === 'sendMessage') {
+                executePlayerIotEvents(data);
             }
         }
     };

package/src/modules/sync-modules/sync-shaka-dash-vod.js

@@ -205,19 +205,32 @@ const syncVodShakaDash = function ({room, wt, roomSession, emitter} = {}) {
 		}
 	};
 	
-	const parseIotEvents = (data) => {
+	const executePlayerIotEvents = (data) => {
 		let rid = _roomId || room.roomId;
+		if(data.attributeName === 'playerReplay' && (!rid || data?.roomId === rid)) {
+			seekTo(0).then(() => playMedia());
+		}
+		
+		if(data.attributeName === 'playerPlay' && (!rid || data?.roomId === rid)) {
+			playMedia();
+		}
+		
+		if(data.attributeName === 'playerPause' && (!rid || data?.roomId === rid)) {
+			pauseMedia();
+		}
+	};
+	
+	const parseIotEvents = (data) => {
 		if(data.event === 'template_updated') {
-			if(data.operation === 'sendMessage' && data.attributeName === 'playerReplay' && (!rid || data?.roomId === rid)) {
-				seekTo(0).then(() => playMedia());
-			}
-			
-			if(data.operation === 'sendMessage' && data.attributeName === 'playerPlay' && (!rid || data?.roomId === rid)) {
-				playMedia();
+			if(data.operation === 'multi') {
+				(data.value || []).forEach(event => {
+					if (event.operation === 'sendMessage') {
+						executePlayerIotEvents({...data, roomId: data.roomId, userId: data.userId});
+					}
+				})
 			}
-			
-			if(data.operation === 'sendMessage' && data.attributeName === 'playerPause' && (!rid || data?.roomId === rid)) {
-				pauseMedia();
+			if(data.operation === 'sendMessage') {
+				executePlayerIotEvents(data);
 			}
 		}
 	};

package/src/modules/wt-room.js

@@ -2005,7 +2005,7 @@ class RoomSession {
 			: Promise.resolve()
 	}
 	
-	toggleAudio() {
+	toggleAudio(value = null) {
 		let handle = this._getHandle(this.handleId);
 		if (!handle) {
 			return Promise.reject({type: 'error', id: 21, message: 'no local id, connect first', data: null})
@@ -2015,12 +2015,12 @@ class RoomSession {
 			let transceiver = config.pc.getTransceivers()
 				.find(t => t.sender && t.sender.track && t.receiver.track.kind === "audio" && t.stopped === false);
 			if (transceiver) {
-				transceiver.sender.track.enabled = !transceiver.sender.track.enabled;
+				transceiver.sender.track.enabled = value !== null ? !!value : !transceiver.sender.track.enabled;
 			}
 			this.isAudioMuted = !transceiver || !transceiver.sender.track.enabled;
 		} else {
 			if (config.stream && config.stream.getAudioTracks().length) {
-				config.stream.getAudioTracks()[0].enabled = !config.stream.getAudioTracks()[0].enabled;
+				config.stream.getAudioTracks()[0].enabled = value !== null ? !!value : !config.stream.getAudioTracks()[0].enabled;
 			}
 			this.isAudioMuted = config.stream.getAudioTracks().length === 0 || !config.stream.getAudioTracks()[0].enabled;
 		}