@reactoo/watchtogether-sdk-js 2.6.24 → 2.6.26

package/package.json

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

package/src/modules/wt-room.js

@@ -518,8 +518,23 @@ class RoomSession {
 					this.id = msg["id"];
 					this.privateId = msg["private_id"];
 					this.isConnected = true;
-					this.emit('joined', true);
 					this._log('We have successfully joined Room');
+					this.emit('joined', true, this.constructId);
+					this.emit('addLocalParticipant', {
+						tid: generateUUID(),
+						id: handle.handleId,
+						constructId: this.constructId,
+						userId: decodeJanusDisplay(handle.userId)?.userId,
+						role: decodeJanusDisplay(this.display)?.role,
+						track: null,
+						stream: null,
+						streamMap: {},
+						source: null,
+						adding: false,
+						removing: false,
+						hasAudioTrack: false,
+						hasVideoTrack: false,
+					});
 					for (let f in list) {
 						let userId = list[f]["display"];
 						let streams = list[f]["streams"] || [];
@@ -732,10 +747,11 @@ class RoomSession {
 					userId: decodeJanusDisplay(handle.userId)?.userId,
 					role: decodeJanusDisplay(handle.userId)?.role,
 					stream: null,
-					streamMap: handle.webrtcStuff?.streamMap,
+					streamMap: structuredClone(handle.webrtcStuff?.streamMap),
 					source: null,
 					track: null,
 					adding: false,
+					removing: false,
 					constructId: this.constructId,
 					hasAudioTrack: false,
 					hasVideoTrack: false
@@ -1159,7 +1175,7 @@ class RoomSession {
 	}
 
 	disconnect() {
-		
+
 		if (this.isDisconnecting) {
 			return Promise.resolve();
 		}
@@ -1367,9 +1383,9 @@ class RoomSession {
 				pc_config.bundlePolicy = "max-bundle";
 			}
 
-            // pc_config.bundlePolicy = 'balanced';
-            // pc_config.iceTransportPolicy = 'relay';
-            // pc_config.rtcpMuxPolicy = "negotiate";
+			// pc_config.bundlePolicy = 'balanced';
+			// pc_config.iceTransportPolicy = 'relay';
+			// pc_config.rtcpMuxPolicy = "negotiate";
 
 			this._log('new RTCPeerConnection', pc_config, pc_constraints);
 
@@ -1394,12 +1410,12 @@ class RoomSession {
 						userId: decodeJanusDisplay(handle.userId)?.userId,
 						role: decodeJanusDisplay(handle.userId)?.role,
 						stream: config.stream,
-						streamMap: config.streamMap,
+						streamMap: structuredClone(config.streamMap),
 						track: null,
 						source: null,
-						optional: true,
 						constructId: this.constructId,
 						adding: false,
+						removing: false,
 						hasAudioTrack: !!(config.stream && config.stream.getAudioTracks().length),
 						hasVideoTrack: !!(config.stream && config.stream.getVideoTracks().length)
 					})
@@ -1417,10 +1433,9 @@ class RoomSession {
 						userId: decodeJanusDisplay(handle.userId)?.userId,
 						role: decodeJanusDisplay(handle.userId)?.role,
 						stream: config.stream,
-						streamMap: config.streamMap,
+						streamMap: structuredClone(config.streamMap),
 						track: null,
 						source: null,
-						optional: true,
 						constructId: this.constructId,
 						adding: false,
 						hasAudioTrack: !!(config.stream && config.stream.getAudioTracks().length),
@@ -1479,7 +1494,7 @@ class RoomSession {
 								userId: decodeJanusDisplay(handle.userId)?.userId,
 								role: decodeJanusDisplay(handle.userId)?.role,
 								stream: config.stream,
-								streamMap: config.streamMap,
+								streamMap: structuredClone(config.streamMap),
 								source,
 								track: ev.track,
 								adding: false,
@@ -1502,11 +1517,12 @@ class RoomSession {
 							userId: decodeJanusDisplay(handle.userId)?.userId,
 							role: decodeJanusDisplay(handle.userId)?.role,
 							stream: config.stream,
-							streamMap: config.streamMap,
+							streamMap: structuredClone(config.streamMap),
 							source,
 							track: event.track,
 							constructId: this.constructId,
 							adding: true,
+							removing: false,
 							hasAudioTrack: !!(config.stream && config.stream.getAudioTracks().length),
 							hasVideoTrack: !!(config.stream && config.stream.getVideoTracks().length)
 						});
@@ -1532,7 +1548,7 @@ class RoomSession {
 								userId: decodeJanusDisplay(handle.userId)?.userId,
 								role: decodeJanusDisplay(handle.userId)?.role,
 								stream: config.stream,
-								streamMap: config.streamMap,
+								streamMap: structuredClone(config.streamMap),
 								source,
 								track: ev.target,
 								adding: false,
@@ -1556,7 +1572,7 @@ class RoomSession {
 								userId: decodeJanusDisplay(handle.userId)?.userId,
 								role: decodeJanusDisplay(handle.userId)?.role,
 								stream: config.stream,
-								streamMap: config.streamMap,
+								streamMap: structuredClone(config.streamMap),
 								source,
 								kind: ev.target.kind,
 								track: ev.target,
@@ -1578,7 +1594,7 @@ class RoomSession {
 								userId: decodeJanusDisplay(handle.userId)?.userId,
 								role: decodeJanusDisplay(handle.userId)?.role,
 								stream: config.stream,
-								streamMap: config.streamMap,
+								streamMap: structuredClone(config.streamMap),
 								source,
 								kind: ev.target.kind,
 								track: ev.target,
@@ -2008,7 +2024,12 @@ class RoomSession {
 		let needsNegotiation = false;
 		let transceivers = config.pc.getTransceivers();
 		let existingTracks = [...(config.streamMap[source] || [])];
-		config.streamMap[source] = stream?.getTracks()?.map(track => track.id) || [];
+
+		if(stream?.getTracks().length) {
+			config.streamMap[source] = stream?.getTracks()?.map(track => track.id) || [];
+		} else {
+			delete config.streamMap[source];
+		}
 
 		// remove old audio track related to this source
 		let oldAudioStream = config?.stream?.getAudioTracks()?.find(track => existingTracks.includes(track.id));
@@ -2051,7 +2072,7 @@ class RoomSession {
 				videoTransceiver = transceiver;
 			}
 
-			// Reusing existing transceivers
+				// Reusing existing transceivers
 			// TODO: if we start using different codecs for different sources, we need to check for that here
 
 			else if(transceiver.currentDirection === 'inactive' && transceiver.sender?.getParameters()?.codecs?.find(c => c.mimeType.indexOf('audio') > -1) && replaceAudio && !audioTransceiver) {
@@ -2166,7 +2187,7 @@ class RoomSession {
 						role: decodeJanusDisplay(this.display)?.role,
 						track: ev.detail,
 						stream: config.stream,
-						streamMap: config.streamMap,
+						streamMap: structuredClone(config.streamMap),
 						source,
 						adding: false,
 						removing: true,
@@ -2194,7 +2215,7 @@ class RoomSession {
 							role: decodeJanusDisplay(this.display)?.role,
 							track,
 							stream: config.stream,
-							streamMap: config.streamMap,
+							streamMap: structuredClone(config.streamMap),
 							source,
 							adding: true,
 							constructId: this.constructId,
@@ -2211,7 +2232,6 @@ class RoomSession {
 				})
 			}
 
-			//TODO: legacy event, remove in future
 			else {
 				this.emit('addLocalParticipant', {
 					tid: generateUUID(),
@@ -2219,7 +2239,7 @@ class RoomSession {
 					userId: decodeJanusDisplay(handle.userId)?.userId,
 					role: decodeJanusDisplay(this.display)?.role,
 					stream: null,
-					streamMap: config.streamMap,
+					streamMap: structuredClone(config.streamMap),
 					source,
 					adding: false,
 					constructId: this.constructId,