@reactoo/watchtogether-sdk-js 2.5.20 → 2.5.21

package/example/index.html

@@ -24,7 +24,7 @@
 
     <script>
 
-        let roomId = 'fc2d34f2-de58-42a0-9312-5cd40f2d754e'; //It will create room automatically if not set
+        let roomId = 'adab485a-548e-44a8-a9ca-157f3ba50c6e'; //It will create room automatically if not set
         let pinHash = undefined;//'967ca05f-7fab-a205-5913-39393bbbe923';
 
 
@@ -124,6 +124,7 @@
             .then(r => {
 
                 if(roomId) {
+                    console.log(roomId);
                     return Promise.resolve({roomId, pinHash});
                 }
 

package/package.json

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

package/src/modules/wt-room.js

@@ -451,9 +451,9 @@ class RoomSession {
 			this._log('detached on', handle.handleId);
 			this._removeParticipant(handle.handleId, null, true);
 		} else if (type === "media") {
-			this._log('Media event:', handle.handleId, json["type"], json["receiving"]);
+			this._log('Media event:', handle.handleId, json["type"], json["receiving"], json["mid"]);
 		} else if (type === "slowlink") {
-			this._log('Slowlink', handle.handleId, json["uplink"], json["nacks"]);
+			this._log('Slowlink', handle.handleId, json["uplink"], json["lost"], json["mid"]);
 		} else if (type === "event") {
 			//none universal
 		} else if (type === 'timeout') {
@@ -1157,10 +1157,11 @@ class RoomSession {
 						id: handle.handleId,
 						userId: handle.userId,
 						stream: config.stream,
+						track: null,
 						optional: true,
 						constructId: this.constructId,
 						metaData: this.options.metaData,
-						adding: true,
+						adding: false,
 						hasAudioTrack: !!(config.stream && config.stream.getAudioTracks().length),
 						hasVideoTrack: !!(config.stream && config.stream.getVideoTracks().length)
 					})
@@ -1177,10 +1178,11 @@ class RoomSession {
 						id: handle.handleId,
 						userId: handle.userId,
 						stream: config.stream,
+						track: null,
 						optional: true,
 						constructId: this.constructId,
 						metaData: this.options.metaData,
-						adding: true,
+						adding: false,
 						hasAudioTrack: !!(config.stream && config.stream.getAudioTracks().length),
 						hasVideoTrack: !!(config.stream && config.stream.getVideoTracks().length)
 					})
@@ -1212,19 +1214,20 @@ class RoomSession {
 			if (enableOntrack) {
 				config.pc.ontrack = (event) => {
 					
-					// if(!event.streams)
-					//     return;
-					
+					if(!event.streams)
+					    return;
+
 					//config.stream = event.streams[0];
 					
 					if (!config.stream) {
 						config.stream = new MediaStream();
 					}
-					
 					if (event.track) {
+						let mid = event.transceiver ? event.transceiver.mid : event.track.id;
 						config.stream.addTrack(event.track);
 						this.emit(this._getAddParticipantEventName(handle.handleId), {
 							tid: generateUUID(),
+							mid,
 							id: handle.handleId,
 							userId: handle.userId,
 							stream: config.stream,
@@ -1240,17 +1243,27 @@ class RoomSession {
 							return;
 						
 						event.track.onended = (ev) => {
+
+							let mid = ev.target.id;
+							if(this.isUnifiedPlan) {
+								let transceiver = config.pc.getTransceivers().find(
+									t => t.receiver.track === ev.target);
+								mid = transceiver.mid;
+							}
+
 							if (config.stream) {
 								config.stream && config.stream.removeTrack(ev.target);
 								this.emit(this._getAddParticipantEventName(handle.handleId), {
 									tid: generateUUID(),
 									id: handle.handleId,
+									mid,
 									userId: handle.userId,
 									stream: config.stream,
 									track: ev.target,
 									constructId: this.constructId,
 									metaData: this.options.metaData,
 									adding: false,
+									removing: true,
 									hasAudioTrack: !!(config.stream && config.stream.getAudioTracks().length),
 									hasVideoTrack: !!(config.stream && config.stream.getVideoTracks().length)
 								});
@@ -1259,8 +1272,17 @@ class RoomSession {
 						
 						event.track.onmute = (ev) => {
 							this._log('remoteTrackMuted', 'onmute');
+
+							let mid = ev.target.id;
+							if(this.isUnifiedPlan) {
+								let transceiver = config.pc.getTransceivers().find(
+									t => t.receiver.track === ev.target);
+								mid = transceiver.mid;
+							}
+
 							this.emit('remoteTrackMuted', {
 								id: handle.handleId,
+								mid,
 								userId: handle.userId,
 								stream: config.stream,
 								kind: ev.target.kind,
@@ -1271,8 +1293,17 @@ class RoomSession {
 						
 						event.track.onunmute = (ev) => {
 							this._log('remoteTrackMuted', 'onunmute');
+
+							let mid = ev.target.id;
+							if(this.isUnifiedPlan) {
+								let transceiver = config.pc.getTransceivers().find(
+									t => t.receiver.track === ev.target);
+								mid = transceiver.mid;
+							}
+
 							this.emit('remoteTrackMuted', {
 								id: handle.handleId,
+								mid,
 								userId: handle.userId,
 								stream: config.stream,
 								kind: ev.target.kind,
@@ -1828,7 +1859,54 @@ class RoomSession {
 			})
 			.then(r => {
 				this._isPublished = true;
-				this.emit('addLocalParticipant', {tid:generateUUID(), id: handle.handleId, userId: handle.userId, stream: config.stream});
+				if(config.stream) {
+					let tracks = config.stream.getTracks();
+					tracks.forEach(track => {
+						// used as a flag to not emit tracks that been already emitted
+						if(!track.onended) {
+							this.emit('addLocalParticipant', {
+								tid: generateUUID(),
+								id: handle.handleId,
+								userId: handle.userId,
+								track,
+								stream: config.stream,
+								adding: true,
+								constructId: this.constructId,
+								metaData: this.options.metaData,
+								hasAudioTrack: hasAudio,
+								hasVideoTrack: hasVideo
+							});
+							track.onended = (ev) => {
+								this.emit('addLocalParticipant', {
+									tid:generateUUID(),
+									id: handle.handleId,
+									userId: handle.userId,
+									track: ev.target,
+									stream: config.stream,
+									adding: false,
+									removing: true,
+									constructId: this.constructId,
+									metaData: this.options.metaData,
+									hasAudioTrack: hasAudio,
+									hasVideoTrack: hasVideo
+								});
+							}
+						}
+					})
+				} else {
+					this.emit('addLocalParticipant', {
+						tid: generateUUID(),
+						id: handle.handleId,
+						userId: handle.userId,
+						stream: null,
+						adding: false,
+						constructId: this.constructId,
+						metaData: this.options.metaData,
+						hasAudioTrack: hasAudio,
+						hasVideoTrack: hasVideo
+					});
+				}
+
 				this.emit('published', {status: true, hasStream: !!config.stream});
 				this.emit('publishing', false);
 				this.emit('localHasVideo', hasVideo);
@@ -1854,7 +1932,7 @@ class RoomSession {
 			: Promise.resolve()
 	}
 	
-	toggleAudio(value = null) {
+	toggleAudio(value = null, mid) {
 		let handle = this._getHandle(this.handleId);
 		if (!handle) {
 			return Promise.reject({type: 'error', id: 21, message: 'no local id, connect first', data: null})
@@ -1862,7 +1940,7 @@ class RoomSession {
 		let config = handle.webrtcStuff;
 		if (this.isUnifiedPlan) {
 			let transceiver = config.pc.getTransceivers()
-				.find(t => t.sender && t.sender.track && t.receiver.track.kind === "audio" && t.stopped === false);
+				.find(t => t.sender && t.sender.track && t.receiver.track.kind === "audio" && t.stopped === false && (mid ? t.mid === mid : true));
 			if (transceiver) {
 				transceiver.sender.track.enabled = value !== null ? !!value : !transceiver.sender.track.enabled;
 			}
@@ -1873,10 +1951,10 @@ class RoomSession {
 			}
 			this.isAudioMuted = config.stream.getAudioTracks().length === 0 || !config.stream.getAudioTracks()[0].enabled;
 		}
-		this.emit('localMuted', {type: 'audio', value: this.isAudioMuted});
+		this.emit('localMuted', {type: 'audio', value: this.isAudioMuted, mid});
 	}
 	
-	toggleVideo() {
+	toggleVideo(value = null, mid) {
 		let handle = this._getHandle(this.handleId);
 		if (!handle) {
 			return Promise.reject({type: 'error', id: 21, message: 'no local id, connect first', data: null})
@@ -1885,19 +1963,19 @@ class RoomSession {
 		
 		if (this.isUnifiedPlan) {
 			let transceiver = config.pc.getTransceivers()
-				.find(t => t.sender && t.sender.track && t.receiver.track.kind === "video" && t.stopped === false);
+				.find(t => t.sender && t.sender.track && t.receiver.track.kind === "video" && t.stopped === false && (mid ? t.mid === mid : true));
 			if (transceiver) {
-				transceiver.sender.track.enabled = !transceiver.sender.track.enabled;
+				transceiver.sender.track.enabled = value !== null ? !!value : !transceiver.sender.track.enabled;
 			}
 			this.isVideoMuted = !transceiver || !transceiver.sender.track.enabled;
 		}
 		else {
 			if (config.stream && config.stream.getVideoTracks().length) {
-				config.stream.getVideoTracks()[0].enabled = !config.stream.getVideoTracks()[0].enabled;
+				config.stream.getVideoTracks()[0].enabled = value !== null ? !!value : !config.stream.getVideoTracks()[0].enabled;
 			}
 			this.isVideoMuted = config.stream.getVideoTracks().length === 0 || !config.stream.getVideoTracks()[0].enabled;
 		}
-		this.emit('localMuted', {type: 'video', value: this.isVideoMuted});
+		this.emit('localMuted', {type: 'video', value: this.isVideoMuted, mid});
 	}
 	
 	setInstructorId(instructorId = null) {